lib/sunspot.rb in outoftime-sunspot-0.0.1 vs lib/sunspot.rb in outoftime-sunspot-0.0.2

@@ -1,22 +1,21 @@
-require 'rubygems'
 gem 'solr-ruby'
 gem 'extlib'
 require 'solr'
 require 'extlib'
 require File.join(File.dirname(__FILE__), 'light_config')
 
-%w(adapters restriction conditions configuration field field_builder indexer query query_builder scope_builder search session type util).each do |filename|
+%w(adapters builder restriction configuration field indexer query search session type util dsl).each do |filename|
   require File.join(File.dirname(__FILE__), 'sunspot', filename)
 end
 
 module Sunspot
   VERSION='0.0.1'
 end
 
 class <<Sunspot
   def setup(clazz, &block)
-    ::Sunspot::FieldBuilder.new(clazz).instance_eval(&block) if block
+    ::Sunspot::DSL::Fields.new(clazz).instance_eval(&block) if block
   end
 
   def index(*objects)
     session.index(*objects)
   end