freelancing-god-thinking-sphinx 1.2.10 → 1.2.11

data/VERSION.yml

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

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

@@ -162,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
     
@@ -189,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)
@@ -286,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/facet.rb

@@ -91,18 +91,29 @@ 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) }.detect { |item|
+      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

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

@@ -299,6 +299,18 @@ describe ThinkingSphinx::Facet do
       
         @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
     
     describe 'for float attributes' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.2.10
+  version: 1.2.11
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-12 00:00:00 -07:00
+date: 2009-09-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,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
 post_install_message: |+
   With the release of Thinking Sphinx 1.1.18, there is one important change to
@@ -144,7 +144,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 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