Update acts_as_solr_reloaded

Changes from https://github.com/coletivoEITA/acts_as_solr_reloaded

Update acts_as_solr_reloaded
Changes from https://github.com/coletivoEITA/acts_as_solr_reloaded
Braulio Bhavamitra
1 parent 0ffb2519
Showing 35 changed files with 497 additions and 378 deletions Show diff stats
vendor/plugins/acts_as_solr_reloaded/.gitignore
vendor/plugins/acts_as_solr_reloaded/.travis.yml
vendor/plugins/acts_as_solr_reloaded/Gemfile
vendor/plugins/acts_as_solr_reloaded/README.markdown
vendor/plugins/acts_as_solr_reloaded/Rakefile
vendor/plugins/acts_as_solr_reloaded/TESTING_THE_PLUGIN
vendor/plugins/acts_as_solr_reloaded/config/solr_environment.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/acts_methods.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/class_methods.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/deprecation.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/instance_methods.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/mongo_mapper.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/parser_methods.rb
vendor/plugins/acts_as_solr_reloaded/lib/acts_as_solr/search_results.rb
vendor/plugins/acts_as_solr_reloaded/lib/solr.rb
vendor/plugins/acts_as_solr_reloaded/lib/solr/field.rb
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/add_document.rb
vendor/plugins/acts_as_solr_reloaded/lib/solr/request/standard.rb
vendor/plugins/acts_as_solr_reloaded/lib/solr/util.rb
vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
@@ -11,6 +11,10 @@ solr/start.jar
 solr/webapps/
 solr/solr/data/*
+Gemfile.lock
+test/solr
+test/tmp
+
 acts_as_solr_reloaded-*.gem
 *.log
 *.log
@@ -0,0 +1,13 @@
+before_script:
+  - mongo mydb_test --eval 'db.addUser("travis", "test");'
+  - gem update --system 1.4.1 > /dev/null 2>&1
+  - rake solr:download
+  - RAILS_ENV=test rake solr:start
+
+script: "bundle exec rake $TASK --trace"
+
+rvm:
+  - 1.8.7
+env: 
+  - TASK=test
+  - TASK=test:functional
@@ -0,0 +1,13 @@
+source :rubygems
+
+gem 'ruby-debug'
+
+gem 'rails', '2.3.5'
+
+gem 'sqlite3'
+
+gem 'mongo_mapper', '0.7.6'
+gem 'bson_ext', '1.0'
+
+gem 'mocha'
+gem 'thoughtbot-shoulda'
+[![Build status](https://secure.travis-ci.org/coletivoEITA/acts_as_solr_reloaded.png?branch=master)](http://travis-ci.org/coletivoEITA/acts_as_solr_reloaded)
+
 Description
 ======
 This plugin adds full text search capabilities and many other nifty features from Apache's [Solr](http://lucene.apache.org/solr/) to any Rails model.
@@ -6,6 +8,8 @@ It was based on the first draft by Erik Hatcher.
 This plugin is intended for use in old versions of Rails. For newer versions, I strongly advice using Sunspot!
 Nevertheless, this plugin is used for Noosfero project in production. Any problem please open an issue.
+It should support Rails 2.1 (and greater 2.x) and is developed latest Solr versions, so don't expect it to run on older Solr.
+
 Installation
 ======
@@ -3,6 +3,9 @@ require &#39;rake&#39;
 require 'rake/testtask'
 require 'rake/rdoctask'
+ENV['RAILS_ENV'] = "test"
+require File.expand_path("#{File.dirname(__FILE__)}/config/solr_environment")
+
 Dir["#{File.dirname(__FILE__)}/lib/tasks/*.rake"].sort.each { |ext| load ext }
 desc "Default Task"
@@ -13,10 +16,7 @@ task :test =&gt; &quot;test:unit&quot;
 namespace :test do
   task :setup do
-    RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/test") unless defined? RAILS_ROOT
-    ENV['RAILS_ENV'] = "test"
-    ENV["ACTS_AS_SOLR_TEST"] = "true"
-    require File.expand_path("#{File.dirname(__FILE__)}/config/solr_environment")
+    DB ||= 'sqlite'
     puts "Using " + DB
     %x(mysql -u#{MYSQL_USER} < #{File.dirname(__FILE__) + "/test/fixtures/db_definitions/mysql.sql"}) if DB == 'mysql'
@@ -34,13 +34,13 @@ namespace :test do
   end
   desc 'Runs the functional tests, testing integration with Solr'
-  Rake::TestTask.new('functional' => :setup) do |t|
+  Rake::TestTask.new(:functional => :setup) do |t|
     t.pattern = "test/functional/*_test.rb"
     t.verbose = true
   end
   desc "Unit tests"
-  Rake::TestTask.new(:unit) do |t|
+  Rake::TestTask.new(:unit => :setup) do |t|
     t.libs << 'test/unit'
     t.pattern = "test/unit/*_shoulda.rb"
     t.verbose = true
 acts_as_solr comes with a quick and fast unit test suite, and with a longer-running
 functional test suite, the latter testing the actual integration with Solr.
-The unit test suite is written using Shoulda, so make sure you have a recent version
-installed.
+== Install dependencies
+sudo apt-get install mongodb-server
+bundle install
+gem update --system 1.4.1
-Running `rake test` or just `rake` will run both test suites. Use `rake test:unit` to
-just run the unit test suite.
- 
-== How to run functional tests for this plugin:
+== Running test
 To run the acts_as_solr's plugin tests run the following steps:
-- create a MySQL database called "actsassolr_test" (if you want to use MySQL)
+- RAILS_ENV=test rake solr:start
-- create a new Rails project, if needed (the plugin can only be tested from within a Rails project); move/checkout acts_as_solr into its vendor/plugins/, as usual
-
-- copy vendor/plugins/acts_as_solr_reloaded/config/solr.yml to config/ (the Rails config folder)
-
-- rake solr:start RAILS_ENV=test
+- rake test:unit
+(or just rake test)
 - rake test:functional (Accepts the following arguments: DB=sqlite|mysql and MYSQL_USER=user)
-ENV['RAILS_ENV']  = (ENV['RAILS_ENV'] || 'development').dup
+ENV['RAILS_ENV'] = (ENV['RAILS_ENV'] || 'development').dup
 require "uri"
 require "fileutils"
 require "yaml"
+require 'net/http'
+
 dir = File.dirname(__FILE__)
 SOLR_PATH = File.expand_path("#{dir}/../solr") unless defined? SOLR_PATH
-# RAILS_ROOT isn't defined yet, so figure it out.
 unless defined? RAILS_ROOT
-  RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../test")
+  # define RAILS_ROOT for test environment
+  RAILS_ROOT = defined?(Rails) ? Rails.root : File.expand_path("#{File.dirname(__FILE__)}/../test")
+end
+unless defined? RAILS_ENV
+  RAILS_ENV = ENV['RAILS_ENV']
 end
 unless defined? SOLR_LOGS_PATH
   SOLR_LOGS_PATH = ENV["SOLR_LOGS_PATH"] || "#{RAILS_ROOT}/log"
@@ -35,9 +40,10 @@ end
 SOLR_JVM_OPTIONS = config[ENV['RAILS_ENV']]['jvm_options'] unless defined? SOLR_JVM_OPTIONS
-if ENV["ACTS_AS_SOLR_TEST"]
-  require "activerecord"
+if ENV["RAILS_ENV"] == 'test'
+  require "active_record"
   DB = (ENV['DB'] ? ENV['DB'] : 'sqlite') unless defined?(DB)
   MYSQL_USER = (ENV['MYSQL_USER'].nil? ? 'root' : ENV['MYSQL_USER']) unless defined? MYSQL_USER
   require File.join(File.dirname(File.expand_path(__FILE__)), '..', 'test', 'db', 'connections', DB, 'connection.rb')
 end
+
@@ -262,6 +262,7 @@ module ActsAsSolr #:nodoc:
     def process_solr_options(options={}, solr_options={})
       self.configuration = {
         :fields => nil,
+        :format => :objects,
         :additional_fields => nil,
         :dynamic_attributes => false,
         :exclude_fields => [],
@@ -279,6 +280,7 @@ module ActsAsSolr #:nodoc:
         :default_boost => 1.0,
       }
+      solr_options ||= {}
       raise "Invalid options: #{(options.keys-configuration.keys).join(',')}" unless (options.keys-configuration.keys).empty?
       raise "Invalid solr options: #{(solr_options.keys-solr_configuration.keys).join(',')}" unless (solr_options.keys-solr_configuration.keys).empty?
@@ -366,7 +368,7 @@ module ActsAsSolr #:nodoc:
         column_type = format_column_type(column.type)
         case column_type
-          when :string then :text
+          when :string then :string
           when :datetime then :date
           when :time then :date
           else column_type
@@ -24,9 +24,9 @@ module ActsAsSolr #:nodoc:
     #
     #             Book.find_by_solr 'ruby', :filter_queries => ['price:5']
     #
-    # order:: - Orders (sort by) the result set using a given criteria:
+    # sort:: - Orders (sort by) the result set using a given criteria:
     #
-    #             Book.find_by_solr 'ruby', :order => 'description asc'
+    #             Book.find_by_solr 'ruby', :sort => 'description asc'
     # 
     # field_types:: This option is deprecated and will be obsolete by version 1.0.
     #               There's no need to specify the :field_types anymore when doing a 
@@ -156,9 +156,8 @@ module ActsAsSolr #:nodoc:
     #            => 0.12321548
     # 
     def multi_solr_search(query, options = {})
-      models = multi_model_suffix(options)
       options.update(:results_format => :objects) unless options[:results_format]
-      data = parse_query(query, options, models)
+      data = parse_query(query, options)
       if data.nil? or data.total_hits == 0
         return SearchResults.new(:docs => [], :total => 0)
@@ -184,12 +183,6 @@ module ActsAsSolr #:nodoc:
       result
     end
-    def multi_model_suffix(options)
-      models = "AND (#{solr_configuration[:type_field]}:\"#{self.name}\""
-      models << " OR " + options[:models].collect {|m| "#{solr_configuration[:type_field]}:\"" + m.to_s + "\""}.join(" OR ") if options[:models].is_a?(Array)
-      models << ")"
-    end
-    
     # returns the total number of documents found in the query specified:
     #  Book.count_by_solr 'rails' => 3
     # 
@@ -29,7 +29,7 @@ module ActsAsSolr #:nodoc:
              "The field types are automatically traced back when you specify a field type in your model."
       end
       if options[:sort_by]
-        plog "The option :sort_by is deprecated, use :order instead!"
+        plog "The option :sort_by is deprecated, use :sort instead!"
         options[:sort] ||= options[:sort_by]
       end
       if options[:start]
@@ -51,7 +51,7 @@ module ActsAsSolr #:nodoc:
         field_type = get_solr_field_type(options[:type])
         solr_name = options[:as] || field_name
-        value = self.send("#{field_name}_for_solr")
+        value = self.send("#{field_name}_for_solr") rescue nil
         next if value.nil?
         suffix = get_solr_field_type(field_type)
@@ -60,7 +60,7 @@ module ActsAsSolr #:nodoc:
         field = Solr::Field.new(:name => "#{solr_name}_#{suffix}", :value => value)
         processed_boost = validate_boost(field_boost)
-        field.boost = processed_boost if processed_boost != solr_configuration[:default_boost]
+        field.boost = processed_boost
         doc << field
       end
@@ -81,8 +81,8 @@ module ActsAsSolr #:nodoc:
     def add_space(doc)
       if configuration[:spatial] and local
-        doc << Solr::Field.new(:name => "lat", :value => local.latitude)
-        doc << Solr::Field.new(:name => "lng", :value => local.longitude)
+        doc << Solr::Field.new(:name => "lat_f", :value => local.latitude)
+        doc << Solr::Field.new(:name => "lng_f", :value => local.longitude)
       end
     end
@@ -96,8 +96,8 @@ module ActsAsSolr #:nodoc:
     def add_dynamic_attributes(doc)
       dynamic_attributes.each do |attribute|
         value = ERB::Util.html_escape(attribute.value)
-        doc << Solr::Field.new(:name => "#{attribute.name}_t", :value => value)
-        doc << Solr::Field.new(:name => "#{attribute.name}_facet", :value => value)
+        doc << Solr::Field.new(:name => "#{attribute.name.downcase}_t", :value => value)
+        doc << Solr::Field.new(:name => "#{attribute.name.downcase}_facet", :value => value)
       end if configuration[:dynamic_attributes]
     end
@@ -117,7 +117,7 @@ module ActsAsSolr #:nodoc:
               Array(data).each do |value|
                 field = Solr::Field.new(:name => "#{field_name}_#{suffix}", :value => value)
                 processed_boost = validate_boost(field_boost)
-                field.boost = processed_boost if processed_boost != solr_configuration[:default_boost]
+                field.boost = processed_boost
                 doc << field
               end
             end
@@ -13,14 +13,11 @@ module ActsAsSolr
       def primary_key
         'id'
       end
-      
-      def find(*args)
-        if args.first.instance_of? Array
-          ids = args.first.map { |id| Mongo::ObjectID.from_string(id) }
-          super :all, :conditions => {primary_key => ids}
-        else
-          super *args
-        end
+
+      def merge_conditions(*args)
+        ret = {}
+        args.each{ |a| ret.merge!(a) if a.is_a?(Hash) }
+        ret
       end
     end
   end
@@ -3,38 +3,43 @@ module ActsAsSolr #:nodoc:
     protected
     # Method used by mostly all the ClassMethods when doing a search
-    def parse_query(query=nil, options={}, models=nil)
-      valid_options = [ :alternate_query, :boost_functions, :filter_queries, :facets, :models, :sort,
-        :scores, :operator, :lazy, :core, :latitude, :longitude, :radius, :relevance, :highlight,
-        :offset, :per_page, :limit, :page,
-        :results_format, :sql_options]
+    def parse_query(query=nil, options={})
+      valid_options = [:models, :lazy, :core, :results_format, :sql_options,
+        :alternate_query, :boost_functions, :filter_queries, :facets, :sort,
+        :scores, :operator, :latitude, :longitude, :radius, :relevance, :highlight,
+        :offset, :per_page, :limit, :page,]
       query_options = {}
-      field_list = models.nil? ? solr_configuration[:primary_key_field] : "id"
-      query_options[:field_list] = [field_list, 'score']
-      query_options[:filter_queries] = []
-      #allow empty queries as a type search will also be done
-      query = nil if (query.nil? || query == '')
-      if query.nil?
-        query = solr_type_condition
-      else
-        query = sanitize_query(query)
-        query_options[:filter_queries].push(solr_type_condition)
-      end
-      query_options[:query] = "#{options[:alternate_query]} #{query}"
-
+      return if query.nil?
+      raise "Query should be a string" unless query.is_a?(String)
       raise "Invalid parameters: #{(options.keys - valid_options).join(',')}" unless (options.keys - valid_options).empty?
       begin
         Deprecation.validate_query(options)
+
+        if options[:alternate_query]
+          query = query.blank? ? '*:*' : sanitize_query(query)
+          query = "#{options[:alternate_query]} #{query}"
+        else
+          query = query.blank? ? '*:*' : sanitize_query(query)
+        end
+
+        query = replace_types([*query], ':').first # put types on filtered fields
+        query = add_relevance query, options[:relevance]
+        query_options[:query] = query
+
+        field_list = options[:models].nil? ? solr_configuration[:primary_key_field] : "id"
+        query_options[:field_list] = [field_list, 'score']
+
         per_page = options[:per_page] || options[:limit] || 30
         offset = options[:offset] || (((options[:page] || 1).to_i - 1) * per_page)
         query_options[:rows] = per_page
         query_options[:start] = offset
-        query_options[:operator] = options[:operator]
-        query = add_relevance query, options[:relevance]
+        query_options[:operator] = options[:operator]
+        query_options[:filter_queries] = [solr_type_condition(options)]
         query_options[:filter_queries] += replace_types([*options[:filter_queries]], '') if options[:filter_queries]
+
         query_options[:boost_functions] = replace_types([*options[:boost_functions]], '').join(' ') if options[:boost_functions]
         # first steps on the facet parameter processing
@@ -46,9 +51,9 @@ module ActsAsSolr #:nodoc:
           query_options[:facets][:mincount] = 1 if options[:facets][:zeros] == false
           # override the :zeros (it's deprecated anyway) if :mincount exists
           query_options[:facets][:mincount] = options[:facets][:mincount] if options[:facets][:mincount]
-          query_options[:facets][:fields] = options[:facets][:fields].collect{|k| "#{k}_facet"} if options[:facets][:fields]
+          query_options[:facets][:fields] = options[:facets][:fields].map{ |k| "#{k}_facet" } if options[:facets][:fields]
           query_options[:filter_queries] += replace_types([*options[:facets][:browse]]) if options[:facets][:browse]
-          query_options[:facets][:queries] = replace_types(options[:facets][:query]) if options[:facets][:query]
+          query_options[:facets][:queries] = replace_types([*options[:facets][:query]]) if options[:facets][:query]
           if options[:facets][:dates]
             query_options[:date_facets] = {}
@@ -75,7 +80,7 @@ module ActsAsSolr #:nodoc:
             if options[:facets][:dates][:other]
               validate_date_facet_other_options(options[:facets][:dates][:other])
-              query_options[:date_facets][:other]   = options[:facets][:dates][:other]
+              query_options[:date_facets][:other] = options[:facets][:dates][:other]
             end
           end
@@ -83,30 +88,36 @@ module ActsAsSolr #:nodoc:
         if options[:highlight]
           query_options[:highlighting] = {}
-          query_options[:highlighting][:field_list] = []
-          query_options[:highlighting][:field_list] << options[:highlight][:fields].collect {|k| "#{k}_t"} if options[:highlight][:fields]
+          query_options[:highlighting][:field_list] = replace_types([*options[:highlight][:fields]], '') if options[:highlight][:fields]
           query_options[:highlighting][:require_field_match] =  options[:highlight][:require_field_match] if options[:highlight][:require_field_match]
           query_options[:highlighting][:max_snippets] = options[:highlight][:max_snippets] if options[:highlight][:max_snippets]
           query_options[:highlighting][:prefix] = options[:highlight][:prefix] if options[:highlight][:prefix]
           query_options[:highlighting][:suffix] = options[:highlight][:suffix] if options[:highlight][:suffix]
         end
-        query_options[:sort] = replace_types([options[:sort]], '')[0] if options[:sort]
+        query_options[:sort] = replace_types([*options[:sort]], '')[0] if options[:sort]
-        query_options[:radius] = options[:radius]
+        if options[:radius]
+          query_options[:radius] = options[:radius]
+          query_options[:filter_queries] << '{!geofilt}'
+        end
         query_options[:latitude] = options[:latitude]
         query_options[:longitude] = options[:longitude]
-        ActsAsSolr::Post.execute(Solr::Request::Dismax.new(query_options), options[:core])
+        not_dismax = query_options[:operator] == :or
+        request = not_dismax ? Solr::Request::Standard.new(query_options) : Solr::Request::Dismax.new(query_options)
+        ActsAsSolr::Post.execute(request, options[:core])
       rescue
         raise "#{$query} There was a problem executing your search\n#{query_options.inspect}\n: #{$!} in #{$!.backtrace.first}"
       end
     end
-    def solr_type_condition
-      (subclasses || []).inject("(#{solr_configuration[:type_field]}:\"#{self.name}\"") do |condition, subclass|
-        condition << (subclass.name.empty? ? "" : " OR #{solr_configuration[:type_field]}:\"#{subclass.name}\"")
-      end << ')'
+    def solr_type_condition(options = {})
+      classes = [self] + (self.subclasses || []) + (options[:models] || [])
+      classes.map do |klass|
+        next if klass.name.empty? 
+        "#{solr_configuration[:type_field]}:\"#{klass.name}\""
+      end.compact.join(' OR ')
     end
     # Parses the data returned from Solr
@@ -155,8 +166,8 @@ module ActsAsSolr #:nodoc:
         ids.collect {|id| ActsAsSolr::LazyDocument.new(id, self)}
       elsif configuration[:format] == :objects
         find_options = options[:sql_options] || {}
-        find_options[:conditions] = self.send :merge_conditions, {:id => ids}, (find_options[:conditions] || [])
-        result = self.all(find_options)
+        find_options[:conditions] = self.send :merge_conditions, {self.primary_key => ids}, (find_options[:conditions] || [])
+        result = self.all(find_options) || []
         result = reorder(result, ids) unless find_options[:order]
         result
       else
@@ -170,8 +181,8 @@ module ActsAsSolr #:nodoc:
     def reorder(things, ids)
       ordered_things = []
       ids.each do |id|
-	      thing = things.find { |t| t.id.to_s == id.to_s }
-	      ordered_things |= [thing] if thing
+        thing = things.find{ |t| t.id.to_s == id.to_s }
+        ordered_things |= [thing] if thing
       end
       ordered_things
     end
@@ -229,25 +240,22 @@ module ActsAsSolr #:nodoc:
     end
     def sanitize_query(query)
-      Solr::Util::query_parser_escape query
+      fields = self.configuration[:solr_fields].keys
+      fields += DynamicAttribute.all(:select => 'name', :group => 'name').map(&:name) if DynamicAttribute.table_exists?
+      Solr::Util::query_parser_escape query, fields
     end
     private
     def add_relevance(query, relevance)
-      return query if relevance.nil?
-      q = if query.include? ':'
-        q = query.split(":").first.split(" ")
-        q.pop
-        return query if q.empty?
-        q.join ' '
-      else
-        query
-      end
-      relevance.each do |attribute, value|
-        query = "#{query} OR #{attribute}:(#{q})^#{value}"
+      return query if relevance.nil? or query.include? ':'
+
+      query = [query] + relevance.map do |attribute, value|
+        "#{attribute}:(#{query})^#{value}"
       end
-      query
+      query = query.join(' OR ')
+
+      replace_types([query], '').first
     end
   end
@@ -72,7 +72,7 @@ module ActsAsSolr #:nodoc:
     # Returns a suggested query
     def suggest
-      @solr_data[:spellcheck]['suggestions']['collation'].match(/\((.+)\) /)[1]
+      Hash[@solr_data[:spellcheck]['suggestions']]['collation']
     end
     # Returns the number of documents per page
@@ -82,12 +82,12 @@ module ActsAsSolr #:nodoc:
     # Returns the number of pages found
     def total_pages
-      (total / per_page.to_f).ceil
+      per_page.zero? ? 0 : (total / per_page.to_f).ceil
     end
     # Returns the current page
     def current_page
-      (@solr_data[:start].to_i / per_page) + 1
+      per_page.zero? ? 0 : (@solr_data[:start].to_i / per_page) + 1
     end
     def blank?
@@ -23,4 +23,5 @@ require File.expand_path(&quot;#{File.dirname(__FILE__)}/solr/xml&quot;)
 require File.expand_path("#{File.dirname(__FILE__)}/solr/field")
 require File.expand_path("#{File.dirname(__FILE__)}/solr/request/base")
 require File.expand_path("#{File.dirname(__FILE__)}/solr/document")
+require File.expand_path("#{File.dirname(__FILE__)}/solr/request/json_update")
 require File.expand_path("#{File.dirname(__FILE__)}/solr/request/update")
@@ -18,7 +18,7 @@ class Solr::Field
   # Accepts an optional <tt>:boost</tt> parameter, used to boost the relevance of a particular field.
   def initialize(params)
-    @boost = params[:boost] == 1.0 ? nil : params[:boost]
+    boost = params[:boost]
     @name = params[:name].to_s
     @value = params[:value]
     # Convert any Time values into UTC/XML schema format (which Solr requires).
@@ -29,6 +29,10 @@ class Solr::Field
     @boost.nil? ? @value : {'boost' => @boost, 'value' => @value}
   end 
+  def boost=(value)
+    @boost = value == 1.0 ? nil : value
+  end
+
   def to_xml
     e = Solr::XML::Element.new 'field'
     e.attributes['name'] = @name
@@ -10,6 +10,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
+require File.expand_path(File.dirname(__FILE__) + '/json_update')
+
 class Solr::Request::AddDocument < Solr::Request::JsonUpdate
   # create the request, optionally passing in a Solr::Document
@@ -64,7 +64,7 @@ class Solr::Request::Standard &lt; Solr::Request::Select
     hash[:sfield] = 'latlng'
     hash[:d] = @params[:radius]
-    hash[:pt] = "#{@params[:latitude]}, #{@params[:longitude]}"
+    hash[:pt] = "#{@params[:latitude]}, #{@params[:longitude]}" if @params[:latitude] and @params[:longitude]
     # facet parameter processing
     if @params[:facets]
@@ -26,11 +26,21 @@ class Solr::Util
   end
   # from http://lucene.apache.org/core/old_versioned_docs/versions/3_0_0/queryparsersyntax.html#Escaping Special Characters
-  ESCAPES = %w[+ - && || ! ( ) { } \[ \] ^ " ~ * ? : \]
+  ESCAPES = %w[+ - && || ! ( ) { } \[ \] " ~ * ? \]
-  def self.query_parser_escape(string)
-    string = string.dup
+  def self.query_parser_escape(string, fields = [])
+    string = string.split(' ').map do |str| 
+      if /(\w+):(.*)/ =~ str # escape : considering fields
+        (!$2.empty? and fields.include?($1.to_sym)) ? "#{$1}:#{$2}" : "#{$1}\\:#{$2}"
+      elsif /^\^(.*)/ =~ str # escape ^
+        "\\^#{$1}"
+      else
+        str
+      end
+    end.join(' ')
+
     ESCAPES.each { |e| string.gsub! e, "\\#{e}" }
     string
   end
+
 end
@@ -6,9 +6,12 @@ namespace :solr do
   SOLR_DIR = "apache-solr-#{SOLR_VERSION}" 
   SOLR_URL = "#{APACHE_MIRROR}/lucene/solr/#{SOLR_VERSION}/#{SOLR_FILENAME}" 
+  # change path if it is on testing environment
+  PLUGIN_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../..")
+
   desc "Download and install Solr+Jetty #{SOLR_VERSION}."
   task :download do
-    if File.exists?(Rails.root + 'vendor/plugins/acts_as_solr_reloaded/solr/start.jar')
+    if File.exists?("#{PLUGIN_ROOT}/solr/start.jar")
       puts 'Solr already downloaded.'
     else
       Dir.chdir '/tmp' do
@@ -17,16 +20,16 @@ namespace :solr do
           sh "tar xzf apache-solr-#{SOLR_VERSION}.tgz"
         end
         cd "apache-solr-#{SOLR_VERSION}/example"
-        cp_r ['../LICENSE.txt', '../NOTICE.txt', 'README.txt', 'etc', 'lib', 'start.jar', 'webapps', 'work'], Rails.root + 'vendor/plugins/acts_as_solr_reloaded/solr', :verbose => true
+        cp_r ['../LICENSE.txt', '../NOTICE.txt', 'README.txt', 'etc', 'lib', 'start.jar', 'webapps', 'work'], "#{PLUGIN_ROOT}/solr", :verbose => true
         cd 'solr'
-        cp_r ['README.txt', 'bin', 'solr.xml'], Rails.root + 'vendor/plugins/acts_as_solr_reloaded/solr/solr', :verbose => true
+        cp_r ['README.txt', 'bin', 'solr.xml'], "#{PLUGIN_ROOT}/solr/solr", :verbose => true
       end
     end
   end
   desc 'Remove Solr instalation from the tree.'
   task :remove do
-    solr_root = Rails.root + 'vendor/plugins/acts_as_solr_reloaded/solr/'
+    solr_root = "#{PLUGIN_ROOT}/solr/"
     rm_r ['README.txt', 'bin', 'solr.xml'].map{ |i| File.join(solr_root, 'solr', i) }, :verbose => true, :force => true
     rm_r ['LICENSE.txt', 'NOTICE.txt', 'README.txt', 'etc', 'lib', 'start.jar', 'webapps', 'work'].map{ |i| File.join(solr_root, i) }, :verbose => true, :force => true
   end
@@ -36,8 +39,9 @@ namespace :solr do
   end
   desc 'Starts Solr. Options accepted: RAILS_ENV=your_env, PORT=XX. Defaults to development if none.'
-  task :start => [:download, :environment] do
-    require File.expand_path("#{File.dirname(__FILE__)}/../../config/solr_environment")
+  task :start => [:download] do
+    require File.expand_path(File.dirname(__FILE__) + '/../../config/solr_environment')
+
     FileUtils.mkdir_p(SOLR_LOGS_PATH)
     FileUtils.mkdir_p(SOLR_DATA_PATH)
     FileUtils.mkdir_p(SOLR_PIDS_PATH)
@@ -73,8 +77,9 @@ namespace :solr do
   end
   desc 'Stops Solr. Specify the environment by using: RAILS_ENV=your_env. Defaults to development if none.'
-  task :stop => :environment do
+  task :stop do
     require File.expand_path("#{File.dirname(__FILE__)}/../../config/solr_environment")
+
     if File.exists?(SOLR_PID_FILE)
       killed = false
       File.open(SOLR_PID_FILE, "r") do |f| 
@@ -95,7 +100,7 @@ namespace :solr do
   end
   desc 'Restart Solr. Specify the environment by using: RAILS_ENV=your_env. Defaults to development if none.'
-  task :restart => :environment do
+  task :restart do
     Rake::Task["solr:stop"].invoke 
     Rake::Task["solr:start"].invoke 
   end
@@ -129,7 +134,7 @@ namespace :solr do
     logger = ActiveRecord::Base.logger = Logger.new(STDOUT)
     logger.level = ActiveSupport::BufferedLogger::INFO unless debug_output
-    Dir["#{Rails.root}/app/models/*.rb"].each{ |file| require file }
+    Dir["#{RAILS_ROOT}/app/models/*.rb"].each{ |file| require file }
     if start_server
       puts "Starting Solr server..."
@@ -148,7 +153,7 @@ namespace :solr do
     models.each do |model|
       if clear_first
         puts "Clearing index for #{model}..."
-        ActsAsSolr::Post.execute(Solr::Request::Delete.new(:query => "#{model.solr_configuration[:type_field]}:#{model}")) 
+        ActsAsSolr::Post.execute(Solr::Request::Delete.new(:query => "#{model.solr_configuration[:type_field]}:\"#{model}\""))
         ActsAsSolr::Post.execute(Solr::Request::Commit.new)
       end
@@ -31,24 +31,22 @@
 <schema name="acts_as_solr" version="0.9">
   <types>
-    <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="false"/>
-    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="false"/>
-    <fieldType name="integer" class="solr.IntField" omitNorms="false"/>
-    <fieldType name="long" class="solr.LongField" omitNorms="false"/>
-    <fieldType name="float" class="solr.FloatField" omitNorms="false"/>
-    <fieldType name="double" class="solr.DoubleField" omitNorms="false"/>
-    <fieldType name="sint" class="solr.SortableIntField" sortMissingLast="true" omitNorms="false"/>
-    <fieldType name="slong" class="solr.SortableLongField" sortMissingLast="true" omitNorms="false"/>
-    <fieldType name="sfloat" class="solr.SortableFloatField" sortMissingLast="true" omitNorms="false"/>
-    <fieldType name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true" omitNorms="false"/>
-    <fieldType name="date" class="solr.TrieDateField" sortMissingLast="true" omitNorms="false"/>
-    <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <fieldType name="text" class="solr.TextField" autoGeneratePhraseQueries="false">
+    <fieldType name="id"       class="solr.StrField"            sortMissingLast="true" omitNorms="false"/>
+    <fieldType name="facet"    class="solr.StrField"            sortMissingLast="true" omitNorms="false"/>
+    <fieldType name="string"   class="solr.StrField"            sortMissingLast="true" omitNorms="false"/>
+    <fieldType name="boolean"  class="solr.BoolField"           sortMissingLast="true" omitNorms="false"/>
+    <fieldType name="integer"  class="solr.IntField"            omitNorms="false"/>
+    <fieldType name="float"    class="solr.FloatField"          omitNorms="false"/>
+    <fieldType name="double"   class="solr.DoubleField"         omitNorms="false"/>
+    <fieldType name="date"     class="solr.TrieDateField"       sortMissingLast="true" omitNorms="false"/>
+
+    <!-- sortable versions -->
+    <fieldType name="sstring" class="solr.StrField"            sortMissingLast="true" omitNorms="false"/>
+    <fieldType name="sinteger" class="solr.SortableIntField"    sortMissingLast="true" omitNorms="false"/>
+    <fieldType name="sfloat"   class="solr.SortableFloatField"  sortMissingLast="true" omitNorms="false"/>
+    <fieldType name="sdouble"  class="solr.SortableDoubleField" sortMissingLast="true" omitNorms="false"/>
+
+    <fieldType name="text"     class="solr.TextField" autoGeneratePhraseQueries="false">
       <analyzer type="index">
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
@@ -62,6 +60,7 @@
         -->
         <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.pt.txt" />
         <filter class="solr.PortugueseStemFilterFactory" />
+        <filter class="solr.PorterStemFilterFactory" />
         <!-- too slow
         <filter class="solr.HunspellStemFilterFactory" dictionary="en_US.dic" affix="en_US.aff" ignoreCase="true" />
         <filter class="solr.HunspellStemFilterFactory" dictionary="pt_PT.dic" affix="pt_PT.aff" ignoreCase="true" />
@@ -84,6 +83,7 @@
         -->
         <filter class="solr.KeywordMarkerFilterFactory" protected="protwords.pt.txt" />
         <filter class="solr.PortugueseStemFilterFactory" />
+        <filter class="solr.PorterStemFilterFactory" />
         <!-- too slow
         <filter class="solr.HunspellStemFilterFactory" dictionary="en_US.dic" affix="en_US.aff" ignoreCase="true" />
         <filter class="solr.HunspellStemFilterFactory" dictionary="pt_PT.dic" affix="pt_PT.aff" ignoreCase="true" />
@@ -94,19 +94,6 @@
         -->
       </analyzer>
     </fieldType>
-
-    <fieldType name="alphaOnlySort" class="solr.TextField" sortMissingLast="true" omitNorms="false">
-      <analyzer>
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory" />
-        <filter class="solr.TrimFilterFactory" />
-        <filter class="solr.PatternReplaceFilterFactory" pattern="([^a-z])" replacement="" replace="all"/>
-      </analyzer>
-    </fieldType>
-
-    <fieldtype name="text_zh" class="solr.TextField">
-      <analyzer class="org.apache.lucene.analysis.cn.ChineseAnalyzer"/>
-    </fieldtype>
     <fieldType name="textSpell" class="solr.TextField" positionIncrementGap="100" >
       <analyzer>
@@ -117,54 +104,74 @@
       </analyzer>
     </fieldType>
-    <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
+    <fieldType name="location"  class="solr.LatLonType" subFieldSuffix="_coordinate"/>
+    <fieldtype name="text_zh"   class="solr.TextField">
+      <analyzer class="org.apache.lucene.analysis.cn.ChineseAnalyzer"/>
+    </fieldtype>
  </types>
  <fields>
-   <field name="latlng" type="location" indexed="true" stored="true" />
-   <field name="latlng_0_coordinate" type="sdouble" indexed="true" stored="true" multiValued="false"/>
-   <field name="latlng_1_coordinate" type="sdouble" indexed="true" stored="true" multiValued="false"/>
-
-   <field name="id" type="string"       indexed="true" stored="true" required="true" />
-   <field name="pk_i" type="integer"    indexed="true" stored="true"/>
-   <field name="pk_s" type="string"     indexed="true" stored="true"/>
-   <field name="text" type="text"       indexed="true" stored="false" multiValued="true"/>
-   <field name="spell" type="textSpell" indexed="true" stored="true" multiValued="true"/>
-
-   <dynamicField name="*_i" type="integer"       indexed="true" stored="false" multiValued="true"/>
-   <dynamicField name="*_t" type="text"          indexed="true" stored="true" multiValued="true"/>
-   <dynamicField name="*_f" type="float"         indexed="true" stored="false" multiValued="false"/>
-   <dynamicField name="*_do" type="double"       indexed="true" stored="false" multiValued="false"/>
-   <dynamicField name="*_b" type="boolean"       indexed="true" stored="false" multiValued="true"/>
-   <dynamicField name="*_d" type="date"          indexed="true" stored="false" multiValued="false"/>
-   <dynamicField name="*_s" type="string"        indexed="true" stored="true" multiValued="false"/>
-   <dynamicField name="*_ri" type="sint"         indexed="true" stored="false" multiValued="true"/>
-   <dynamicField name="*_rf" type="sfloat"       indexed="true" stored="false" multiValued="true"/>
-   <dynamicField name="*_facet" type="string"    indexed="true" stored="false" multiValued="true"/>
-   <dynamicField name="*_s_mv" type="string"     indexed="true" stored="false" multiValued="true"/>
-   <dynamicField name="*_zh_text" type="text_zh" indexed="true" stored="false" multiValued="true"/>
-   <dynamicField name="*_display" type="text"    indexed="false" stored="true" multiValued="true"/>
-
-   <field name="lat" type="sdouble" indexed="true" stored="true"/><!-- must match the latField in solrconfig.xml -->
-   <field name="lng" type="sdouble" indexed="true" stored="true"/><!-- must match the lngField in solrconfig.xml -->
-   <field name="geo_distance" type="sdouble"/> <!-- Optional but used for distributed searching -->
-   <dynamicField name="_local*" type="sdouble" indexed="true" stored="true"/><!-- used internally by localsolr -->
+   <field        name="latlng"              type="location"  indexed="true"  stored="true" />
+   <field        name="latlng_0_coordinate" type="sdouble"   indexed="true"  stored="true"  multiValued="false"/>
+   <field        name="latlng_1_coordinate" type="sdouble"   indexed="true"  stored="true"  multiValued="false"/>
+
+   <field        name="id"                  type="id"        indexed="true"  stored="true"  multiValued="true" required="true"/>
+   <field        name="_id_s"               type="id"        indexed="true"  stored="true"  multiValued="true"/>
+   <field        name="pk_i"                type="integer"   indexed="true"  stored="true"  multiValued="true"/>
+   <field        name="pk_s"                type="id"        indexed="true"  stored="true"  multiValued="true"/>
+   <field        name="type_s"              type="string"    indexed="true"  stored="true"  multiValued="true" required="true"/>
+
+    <!-- sortable versions -->
+   <dynamicField name="*sortable_s"         type="sstring"   indexed="true"  stored="false" multiValued="false"/>
+   <dynamicField name="*sortable_i"         type="sinteger"  indexed="true"  stored="false" multiValued="false"/>
+   <dynamicField name="*sortable_f"         type="sfloat"    indexed="true"  stored="false" multiValued="false"/>
+   <dynamicField name="*sortable_do"        type="sdouble"   indexed="true"  stored="false" multiValued="false"/>
+
+   <dynamicField name="*_t"                 type="text"      indexed="true"  stored="true"  multiValued="true"/>
+   <dynamicField name="*_s"                 type="text"      indexed="true"  stored="true"  multiValued="false"/>
+   <dynamicField name="*_i"                 type="integer"   indexed="true"  stored="false" multiValued="true"/>
+   <dynamicField name="*_f"                 type="float"     indexed="true"  stored="true"  multiValued="false"/>
+   <dynamicField name="*_do"                type="double"    indexed="true"  stored="false" multiValued="false"/>
+   <dynamicField name="*_b"                 type="boolean"   indexed="true"  stored="false" multiValued="true"/>
+   <dynamicField name="*_d"                 type="date"      indexed="true"  stored="false" multiValued="false"/>
+   <dynamicField name="*_ri"                type="sinteger"  indexed="true"  stored="false" multiValued="false"/>
+   <dynamicField name="*_rf"                type="sfloat"    indexed="true"  stored="false" multiValued="false"/>
+   <dynamicField name="*_facet"             type="facet"     indexed="true"  stored="false" multiValued="true"/>
+
+   <field        name="lat"                 type="sdouble"   indexed="true"  stored="true"/>
+   <field        name="lng"                 type="sdouble"   indexed="true"  stored="true"/>
+   <dynamicField name="_local*"             type="sdouble"   indexed="true"  stored="true"/> <!-- used internally by localsolr -->
+   <field        name="geo_distance"        type="sdouble"/> <!-- Optional but used for distributed searching -->
+
+   <field        name="text"                type="text"      indexed="true"  stored="false" multiValued="true"/>
+   <field        name="spell"               type="textSpell" indexed="true"  stored="true"  multiValued="true"/>
+
+   <dynamicField name="*_s_mv"              type="string"    indexed="true"  stored="false" multiValued="true"/>
+   <dynamicField name="*_zh_text"           type="text_zh"   indexed="true"  stored="false" multiValued="true"/>
+   <dynamicField name="*_display"           type="text"      indexed="false" stored="true"  multiValued="true"/>
+
  </fields>
  <uniqueKey>id</uniqueKey>
+
  <defaultSearchField>text</defaultSearchField>
+ <copyField source="*_s"     dest="text"/>
+ <copyField source="*_t"     dest="text"/>
+ <copyField source="*_i"     dest="text"/>
+ <copyField source="*_f"     dest="text"/>
+ <copyField source="*_d"     dest="text"/>
+ <copyField source="*_do"    dest="text"/>
+ <copyField source="*_facet" dest="text"/>
+
+ <copyField source="*_s"     dest="spell"/>
+ <copyField source="*_t"     dest="spell"/>
+ <copyField source="*_facet" dest="spell"/>
  <copyField source="lat_f" dest="latlng_0_coordinate"/>
  <copyField source="lng_f" dest="latlng_1_coordinate"/>
- <copyField source="*_s" dest="text"/>
- <copyField source="*_s" dest="spell"/>
- <copyField source="*_t" dest="text"/>
- <copyField source="*_t" dest="spell"/>
- <copyField source="*_facet" dest="text"/>
- <copyField source="*_facet" dest="spell"/>
  <solrQueryParser defaultOperator="AND"/>
 </schema>
@@ -776,7 +776,11 @@
          <str>nameOfCustomComponent2</str>
        </arr>
       -->
-    </requestHandler>
+    <arr name="last-components">
+      <str>spellcheck</str>
+    </arr>
+
+  </requestHandler>
   <!-- DisMaxRequestHandler allows easy searching across multiple fields
        for simple user-entered phrases.  It's implementation is now
@@ -1099,24 +1103,22 @@
       -->
     <lst name="spellchecker">
       <str name="name">default</str>
-      <str name="field">name</str>
+      <str name="field">spell</str>
       <str name="spellcheckIndexDir">spellchecker</str>
+      <str name="buildOnCommit">true</str>
+      <str name="buildOnOptimize">true</str>
       <!-- uncomment this to require terms to occur in 1% of the documents in order to be included in the dictionary
       	<float name="thresholdTokenFrequency">.01</float>
       -->
     </lst>
     <!-- a spellchecker that uses a different distance measure -->
-    <!--
-       <lst name="spellchecker">
-         <str name="name">jarowinkler</str>
-         <str name="field">spell</str>
-         <str name="distanceMeasure">
-           org.apache.lucene.search.spell.JaroWinklerDistance
-         </str>
-         <str name="spellcheckIndexDir">spellcheckerJaro</str>
-       </lst>
-     -->
+    <lst name="spellchecker">
+      <str name="name">jarowinkler</str>
+      <str name="field">spell</str>
+      <str name="distanceMeasure">org.apache.lucene.search.spell.JaroWinklerDistance</str>
+      <str name="spellcheckIndexDir">spellcheckerJaro</str>
+    </lst>
     <!-- a spellchecker that use an alternate comparator 
@@ -1135,15 +1137,13 @@
       -->
     <!-- A spellchecker that reads the list of words from a file -->
-    <!--
-       <lst name="spellchecker">
-         <str name="classname">solr.FileBasedSpellChecker</str>
-         <str name="name">file</str>
-         <str name="sourceLocation">spellings.txt</str>
-         <str name="characterEncoding">UTF-8</str>
-         <str name="spellcheckIndexDir">spellcheckerFile</str>
-       </lst>
-      -->
+    <lst name="spellchecker">
+      <str name="classname">solr.FileBasedSpellChecker</str>
+      <str name="name">file</str>
+      <str name="sourceLocation">spellings.en.txt</str>
+      <str name="characterEncoding">UTF-8</str>
+      <str name="spellcheckIndexDir">spellcheckerFile</str>
+    </lst>
   </searchComponent>
   <!-- A request handler for demonstrating the spellcheck component.  
@@ -1444,6 +1444,7 @@
           <str name="hl.bs.country">US</str>
         </lst>
       </boundaryScanner>
+
     </highlighting>
   </searchComponent>
 test:
-  url: http://localhost:8981/solr
 \ No newline at end of file
+  url: http://0.0.0.0:8981/solr
@@ -5,16 +5,10 @@ class ActsAsSolrTest &lt; Test::Unit::TestCase
   fixtures :books, :movies, :electronics, :postings, :authors, :advertises
+  MongoMapper.connection = Mongo::Connection.new("127.0.0.1", 27017, :slave_ok => true, :pool_size => 16, :timeout => 10)
+  MongoMapper.database = "#mydb_test"
   Document.destroy_all
-  DynamicAttribute.delete_all
-  Advertise.first.dynamic_attributes.create! :name => 'Description', :value => 'A very cool bike'
-  Advertise.first.dynamic_attributes.create! :name => 'Price', :value => '1000'
-
-  Local.delete_all
-  Local.create! :localizable => Advertise.find(1), :longitude => '-77.4027', :latitude => '39.36'
-  Local.create! :localizable => Advertise.find(2), :longitude => '77.4027',  :latitude => '-38.36'
-
   # Inserting new data into Solr and making sure it's getting indexed
   def test_insert_new_data
     assert_equal 2, Book.count_by_solr('ruby OR splinter OR bob')
@@ -102,16 +96,30 @@ class ActsAsSolrTest &lt; Test::Unit::TestCase
   # The method current_time above gets indexed as being part of the
   # Movie model and it's available for search as well
   def test_find_with_dynamic_fields
+    DynamicAttribute.delete_all
+    Movie.first.dynamic_attributes.create! :name => 'description', :value => 'A very cool bike'
+    Movie.first.solr_save
+
     date = Time.now.strftime('%b %d %Y')
-    ["dynamite AND #{date}", "description:goofy AND #{date}", "goofy napoleon #{date}",
-      "goofiness #{date}"].each do |term|
-      records = Movie.find_by_solr term
+    ["dynamite AND #{date}", "description_t:bike AND #{date}", "goofy napoleon #{date}", "goofy #{date}"].each do |term|
+      records = Movie.find_by_solr '', :alternate_query => term
       assert_equal 1, records.total
       assert_equal ({"id" => 1, "name" => "Napoleon Dynamite",
                      "description" => "Cool movie about a goofy guy"}), records.docs.first.attributes
     end
   end
+  def test_dynamic_attributes_are_faceted
+    DynamicAttribute.delete_all
+    Movie.first.dynamic_attributes.create! :name => 'description', :value => 'A very cool bike'
+    Movie.first.solr_save
+
+    records = Movie.find_by_solr '', :alternate_query => "description_t:bike", :facets => { :fields => [:description] }
+    expected = { "A very cool bike" => 1 }
+    assert_equal expected, Hash[records.facets['facet_fields']['description_facet']]
+  end
+
+
   # Testing basic solr search that returns just the ids instead of the objects:
   #   Model.find_id_by_solr 'term'
   # Note that you're able to mix free-search with fields and boolean operators
@@ -140,11 +148,10 @@ class ActsAsSolrTest &lt; Test::Unit::TestCase
   #   Model.find_id_by_solr 'term'
   # Note that you're able to mix free-search with fields and boolean operators
   def test_find_id_by_solr_ruby_or_splinter
-    ['ruby OR splinter', 'ruby OR author:tom', 'name:cell OR author:peter',
-      'dummy OR cell'].each do |term|
+    ['ruby OR splinter', 'ruby OR author:tom', 'name:cell OR author:peter', 'dummy OR cell'].each do |term|
       records = Book.find_id_by_solr term
       assert_equal 2, records.docs.size
-      assert_equal ['1','2'], records.docs
+      assert_equivalent ['1','2'], records.docs
     end
   end
@@ -152,8 +159,7 @@ class ActsAsSolrTest &lt; Test::Unit::TestCase
   #   Model.find_count_by_solr 'term'
   # Note that you're able to mix free-search with fields and boolean operators
   def test_count_by_solr
-    ['ruby', 'dummy', 'name:ruby', 'name:dummy', 'name:ruby AND author:peter',
-      'author:peter AND ruby'].each do |term|
+    ['ruby', 'dummy', 'name:ruby', 'name:dummy', 'name:ruby AND author:peter', 'author:peter AND ruby'].each do |term|
       assert_equal 1, Book.count_by_solr(term), "there should only be 1 result for search: #{term}"
     end
   end
@@ -221,13 +227,13 @@ class ActsAsSolrTest &lt; Test::Unit::TestCase
     assert_equal 'Splinter Cell', records.docs.last.name
   end
-  # Testing solr search with optional :order argument
-  def _test_with_order_option
-    records = Movie.find_by_solr 'office^5 OR goofiness'
+  # Testing solr search with optional :sort argument
+  def test_with_order_option
+    records = Movie.find_by_solr 'office^5 OR goofy'
     assert_equal 'Hypnotized dude loves fishing but not working', records.docs.first.description
     assert_equal 'Cool movie about a goofy guy', records.docs.last.description
-    records = Movie.find_by_solr 'office^5 OR goofiness', :order => 'description asc'
+    records = Movie.find_by_solr 'office^5 OR goofy', :sort => 'description asc'
     assert_equal 'Cool movie about a goofy guy', records.docs.first.description
     assert_equal 'Hypnotized dude loves fishing but not working', records.docs.last.description
   end
@@ -235,13 +241,13 @@ class ActsAsSolrTest &lt; Test::Unit::TestCase
   # Testing search with omitted :field_types should
   # return the same result set as if when we use it
   def test_omit_field_types_in_search
-    records  = Electronic.find_by_solr "price:[200 TO 599.99]"
-    assert_match(/599/, records.docs.first.price)
-    assert_match(/319/, records.docs.last.price)
+    records  = Electronic.find_by_solr '', :filter_queries => ["price:[200 TO 599.99]"]
+    assert_match /599/, records.docs.last.price
+    assert_match /319/, records.docs.first.price
-    records  = Electronic.find_by_solr "price:[200 TO 599.99]", :order => 'price asc'
-    assert_match(/319/, records.docs.first.price)
-    assert_match(/599/, records.docs.last.price)
+    records  = Electronic.find_by_solr '', :filter_queries => ["price:[200 TO 599.99]"], :sort => 'price asc'
+    assert_match /319/, records.docs.first.price
+    assert_match /599/, records.docs.last.price
   end
@@ -289,6 +295,12 @@ class ActsAsSolrTest &lt; Test::Unit::TestCase
     assert_equal 0, Author.count_by_solr('raymond chandler')
   end
+  def test_basic_search_on_model_with_string_id_field
+    records = Posting.find_by_solr 'first'
+    assert_equal 1, records.total
+    assert_equal 'ABC-123', records.docs.first.guid
+  end
+
   # Testing models that use a different key as the primary key
   def test_search_on_model_with_string_id_field
     records = Posting.find_by_solr 'first^5 OR second'
@@ -379,13 +391,11 @@ class ActsAsSolrTest &lt; Test::Unit::TestCase
   end
   def test_operator_search_option
-    assert_nothing_raised {
-      books = Movie.find_by_solr "office napoleon", :operator => :or
-      assert_equal 2, books.total
+    books = Movie.find_by_solr "office napoleon", :operator => :or
+    assert_equal 2, books.total
-      books = Movie.find_by_solr "office napoleon", :operator => :and
-      assert_equal 0, books.total
-    }
+    books = Movie.find_by_solr "office napoleon", :operator => :and
+    assert_equal 0, books.total
     assert_raise RuntimeError do
       Movie.find_by_solr "office napoleon", :operator => :bad
@@ -395,18 +405,17 @@ class ActsAsSolrTest &lt; Test::Unit::TestCase
   # Making sure find_by_solr with scores actually return the scores
   # for each individual record and orders them accordingly
   def test_find_by_solr_order_by_score
-    books = Book.find_by_solr 'ruby^10 OR splinter', {:scores => true, :order => 'score asc' }
+    books = Book.find_by_solr 'ruby^10 OR splinter', :scores => true, :sort => 'score asc'
     assert (books.docs.collect(&:solr_score).compact.size == books.docs.size), "Each book should have a score"
-    assert (books.docs.last.solr_score >= 0.3 && books.docs.last.solr_score <= 0.6)
+    assert (books.docs.first.solr_score < books.docs.last.solr_score)
-    books = Book.find_by_solr 'ruby^10 OR splinter', {:scores => true, :order => 'score desc' }
-    assert (books.docs.first.solr_score >= 0.3 && books.docs.first.solr_score <= 0.6)
+    books = Book.find_by_solr 'ruby^10 OR splinter', :scores => true, :sort => 'score desc'
     assert (books.docs.last.solr_score < books.docs.first.solr_score)
   end
   # Search based on fields with the :date format
   def test_indexed_date_field_format
-    movies = Movie.find_by_solr 'time_on_xml:[NOW-1DAY TO NOW]'
+    movies = Movie.find_by_solr '', :filter_queries => 'time_on_xml:[NOW-1DAY TO NOW]'
     assert_equal 2, movies.total
   end
@@ -422,38 +431,26 @@ class ActsAsSolrTest &lt; Test::Unit::TestCase
     assert_equal 0, Gadget.find_id_by_solr('flipvideo').total
   end
-  def test_should_find_filtering_a_dynamic_attribute
-    records = Advertise.find_by_solr "description:bike"
-    assert_equal 1, records.total
-  end
-
-  def test_dynamic_attributes_are_faceted
-    records = Advertise.find_by_solr "Description:bike", :facets => { :fields => [:Description] }
-    expected = { "A very cool bike" => 1 }
-    assert_equal expected, records.facets['facet_fields']['Description_facet']
-  end
-
   def test_search_is_an_alias_for_find_by_solr
     assert_equal Advertise.find_by_solr("bike").docs, Advertise.search("bike").docs
   end
   def test_search_given_a_radius
+    Local.delete_all
+    Local.create! :localizable => Advertise.find(1), :longitude => '-77.4027', :latitude => '39.36'
+    Local.create! :localizable => Advertise.find(2), :longitude => '77.4027',  :latitude => '-38.36'
+    Advertise.find(1).solr_save
+    Advertise.find(2).solr_save
+
     records = Advertise.search "bike", :latitude => '-39.36', :longitude => '77.4027', :radius => 1
     assert_equal 0, records.total
-  end
-
-  def test_records_are_found_in_a_radius
-    records = Advertise.search "bike", :latitude => '39.36', :longitude => '-77.4027', :radius => 1
-    assert_equal 1, records.total
-  end
-  def test_records_are_found_with_highlight
-    records = Book.find_by_solr "ruby", :highlight => { :fields => "name" }
+    records = Advertise.search "car", :latitude => '39.36', :longitude => '-77.4027', :radius => 1
     assert_equal 1, records.total
   end
-  def test_records_wiht_highlights_are_returned_properly
-    records = Book.find_by_solr "ruby", :highlight => { :fields => "name" }
+  def test_records_with_highlights_are_returned_properly
+    records = Book.find_by_solr "Ruby", :highlight => { :fields => "name" }
     expected = {"name"=>["<em>Ruby</em> for Dummies"]}
     assert_equal expected, records.highlights.values.first
   end
@@ -464,23 +461,25 @@ class ActsAsSolrTest &lt; Test::Unit::TestCase
   def test_mongo_mappers_documents_are_found
     Document.new(:name => "mapper").save
-    assert_equal "mapper", Document.search("mapper").docs.first.name
+    records = Document.search("mapper").docs
+    assert_equal 1, records.count
+    assert_equal "mapper", records.first.name
   end
   def test_total_pages_is_returned_when_limit_specified
-    assert_equal 2, Posting.search("test", :limit => 1).total_pages
+    assert_equal 2, Posting.search("testing", :limit => 1).total_pages
   end
   def test_total_pages_is_returned_when_limit_not_specified
-    assert_equal 1, Posting.search("test").total_pages
+    assert_equal 1, Posting.search("testing").total_pages
   end
   def test_current_page_is_returned
-    assert_equal 2, Posting.search("test", :limit => 1, :offset => 1).current_page
+    assert_equal 2, Posting.search("testing", :limit => 1, :offset => 1).current_page
   end
   def test_current_page_1_is_returned
-    assert_equal 1, Posting.search("test").current_page
+    assert_equal 1, Posting.search("testing").current_page
   end
   def test_current_page_1_is_returned_when_no_records_found
@@ -488,10 +487,10 @@ class ActsAsSolrTest &lt; Test::Unit::TestCase
   end
   def test_page_parameter_is_accepted
-    assert_equal 2, Posting.search("test", :limit => 1, :page => 2).current_page
+    assert_equal 2, Posting.search("testing", :limit => 1, :page => 2).current_page
   end
   def test_per_page_parameter_is_accepted
-    assert_equal 1, Posting.search("test", :per_page => 1).per_page
+    assert_equal 1, Posting.search("testing", :per_page => 1).per_page
   end
 end
@@ -14,11 +14,10 @@ class FacetedSearchTest &lt; Test::Unit::TestCase
   # A basic faceted search using just one facet field
   def test_faceted_search_basic
     records = Electronic.find_by_solr "memory", :facets => {:fields =>[:category]}
+    ipod_video = Electronic.find 1
     assert_equal 4, records.docs.size
-    assert_match /Apple 60 GB Memory iPod/, records.docs.first.name
-    assert_equal({"category_facet" => {"Electronics" => 1, 
-                                       "Memory" => 2, 
-                                       "Hard Drive" => 1}}, 
+    assert records.docs.include?(ipod_video)
+    assert_equal({"category_facet" => [["Electronics", 1], ["Hard Drive", 1], ["Memory", 2]]}, 
                  records.facets['facet_fields'])
   end
@@ -33,14 +32,12 @@ class FacetedSearchTest &lt; Test::Unit::TestCase
   def test_faceted_search_multiple_fields
     records = Electronic.find_by_solr "memory", :facets => {:fields =>[:category, :manufacturer]}
     assert_equal 4, records.docs.size
-    assert_equal({"category_facet" => {"Electronics" => 1, 
-                                       "Memory" => 2, 
-                                       "Hard Drive" => 1},
-                  "manufacturer_facet" => {"Dell, Inc" => 0,
-                                           "Samsung Electronics Co. Ltd." => 1, 
-                                           "Corsair Microsystems Inc." => 1, 
-                                           "A-DATA Technology Inc." => 1,
-                                           "Apple Computer Inc." => 1}}, records.facets['facet_fields'])
+    assert_equal({"category_facet" => [["Electronics", 1], ["Hard Drive", 1], ["Memory", 2]],
+                  "manufacturer_facet" => [["A-DATA Technology Inc.", 1],
+                    ["Apple Computer Inc.", 1],
+                    ["Corsair Microsystems Inc.", 1],
+                    ["Dell, Inc", 0],
+                    ["Samsung Electronics Co. Ltd.", 1]]}, records.facets['facet_fields'])
   end
   # A basic faceted search using facet queries to get counts. 
@@ -56,7 +53,7 @@ class FacetedSearchTest &lt; Test::Unit::TestCase
     assert_equal({"facet_queries" => {"price_rf:[* TO 200.00]"=>2,
                                       "price_rf:[200.00 TO 500.00]"=>1,
                                       "price_rf:[500.00 TO *]"=>1}, 
-                  "facet_fields" => {}, "facet_dates" => {}}, records.facets)
+                   "facet_ranges" => {}, "facet_fields" => {}, "facet_dates" => {}}, records.facets)
   end
   # Faceted search specifying the query and fields
@@ -72,9 +69,11 @@ class FacetedSearchTest &lt; Test::Unit::TestCase
     assert_equal 1, q["price_rf:[200.00 TO 500.00]"]
     f = records.facets["facet_fields"]
+    f["category_facet"] = Hash[f["category_facet"]]
     assert_equal 1, f["category_facet"]["Electronics"]
     assert_equal 2, f["category_facet"]["Memory"]
     assert_equal 1, f["category_facet"]["Hard Drive"]
+    f["manufacturer_facet"] = Hash[f["manufacturer_facet"]]
     assert_equal 1, f["manufacturer_facet"]["Samsung Electronics Co. Ltd."]
     assert_equal 1, f["manufacturer_facet"]["Corsair Microsystems Inc."]
     assert_equal 1, f["manufacturer_facet"]["A-DATA Technology Inc."]
@@ -84,23 +83,23 @@ class FacetedSearchTest &lt; Test::Unit::TestCase
   # Faceted searches with :sort and :zeros options turned on/off
   def test_faceted_search_using_zero_and_sort
     records = Electronic.find_by_solr "memory", :facets => {:fields =>[:category]}
-    assert_equal({"category_facet"=>{"Electronics"=>1, "Memory"=>2, "Hard Drive"=>1}}, records.facets['facet_fields'])
+    assert_equal({"category_facet"=>[["Electronics", 1], ["Hard Drive", 1], ["Memory", 2]]}, records.facets['facet_fields'])
     records = Electronic.find_by_solr "memory", :facets => {:sort => true, :fields =>[:category]}
-    assert_equal({"category_facet"=>{"Memory"=>2, "Electronics"=>1, "Hard Drive"=>1}}, records.facets['facet_fields'])
+    assert_equal({"category_facet"=>[["Memory", 2], ["Electronics", 1], ["Hard Drive", 1]]}, records.facets['facet_fields'])
     records = Electronic.find_by_solr "memory", :facets => {:fields =>[:manufacturer]}
-    assert_equal({"manufacturer_facet" => {"Dell, Inc" => 0,
-                                          "Samsung Electronics Co. Ltd." => 1, 
-                                          "Corsair Microsystems Inc." => 1, 
-                                          "A-DATA Technology Inc." => 1,
-                                          "Apple Computer Inc." => 1}}, records.facets['facet_fields'])
+    assert_equal({"manufacturer_facet" => [["A-DATA Technology Inc.", 1],
+                   ["Apple Computer Inc.", 1],
+                   ["Corsair Microsystems Inc.", 1],
+                   ["Dell, Inc", 0],
+                   ["Samsung Electronics Co. Ltd.", 1]]}, records.facets['facet_fields'])
     records = Electronic.find_by_solr "memory", :facets => {:zeros => false, :fields =>[:manufacturer]}
-    assert_equal({"manufacturer_facet" => {"Samsung Electronics Co. Ltd." => 1, 
-                                          "Corsair Microsystems Inc." => 1, 
-                                          "A-DATA Technology Inc." => 1,
-                                          "Apple Computer Inc." => 1}}, records.facets['facet_fields'])
+    assert_equal({"manufacturer_facet" => [["A-DATA Technology Inc.", 1],
+                   ["Apple Computer Inc.", 1],
+                   ["Corsair Microsystems Inc.", 1],
+                   ["Samsung Electronics Co. Ltd.", 1]]}, records.facets['facet_fields'])
   end
   # Faceted search with 'drill-down' option being passed.
@@ -110,13 +109,13 @@ class FacetedSearchTest &lt; Test::Unit::TestCase
   def test_faceted_search_with_drill_down
     records = Electronic.find_by_solr "memory", :facets => {:fields =>[:category]}
     assert_equal 4, records.docs.size
-    assert_equal({"category_facet"=>{"Electronics"=>1, "Memory"=>2, "Hard Drive"=>1}}, records.facets['facet_fields'])
+    assert_equal({"category_facet"=>[["Electronics", 1], ["Hard Drive", 1], ["Memory", 2]]}, records.facets['facet_fields'])
     records = Electronic.find_by_solr "memory", :facets => {:fields =>[:category],
                                                                :browse => "category:Memory",
                                                                :zeros => false}
     assert_equal 2, records.docs.size
-    assert_equal({"category_facet"=>{"Memory"=>2}}, records.facets['facet_fields'])
+    assert_equal({"category_facet"=>[["Memory", 2]]}, records.facets['facet_fields'])
   end
   def test_faceted_search_with_dates
@@ -42,11 +42,9 @@ class ActsAsSolrTest &lt; Test::Unit::TestCase
     assert_equal 0, records.total
   end
-  def test_search_on_empty_string_does_not_return_nil
+  def test_search_on_empty_string_return_all_results
     records = Book.multi_solr_search('', :models => [Movie, Category])
-    assert_not_nil records
-    assert_equal [], records.docs
-    assert_equal 0, records.total
+    assert_equal Book.count+Movie.count+Category.count, records.total
   end
   def test_search_with_score_should_set_score
@@ -2,5 +2,5 @@
 # - id
 class Advertise < ActiveRecord::Base
-  acts_as_solr :dynamic_attributes => true, :spatial => true
+  acts_as_solr :spatial => true
 end
@@ -4,7 +4,7 @@
 # - description
 class Movie < ActiveRecord::Base
-  acts_as_solr :additional_fields => [:current_time, {:time_on_xml => :date}]
+  acts_as_solr :additional_fields => [:current_time, {:time_on_xml => :date}], :dynamic_attributes => true
   def current_time
     Time.now.to_s
@@ -14,4 +14,4 @@ class Movie &lt; ActiveRecord::Base
     Time.now
   end
-end
 \ No newline at end of file
+end
@@ -2,6 +2,8 @@ require &#39;rubygems&#39;
 require 'test/unit'
 require 'active_record'
 require 'active_record/fixtures'
+require 'shoulda'
+require 'mocha'
 require 'ruby-debug'
@@ -12,15 +14,24 @@ end
 require 'mongo_mapper'
+class Rails
+  def self.root
+    RAILS_ROOT
+  end
+
+  def self.env
+    RAILS_ENV
+  end
+end
+
 MongoMapper.database = "acts_as_solr_reloaded-test"
 RAILS_ROOT = File.dirname(__FILE__) unless defined? RAILS_ROOT
 RAILS_ENV  = 'test' unless defined? RAILS_ENV
 ENV["RAILS_ENV"] = "test"
-ENV["ACTS_AS_SOLR_TEST"] = "true"
+require File.expand_path(File.dirname(__FILE__) + '/../config/solr_environment')
 require File.expand_path(File.dirname(__FILE__) + '/../lib/acts_as_solr')
-require File.expand_path(File.dirname(__FILE__) + '/../config/solr_environment.rb')
 # Load Models
 models_dir = File.join(File.dirname( __FILE__ ), 'models')
@@ -57,14 +68,17 @@ class Test::Unit::TestCase
   def self.clear_from_solr(table_name)
     ActsAsSolr::Post.execute(Solr::Request::Delete.new(:query => "type_s:#{table_name.to_s.capitalize.singularize}"))
   end
-end
-class Rails
-  def self.root
-    RAILS_ROOT
+  def assert_equivalent(enum1, enum2)
+    assert( ((enum1 - enum2) == []) && ((enum2 - enum1) == []), "<#{enum1.inspect}> expected to be equivalent to <#{enum2.inspect}>")
   end
-  def self.env
-    RAILS_ENV
+  def assert_includes(array, element)
+    assert(array.include?(element), "<#{array.inspect}> expected to include <#{element.inspect}>")
+  end
+
+  def assert_not_includes(array, element)
+    assert(!array.include?(element), "<#{array.inspect}> expected to NOT include <#{element.inspect}>")
   end
+
 end
-require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
 class ActsMethodsTest < Test::Unit::TestCase
   class Model
@@ -55,6 +55,21 @@ class ActsMethodsTest &lt; Test::Unit::TestCase
     acts_as_solr
   end
+  should "enable auto_commit in all environments except production" do
+    Taggable.stubs(:after_save)
+    Taggable.stubs(:after_destroy)
+    instance = Taggable.new
+    instance.stubs(:attributes).returns({})
+    Taggable.stubs(:new).returns(instance)
+
+    Rails.stubs(:env).returns('test')
+    Taggable.acts_as_solr
+    assert Taggable.configuration[:auto_commit] == true
+    Rails.stubs(:env).returns('production')
+    Taggable.acts_as_solr
+    assert Taggable.configuration[:auto_commit] == false
+  end
+
   should "define the model as taggable if taggable is true" do
     assert Taggable.taggable?
   end
@@ -63,12 +78,12 @@ class ActsMethodsTest &lt; Test::Unit::TestCase
     assert !NotTaggable.taggable?
   end
-  should "define the type of a MongoMapper document id as text" do
-    assert_equal :text, Mapper.configuration[:solr_fields][:_id][:type]
+  should "define the type of a MongoMapper document id as string" do
+    assert_equal :string, Mapper.configuration[:solr_fields][:_id][:type]
   end
-  should "recognize the type String of a MongoMapper key as text" do
-    assert_equal :text, Mapper.configuration[:solr_fields][:value1][:type]
+  should "recognize the type String of a MongoMapper key as string" do
+    assert_equal :string, Mapper.configuration[:solr_fields][:value1][:type]
   end
   context "when getting field values" do
-require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
 class User
   attr_accessor :name, :id
@@ -31,12 +31,12 @@ class ClassMethodsTest &lt; Test::Unit::TestCase
     end
     should "include the type field in the query" do
-      expects(:parse_query).with("name:paul", {:results_format => :objects}, "AND (type_t:User)")
+      expects(:parse_query).with("name:paul", {:results_format => :objects})
       multi_solr_search("name:paul")
     end
     should "add all models in the query" do
-      expects(:parse_query).with("name:paul", {:results_format => :objects, :models => ["Movie", "DVD"]}, "AND (type_t:User OR type_t:Movie OR type_t:DVD)")
+      expects(:parse_query).with("name:paul", {:results_format => :objects, :models => ["Movie", "DVD"]})
       multi_solr_search("name:paul", :models => ["Movie", "DVD"])
     end
@@ -82,4 +82,4 @@ class ClassMethodsTest &lt; Test::Unit::TestCase
       end
     end
   end
-end
 \ No newline at end of file
+end
-require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
 class CommonMethodsTest < Test::Unit::TestCase
   include ActsAsSolr::CommonMethods
@@ -35,6 +35,14 @@ class CommonMethodsTest &lt; Test::Unit::TestCase
       assert_equal "f", get_solr_field_type(:float)
     end
+    should "return f for a decimal" do
+      assert_equal "f", get_solr_field_type(:decimal)
+    end
+    
+    should "return do for a double" do
+      assert_equal "do", get_solr_field_type(:double)
+    end
+    
     should "return b for a boolean" do
       assert_equal "b", get_solr_field_type(:boolean)
     end
-require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
 module Solr; end
 class InstanceMethodsTest < Test::Unit::TestCase
@@ -148,7 +148,8 @@ class InstanceMethodsTest &lt; Test::Unit::TestCase
     context "when converting an instance to a solr document" do
       setup do
-        @instance.configuration = {:if => true, :auto_commit => true, :solr_fields => {:name => {:boost => 9.0}}, :boost => 10.0}
+        @instance.configuration = {:if => true, :auto_commit => true, :fields => [:name, :last_name],
+          :solr_fields => {:name => {:boost => 9.0}, :last_name => {:type => :string}}, :boost => 10.0}
         @instance.solr_configuration = {:type_field => "type", :primary_key_field => "pk_id", :default_boost => 25.0}
       end
@@ -183,12 +184,12 @@ class InstanceMethodsTest &lt; Test::Unit::TestCase
         end
         should "add the longitude" do
-          field = @fields.find { |field| field.name.eql? "lng" }
+          field = @fields.find { |field| field.name.eql? "lng_f" }
           assert_equal @local.longitude, field.value
         end
         should "add the latitude" do
-          field = @fields.find { |field| field.name.eql? "lat" }
+          field = @fields.find { |field| field.name.eql? "lat_f" }
           assert_equal @local.latitude, field.value
         end
       end
@@ -198,7 +199,7 @@ class InstanceMethodsTest &lt; Test::Unit::TestCase
           @instance.stubs(:local).returns(nil)
           @instance.configuration[:spatial] = true
           fields = @instance.to_solr_doc.fields
-          assert_equal nil, fields.find { |field| field.name.eql? 'lng' }
+          assert_equal nil, fields.find { |field| field.name.eql? 'lng_f' }
         end
       end
@@ -217,6 +218,13 @@ class InstanceMethodsTest &lt; Test::Unit::TestCase
           field = @instance.to_solr_doc.fields.find {|f| f.name.to_s == "name_s"}
           assert_equal 25.0, field.boost
         end
+
+        should "ignore null fields" do
+          @instance.stubs(:name_for_solr).returns(nil)
+          @instance.stubs(:last_name_for_solr).returns('Dohn')
+          assert ! @instance.to_solr_doc.fields.find {|f| f.name.to_s == "name_s"}
+          assert @instance.to_solr_doc.fields.find {|f| f.name.to_s == "last_name_s"}
+        end
         should "not overwrite the type or id field" do
           @instance.configuration[:solr_fields] = {:type => {}, :id => {}}
@@ -281,7 +289,7 @@ class InstanceMethodsTest &lt; Test::Unit::TestCase
             @instance.stubs(:people).returns(@people)
             @reflection = OpenStruct.new(:macro => :has_many)
             @instance.class.stubs(:reflect_on_association).returns(@reflection)
-            @instance.configuration[:solr_includes] = {@assoc => {}}
+            @instance.configuration[:solr_includes] = {@assoc => {:type => :string}}
             @instance.solr_configuration.merge! :default_boost => 35.0
           end
@@ -306,7 +314,6 @@ class InstanceMethodsTest &lt; Test::Unit::TestCase
           end
           should "set the default boost for the include, if none is configured" do
-            # @instance.configuration[:solr_includes] = {@assoc => {}}
             field = @instance.to_solr_doc.fields.find {|f| f.name.to_s == "person_s"}
             assert_equal 35.0, field.boost
           end
@@ -318,10 +325,9 @@ class InstanceMethodsTest &lt; Test::Unit::TestCase
           end
           should "default to a field value with all association attributes" do
-            # @instance.configuration[:solr_includes] = {@assoc => {}}
             field = @instance.to_solr_doc.fields.find {|f| f.name.to_s == "person_s"}
             @people.first.attributes.each do |attr, value|
-              assert_match /#{attr}=#{value}/, field.value
+              assert_match /#{value}/, field.value
             end
           end
@@ -346,7 +352,6 @@ class InstanceMethodsTest &lt; Test::Unit::TestCase
           end
           should "include multiple values separately if the :multivalued options is specified"    do
-            # @instance.configuration[:solr_includes] = {@assoc => {}}
             second_person = {:name => 'Dean Venture', :address => 'Venture Compound'}
             @people << OpenStruct.new(second_person.merge(:attributes => second_person))
             fields = @instance.to_solr_doc.fields.select {|f| f.name.to_s == "person_s"}
-require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/parser_instance")
 class ParserMethodsTest < Test::Unit::TestCase
@@ -16,6 +17,8 @@ class ParserMethodsTest &lt; Test::Unit::TestCase
         @results.stubs(:highlighting).returns []
         @results.stubs(:data).returns({"responseHeader" => {"QTime" => "10.2"}})
         @results.stubs(:header).returns({})
+        @parser.stubs(:merge_conditions).returns({:id => []})
+        @parser.stubs(:all).returns([])
       end
       should "return a SearchResults object" do
@@ -36,11 +39,13 @@ class ParserMethodsTest &lt; Test::Unit::TestCase
           @parser.configuration = {:format => :objects}
           @parser.solr_configuration = {:primary_key_field => :pk_id}
           @results.stubs(:hits).returns [{"pk_id" => 1}, {"pk_id" => 2}]
+          @ids = @results.hits.map{ |h| h.first.last }
           @parser.stubs(:reorder)
+          @parser.expects(:merge_conditions).returns({:id => @ids})
         end
         should "query with the record ids" do
-          @parser.expects(:find).with([1, 2], {}).returns [1, 2]
+          @parser.expects(:all).with(:conditions => {:id => @ids}).returns @ids
           @parser.parse_results(@results)
         end
@@ -50,8 +55,8 @@ class ParserMethodsTest &lt; Test::Unit::TestCase
         end
         should "add :include if :include was specified" do
-          @parser.expects(:find).with([1, 2], :include => [:author]).returns [1, 2]
-          @parser.parse_results(@results, :include => [:author])
+          @parser.expects(:all).with(:conditions => {:id => @ids}, :include => [:author]).returns @ids
+          @parser.parse_results(@results, :sql_options => {:include => [:author]})
         end
       end
@@ -129,8 +134,8 @@ class ParserMethodsTest &lt; Test::Unit::TestCase
   end
   context "when reordering results" do
-    should "raise an error if arguments don't have the same number of elements" do
-      assert_raise(RuntimeError) {@parser.reorder([], [1])}
+    should "don't raise an error if arguments don't have the same number of elements" do
+      assert_nothing_raised {@parser.reorder([], [1])}
     end
     should "reorder the results to match the order of the documents returned by solr" do
@@ -151,7 +156,22 @@ class ParserMethodsTest &lt; Test::Unit::TestCase
       ActsAsSolr::Post.stubs(:execute)
       @parser.stubs(:solr_type_condition).returns "(type:ParserMethodsTest)"
       @parser.solr_configuration = {:primary_key_field => "id"}
-      @parser.configuration = {:solr_fields => nil}
+      @parser.configuration = {:solr_fields => {:title => {:type => :string}, :tag => {:type => :text}, :description => {:type => :text}}}
+    end
+
+    should "not escape fields followed filter and boost chars" do
+      ActsAsSolr::Post.expects(:execute).with {|request, core|
+        request.to_hash[:q] == 'tag_t:blah nonfield\\:blah'
+      }
+      @parser.parse_query "tag:blah nonfield:blah"
+    end
+
+
+    should "always use search as query type" do
+      ActsAsSolr::Post.expects(:execute).with {|request, core|
+        request.to_hash[:qt] == 'search'
+      }
+      @parser.parse_query "foo"
     end
     should "set the limit and offset" do
@@ -165,23 +185,16 @@ class ParserMethodsTest &lt; Test::Unit::TestCase
     should "set the relevancy of the specified fields and non-filtered terms" do
       ActsAsSolr::Post.expects(:execute).with {|request, core|
         q = request.to_hash[:q]
-        q.starts_with?("(aeroplane brasil continent_t:south OR tag_t:(aeroplane brasil)^5 OR description_t:(aeroplane brasil)^3)") or q.starts_with?("(aeroplane brasil continent_t:south OR description_t:(aeroplane brasil)^3 OR tag_t:(aeroplane brasil)^5)")
+        q.starts_with?("aeroplane brasil OR tag_t:(aeroplane brasil)^5 OR description_t:(aeroplane brasil)^3") or
+        q.starts_with?("aeroplane brasil OR description_t:(aeroplane brasil)^3 OR tag_t:(aeroplane brasil)^5")
       }
-      @parser.parse_query "aeroplane brasil continent:south", :relevance => {:tag => 5, :description => 3}
-    end
-
-    should "set the relevance unless no query specified" do
-      expected = "(continent_t:south)"
-      ActsAsSolr::Post.expects(:execute).with {|request, core|
-        request.to_hash[:q].starts_with? expected
-      }
-      @parser.parse_query "continent:south", :relevance => {:tag => 5, :description => 3}
+      @parser.parse_query "aeroplane brasil", :filter_queries => ['continent:south'], :relevance => {:tag => 5, :description => 3}
     end
     should "set the relevance with simple queries" do
       ActsAsSolr::Post.expects(:execute).with {|request, core|
         q = request.to_hash[:q]
-        q.starts_with?("(car OR tag_t:(car)^5 OR description_t:(car)^3)") or q.starts_with?("(car OR description_t:(car)^3 OR tag_t:(car)^5)")
+        q.starts_with?("car OR tag_t:(car)^5 OR description_t:(car)^3") or q.starts_with?("car OR description_t:(car)^3 OR tag_t:(car)^5")
       }
       @parser.parse_query "car", :relevance => {:tag => 5, :description => 3}
     end
@@ -202,24 +215,24 @@ class ParserMethodsTest &lt; Test::Unit::TestCase
     should "add the type" do
       ActsAsSolr::Post.expects(:execute).with {|request, core|
-        request.to_hash[:q].include?("(type:ParserMethodsTest)")
+        request.to_hash[:fq].include?("(type:ParserMethodsTest)")
       }
       @parser.parse_query "foo"
     end
-    should "append the field types for the specified fields" do
+    should "not append field types for not specified fields" do
       ActsAsSolr::Post.expects(:execute).with {|request, core|
-        request.to_hash[:q].include?("(username_t:Chunky)")
+        request.to_hash[:fq].include?("username:Chunky")
       }
-      @parser.parse_query "username:Chunky"
+      @parser.parse_query '', :filter_queries => ["username:Chunky"]
   end
   should "replace the field types" do
-    @parser.expects(:replace_types).returns(["active_i:1"])
+    @parser.configuration = {:solr_fields => {:active => {:type => :integer}}}
     ActsAsSolr::Post.expects(:execute).with {|request, core|
-      request.to_hash[:q].include?("active_i:1")
+      request.to_hash[:fq].include?("active_i:1")
     }
-    @parser.parse_query "active:1"
+    @parser.parse_query "", :filter_queries => ['active:1']
   end
   should "add score and primary key to field list" do
@@ -232,7 +245,7 @@ class ParserMethodsTest &lt; Test::Unit::TestCase
   should "add highlight options" do
     ActsAsSolr::Post.expects(:execute).with {|request, core|
       request.to_hash[:hl] == "true"
-      request.to_hash["hl.fl"] == "title_t"
+      request.to_hash["hl.fl"] == "title_s"
     }
     @parser.parse_query "car", :highlight => {:fields => "title"}
   end
@@ -259,30 +272,16 @@ class ParserMethodsTest &lt; Test::Unit::TestCase
   end
   context "with the around option" do
-    should "set the qt as geo" do
-      ActsAsSolr::Post.expects(:execute).with {|request, core|
-        request.to_hash[:qt] == ('geo')
-      }
-      @parser.parse_query "foo" , :latitude => '-39.36', :longitude => '77.4027', :radius => 1
-    end
-
     should "set the radius" do
       ActsAsSolr::Post.expects(:execute).with {|request, core|
-        request.to_hash[:radius] == 12
-      }
-      @parser.parse_query "foo" , :latitude => '-39.36', :longitude => '77.4027', :radius => 12
-    end
-
-    should "set the latitude" do
-      ActsAsSolr::Post.expects(:execute).with {|request, core|
-        request.to_hash[:lat] == '-39.36'
+        request.to_hash[:d] == 12
       }
       @parser.parse_query "foo" , :latitude => '-39.36', :longitude => '77.4027', :radius => 12
     end
-    should "set the longitude" do
+    should "set the latitude and the longitude" do
       ActsAsSolr::Post.expects(:execute).with {|request, core|
-        request.to_hash[:long] == '77.4027'
+        request.to_hash[:pt] == "-39.36, 77.4027"
       }
       @parser.parse_query "foo" , :latitude => '-39.36', :longitude => '77.4027', :radius => 12
     end
@@ -290,10 +289,11 @@ class ParserMethodsTest &lt; Test::Unit::TestCase
   context "with the order option" do
     should "add the order criteria to the query" do
+      @parser.configuration = {:solr_fields => {:active => {:type => :text}}}
       ActsAsSolr::Post.expects(:execute).with {|request, core|
         request.to_hash[:sort].include?("active_t desc")
       }
-      @parser.parse_query "active:1", :order => "active desc"
+      @parser.parse_query "active:1", :sort => "active desc"
     end
   end
@@ -308,16 +308,16 @@ context &quot;When setting the field types&quot; do
   end
   should "replace the _t suffix with the real type" do
-    assert_equal ["name_s:Chunky AND age_i:21"], @parser.replace_types(["name_t:Chunky AND age_t:21"])
+    assert_equal ["name_s:Chunky AND age_i:21"], @parser.replace_types(["name:Chunky AND age:21"])
   end
   context "with a suffix" do
     should "not include the colon when false" do
-      assert_equal ["name_s"], @parser.replace_types(["name_t"], false)
+      assert_equal ["name_s"], @parser.replace_types(["name"], '')
     end
     should "include the colon by default" do
-      assert_equal ["name_s:Chunky"], @parser.replace_types(["name_t:Chunky"])
+      assert_equal ["name_s:Chunky"], @parser.replace_types(["name:Chunky"])
     end
   end
 end
@@ -0,0 +1,15 @@
+require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
+
+# This tests a solr-ruby modification
+
+class SolrAddDocumentTest < Test::Unit::TestCase
+
+  should "return correct handler" do
+    assert_equal Solr::Request::AddDocument.new.handler, 'update/json'
+  end
+
+  should "have xml as response format" do
+    assert_equal Solr::Request::AddDocument.new.response_format, :xml
+  end
+
+end
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+before_script:
	2	+ - mongo mydb_test --eval 'db.addUser("travis", "test");'
	3	+ - gem update --system 1.4.1 > /dev/null 2>&1
	4	+ - rake solr:download
	5	+ - RAILS_ENV=test rake solr:start
	6	+
	7	+script: "bundle exec rake $TASK --trace"
	8	+
	9	+rvm:
	10	+ - 1.8.7
	11	+env:
	12	+ - TASK=test
	13	+ - TASK=test:functional
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+source :rubygems
	2	+
	3	+gem 'ruby-debug'
	4	+
	5	+gem 'rails', '2.3.5'
	6	+
	7	+gem 'sqlite3'
	8	+
	9	+gem 'mongo_mapper', '0.7.6'
	10	+gem 'bson_ext', '1.0'
	11	+
	12	+gem 'mocha'
	13	+gem 'thoughtbot-shoulda'
1	-ENV['RAILS_ENV'] = (ENV['RAILS_ENV'] \|\| 'development').dup	1	+ENV['RAILS_ENV'] = (ENV['RAILS_ENV'] \|\| 'development').dup
2	require "uri"	2	require "uri"
3	require "fileutils"	3	require "fileutils"
4	require "yaml"	4	require "yaml"
		5	+require 'net/http'
		6	+
5	dir = File.dirname(__FILE__)	7	dir = File.dirname(__FILE__)
6	SOLR_PATH = File.expand_path("#{dir}/../solr") unless defined? SOLR_PATH	8	SOLR_PATH = File.expand_path("#{dir}/../solr") unless defined? SOLR_PATH
7		9
8	-# RAILS_ROOT isn't defined yet, so figure it out.
9	unless defined? RAILS_ROOT	10	unless defined? RAILS_ROOT
10	- RAILS_ROOT = File.expand_path("#{File.dirname(__FILE__)}/../test")	11	+ # define RAILS_ROOT for test environment
		12	+ RAILS_ROOT = defined?(Rails) ? Rails.root : File.expand_path("#{File.dirname(__FILE__)}/../test")
		13	+end
		14	+unless defined? RAILS_ENV
		15	+ RAILS_ENV = ENV['RAILS_ENV']
11	end	16	end
12	unless defined? SOLR_LOGS_PATH	17	unless defined? SOLR_LOGS_PATH
13	SOLR_LOGS_PATH = ENV["SOLR_LOGS_PATH"] \|\| "#{RAILS_ROOT}/log"	18	SOLR_LOGS_PATH = ENV["SOLR_LOGS_PATH"] \|\| "#{RAILS_ROOT}/log"
	@@ -35,9 +40,10 @@ end		@@ -35,9 +40,10 @@ end
35		40
36	SOLR_JVM_OPTIONS = config[ENV['RAILS_ENV']]['jvm_options'] unless defined? SOLR_JVM_OPTIONS	41	SOLR_JVM_OPTIONS = config[ENV['RAILS_ENV']]['jvm_options'] unless defined? SOLR_JVM_OPTIONS
37		42
38	-if ENV["ACTS_AS_SOLR_TEST"]
39	- require "activerecord"	43	+if ENV["RAILS_ENV"] == 'test'
		44	+ require "active_record"
40	DB = (ENV['DB'] ? ENV['DB'] : 'sqlite') unless defined?(DB)	45	DB = (ENV['DB'] ? ENV['DB'] : 'sqlite') unless defined?(DB)
41	MYSQL_USER = (ENV['MYSQL_USER'].nil? ? 'root' : ENV['MYSQL_USER']) unless defined? MYSQL_USER	46	MYSQL_USER = (ENV['MYSQL_USER'].nil? ? 'root' : ENV['MYSQL_USER']) unless defined? MYSQL_USER
42	require File.join(File.dirname(File.expand_path(__FILE__)), '..', 'test', 'db', 'connections', DB, 'connection.rb')	47	require File.join(File.dirname(File.expand_path(__FILE__)), '..', 'test', 'db', 'connections', DB, 'connection.rb')
43	end	48	end
		49	+
	@@ -29,7 +29,7 @@ module ActsAsSolr #:nodoc:		@@ -29,7 +29,7 @@ module ActsAsSolr #:nodoc:
29	"The field types are automatically traced back when you specify a field type in your model."	29	"The field types are automatically traced back when you specify a field type in your model."
30	end	30	end
31	if options[:sort_by]	31	if options[:sort_by]
32	- plog "The option :sort_by is deprecated, use :order instead!"	32	+ plog "The option :sort_by is deprecated, use :sort instead!"
33	options[:sort] \|\|= options[:sort_by]	33	options[:sort] \|\|= options[:sort_by]
34	end	34	end
35	if options[:start]	35	if options[:start]
	@@ -72,7 +72,7 @@ module ActsAsSolr #:nodoc:		@@ -72,7 +72,7 @@ module ActsAsSolr #:nodoc:
72		72
73	# Returns a suggested query	73	# Returns a suggested query
74	def suggest	74	def suggest
75	- @solr_data[:spellcheck]['suggestions']['collation'].match(/\((.+)\) /)[1]	75	+ Hash[@solr_data[:spellcheck]['suggestions']]['collation']
76	end	76	end
77		77
78	# Returns the number of documents per page	78	# Returns the number of documents per page
	@@ -82,12 +82,12 @@ module ActsAsSolr #:nodoc:		@@ -82,12 +82,12 @@ module ActsAsSolr #:nodoc:
82		82
83	# Returns the number of pages found	83	# Returns the number of pages found
84	def total_pages	84	def total_pages
85	- (total / per_page.to_f).ceil	85	+ per_page.zero? ? 0 : (total / per_page.to_f).ceil
86	end	86	end
87		87
88	# Returns the current page	88	# Returns the current page
89	def current_page	89	def current_page
90	- (@solr_data[:start].to_i / per_page) + 1	90	+ per_page.zero? ? 0 : (@solr_data[:start].to_i / per_page) + 1
91	end	91	end
92		92
93	def blank?	93	def blank?
	@@ -23,4 +23,5 @@ require File.expand_path("#{File.dirname(__FILE__)}/solr/xml")		@@ -23,4 +23,5 @@ require File.expand_path("#{File.dirname(__FILE__)}/solr/xml")
23	require File.expand_path("#{File.dirname(__FILE__)}/solr/field")	23	require File.expand_path("#{File.dirname(__FILE__)}/solr/field")
24	require File.expand_path("#{File.dirname(__FILE__)}/solr/request/base")	24	require File.expand_path("#{File.dirname(__FILE__)}/solr/request/base")
25	require File.expand_path("#{File.dirname(__FILE__)}/solr/document")	25	require File.expand_path("#{File.dirname(__FILE__)}/solr/document")
		26	+require File.expand_path("#{File.dirname(__FILE__)}/solr/request/json_update")
26	require File.expand_path("#{File.dirname(__FILE__)}/solr/request/update")	27	require File.expand_path("#{File.dirname(__FILE__)}/solr/request/update")
	@@ -10,6 +10,8 @@		@@ -10,6 +10,8 @@
10	# See the License for the specific language governing permissions and	10	# See the License for the specific language governing permissions and
11	# limitations under the License.	11	# limitations under the License.
12		12
		13	+require File.expand_path(File.dirname(__FILE__) + '/json_update')
		14	+
13	class Solr::Request::AddDocument < Solr::Request::JsonUpdate	15	class Solr::Request::AddDocument < Solr::Request::JsonUpdate
14		16
15	# create the request, optionally passing in a Solr::Document	17	# create the request, optionally passing in a Solr::Document
	@@ -64,7 +64,7 @@ class Solr::Request::Standard < Solr::Request::Select		@@ -64,7 +64,7 @@ class Solr::Request::Standard < Solr::Request::Select
64		64
65	hash[:sfield] = 'latlng'	65	hash[:sfield] = 'latlng'
66	hash[:d] = @params[:radius]	66	hash[:d] = @params[:radius]
67	- hash[:pt] = "#{@params[:latitude]}, #{@params[:longitude]}"	67	+ hash[:pt] = "#{@params[:latitude]}, #{@params[:longitude]}" if @params[:latitude] and @params[:longitude]
68		68
69	# facet parameter processing	69	# facet parameter processing
70	if @params[:facets]	70	if @params[:facets]
	@@ -26,11 +26,21 @@ class Solr::Util		@@ -26,11 +26,21 @@ class Solr::Util
26	end	26	end
27		27
28	# from http://lucene.apache.org/core/old_versioned_docs/versions/3_0_0/queryparsersyntax.html#Escaping Special Characters	28	# from http://lucene.apache.org/core/old_versioned_docs/versions/3_0_0/queryparsersyntax.html#Escaping Special Characters
29	- ESCAPES = %w[+ - && \|\| ! ( ) { } \[ \] ^ " ~ * ? : \]	29	+ ESCAPES = %w[+ - && \|\| ! ( ) { } \[ \] " ~ * ? \]
30		30
31	- def self.query_parser_escape(string)
32	- string = string.dup	31	+ def self.query_parser_escape(string, fields = [])
		32	+ string = string.split(' ').map do \|str\|
		33	+ if /(\w+):(.*)/ =~ str # escape : considering fields
		34	+ (!$2.empty? and fields.include?($1.to_sym)) ? "#{$1}:#{$2}" : "#{$1}\\:#{$2}"
		35	+ elsif /^\^(.*)/ =~ str # escape ^
		36	+ "\\^#{$1}"
		37	+ else
		38	+ str
		39	+ end
		40	+ end.join(' ')
		41	+
33	ESCAPES.each { \|e\| string.gsub! e, "\\#{e}" }	42	ESCAPES.each { \|e\| string.gsub! e, "\\#{e}" }
34	string	43	string
35	end	44	end
		45	+
36	end	46	end
1	test:	1	test:
2	- url: http://localhost:8981/solr
3	\ No newline at end of file	2	\ No newline at end of file
		3	+ url: http://0.0.0.0:8981/solr