freelancing-god-thinking-sphinx 1.2.9 → 1.2.10

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 2
-:patch: 9
+:patch: 10

data/lib/thinking_sphinx/active_record.rb

@@ -155,6 +155,14 @@ module ThinkingSphinx
             self.name.underscore.tr(':/\\', '_')
           end
           
+          def sphinx_index_names
+            klass = source_of_sphinx_index
+            names = ["#{klass.sphinx_name}_core"]
+            names << "#{klass.sphinx_name}_delta" if sphinx_delta?
+            
+            names
+          end
+          
           private
           
           def sphinx_delta?

data/lib/thinking_sphinx/search.rb

@@ -177,6 +177,13 @@ module ThinkingSphinx
       (current_page - 1) * per_page
     end
     
+    def indexes
+      return options[:index] if options[:index]
+      return '*' if classes.empty?
+      
+      classes.collect { |klass| klass.sphinx_index_names }.flatten.join(',')
+    end
+    
     def each_with_groupby_and_count(&block)
       populate
       results[:matches].each_with_index do |match, index|
@@ -194,8 +201,8 @@ module ThinkingSphinx
     end
     
     def excerpt_for(string, model = nil)
-      if model.nil? && classes.length == 1
-        model ||= classes.first
+      if model.nil? && one_class
+        model ||= one_class
       end
       
       populate
@@ -224,7 +231,7 @@ module ThinkingSphinx
       retry_on_stale_index do
         begin
           log "Querying Sphinx: #{query}"
-          @results = client.query query, index, comment
+          @results = client.query query, indexes, comment
         rescue Errno::ECONNREFUSED => err
           raise ThinkingSphinx::ConnectionError,
             'Connection to Sphinx Daemon (searchd) failed.'
@@ -266,8 +273,8 @@ module ThinkingSphinx
     def client
       client = config.client
       
-      index_options = classes.length != 1 ?
-        {} : classes.first.sphinx_indexes.first.local_options
+      index_options = one_class ?
+        one_class.sphinx_indexes.first.local_options : {}
       
       [
         :max_matches, :group_by, :group_function, :group_clause,
@@ -325,6 +332,10 @@ module ThinkingSphinx
       @classes ||= options[:classes] || []
     end
     
+    def one_class
+      @one_class ||= classes.length != 1 ? nil : classes.first
+    end
+    
     def query
       @query ||= begin
         q = @args.join(' ') << conditions_as_query
@@ -363,10 +374,6 @@ module ThinkingSphinx
       end
     end
     
-    def index
-      options[:index] || '*'
-    end
-    
     def comment
       options[:comment] || ''
     end
@@ -408,9 +415,9 @@ module ThinkingSphinx
     end
     
     def field_names
-      return [] if classes.length != 1
+      return [] unless one_class
       
-      classes.first.sphinx_indexes.collect { |index|
+      one_class.sphinx_indexes.collect { |index|
         index.fields.collect { |field| field.unique_name }
       }.flatten
     end
@@ -548,15 +555,15 @@ MSG
     end
     
     def index_option(key)
-      return nil if classes.length != 1
+      return nil unless one_class
       
-      classes.first.sphinx_indexes.collect { |index|
+      one_class.sphinx_indexes.collect { |index|
         index.local_options[key]
       }.compact.first
     end
     
     def attribute(*keys)
-      return nil if classes.length != 1
+      return nil unless one_class
       
       keys.detect { |key|
         attributes.include?(key)
@@ -564,9 +571,9 @@ MSG
     end
     
     def attributes
-      return [] if classes.length != 1
+      return [] unless one_class
       
-      attributes = classes.first.sphinx_indexes.collect { |index|
+      attributes = one_class.sphinx_indexes.collect { |index|
         index.attributes.collect { |attrib| attrib.unique_name }
       }.flatten
     end
@@ -618,7 +625,7 @@ MSG
     # the number of #find's in multi-model searches.
     # 
     def instances_from_matches
-      return single_class_results if classes.length == 1
+      return single_class_results if one_class
       
       groups = results[:matches].group_by { |match|
         match[:attributes]["class_crc"]
@@ -639,7 +646,7 @@ MSG
     end
     
     def single_class_results
-      instances_from_class classes.first, results[:matches]
+      instances_from_class one_class, results[:matches]
     end
     
     def class_from_crc(crc)
@@ -655,12 +662,11 @@ MSG
     end
     
     def is_scope?(method)
-      classes && classes.length == 1 &&
-      classes.first.sphinx_scopes.include?(method)
+      one_class && one_class.sphinx_scopes.include?(method)
     end
     
     def add_scope(method, *args, &block)
-      merge_search classes.first.send(method, *args, &block)
+      merge_search one_class.send(method, *args, &block)
     end
     
     def merge_search(search)

data/spec/lib/thinking_sphinx/active_record_spec.rb

@@ -1,7 +1,7 @@
 require 'spec/spec_helper'
 
-describe "ThinkingSphinx::ActiveRecord" do
-  describe "define_index method" do
+describe ThinkingSphinx::ActiveRecord do
+  describe '.define_index' do
     before :each do
       module ::TestModule
         class TestModel < ActiveRecord::Base; end
@@ -154,7 +154,7 @@ describe "ThinkingSphinx::ActiveRecord" do
     end
   end
 
-  describe "source_of_sphinx_index method" do
+  describe '.source_of_sphinx_index' do
     it "should return self if model defines an index" do
       Person.source_of_sphinx_index.should == Person
     end
@@ -164,13 +164,13 @@ describe "ThinkingSphinx::ActiveRecord" do
     end
   end
   
-  describe "to_crc32 method" do
+  describe '.to_crc32' do
     it "should return an integer" do
       Person.to_crc32.should be_a_kind_of(Integer)
     end
   end
     
-  describe "to_crc32s method" do
+  describe '.to_crc32s' do
     it "should return an array" do
       Person.to_crc32s.should be_a_kind_of(Array)
     end
@@ -351,4 +351,18 @@ describe "ThinkingSphinx::ActiveRecord" do
       @person.primary_key_for_sphinx.should == id
     end
   end
+  
+  describe '.sphinx_index_names' do
+    it "should return the core index" do
+      Alpha.sphinx_index_names.should == ['alpha_core']
+    end
+    
+    it "should return the delta index if enabled" do
+      Beta.sphinx_index_names.should == ['beta_core', 'beta_delta']
+    end
+    
+    it "should return the superclass with an index definition" do
+      Parent.sphinx_index_names.should == ['person_core', 'person_delta']
+    end
+  end
 end

data/spec/lib/thinking_sphinx/search_spec.rb

@@ -193,6 +193,14 @@ describe ThinkingSphinx::Search do
       search[3].id.should == 1
     end
     
+    it "should use the requested classes to generate the index argument" do
+      @client.should_receive(:query) do |query, index, comment|
+        index.should == 'alpha_core,beta_core,beta_delta'
+      end
+      
+      ThinkingSphinx::Search.new(:classes => [Alpha, Beta]).first
+    end
+    
     describe 'query' do
       it "should concatenate arguments with spaces" do
         @client.should_receive(:query) do |query, index, comment|
@@ -838,6 +846,27 @@ describe ThinkingSphinx::Search do
     end
   end
   
+  describe '#indexes' do
+    it "should default to '*'" do
+      ThinkingSphinx::Search.new.indexes.should == '*'
+    end
+    
+    it "should use given class to determine index name" do
+      ThinkingSphinx::Search.new(:classes => [Alpha]).indexes.
+        should == 'alpha_core'
+    end
+    
+    it "should add both core and delta indexes for given classes" do
+      ThinkingSphinx::Search.new(:classes => [Alpha, Beta]).indexes.
+        should == 'alpha_core,beta_core,beta_delta'
+    end
+    
+    it "should respect the :index option" do
+      ThinkingSphinx::Search.new(:classes => [Alpha], :index => '*').indexes.
+        should == '*'
+    end
+  end
+  
   describe '.each_with_groupby_and_count' do
     before :each do
       @alpha = Alpha.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-05 00:00:00 -07:00
+date: 2009-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency