thorsson_thinking-sphinx 1.3.18 → 2.0

data/README.textile

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

data/VERSION

@@ -1 +1 @@
-1.3.18
+1.3.20

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/searching_across_models.feature

@@ -7,7 +7,7 @@ Feature: Searching across multiple model
     Given Sphinx is running
     When I search for James
     And I am retrieving the result count
-    Then I should get a value of 3
+    Then I should get a value of 6
   
   Scenario: Confirming existance of a document id in a given index
     Given Sphinx is running

data/features/sphinx_scopes.feature

@@ -40,3 +40,29 @@ 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
+  
+  Scenario: Default Scope
+    Given Sphinx is running
+    And I am searching on andrews
+    Then I should get 7 results
+  
+  Scenario: Default Scope and additional query terms
+    Given Sphinx is running
+    And I am searching on andrews
+    When I search for "Byrne"
+    Then I should get 1 result
+  
+  Scenario: Explicit scope plus search over a default scope
+    Given Sphinx is running
+    And I am searching on andrews
+    When I use the locked_last_name scope
+    And I search for "Cecil"
+    Then I should get 1 result
+  

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/features/thinking_sphinx/models/alpha.rb

@@ -14,6 +14,7 @@ class Alpha < ActiveRecord::Base
     
     has value, created_at, created_on
     has cost, :facet => true
+    has active
     
     set_property :field_weights => {'alternative_name' => 10}
     

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

@@ -10,6 +10,7 @@ require 'thinking_sphinx/property'
 require 'thinking_sphinx/active_record'
 require 'thinking_sphinx/association'
 require 'thinking_sphinx/attribute'
+require 'thinking_sphinx/bundled_search'
 require 'thinking_sphinx/configuration'
 require 'thinking_sphinx/context'
 require 'thinking_sphinx/excerpter'

data/lib/thinking_sphinx/active_record.rb

@@ -322,6 +322,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/active_record/scopes.rb

@@ -53,6 +53,13 @@ module ThinkingSphinx
               
               ThinkingSphinx::Search.new(options)
             end
+            
+            define_method("#{method}_without_default".to_sym) do |*args|
+              options = {:classes => classes_option, :ignore_default => true}
+              options.merge! block.call(*args)
+              
+              ThinkingSphinx::Search.new(options)
+            end
           end
         end
 

data/lib/thinking_sphinx/adapters/abstract_adapter.rb

@@ -13,7 +13,8 @@ module ThinkingSphinx
       case model.connection.class.name
       when "ActiveRecord::ConnectionAdapters::MysqlAdapter",
            "ActiveRecord::ConnectionAdapters::MysqlplusAdapter",
-           "ActiveRecord::ConnectionAdapters::Mysql2Adapter"
+           "ActiveRecord::ConnectionAdapters::Mysql2Adapter",
+           "ActiveRecord::ConnectionAdapters::NullDBAdapter"
         ThinkingSphinx::MysqlAdapter.new model
       when "ActiveRecord::ConnectionAdapters::PostgreSQLAdapter"
         ThinkingSphinx::PostgreSQLAdapter.new model

data/lib/thinking_sphinx/auto_version.rb

@@ -5,6 +5,8 @@ module ThinkingSphinx
       case version
       when '0.9.8', '0.9.9'
         require "riddle/#{version}"
+      when '1.10-beta'
+        require 'riddle/1.10'
       else
         STDERR.puts %Q{
 Sphinx cannot be found on your system. You may need to configure the following

data/lib/thinking_sphinx/bundled_search.rb

@@ -0,0 +1,44 @@
+module ThinkingSphinx
+  class BundledSearch
+    attr_reader :client
+    
+    def initialize
+      @searches = []
+    end
+    
+    def search(*args)
+      @searches << ThinkingSphinx.search(*args)
+      @searches.last.append_to client
+    end
+    
+    def search_for_ids(*args)
+      @searches << ThinkingSphinx.search_for_ids(*args)
+      @searches.last.append_to client
+    end
+    
+    def searches
+      populate
+      @searches
+    end
+    
+    private
+    
+    def client
+      @client ||= ThinkingSphinx::Configuration.instance.client
+    end
+    
+    def populated?
+      @populated
+    end
+    
+    def populate
+      return if populated?
+      
+      @populated = true
+      
+      client.run.each_with_index do |results, index|
+        searches[index].populate_from_queue results
+      end
+    end
+  end
+end

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

@@ -54,13 +54,14 @@ module ThinkingSphinx
       sql_query_killlist sql_ranged_throttle sql_query_post_index unpack_zlib
       unpack_mysqlcompress unpack_mysqlcompress_maxsize )
     
-    IndexOptions  = %w( charset_table charset_type charset_dictpath docinfo
-      enable_star exceptions html_index_attrs html_remove_elements html_strip
-      index_exact_words ignore_chars inplace_docinfo_gap inplace_enable
-      inplace_hit_gap inplace_reloc_factor inplace_write_factor min_infix_len
-      min_prefix_len min_stemming_len min_word_len mlock morphology ngram_chars
-      ngram_len ondisk_dict overshort_step phrase_boundary phrase_boundary_step
-      preopen stopwords stopwords_step wordforms )
+    IndexOptions  = %w( blend_chars charset_table charset_type charset_dictpath
+      docinfo enable_star exceptions expand_keywords hitless_words
+      html_index_attrs html_remove_elements html_strip index_exact_words
+      ignore_chars inplace_docinfo_gap inplace_enable inplace_hit_gap
+      inplace_reloc_factor inplace_write_factor min_infix_len min_prefix_len
+      min_stemming_len min_word_len mlock morphology ngram_chars ngram_len
+      ondisk_dict overshort_step phrase_boundary phrase_boundary_step preopen
+      stopwords stopwords_step wordforms )
     
     CustomOptions = %w( disable_range )
         

data/lib/thinking_sphinx/context.rb

@@ -65,8 +65,10 @@ class ThinkingSphinx::Context
           model_name.gsub!(/.*[\/\\]/, '').nil? ? next : retry
         rescue NameError
           next
-        rescue StandardError
-          STDERR.puts "Warning: Error loading #{file}"
+        rescue StandardError => err
+          STDERR.puts "Warning: Error loading #{file}:"
+          STDERR.puts err.message
+          STDERR.puts err.backtrace.join("\n"), ''
         end
       end
     end

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,18 @@ module ThinkingSphinx
       ThinkingSphinx.facets *args
     end
     
+    def self.bundle_searches(enum = nil)
+      bundle = ThinkingSphinx::BundledSearch.new
+      
+      if enum.nil?
+        yield bundle
+      else
+        enum.each { |item| yield bundle, item }
+      end
+      
+      bundle.searches
+    end
+    
     def self.matching_fields(fields, bitmask)
       matches   = []
       bitstring = bitmask.to_s(2).rjust(32, '0').reverse
@@ -74,6 +86,8 @@ module ThinkingSphinx
       @options  = args.extract_options!
       @args     = args
       
+      add_default_scope unless options[:ignore_default]
+      
       populate if @options[:populate]
     end
     
@@ -111,6 +125,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 +201,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 +258,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,16 +274,45 @@ 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
     
     def search(*args)
-      add_default_scope
+      args << args.extract_options!.merge(:ignore_default => true)
       merge_search ThinkingSphinx::Search.new(*args)
       self
     end
     
+    def client
+      client = options[:client] || config.client
+      
+      prepare client
+    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 +351,32 @@ module ThinkingSphinx
     
     def add_excerpter
       each do |object|
-        next if object.respond_to?(:excerpts)
+        next if object.nil?
         
-        excerpter = ThinkingSphinx::Excerpter.new self, object
-        block = lambda { excerpter }
-        
-        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
     
@@ -349,9 +400,7 @@ module ThinkingSphinx
       self.class.log(*args)
     end
     
-    def client
-      client = config.client
-      
+    def prepare(client)
       index_options = one_class ?
         one_class.sphinx_indexes.first.local_options : {}
       
@@ -588,14 +637,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 +644,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
@@ -747,10 +788,12 @@ MSG
     
     # Adds the default_sphinx_scope if set.
     def add_default_scope
-      add_scope(one_class.get_default_sphinx_scope) if one_class && one_class.has_default_sphinx_scope?
+      return unless one_class && one_class.has_default_sphinx_scope?
+      add_scope(one_class.get_default_sphinx_scope.to_sym)
     end
     
     def add_scope(method, *args, &block)
+      method = "#{method}_without_default".to_sym
       merge_search one_class.send(method, *args, &block)
     end
     

data/lib/thinking_sphinx/tasks.rb

@@ -4,7 +4,12 @@ namespace :thinking_sphinx do
   task :app_env do
     if defined?(RAILS_ROOT)
       Rake::Task[:environment].invoke
-      Rails.configuration.cache_classes = false
+      
+      if defined?(Rails.configuration)
+        Rails.configuration.cache_classes = false
+      else
+        Rails::Initializer.run { |config| config.cache_classes = false }
+      end
     end
     
     Rake::Task[:merb_env].invoke    if defined?(Merb)

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/active_record/scopes_spec.rb

@@ -87,10 +87,9 @@ describe ThinkingSphinx::ActiveRecord::Scopes do
       search.by_foo('foo').search.options[:conditions].should == {:foo => 'foo', :name => 'foo'}
     end
 
-    # FIXME: Probably the other way around is more logical? How to do this?
-    it "should apply the default scope options after other scope options to the underlying search object" do
+    it "should apply the default scope options before other scope options to the underlying search object" do
       search = ThinkingSphinx::Search.new(:classes => [Alpha])
-      search.by_name('bar').search.options[:conditions].should == {:name => 'foo'}
+      search.by_name('bar').search.options[:conditions].should == {:name => 'bar'}
     end
   end
 

data/spec/thinking_sphinx/auto_version_spec.rb

@@ -22,6 +22,14 @@ describe ThinkingSphinx::AutoVersion do
       ThinkingSphinx::AutoVersion.detect
     end
     
+    it "should require 1.10-beta if that is the detected version" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/1.10')
+      
+      @config.stub!(:version => '1.10-beta')
+      ThinkingSphinx::AutoVersion.detect
+    end
+    
     it "should output a warning if the detected version is something else" do
       STDERR.should_receive(:puts)
       

data/spec/thinking_sphinx/context_spec.rb

@@ -53,8 +53,9 @@ describe ThinkingSphinx::Context do
 
     it "should catch database errors with a warning" do
       @class_name.should_receive(:constantize).and_raise(Mysql::Error)
-      STDERR.should_receive(:puts).with('Warning: Error loading a.rb')
-
+      STDERR.stub!(:puts => '')
+      STDERR.should_receive(:puts).with('Warning: Error loading a.rb:')
+      
       lambda {
         @context.prepare
       }.should_not raise_error

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'
@@ -1197,6 +1202,19 @@ describe ThinkingSphinx::Search do
       @search.freeze.should be_a(ThinkingSphinx::Search)
     end
   end
+  
+  describe '#client' do
+    let(:client) { Riddle::Client.new }
+    it "should respect the client in options" do
+      search = ThinkingSphinx::Search.new :client => client
+      search.client.should == client
+    end
+    
+    it "should get a new client from the configuration singleton by default" do
+      ThinkingSphinx::Configuration.instance.stub!(:client => client)
+      ThinkingSphinx::Search.new.client.should == client
+    end
+  end
 end
 
 describe ThinkingSphinx::Search, "playing nice with Search model" do

data/spec/thinking_sphinx/test_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require "#{File.dirname(__FILE__)}/../../lib/thinking_sphinx/test"
+
+describe ThinkingSphinx::Test do
+  describe ".run" do
+    before :each do
+      ThinkingSphinx::Test.stub!(:start)
+    end
+
+    it "should call stop when an exception is raised by passed block" do
+      ThinkingSphinx::Test.should_receive(:stop)
+      
+      begin
+        ThinkingSphinx::Test.run { raise FakeError }
+      rescue => FakeError
+        # we raised it manually ourselves!
+      end
+    end
+  end
+end

data/tasks/distribution.rb

@@ -23,11 +23,13 @@ Jeweler::Tasks.new do |gem|
     "VERSION"
   ]
   gem.test_files = FileList[
-    "features/**/*",
+    "features/**/*.rb",
+    "features/**/*.feature",
+    "features/**/*.example.yml",
     "spec/**/*_spec.rb"
   ]
   
-  gem.add_dependency 'activerecord', '>= 1.15.6'
+  gem.add_dependency 'activerecord', '>= 1.15.6', '< 3.0.0'
   gem.add_dependency 'riddle',       '>= 1.0.10'
   gem.add_dependency 'after_commit', '>= 1.0.6'
   

metadata

@@ -3,10 +3,9 @@ name: thorsson_thinking-sphinx
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 1
-  - 3
-  - 18
-  version: 1.3.18
+  - 2
+  - 0
+  version: "2.0"
 platform: ruby
 authors: 
 - Pat Allan
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 +02:00
+date: 2010-09-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,6 +29,13 @@ dependencies:
         - 15
         - 6
         version: 1.15.6
+    - - <
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -175,6 +181,7 @@ files:
 - lib/thinking_sphinx/association.rb
 - lib/thinking_sphinx/attribute.rb
 - lib/thinking_sphinx/auto_version.rb
+- lib/thinking_sphinx/bundled_search.rb
 - lib/thinking_sphinx/class_facet.rb
 - lib/thinking_sphinx/configuration.rb
 - lib/thinking_sphinx/context.rb
@@ -204,24 +211,6 @@ files:
 - tasks/distribution.rb
 - tasks/rails.rake
 - tasks/testing.rb
-- features/abstract_inheritance.feature
-- features/alternate_primary_key.feature
-- features/attribute_transformation.feature
-- features/attribute_updates.feature
-- features/deleting_instances.feature
-- features/direct_attributes.feature
-- features/excerpts.feature
-- features/extensible_delta_indexing.feature
-- features/facets.feature
-- features/facets_across_model.feature
-- features/handling_edits.feature
-- features/retry_stale_indexes.feature
-- features/searching_across_models.feature
-- features/searching_by_index.feature
-- features/searching_by_model.feature
-- features/searching_with_find_arguments.feature
-- features/sphinx_detection.feature
-- features/sphinx_scopes.feature
 - features/step_definitions/alpha_steps.rb
 - features/step_definitions/beta_steps.rb
 - features/step_definitions/common_steps.rb
@@ -232,11 +221,9 @@ files:
 - features/step_definitions/scope_steps.rb
 - features/step_definitions/search_steps.rb
 - features/step_definitions/sphinx_steps.rb
-- features/sti_searching.feature
 - features/support/env.rb
 - features/support/lib/generic_delta_handler.rb
 - features/thinking_sphinx/database.example.yml
-- features/thinking_sphinx/database.yml
 - features/thinking_sphinx/db/fixtures/alphas.rb
 - features/thinking_sphinx/db/fixtures/authors.rb
 - features/thinking_sphinx/db/fixtures/betas.rb
@@ -293,6 +280,25 @@ files:
 - features/thinking_sphinx/models/robot.rb
 - features/thinking_sphinx/models/tag.rb
 - features/thinking_sphinx/models/tagging.rb
+- features/abstract_inheritance.feature
+- features/alternate_primary_key.feature
+- features/attribute_transformation.feature
+- features/attribute_updates.feature
+- features/deleting_instances.feature
+- features/direct_attributes.feature
+- features/excerpts.feature
+- features/extensible_delta_indexing.feature
+- features/facets.feature
+- features/facets_across_model.feature
+- features/handling_edits.feature
+- features/retry_stale_indexes.feature
+- features/searching_across_models.feature
+- features/searching_by_index.feature
+- features/searching_by_model.feature
+- features/searching_with_find_arguments.feature
+- features/sphinx_detection.feature
+- features/sphinx_scopes.feature
+- features/sti_searching.feature
 - spec/thinking_sphinx/active_record/delta_spec.rb
 - spec/thinking_sphinx/active_record/has_many_association_spec.rb
 - spec/thinking_sphinx/active_record/scopes_spec.rb
@@ -315,6 +321,7 @@ files:
 - spec/thinking_sphinx/search_methods_spec.rb
 - spec/thinking_sphinx/search_spec.rb
 - spec/thinking_sphinx/source_spec.rb
+- spec/thinking_sphinx/test_spec.rb
 - spec/thinking_sphinx_spec.rb
 has_rdoc: true
 homepage: http://ts.freelancing-gods.com
@@ -352,24 +359,6 @@ signing_key:
 specification_version: 3
 summary: ActiveRecord/Rails Sphinx library
 test_files: 
-- features/abstract_inheritance.feature
-- features/alternate_primary_key.feature
-- features/attribute_transformation.feature
-- features/attribute_updates.feature
-- features/deleting_instances.feature
-- features/direct_attributes.feature
-- features/excerpts.feature
-- features/extensible_delta_indexing.feature
-- features/facets.feature
-- features/facets_across_model.feature
-- features/handling_edits.feature
-- features/retry_stale_indexes.feature
-- features/searching_across_models.feature
-- features/searching_by_index.feature
-- features/searching_by_model.feature
-- features/searching_with_find_arguments.feature
-- features/sphinx_detection.feature
-- features/sphinx_scopes.feature
 - features/step_definitions/alpha_steps.rb
 - features/step_definitions/beta_steps.rb
 - features/step_definitions/common_steps.rb
@@ -380,11 +369,9 @@ test_files:
 - features/step_definitions/scope_steps.rb
 - features/step_definitions/search_steps.rb
 - features/step_definitions/sphinx_steps.rb
-- features/sti_searching.feature
 - features/support/env.rb
 - features/support/lib/generic_delta_handler.rb
 - features/thinking_sphinx/database.example.yml
-- features/thinking_sphinx/database.yml
 - features/thinking_sphinx/db/fixtures/alphas.rb
 - features/thinking_sphinx/db/fixtures/authors.rb
 - features/thinking_sphinx/db/fixtures/betas.rb
@@ -441,6 +428,26 @@ test_files:
 - features/thinking_sphinx/models/robot.rb
 - features/thinking_sphinx/models/tag.rb
 - features/thinking_sphinx/models/tagging.rb
+- features/abstract_inheritance.feature
+- features/alternate_primary_key.feature
+- features/attribute_transformation.feature
+- features/attribute_updates.feature
+- features/deleting_instances.feature
+- features/direct_attributes.feature
+- features/excerpts.feature
+- features/extensible_delta_indexing.feature
+- features/facets.feature
+- features/facets_across_model.feature
+- features/handling_edits.feature
+- features/retry_stale_indexes.feature
+- features/searching_across_models.feature
+- features/searching_by_index.feature
+- features/searching_by_model.feature
+- features/searching_with_find_arguments.feature
+- features/sphinx_detection.feature
+- features/sphinx_scopes.feature
+- features/sti_searching.feature
+- features/thinking_sphinx/database.example.yml
 - spec/thinking_sphinx/active_record/delta_spec.rb
 - spec/thinking_sphinx/active_record/has_many_association_spec.rb
 - spec/thinking_sphinx/active_record/scopes_spec.rb
@@ -463,4 +470,5 @@ test_files:
 - spec/thinking_sphinx/search_methods_spec.rb
 - spec/thinking_sphinx/search_spec.rb
 - spec/thinking_sphinx/source_spec.rb
+- spec/thinking_sphinx/test_spec.rb
 - spec/thinking_sphinx_spec.rb

data/features/thinking_sphinx/database.yml

@@ -1,3 +0,0 @@
-username: root
-host: localhost
-password: