hariton-thinking-sphinx 1.2.7.1 → 1.2.11

data/README.textile

@@ -154,3 +154,4 @@ Since I first released this library, there's been quite a few people who have su
 * Zach Inglis
 * Ward Bekker
 * Brian Terlson
+* Christian Aust

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:patch: 11
 :major: 1
 :minor: 2
-:patch: 7

data/lib/thinking_sphinx.rb

@@ -7,6 +7,7 @@ require 'riddle'
 require 'after_commit'
 require 'yaml'
 
+require 'thinking_sphinx/core/array'
 require 'thinking_sphinx/core/string'
 require 'thinking_sphinx/property'
 require 'thinking_sphinx/active_record'

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?
@@ -281,7 +289,7 @@ module ThinkingSphinx
     # @return [Integer] Unique record id for the purposes of Sphinx.
     # 
     def primary_key_for_sphinx
-      read_attribute(self.class.primary_key_for_sphinx)
+      @primary_key_for_sphinx ||= read_attribute(self.class.primary_key_for_sphinx)
     end
     
     def sphinx_document_id

data/lib/thinking_sphinx/active_record/has_many_association.rb

@@ -9,8 +9,7 @@ module ThinkingSphinx
         (@reflection.klass.sphinx_indexes || []).each do |index|
           attribute = index.attributes.detect { |attrib|
             attrib.columns.length == 1 &&
-            attrib.columns.first.__name  == foreign_key.to_sym &&
-            attrib.columns.first.__stack == stack
+            attrib.columns.first.__name  == foreign_key.to_sym
           }
           break if attribute
         end

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -29,7 +29,7 @@ module ThinkingSphinx
     end
     
     def cast_to_datetime(clause)
-      "cast(extract(epoch from #{clause}) as bigint)"
+      "cast(extract(epoch from #{clause}) as int)"
     end
     
     def cast_to_unsigned(clause)

data/lib/thinking_sphinx/attribute.rb

@@ -75,7 +75,9 @@ module ThinkingSphinx
       @crc            = options[:crc]
       
       @type         ||= :multi    unless @query_source.nil?
-      @type           = :integer  if @type == :string && @crc
+      if @type == :string && @crc
+        @type = is_many? ? :multi : :integer
+      end
       
       source.attributes << self
     end
@@ -160,11 +162,12 @@ module ThinkingSphinx
         end
         
         if base_type == :string && @crc
-          :integer
+          base_type = :integer
         else
-          @crc = false
-          base_type
+          @crc = false unless base_type == :multi && is_many_strings? && @crc
         end
+        
+        base_type
       end
     end
     
@@ -187,6 +190,10 @@ module ThinkingSphinx
       all_of_type?(:datetime, :date, :timestamp)
     end
     
+    def all_strings?
+      all_of_type?(:string, :text)
+    end
+    
     private
     
     def source_value(offset, delta)
@@ -284,6 +291,10 @@ WHERE #{@source.index.delta_object.clause(model, true)})
     def is_many_datetimes?
       is_many? && all_datetimes?
     end
+    
+    def is_many_strings?
+      is_many? && all_strings?
+    end
        
     def type_from_database
       klass = @associations.values.flatten.first ? 

data/lib/thinking_sphinx/core/array.rb

@@ -0,0 +1,7 @@
+module SearchAsArray
+  def ===(object)
+    object.is_a?(ThinkingSphinx::Search) || super
+  end
+end
+
+Array.extend SearchAsArray

data/lib/thinking_sphinx/facet.rb

@@ -72,7 +72,7 @@ module ThinkingSphinx
     end
     
     def value(object, attribute_value)
-      return translate(object, attribute_value) if translate?
+      return translate(object, attribute_value) if translate? || float?
       
       case @property.type
       when :datetime
@@ -91,18 +91,35 @@ module ThinkingSphinx
     private
     
     def translate(object, attribute_value)
-      column.__stack.each { |method|
-        return nil unless object = object.send(method)
-      }
-      if object.is_a?(Array)
-        object.collect { |item| item.send(column.__name) }
+      objects = source_objects(object)
+      return nil if objects.nil? || objects.empty?
+      
+      if objects.length > 1
+        objects.collect { |item| item.send(column.__name) }.detect { |item|
+          item.to_crc32 == attribute_value
+        }
       else
-        object.send(column.__name)
+        objects.first.send(column.__name)
       end
     end
     
+    def source_objects(object)
+      column.__stack.each { |method|
+        object = Array(object).collect { |item|
+          item.send(method)
+        }.flatten.compact
+        
+        return nil if object.empty?
+      }
+      Array(object)
+    end
+    
     def column
       @property.columns.first
     end
+    
+    def float?
+      @property.type == :float
+    end
   end
 end

data/lib/thinking_sphinx/index.rb

@@ -41,10 +41,10 @@ module ThinkingSphinx
     end
     
     def name
-      self.class.name(@model)
+      self.class.name_for @model
     end
     
-    def self.name(model)
+    def self.name_for(model)
       model.name.underscore.tr(':/\\', '_')
     end
     

data/lib/thinking_sphinx/index/builder.rb

@@ -198,7 +198,6 @@ module ThinkingSphinx
       #   set_property :delta => true
       #   set_property :field_weights => {"name" => 100}
       #   set_property :order => "name ASC"
-      #   set_property :include => :picture
       #   set_property :select => 'name'
       # 
       # Also, the following two properties are particularly relevant for

data/lib/thinking_sphinx/property.rb

@@ -14,6 +14,8 @@ module ThinkingSphinx
       @faceted  = options[:facet]
       @admin    = options[:admin]
       
+      @alias    = @alias.to_sym unless @alias.blank?
+      
       @columns.each { |col|
         @associations[col] = association_stack(col.__stack.clone).each { |assoc|
           assoc.join_to(source.base)

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,15 +201,15 @@ module ThinkingSphinx
     end
     
     def excerpt_for(string, model = nil)
-      if model.nil? && options[:classes].length == 1
-        model ||= options[:classes].first
+      if model.nil? && one_class
+        model ||= one_class
       end
       
       populate
       client.excerpts(
         :docs   => [string],
         :words  => results[:words].keys.join(' '),
-        :index  => "#{model.name == model.class_name ? model.sphinx_name : model.class_name.underscore.tr(':/\\', '_')}_core"
+        :index  => "#{model.source_of_sphinx_index.sphinx_name}_core"
       ).first
     end
     
@@ -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 = (options[:classes] || []).length != 1 ?
-        {} : options[: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,
@@ -321,6 +328,14 @@ module ThinkingSphinx
       end
     end
     
+    def classes
+      @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
@@ -333,7 +348,7 @@ module ThinkingSphinx
       
       # Soon to be deprecated.
       keys = @options[:conditions].keys.reject { |key|
-        attributes.include?(key)
+        attributes.include?(key.to_sym)
       }
       
       ' ' + keys.collect { |key|
@@ -359,10 +374,6 @@ module ThinkingSphinx
       end
     end
     
-    def index
-      options[:index] || '*'
-    end
-    
     def comment
       options[:comment] || ''
     end
@@ -404,9 +415,9 @@ module ThinkingSphinx
     end
     
     def field_names
-      return [] if (options[:classes] || []).length != 1
+      return [] unless one_class
       
-      options[:classes].first.sphinx_indexes.collect { |index|
+      one_class.sphinx_indexes.collect { |index|
         index.fields.collect { |field| field.unique_name }
       }.flatten
     end
@@ -428,7 +439,7 @@ module ThinkingSphinx
       weights = options[:index_weights] || {}
       weights.keys.inject({}) do |hash, key|
         if key.is_a?(Class)
-          name = ThinkingSphinx::Index.name(key)
+          name = ThinkingSphinx::Index.name_for(key)
           hash["#{name}_core"]  = weights[key]
           hash["#{name}_delta"] = weights[key]
         else
@@ -450,7 +461,7 @@ module ThinkingSphinx
     def internal_filters
       filters = [Riddle::Client::Filter.new('sphinx_deleted', [0])]
       
-      class_crcs = (options[:classes] || []).collect { |klass|
+      class_crcs = classes.collect { |klass|
         klass.to_crc32s
       }.flatten
       
@@ -467,7 +478,7 @@ module ThinkingSphinx
     
     def condition_filters
       (options[:conditions] || {}).collect { |attrib, value|
-        if attributes.include?(attrib)
+        if attributes.include?(attrib.to_sym)
           puts <<-MSG
 Deprecation Warning: filters on attributes should be done using the :with
 option, not :conditions. For example:
@@ -513,6 +524,8 @@ MSG
         value.collect { |v| filter_value(v) }.flatten
       when Time
         value.respond_to?(:in_time_zone) ? [value.utc.to_i] : [value.to_i]
+      when NilClass
+        0
       else
         Array(value)
       end
@@ -542,15 +555,15 @@ MSG
     end
     
     def index_option(key)
-      return nil if options[:classes].length != 1
+      return nil unless one_class
       
-      options[: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 options[:classes].length != 1
+      return nil unless one_class
       
       keys.detect { |key|
         attributes.include?(key)
@@ -558,9 +571,9 @@ MSG
     end
     
     def attributes
-      return [] if (options[:classes] || []).length != 1
+      return [] unless one_class
       
-      attributes = options[:classes].first.sphinx_indexes.collect { |index|
+      attributes = one_class.sphinx_indexes.collect { |index|
         index.attributes.collect { |attrib| attrib.unique_name }
       }.flatten
     end
@@ -599,7 +612,7 @@ MSG
 
       # if the user has specified an SQL order, return the collection
       # without rearranging it into the Sphinx order
-      return instances if options[:sql_order]
+      return instances if (options[:sql_order] || index_options[:sql_order])
 
       ids.collect { |obj_id|
         instances.detect do |obj|
@@ -612,6 +625,8 @@ MSG
     # the number of #find's in multi-model searches.
     # 
     def instances_from_matches
+      return single_class_results if one_class
+      
       groups = results[:matches].group_by { |match|
         match[:attributes]["class_crc"]
       }
@@ -630,6 +645,10 @@ MSG
       end
     end
     
+    def single_class_results
+      instances_from_class one_class, results[:matches]
+    end
+    
     def class_from_crc(crc)
       config.models_by_crc[crc].constantize
     end
@@ -643,12 +662,11 @@ MSG
     end
     
     def is_scope?(method)
-      options[:classes] && options[:classes].length == 1 &&
-      options[:classes].first.sphinx_scopes.include?(method)
+      one_class && one_class.sphinx_scopes.include?(method)
     end
     
     def add_scope(method, *args, &block)
-      merge_search options[:classes].first.send(method, *args, &block)
+      merge_search one_class.send(method, *args, &block)
     end
     
     def merge_search(search)

data/lib/thinking_sphinx/source.rb

@@ -82,7 +82,7 @@ module ThinkingSphinx
       config = @model.connection.instance_variable_get(:@config)
       
       source.sql_host = config[:host]           || "localhost"
-      source.sql_user = config[:username]       || config[:user] || ""
+      source.sql_user = config[:username]       || config[:user] || 'root'
       source.sql_pass = (config[:password].to_s || "").gsub('#', '\#')
       source.sql_db   = config[:database]
       source.sql_port = config[:port]

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/attribute_spec.rb

@@ -265,6 +265,41 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
+  describe '#all_strings?' do
+    it "should return true if all columns are strings or text" do
+      attribute = ThinkingSphinx::Attribute.new(@source,
+        [ ThinkingSphinx::Index::FauxColumn.new(:first_name),
+          ThinkingSphinx::Index::FauxColumn.new(:last_name) ]
+      )
+      attribute.model = Person
+      attribute.columns.each { |col| attribute.associations[col] = [] }
+      
+      attribute.should be_all_strings
+    end
+    
+    it "should return false if only some columns are strings" do
+      attribute = ThinkingSphinx::Attribute.new(@source,
+        [ ThinkingSphinx::Index::FauxColumn.new(:id),
+          ThinkingSphinx::Index::FauxColumn.new(:first_name) ]
+      )
+      attribute.model = Person
+      attribute.columns.each { |col| attribute.associations[col] = [] }
+      
+      attribute.should_not be_all_strings
+    end
+    
+    it "should return true if all columns are not strings" do
+      attribute = ThinkingSphinx::Attribute.new(@source,
+        [ ThinkingSphinx::Index::FauxColumn.new(:id),
+          ThinkingSphinx::Index::FauxColumn.new(:parent_id) ]
+      )
+      attribute.model = Person
+      attribute.columns.each { |col| attribute.associations[col] = [] }
+      
+      attribute.should_not be_all_strings
+    end
+  end
+  
   describe "MVA with source query" do
     before :each do
       @attribute = ThinkingSphinx::Attribute.new(@source,

data/spec/lib/thinking_sphinx/core/array_spec.rb

@@ -0,0 +1,9 @@
+require 'spec/spec_helper'
+
+describe Array do
+  describe '.===' do
+    it "should return true if an instance of ThinkingSphinx::Search" do
+      Array.should === ThinkingSphinx::Search.new
+    end
+  end
+end

data/spec/lib/thinking_sphinx/facet_spec.rb

@@ -277,26 +277,57 @@ describe ThinkingSphinx::Facet do
   end
   
   describe "#value" do
-    before :each do
-      @index  = ThinkingSphinx::Index.new(Friendship)
-      @source = ThinkingSphinx::Source.new(@index)
-      @field  = ThinkingSphinx::Field.new(
-        @source, ThinkingSphinx::Index::FauxColumn.new(:person, :first_name)
-      )
-      @facet  = ThinkingSphinx::Facet.new(@field)
-    end
+    describe 'for fields from associations' do
+      before :each do
+        @index  = ThinkingSphinx::Index.new(Friendship)
+        @source = ThinkingSphinx::Source.new(@index)
+        @field  = ThinkingSphinx::Field.new(
+          @source, ThinkingSphinx::Index::FauxColumn.new(:person, :first_name)
+        )
+        @facet  = ThinkingSphinx::Facet.new(@field)
+      end
     
-    it "should return association values" do
-      person      = Person.find(:first)
-      friendship  = Friendship.new(:person => person)
+      it "should return association values" do
+        person      = Person.find(:first)
+        friendship  = Friendship.new(:person => person)
       
-      @facet.value(friendship, 1).should == person.first_name
+        @facet.value(friendship, 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
+      end
+      
+      it "should return multi-level association values" do
+        person      = Person.find(:first)
+        tag         = person.tags.build(:name => 'buried')
+        friendship  = Friendship.new(:person => person)
+        
+        field  = ThinkingSphinx::Field.new(
+          @source, ThinkingSphinx::Index::FauxColumn.new(:person, :tags, :name)
+        )
+        ThinkingSphinx::Facet.new(field).value(friendship, 'buried'.to_crc32).
+          should == 'buried'
+      end
     end
     
-    it "should return nil if the association is nil" do
-      friendship = Friendship.new(:person => nil)
+    describe 'for float attributes' do
+      before :each do
+        @index     = ThinkingSphinx::Index.new(Alpha)
+        @source    = ThinkingSphinx::Source.new(@index)
+        @attribute = ThinkingSphinx::Attribute.new(
+          @source, ThinkingSphinx::Index::FauxColumn.new(:cost)
+        )
+        @facet     = ThinkingSphinx::Facet.new(@attribute)
+      end
+      
+      it "should translate using the given model" do
+        alpha = Alpha.new(:cost => 10.5)
       
-      @facet.value(friendship, 1).should be_nil
+        @facet.value(alpha, 1093140480).should == 10.5
+      end
     end
   end
 end

data/spec/lib/thinking_sphinx/index/builder_spec.rb

@@ -53,6 +53,35 @@ describe ThinkingSphinx::Index::Builder do
     end
   end
   
+  describe 'aliased field' do
+    before :each do
+      @index = ThinkingSphinx::Index::Builder.generate(Person) do
+        indexes first_name, :as => 'name'
+      end
+      
+      @source = @index.sources.first
+    end
+    
+    it "should store the alias as a symbol for consistency" do
+      @source.fields.last.unique_name.should == :name
+    end
+  end
+  
+  describe 'aliased attribute' do
+    before :each do
+      @index = ThinkingSphinx::Index::Builder.generate(Person) do
+        indexes first_name
+        has :id, :as => 'real_id'
+      end
+      
+      @source = @index.sources.first
+    end
+    
+    it "should store the alias as a symbol for consistency" do
+      @source.attributes.last.unique_name.should == :real_id
+    end
+  end
+  
   describe "sortable field" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
@@ -223,6 +252,77 @@ describe ThinkingSphinx::Index::Builder do
     end
   end
   
+  describe 'faceted manual MVA' do
+    before :each do
+      @index = ThinkingSphinx::Index::Builder.generate(Person) do
+        indexes first_name
+        has 'SQL STATEMENT', :type => :multi, :as => :sql, :facet => true
+      end
+      
+      @source = @index.sources.first
+    end
+    
+    after :each do
+      Person.sphinx_facets.delete_at(-1)
+    end
+    
+    it "should have two attributes alongside the four internal ones" do
+      @source.attributes.length.should == 6
+    end
+    
+    it "should set the facet attribute name to have the _facet suffix" do
+      @source.attributes.last.unique_name.should == :sql_facet
+    end
+    
+    it "should keep the original attribute's name set as requested" do
+      @source.attributes[-2].unique_name.should == :sql
+    end
+    
+    it "should set the attribute type to multi" do
+      @source.attributes.last.type.should == :multi
+    end
+    
+    it "should set the attribute column to be the same as the field" do
+      @source.attributes.last.columns.length.should == 1
+      @source.attributes.last.columns.first.__name.should == 'SQL STATEMENT'
+    end
+  end
+  
+  describe 'faceted MVA field' do
+    before :each do
+      @index = ThinkingSphinx::Index::Builder.generate(Person) do
+        indexes tags(:name), :as => :tags, :facet => true
+      end
+      
+      @source = @index.sources.first
+    end
+    
+    after :each do
+      Person.sphinx_facets.delete_at(-1)
+    end
+    
+    it "should have one field" do
+      @source.fields.length.should == 1
+    end
+    
+    it "should have one attribute alongside the four internal ones" do
+      @source.attributes.length.should == 5
+    end
+    
+    it "should set the attribute name to have the _facet suffix" do
+      @source.attributes.last.unique_name.should == :tags_facet
+    end
+    
+    it "should set the attribute type to multi" do
+      @source.attributes.last.type.should == :multi
+    end
+    
+    it "should set the attribute column to be the same as the field" do
+      @source.attributes.last.columns.length.should == 1
+      @source.attributes.last.columns.first.__name.should == :name
+    end
+  end
+  
   describe "no fields" do
     it "should raise an exception" do
       lambda {

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|
@@ -379,6 +387,13 @@ describe ThinkingSphinx::Search do
         filter.exclude?.should be_false
       end
       
+      it "should treat nils in arrays as 0" do
+        ThinkingSphinx::Search.new(:with => {:ints => [nil, 1, 2, 3]}).first
+        
+        filter = @client.filters.last
+        filter.values.should    == [0, 1, 2, 3]
+      end
+      
       it "should append inclusive filters of time ranges" do
         first, last = 1.week.ago, Time.now
         ThinkingSphinx::Search.new(:with => {
@@ -688,6 +703,35 @@ describe ThinkingSphinx::Search do
       end
     end
     
+    describe 'sql ordering' do
+      before :each do
+        @client.stub! :query => {
+          :matches => minimal_result_hashes(@alpha_b, @alpha_a)
+        }
+        Alpha.stub! :find => [@alpha_a, @alpha_b]
+      end
+      
+      it "shouldn't re-sort SQL results based on Sphinx information" do
+        search = ThinkingSphinx::Search.new(
+          :classes    => [Alpha],
+          :sql_order  => 'id'
+        )
+        search.first.should == @alpha_a
+        search.last.should  == @alpha_b
+      end
+      
+      it "should use the option for the ActiveRecord::Base#find calls" do
+        Alpha.should_receive(:find) do |mode, options|
+          options[:order].should == 'id'
+        end
+        
+        ThinkingSphinx::Search.new(
+          :classes    => [Alpha],
+          :sql_order  => 'id'
+        ).first
+      end
+    end
+    
     describe 'excerpts' do
       before :each do
         @search = ThinkingSphinx::Search.new
@@ -802,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
@@ -942,6 +1007,14 @@ describe ThinkingSphinx::Search do
       
       @search.excerpt_for('string', Beta)
     end
+    
+    it "should use the correct index in STI situations" do
+      @client.should_receive(:excerpts) do |options|
+        options[:index].should == 'person_core'
+      end
+      
+      @search.excerpt_for('string', Parent)
+    end
   end
   
   describe '#search' do

data/spec/lib/thinking_sphinx/source_spec.rb

@@ -72,6 +72,16 @@ describe ThinkingSphinx::Source do
       @riddle.sql_sock.should == config[:socket]
     end
     
+    it "should use a default username of root if nothing else is provided" do
+      Person.connection.stub!(:instance_variable_get => {
+        :user     => nil,
+        :username => nil
+      })
+      
+      riddle = @source.to_riddle_for_core(1, 0)
+      riddle.sql_user.should == 'root'
+    end
+    
     it "should assign attributes" do
       # 3 internal attributes plus the one requested
       @riddle.sql_attr_uint.length.should == 4

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hariton-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.2.7.1
+  version: 1.2.11
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-10 00:00:00 -07:00
+date: 2009-09-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - lib/thinking_sphinx/attribute.rb
 - lib/thinking_sphinx/class_facet.rb
 - lib/thinking_sphinx/configuration.rb
+- lib/thinking_sphinx/core/array.rb
 - lib/thinking_sphinx/core/string.rb
 - lib/thinking_sphinx/deltas.rb
 - lib/thinking_sphinx/deltas/datetime_delta.rb
@@ -103,7 +104,7 @@ files:
 - vendor/riddle/lib/riddle/configuration/sql_source.rb
 - vendor/riddle/lib/riddle/configuration/xml_source.rb
 - vendor/riddle/lib/riddle/controller.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://ts.freelancing-gods.com
 licenses: 
 post_install_message: |+
@@ -144,7 +145,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
 test_files: 
 - spec/lib/thinking_sphinx/active_record/delta_spec.rb
@@ -154,6 +155,7 @@ test_files:
 - spec/lib/thinking_sphinx/association_spec.rb
 - spec/lib/thinking_sphinx/attribute_spec.rb
 - spec/lib/thinking_sphinx/configuration_spec.rb
+- spec/lib/thinking_sphinx/core/array_spec.rb
 - spec/lib/thinking_sphinx/core/string_spec.rb
 - spec/lib/thinking_sphinx/excerpter_spec.rb
 - spec/lib/thinking_sphinx/facet_search_spec.rb