thinking-sphinx 2.0.0.rc1 → 2.0.0.rc2

data/README.textile

@@ -177,3 +177,9 @@ Since I first released this library, there's been quite a few people who have su
 * James Brooks
 * Andrew Coldham
 * Mark Dodwell
+* Frédéric Malamitsas
+* Jon Gubman
+* Michael Schuerig
+* Ben Hutton
+* Alfonso Jiménez
+* Szymon Nowak

data/VERSION

@@ -1 +1 @@
-2.0.0.rc1
+2.0.0.rc2

data/features/facets.feature

@@ -27,7 +27,7 @@ Feature: Search and browse models by their defined facets
     And I should have the facet State
     And I should have the facet Age
   
-  Scenario: Requseting float facets
+  Scenario: Requesting float facets
     Given Sphinx is running
     And I am searching on alphas
     When I am requesting facet results
@@ -80,3 +80,11 @@ Feature: Search and browse models by their defined facets
     And I am searching on posts
     When I am requesting facet results
     Then the Comment Ids facet should have 9 keys
+  
+  Scenario: Requesting facets from a subclass
+    Given Sphinx is running
+    And I am searching on animals
+    When I am requesting facet results
+    And I want classes included
+    Then I should have the facet Class
+  

data/features/sphinx_scopes.feature

@@ -40,3 +40,11 @@ Feature: Sphinx Scopes
     When I use the with_first_name scope set to "Andrew"
     And I am retrieving the scoped result count
     Then I should get a value of 7
+
+  Scenario: Counts with scopes and additional query terms
+    Given Sphinx is running
+    And I am searching on people
+    When I use the with_first_name scope set to "Andrew"
+    And I am retrieving the scoped result count for "Byrne"
+    Then I should get a value of 1
+  

data/features/step_definitions/scope_steps.rb

@@ -13,3 +13,7 @@ end
 When /^I am retrieving the scoped result count$/ do
   @results = results.search_count
 end
+
+When /^I am retrieving the scoped result count for "([^"]*)"$/ do |query|
+  @results = results.search_count query
+end

data/lib/cucumber/thinking_sphinx/external_world.rb

@@ -1,8 +1,12 @@
 require 'thinking_sphinx/test'
 
-class Cucumber::ThinkingSphinx::ExternalWorld
-  def initialize(suppress_delta_output = true)
-    ::ThinkingSphinx::Test.init
-    ::ThinkingSphinx::Test.start_with_autostop
+module Cucumber
+  module ThinkingSphinx
+    class ExternalWorld
+      def initialize(suppress_delta_output = true)
+        ::ThinkingSphinx::Test.init
+        ::ThinkingSphinx::Test.start_with_autostop
+      end
+    end
   end
 end

data/lib/thinking_sphinx.rb

@@ -27,7 +27,7 @@ require 'thinking_sphinx/adapters/abstract_adapter'
 require 'thinking_sphinx/adapters/mysql_adapter'
 require 'thinking_sphinx/adapters/postgresql_adapter'
 
-require 'thinking_sphinx/railtie'
+require 'thinking_sphinx/railtie' if defined?(Rails)
 
 module ThinkingSphinx
   # A ConnectionError will get thrown when a connection to Sphinx can't be

data/lib/thinking_sphinx/active_record.rb

@@ -41,7 +41,7 @@ module ThinkingSphinx
           end
           
           def to_crc32s
-            (subclasses << self).collect { |klass| klass.to_crc32 }
+            (descendants << self).collect { |klass| klass.to_crc32 }
           end
           
           def sphinx_database_adapter
@@ -183,7 +183,7 @@ module ThinkingSphinx
       
       def insert_sphinx_index(index)
         self.sphinx_indexes << index
-        subclasses.each { |klass| klass.insert_sphinx_index(index) }
+        descendants.each { |klass| klass.insert_sphinx_index(index) }
       end
       
       def has_sphinx_indexes?
@@ -308,6 +308,10 @@ module ThinkingSphinx
       end
     end
     
+    attr_accessor :excerpts
+    attr_accessor :sphinx_attributes
+    attr_accessor :matching_fields
+    
     def in_index?(suffix)
       self.class.search_for_id self.sphinx_document_id, sphinx_index_name(suffix)
     end

data/lib/thinking_sphinx/adapters/abstract_adapter.rb

@@ -12,7 +12,9 @@ module ThinkingSphinx
     def self.detect(model)
       case model.connection.class.name
       when "ActiveRecord::ConnectionAdapters::MysqlAdapter",
-           "ActiveRecord::ConnectionAdapters::MysqlplusAdapter"
+           "ActiveRecord::ConnectionAdapters::MysqlplusAdapter",
+           "ActiveRecord::ConnectionAdapters::Mysql2Adapter",
+           "ActiveRecord::ConnectionAdapters::NullDBAdapter"
         ThinkingSphinx::MysqlAdapter.new model
       when "ActiveRecord::ConnectionAdapters::PostgreSQLAdapter"
         ThinkingSphinx::PostgreSQLAdapter.new model

data/lib/thinking_sphinx/class_facet.rb

@@ -8,8 +8,9 @@ module ThinkingSphinx
       "class_crc"
     end
     
-    def value(object, attribute_value)
-      object.class.name
+    def value(object, attribute_hash)
+      crc = attribute_hash['class_crc']
+      ThinkingSphinx::Configuration.instance.models_by_crc[crc]
     end
   end
 end

data/lib/thinking_sphinx/configuration.rb

@@ -243,7 +243,7 @@ module ThinkingSphinx
       @models_by_crc ||= begin
         ThinkingSphinx.context.indexed_models.inject({}) do |hash, model|
           hash[model.constantize.to_crc32] = model
-          model.constantize.subclasses.each { |subclass|
+          model.constantize.descendants.each { |subclass|
             hash[subclass.to_crc32] = subclass.name
           }
           hash

data/lib/thinking_sphinx/context.rb

@@ -40,7 +40,7 @@ class ThinkingSphinx::Context
   private
   
   def add_indexed_models
-    ActiveRecord::Base.subclasses.each do |klass|
+    ActiveRecord::Base.descendants.each do |klass|
       add_indexed_model klass if klass.has_sphinx_indexes?
     end
   end
@@ -55,7 +55,7 @@ class ThinkingSphinx::Context
         model_name = file.gsub(/^#{base}([\w_\/\\]+)\.rb/, '\1')
         
         next if model_name.nil?
-        next if ::ActiveRecord::Base.send(:subclasses).detect { |model|
+        next if ::ActiveRecord::Base.send(:descendants).detect { |model|
           model.name == model_name.camelize
         }
         

data/lib/thinking_sphinx/deltas/default_delta.rb

@@ -44,7 +44,7 @@ module ThinkingSphinx
         config = ThinkingSphinx::Configuration.instance
         rotate = ThinkingSphinx.sphinx_running? ? "--rotate" : ""
         
-        output = `#{config.bin_path}#{config.indexer_binary_name} --config '#{config.config_file}' #{rotate} #{model.delta_index_names.join(' ')}`
+        output = `#{config.bin_path}#{config.indexer_binary_name} --config "#{config.config_file}" #{rotate} #{model.delta_index_names.join(' ')}`
         puts(output) unless ThinkingSphinx.suppress_delta_output?
       end
       

data/lib/thinking_sphinx/facet.rb

@@ -71,7 +71,12 @@ module ThinkingSphinx
       @property.is_a?(Field) ? :string : @property.type
     end
     
-    def value(object, attribute_value)
+    def float?
+      @property.type == :float
+    end
+    
+    def value(object, attribute_hash)
+      attribute_value = attribute_hash['@groupby']
       return translate(object, attribute_value) if translate? || float?
       
       case @property.type
@@ -117,9 +122,5 @@ module ThinkingSphinx
     def column
       @property.columns.first
     end
-    
-    def float?
-      @property.type == :float
-    end
   end
 end

data/lib/thinking_sphinx/facet_search.rb

@@ -44,23 +44,21 @@ module ThinkingSphinx
     end
     
     def populate
-      facet_names.each do |name|
-        search_options = facet_search_options.merge(:group_by => name)
-        add_from_results name, ThinkingSphinx.search(
-          *(args + [search_options])
-        )
-      end
+      ThinkingSphinx::Search.bundle_searches(facet_names) { |sphinx, name|
+        sphinx.search *(args + [facet_search_options(name)])
+      }.each_with_index { |search, index|
+        add_from_results facet_names[index], search
+      }
     end
     
-    def facet_search_options
-      config = ThinkingSphinx::Configuration.instance
-      max    = config.configuration.searchd.max_matches || 1000
-      
+    def facet_search_options(facet_name)
       options.merge(
         :group_function => :attr,
-        :limit          => max,
-        :max_matches    => max,
-        :page           => 1
+        :limit          => max_matches,
+        :max_matches    => max_matches,
+        :page           => 1,
+        :group_by       => facet_name,
+        :ids_only       => !translate?(facet_name)
       )
     end
     
@@ -101,21 +99,34 @@ module ThinkingSphinx
       }
     end
     
-    def add_from_results(facet, results)
-      name = ThinkingSphinx::Facet.name_for(facet)
+    def translate?(name)
+      facet = facet_from_name(name)
+      facet.translate? || facet.float?
+    end
+    
+    def config
+      ThinkingSphinx::Configuration.instance
+    end
+    
+    def max_matches
+      @max_matches ||= config.configuration.searchd.max_matches || 1000
+    end
+    
+    # example: facet = country_facet; name = :country
+    def add_from_results(facet, search)
+      name  = ThinkingSphinx::Facet.name_for(facet)
+      facet = facet_from_name(facet)
       
       self[name]  ||= {}
       
-      return if results.empty?
-      
-      facet = facet_from_object(results.first, facet) if facet.is_a?(String)
+      return if search.empty?
       
-      results.each_with_groupby_and_count { |result, group, count|
-        facet_value = facet.value(result, group)
+      search.each_with_match do |result, match|
+        facet_value = facet.value(result, match[:attributes])
         
         self[name][facet_value] ||= 0
-        self[name][facet_value]  += count
-      }
+        self[name][facet_value]  += match[:attributes]["@count"]
+      end
     end
     
     def underlying_value(key, value)
@@ -130,7 +141,24 @@ module ThinkingSphinx
     end
     
     def facet_from_object(object, name)
-      object.sphinx_facets.detect { |facet| facet.attribute_name == name }
+      facet = nil
+      klass = object.class
+      
+      while klass != ::ActiveRecord::Base && facet.nil?
+        facet = klass.sphinx_facets.detect { |facet|
+          facet.attribute_name == name
+        }
+        klass = klass.superclass
+      end
+      
+      facet
+    end
+    
+    def facet_from_name(name)
+      name = ThinkingSphinx::Facet.name_for(name)
+      all_facets.detect { |facet|
+        facet.name == name
+      }
     end
   end
 end

data/lib/thinking_sphinx/search.rb

@@ -57,6 +57,22 @@ module ThinkingSphinx
       ThinkingSphinx.facets *args
     end
     
+    def self.bundle_searches(enum)
+      client = ThinkingSphinx::Configuration.instance.client
+      
+      searches = enum.collect { |item|
+        search = yield ThinkingSphinx, item
+        search.append_to client
+        search
+      }
+      
+      client.run.each_with_index.collect { |results, index|
+        searches[index].populate_from_queue results
+      }
+      
+      searches
+    end
+    
     def self.matching_fields(fields, bitmask)
       matches   = []
       bitstring = bitmask.to_s(2).rjust(32, '0').reverse
@@ -111,6 +127,7 @@ module ThinkingSphinx
         add_scope(method, *args, &block)
         return self
       elsif method == :search_count
+        merge_search one_class.search(*args)
         return scoped_count
       elsif method.to_s[/^each_with_.*/].nil? && !@array.respond_to?(method)
         super
@@ -186,6 +203,17 @@ module ThinkingSphinx
     # Compatibility with older versions of will_paginate
     alias_method :page_count, :total_pages
     
+    # Query time taken
+    # 
+    # @return [Integer]
+    #
+    def query_time
+      populate
+      return 0 if @results[:time].nil?
+
+      @query_time ||= @results[:time]
+    end
+
     # The total number of search results available.
     # 
     # @return [Integer]
@@ -232,6 +260,13 @@ module ThinkingSphinx
       end
     end
     
+    def each_with_match(&block)
+      populate
+      results[:matches].each_with_index do |match, index|
+        yield self[index], match
+      end
+    end
+    
     def excerpt_for(string, model = nil)
       if model.nil? && one_class
         model ||= one_class
@@ -241,7 +276,7 @@ module ThinkingSphinx
       client.excerpts(
         :docs   => [string],
         :words  => results[:words].keys.join(' '),
-        :index  => "#{model.source_of_sphinx_index.sphinx_name}_core"
+        :index  => options[:index] || "#{model.source_of_sphinx_index.sphinx_name}_core"
       ).first
     end
     
@@ -251,6 +286,29 @@ module ThinkingSphinx
       self
     end
     
+    def append_to(client)
+      prepare client
+      client.append_query query, indexes, comment
+      client.reset
+    end
+    
+    def populate_from_queue(results)
+      return if @populated
+      @populated = true
+      @results   = results
+      
+      if options[:ids_only]
+        replace @results[:matches].collect { |match|
+          match[:attributes]["sphinx_internal_id"]
+        }
+      else
+        replace instances_from_matches
+        add_excerpter
+        add_sphinx_attributes
+        add_matching_fields if client.rank_mode == :fieldmask
+      end
+    end
+    
     private
     
     def config
@@ -289,43 +347,32 @@ module ThinkingSphinx
     
     def add_excerpter
       each do |object|
-        next if object.respond_to?(:excerpts)
-        
-        excerpter = ThinkingSphinx::Excerpter.new self, object
-        block = lambda { excerpter }
+        next if object.nil?
         
-        object.singleton_class.instance_eval do
-          define_method(:excerpts, &block)
-        end
+        object.excerpts = ThinkingSphinx::Excerpter.new self, object
       end
     end
     
     def add_sphinx_attributes
       each do |object|
-        next if object.nil? || object.respond_to?(:sphinx_attributes)
+        next if object.nil?
         
         match = match_hash object
         next if match.nil?
         
-        object.singleton_class.instance_eval do
-          define_method(:sphinx_attributes) { match[:attributes] }
-        end
+        object.sphinx_attributes = match[:attributes]
       end
     end
     
     def add_matching_fields
       each do |object|
-        next if object.nil? || object.respond_to?(:matching_fields)
+        next if object.nil?
         
         match = match_hash object
         next if match.nil?
-        fields = ThinkingSphinx::Search.matching_fields(
+        object.matching_fields = ThinkingSphinx::Search.matching_fields(
           @results[:fields], match[:weight]
         )
-        
-        object.singleton_class.instance_eval do
-          define_method(:matching_fields) { fields }
-        end
       end
     end
     
@@ -352,6 +399,10 @@ module ThinkingSphinx
     def client
       client = config.client
       
+      prepare client
+    end
+    
+    def prepare(client)
       index_options = one_class ?
         one_class.sphinx_indexes.first.local_options : {}
       
@@ -588,14 +639,6 @@ MSG
     end
     
     # When passed a Time instance, returns the integer timestamp.
-    # 
-    # If using Rails 2.1+, need to handle timezones to translate them back to
-    # UTC, as that's what datetimes will be stored as by MySQL.
-    # 
-    # in_time_zone is a method that was added for the timezone support in
-    # Rails 2.1, which is why it's used for testing. I'm sure there's better
-    # ways, but this does the job.
-    # 
     def filter_value(value)
       case value
       when Range
@@ -603,7 +646,7 @@ MSG
       when Array
         value.collect { |v| filter_value(v) }.flatten
       when Time
-        value.respond_to?(:in_time_zone) ? [value.utc.to_i] : [value.to_i]
+        [value.to_i]
       when NilClass
         0
       else

data/lib/thinking_sphinx/source/internal_properties.rb

@@ -37,7 +37,7 @@ module ThinkingSphinx
       end
 
       def subclasses_to_s
-        "'" + (@model.send(:subclasses).collect { |klass|
+        "'" + (@model.send(:descendants).collect { |klass|
           klass.to_crc32.to_s
         } << @model.to_crc32.to_s).join(",") + "'"
       end

data/spec/thinking_sphinx/active_record/delta_spec.rb

@@ -106,7 +106,7 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do
     
     it "should call indexer for the delta index" do
       Person.sphinx_indexes.first.delta_object.should_receive(:`).with(
-        "#{ThinkingSphinx::Configuration.instance.bin_path}indexer --config '#{ThinkingSphinx::Configuration.instance.config_file}' --rotate person_delta"
+        "#{ThinkingSphinx::Configuration.instance.bin_path}indexer --config \"#{ThinkingSphinx::Configuration.instance.config_file}\" --rotate person_delta"
       )
       
       @person.send(:index_delta)

data/spec/thinking_sphinx/facet_search_spec.rb

@@ -1,28 +1,26 @@
 require 'spec_helper'
 
 describe ThinkingSphinx::FacetSearch do
+  let(:search) { stub('search', :append_to => nil, :empty? => true) }
+  let(:config) { ThinkingSphinx::Configuration.instance }
+  let(:client) { stub('client', :run => []) }
+  
+  before :each do
+    config.stub!(:client => client)
+  end
+  
   describe 'populate' do
-    it "should make separate Sphinx queries for each facet" do
-      ThinkingSphinx.should_receive(:search).with(
-        hash_including(:group_by => 'city_facet')
-      ).and_return([])
-      ThinkingSphinx.should_receive(:search).with(
-        hash_including(:group_by => 'state_facet')
-      ).and_return([])
-      ThinkingSphinx.should_receive(:search).with(
-        hash_including(:group_by => 'birthday')
-      ).and_return([])
-      
-      ThinkingSphinx::FacetSearch.new(:classes => [Person])
+    before :each do
+      config.configuration.searchd.max_matches = 10_000
     end
-    
+        
     it "should request all shared facets in a multi-model request by default" do
-      ThinkingSphinx.stub!(:search => [])
+      ThinkingSphinx.stub!(:search => search)
       ThinkingSphinx::FacetSearch.new.facet_names.should == ['class_crc']
     end
     
     it "should request all facets in a multi-model request if specified" do
-      ThinkingSphinx.stub!(:search => [])
+      ThinkingSphinx.stub!(:search => search)
       ThinkingSphinx::FacetSearch.new(
         :all_facets => true
       ).facet_names.should == [
@@ -30,80 +28,22 @@ describe ThinkingSphinx::FacetSearch do
       ]
     end
     
-    describe ':facets option' do
-      it "should limit facets to the requested set" do
-        ThinkingSphinx.should_receive(:search).once.and_return([])
-        
-        ThinkingSphinx::FacetSearch.new(
-          :classes => [Person], :facets => :state
-        )
-      end
-    end
-    
-    describe "empty result set for attributes" do
-      before :each do
-        ThinkingSphinx.stub!(:search => [])
-        @facets = ThinkingSphinx::FacetSearch.new(
-          :classes => [Person], :facets => :state
-        )
-      end
-      
-      it "should add key as attribute" do
-        @facets.should have_key(:state)
-      end
-
-      it "should return an empty hash for the facet results" do
-        @facets[:state].should be_empty
-      end
-    end
-
-    describe "non-empty result set" do
-      before :each do
-        @person = Person.find(:first)
-        @people = [@person]
-        @people.stub!(:each_with_groupby_and_count).
-          and_yield(@person, @person.city.to_crc32, 1)
-        ThinkingSphinx.stub!(:search => @people)
-        
-        @facets = ThinkingSphinx::FacetSearch.new(
-          :classes => [Person], :facets => :city
-        )
-      end
-
-      it "should return a hash" do
-        @facets.should be_a_kind_of(Hash)
-      end
-
-      it "should add key as attribute" do
-        @facets.keys.should include(:city)
-      end
-
-      it "should return a hash" do
-        @facets[:city].should == {@person.city => 1}
-      end
-    end
-    
-    before :each do
-      @config = ThinkingSphinx::Configuration.instance
-      @config.configuration.searchd.max_matches = 10_000
-    end
-    
     it "should use the system-set max_matches for limit on facet calls" do
       ThinkingSphinx.should_receive(:search) do |options|
         options[:max_matches].should  == 10_000
         options[:limit].should        == 10_000
-        []
+        search
       end
       
       ThinkingSphinx::FacetSearch.new
     end
     
     it "should use the default max-matches if there is no explicit setting" do
-      @config.configuration.searchd.max_matches = nil
+      config.configuration.searchd.max_matches = nil
       ThinkingSphinx.should_receive(:search) do |options|
         options[:max_matches].should  == 1000
         options[:limit].should        == 1000
-        []
+        search
       end
       
       ThinkingSphinx::FacetSearch.new
@@ -113,7 +53,7 @@ describe ThinkingSphinx::FacetSearch do
       ThinkingSphinx.should_receive(:search) do |options|
         options[:max_matches].should  == 10_000
         options[:limit].should        == 10_000
-        []
+        search
       end
       
       ThinkingSphinx::FacetSearch.new(
@@ -125,7 +65,7 @@ describe ThinkingSphinx::FacetSearch do
     it "should not use an explicit :page" do
       ThinkingSphinx.should_receive(:search) do |options|
         options[:page].should == 1
-        []
+        search
       end
       
       ThinkingSphinx::FacetSearch.new(:page => 3)
@@ -149,15 +89,69 @@ describe ThinkingSphinx::FacetSearch do
         }.should raise_error
       end
     end
+    
+    describe ':facets option' do
+      it "should limit facets to the requested set" do
+        ThinkingSphinx.should_receive(:search).once.and_return(search)
+        
+        ThinkingSphinx::FacetSearch.new(
+          :classes => [Person], :facets => :state
+        )
+      end
+    end
+    
+    describe "empty result set for attributes" do
+      before :each do
+        ThinkingSphinx.stub!(:search => search)
+        @facets = ThinkingSphinx::FacetSearch.new(
+          :classes => [Person], :facets => :state
+        )
+      end
+      
+      it "should add key as attribute" do
+        @facets.should have_key(:state)
+      end
+
+      it "should return an empty hash for the facet results" do
+        @facets[:state].should be_empty
+      end
+    end
+
+    describe "non-empty result set" do
+      before :each do
+        @person = Person.find(:first)
+        @people = [@person]
+        search.stub!(:empty? => false)
+        search.stub!(:each_with_match).
+          and_yield(@person, {:attributes => {'@groupby' => @person.city.to_crc32, '@count' => 1}})
+        ThinkingSphinx::Search.stub!(:bundle_searches => [search])
+        
+        @facets = ThinkingSphinx::FacetSearch.new(
+          :classes => [Person], :facets => :city
+        )
+      end
+
+      it "should return a hash" do
+        @facets.should be_a_kind_of(Hash)
+      end
+
+      it "should add key as attribute" do
+        @facets.keys.should include(:city)
+      end
+
+      it "should return a hash" do
+        @facets[:city].should == {@person.city => 1}
+      end
+    end
   end
   
   describe "#for" do
     before do
       @person = Person.find(:first)
       @people = [@person]
-      @people.stub!(:each_with_groupby_and_count).
-        and_yield(@person, @person.city.to_crc32, 1)
-      ThinkingSphinx.stub!(:search => @people)
+      search.stub!(:each_with_match).
+        and_yield(@person, {:attributes => {'@groupby' => @person.city.to_crc32, '@count' => 1}})
+      ThinkingSphinx::Search.stub!(:bundle_searches => [search])
       
       @facets = ThinkingSphinx::FacetSearch.new(
         :classes => [Person], :facets => :city

data/spec/thinking_sphinx/facet_spec.rb

@@ -291,13 +291,13 @@ describe ThinkingSphinx::Facet do
         person      = Person.find(:first)
         friendship  = Friendship.new(:person => person)
       
-        @facet.value(friendship, 1).should == person.first_name
+        @facet.value(friendship, {'first_name_facet' => 1}).should == person.first_name
       end
     
       it "should return nil if the association is nil" do
         friendship = Friendship.new(:person => nil)
       
-        @facet.value(friendship, 1).should be_nil
+        @facet.value(friendship, {'first_name_facet' => 1}).should be_nil
       end
       
       it "should return multi-level association values" do
@@ -308,7 +308,7 @@ describe ThinkingSphinx::Facet do
         field  = ThinkingSphinx::Field.new(
           @source, ThinkingSphinx::Index::FauxColumn.new(:person, :tags, :name)
         )
-        ThinkingSphinx::Facet.new(field).value(friendship, 'buried'.to_crc32).
+        ThinkingSphinx::Facet.new(field).value(friendship, {'name_facet' => 'buried'.to_crc32}).
           should == 'buried'
       end
     end
@@ -326,7 +326,7 @@ describe ThinkingSphinx::Facet do
       it "should translate using the given model" do
         alpha = Alpha.new(:cost => 10.5)
       
-        @facet.value(alpha, 1093140480).should == 10.5
+        @facet.value(alpha, {'cost' => 1093140480}).should == 10.5
       end
     end
   end

data/spec/thinking_sphinx/search_methods_spec.rb

@@ -135,6 +135,10 @@ describe ThinkingSphinx::SearchMethods do
   end
   
   describe '.facets' do
+    before :each do
+      ThinkingSphinx::Search.stub!(:bundle_searches => [])
+    end
+    
     it "should return a FacetSearch instance" do
       Alpha.facets.should be_a(ThinkingSphinx::FacetSearch)
     end

data/spec/thinking_sphinx/search_spec.rb

@@ -785,9 +785,10 @@ describe ThinkingSphinx::Search do
         end
       
         it "should set up the excerpter with the instances and search" do
-          ThinkingSphinx::Excerpter.should_receive(:new).with(@search, @alpha_a)
-          ThinkingSphinx::Excerpter.should_receive(:new).with(@search, @alpha_b)
-        
+          [@alpha_a, @beta_b, @alpha_b, @beta_a].each do |object|
+            ThinkingSphinx::Excerpter.should_receive(:new).with(@search, object)
+          end
+          
           @search.first
         end
       end
@@ -822,11 +823,6 @@ describe ThinkingSphinx::Search do
           search.first.should respond_to(:matching_fields)
         end
         
-        it "should not add matching_fields method if using a different ranking mode" do
-          search = ThinkingSphinx::Search.new :rank_mode => :bm25
-          search.first.should_not respond_to(:matching_fields)
-        end
-        
         it "should not add matching_fields method if object already have one" do
           search = ThinkingSphinx::Search.new :rank_mode => :fieldmask
           search.last.matching_fields.should_not be_an(Array)
@@ -1112,6 +1108,15 @@ describe ThinkingSphinx::Search do
       @search.excerpt_for('string')
     end
     
+    it "should respect the provided index option" do
+      @search = ThinkingSphinx::Search.new(:classes => [Alpha], :index => 'foo')
+      @client.should_receive(:excerpts) do |options|
+        options[:index].should == 'foo'
+      end
+      
+      @search.excerpt_for('string')
+    end
+    
     it "should optionally take a second argument to allow for multi-model searches" do
       @client.should_receive(:excerpts) do |options|
         options[:index].should == 'beta_core'

data/tasks/distribution.rb

@@ -28,15 +28,8 @@ Jeweler::Tasks.new do |gem|
     "spec/**/*_spec.rb"
   ]
   
-  gem.add_dependency 'activerecord', '>= 3.0.0.beta3'
-  gem.add_dependency 'riddle',       '>= 1.0.10'
-  
-  gem.add_development_dependency "yard",          ">= 0"
-  gem.add_development_dependency "rspec",         ">= 1.2.9"
-  gem.add_development_dependency "cucumber",      ">= 0"
-  gem.add_development_dependency "will_paginate", "3.0.pre"
-  gem.add_development_dependency "ginger",        "1.2.0"
-  gem.add_development_dependency "faker",         "0.3.1"
+  gem.add_dependency 'activerecord', '>= 3.0.0.rc'
+  gem.add_dependency 'riddle',       '>= 1.0.12'
   
   gem.post_install_message = <<-MESSAGE
 If you're upgrading, you should read this:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 977940590
+  hash: 977940591
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
-  - rc1
-  version: 2.0.0.rc1
+  - rc2
+  version: 2.0.0.rc2
 platform: ruby
 authors: 
 - Pat Allan
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 +10:00
+date: 2010-08-23 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +27,13 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1848230021
+        hash: 7712042
         segments: 
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - rc
+        version: 3.0.0.rc
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,106 +44,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 1
         - 0
-        - 10
-        version: 1.0.10
+        - 12
+        version: 1.0.12
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: will_paginate
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 961915916
-        segments: 
-        - 3
-        - 0
-        - pre
-        version: 3.0.pre
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ginger
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: faker
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 0
-        - 3
-        - 1
-        version: 0.3.1
-  type: :development
-  version_requirements: *id008
 description: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
 email: pat@freelancing-gods.com
 executables: []