thinking-sphinx 1.5.0 → 2.0.0.rc1

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, {'first_name_facet' => 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, {'first_name_facet' => 1}).should be_nil
+        @facet.value(friendship, 1).should be_nil
       end
       
       it "should return multi-level association values" do
@@ -308,21 +308,9 @@ describe ThinkingSphinx::Facet do
         field  = ThinkingSphinx::Field.new(
           @source, ThinkingSphinx::Index::FauxColumn.new(:person, :tags, :name)
         )
-        ThinkingSphinx::Facet.new(field).value(friendship, {'name_facet' => 'buried'.to_crc32}).
+        ThinkingSphinx::Facet.new(field).value(friendship, 'buried'.to_crc32).
           should == 'buried'
       end
-      
-      it "should not error with multi-level association values containing a nil value" do
-        person      = Person.find(:first)
-        tag         = person.tags.build(:name => nil)
-        tag         = person.tags.build(:name => "buried")
-        friendship  = Friendship.new(:person => person)
-        
-        field  = ThinkingSphinx::Field.new(
-          @source, ThinkingSphinx::Index::FauxColumn.new(:person, :tags, :name)
-        )
-        lambda{ThinkingSphinx::Facet.new(field).value(friendship, {'name_facet' => 'buried'.to_crc32})}.should_not raise_error
-      end
     end
     
     describe 'for float attributes' do
@@ -338,21 +326,7 @@ describe ThinkingSphinx::Facet do
       it "should translate using the given model" do
         alpha = Alpha.new(:cost => 10.5)
       
-        @facet.value(alpha, {'cost' => 1093140480}).should == 10.5
-      end
-    end
-    
-    context 'manual value source' do
-      let(:index)  { ThinkingSphinx::Index.new(Alpha) }
-      let(:source) { ThinkingSphinx::Source.new(index) }
-      let(:column) { ThinkingSphinx::Index::FauxColumn.new('LOWER(name)') }
-      let(:field)  { ThinkingSphinx::Field.new(source, column) }
-      let(:facet)  { ThinkingSphinx::Facet.new(field, :name) }
-      
-      it "should use the given value source to figure out the value" do
-        alpha = Alpha.new(:name => 'Foo')
-        
-        facet.value(alpha, {'foo_facet' => 'foo'.to_crc32}).should == 'Foo'
+        @facet.value(alpha, 1093140480).should == 10.5
       end
     end
   end

data/spec/thinking_sphinx/field_spec.rb

@@ -44,17 +44,6 @@ describe ThinkingSphinx::Field do
       @field.unique_name.should == "col_name"
     end
   end
-  
-  describe '#to_select_sql' do
-    it "should return nil if polymorphic association data does not exist" do
-      field = ThinkingSphinx::Field.new(@source,
-        [ThinkingSphinx::Index::FauxColumn.new(:source, :name)],
-        :as => :source_name
-      )
-      
-      field.to_select_sql.should be_nil
-    end
-  end
 
   describe "prefixes method" do
     it "should default to false" do
@@ -90,9 +79,9 @@ describe ThinkingSphinx::Field do
   
   describe "is_many? method" do
     before :each do
-      @assoc_a = ThinkingSphinx::Association.new(nil, nil)
-      @assoc_b = ThinkingSphinx::Association.new(nil, nil)
-      @assoc_c = ThinkingSphinx::Association.new(nil, nil)
+      @assoc_a = stub('assoc', :is_many? => true)
+      @assoc_b = stub('assoc', :is_many? => true)
+      @assoc_c = stub('assoc', :is_many? => true)
       
       @field = ThinkingSphinx::Field.new(
         @source, [ThinkingSphinx::Index::FauxColumn.new(:col_name)]
@@ -100,9 +89,6 @@ describe ThinkingSphinx::Field do
       @field.associations = {
         :a => @assoc_a, :b => @assoc_b, :c => @assoc_c
       }
-      @field.associations.values.each { |assoc|
-        assoc.stub!(:is_many? => true)
-      }
     end
     
     it "should return true if all associations return true to is_many?" do

data/spec/thinking_sphinx/index/builder_spec.rb

@@ -1,347 +1,344 @@
 require 'spec_helper'
 
 describe ThinkingSphinx::Index::Builder do
-  let(:internal_attribute_count) {
-    Riddle.loaded_version.to_i < 2 ? 3 : 4
-  }
   describe ".generate without source scope" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name, last_name
         has birthday
         has id, :as => :internal_id
-
+        
         set_property :sql_range_step => 1000
-
+        
         where "birthday <= NOW()"
         group_by "first_name"
       end
-
+      
       @source = @index.sources.first
     end
-
+    
     it "should return an index" do
       @index.should be_a_kind_of(ThinkingSphinx::Index)
     end
-
+    
     it "should have one source for the index" do
       @index.sources.length.should == 1
     end
-
+    
     it "should have two fields" do
       @source.fields.length.should == 2
       @source.fields[0].unique_name.should == :first_name
       @source.fields[1].unique_name.should == :last_name
     end
-
-    it "should have two attributes alongside the internal ones" do
-      @source.attributes.length.should == 2 + internal_attribute_count
-      @source.attributes[internal_attribute_count].unique_name.should == :birthday
-      @source.attributes[1 + internal_attribute_count].unique_name.should == :internal_id
+    
+    it "should have two attributes alongside the three internal ones" do
+      @source.attributes.length.should == 5
+      @source.attributes[3].unique_name.should == :birthday
+      @source.attributes[4].unique_name.should == :internal_id
     end
-
+    
     it "should have one condition" do
       @source.conditions.length.should == 1
       @source.conditions.first.should == "birthday <= NOW()"
     end
-
+    
     it "should have one grouping" do
       @source.groupings.length.should == 1
       @source.groupings.first.should == "first_name"
     end
-
+    
     it "should have one option" do
       @source.options.length.should == 1
       @source.options[:sql_range_step].should == 1000
     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
         indexes first_name, :sortable => true
       end
-
+      
       @source = @index.sources.first
     end
-
+    
     it "should have one field" do
       @source.fields.length.should == 1
     end
-
-    it "should have one attribute alongside the internal ones" do
-      @source.attributes.length.should == 1 + internal_attribute_count
+    
+    it "should have one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
-
+    
     it "should set the attribute name to have the _sort suffix" do
       @source.attributes.last.unique_name.should == :first_name_sort
     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 == :first_name
     end
   end
-
+  
   describe '#join' do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name
-
+        
         join contacts
       end
-
+      
       @source = @index.sources.first
     end
-
+    
     it "should include the explicit join" do
       @source.joins.length.should == 1
     end
   end
-
+  
   describe "faceted field" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name, :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 internal ones" do
-      @source.attributes.length.should == 1 + internal_attribute_count
+    
+    it "should have one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
-
+    
     it "should set the attribute name to have the _facet suffix" do
       @source.attributes.last.unique_name.should == :first_name_facet
     end
-
+    
     it "should set the attribute type to integer" do
       @source.attributes.last.type.should == :integer
     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 == :first_name
     end
   end
-
+  
   describe "faceted integer attribute" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Alpha) do
         indexes :name
         has value, :facet => true
       end
-
+      
       @source = @index.sources.first
     end
-
+    
     after :each do
       Alpha.sphinx_facets.delete_at(-1)
     end
-
-    it "should have just one attribute alongside the internal ones" do
-      @source.attributes.length.should == 1 + internal_attribute_count
+    
+    it "should have just one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
   end
-
+  
   describe "faceted timestamp attribute" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name
         has birthday, :facet => true
       end
-
+      
       @source = @index.sources.first
     end
-
+    
     after :each do
       Person.sphinx_facets.delete_at(-1)
     end
-
-    it "should have just one attribute alongside the internal ones" do
-      @source.attributes.length.should == 1 + internal_attribute_count
+    
+    it "should have just one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
   end
-
+  
   describe "faceted boolean attribute" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Beta) do
         indexes :name
         has delta, :facet => true
       end
-
+      
       @source = @index.sources.first
     end
-
+    
     after :each do
       Beta.sphinx_facets.delete_at(-1)
     end
-
-    it "should have just one attribute alongside the internal ones" do
-      @source.attributes.length.should == 1 + internal_attribute_count
+    
+    it "should have just one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
   end
-
+  
   describe "faceted float attribute" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Alpha) do
         indexes :name
         has cost, :facet => true
       end
-
+      
       @source = @index.sources.first
     end
-
+    
     after :each do
       Alpha.sphinx_facets.delete_at(-1)
     end
-
-    it "should have just one attribute alongside the internal ones" do
-      @source.attributes.length.should == 1 + internal_attribute_count
+    
+    it "should have just one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
   end
-
+  
   describe "faceted string attribute" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name
         has last_name, :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 internal ones" do
-      @source.attributes.length.should == 2 + internal_attribute_count
+    
+    it "should have two attributes alongside the three internal ones" do
+      @source.attributes.length.should == 5
     end
-
+    
     it "should set the facet attribute name to have the _facet suffix" do
       @source.attributes.last.unique_name.should == :last_name_facet
     end
-
+    
     it "should set the attribute type to integer" do
       @source.attributes.last.type.should == :integer
     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 == :last_name
     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 internal ones" do
-      @source.attributes.length.should == 2 + internal_attribute_count
+    
+    it "should have two attributes alongside the three internal ones" do
+      @source.attributes.length.should == 5
     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 internal ones" do
-      @source.attributes.length.should == 1 + internal_attribute_count
+    
+    it "should have one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     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 {
@@ -351,7 +348,7 @@ describe ThinkingSphinx::Index::Builder do
       }.should raise_error
     end
   end
-
+  
   describe "explicit source" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
@@ -359,38 +356,38 @@ describe ThinkingSphinx::Index::Builder do
           indexes first_name, last_name
           has birthday
           has id, :as => :internal_id
-
+        
           set_property :delta => true
-
+        
           where "birthday <= NOW()"
           group_by "first_name"
         end
       end
-
+      
       @source = @index.sources.first
     end
-
+    
     it "should return an index" do
       @index.should be_a_kind_of(ThinkingSphinx::Index)
     end
-
+    
     it "should have one source for the index" do
       @index.sources.length.should == 1
     end
-
+    
     it "should have two fields" do
       @source.fields.length.should == 2
       @source.fields[0].unique_name.should == :first_name
       @source.fields[1].unique_name.should == :last_name
     end
-
-    it "should have two attributes alongside the internal ones" do
-      @source.attributes.length.should == 2 + internal_attribute_count
-      @source.attributes[internal_attribute_count].unique_name.should == :birthday
-      @source.attributes[1 + internal_attribute_count].unique_name.should == :internal_id
+    
+    it "should have two attributes alongside the three internal ones" do
+      @source.attributes.length.should == 5
+      @source.attributes[3].unique_name.should == :birthday
+      @source.attributes[4].unique_name.should == :internal_id
     end
   end
-
+  
   describe "multiple sources" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
@@ -398,135 +395,101 @@ describe ThinkingSphinx::Index::Builder do
           indexes first_name
           has birthday
         end
-
+        
         define_source do
           indexes last_name
           has :id, :as => :internal_id
         end
       end
     end
-
+    
     it "should have two sources" do
       @index.sources.length.should == 2
     end
-
+    
     it "should have two fields" do
       @index.fields.length.should == 2
     end
-
+    
     it "should have one field in each source" do
       @index.sources.each do |source|
         source.fields.length.should == 1
       end
     end
-
+    
     it "should have two attributes alongside the six internal ones" do
-      @index.attributes.length.should == 2 + (internal_attribute_count * 2)
+      @index.attributes.length.should == 8
     end
-
-    it "should have one attribute in each source alongside the internal ones" do
+    
+    it "should have one attribute in each source alongside the three internal ones" do
       @index.sources.each do |source|
-        source.attributes.length.should == 1 + internal_attribute_count
+        source.attributes.length.should == 4
       end
     end
   end
-
-  describe "multiple local indexes" do
-    before :each do
-      @index = ThinkingSphinx::Index::Builder.generate(Person) do
-        indexes first_name
-
-        use_local_index :other_local_index_1
-        use_local_indices "other_local_index_2", "other_local_index_3"
-      end
-    end
-
-    it "should have three additional indexes" do
-      @index.additional_indices.length.should == 3
-    end
-
-    it "should append _core to the name of each local index" do
-      @index.additional_indices[0].should eql("other_local_index_1_core")
-      @index.additional_indices[1].should eql("other_local_index_2_core")
-      @index.additional_indices[2].should eql("other_local_index_3_core")
-    end
-  end
-
+  
   describe "index options" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name
-
+        
         set_property :charset_type => "utf16"
         set_property :group_concat_max_len => 1024
       end
     end
-
+    
     it "should store the index setting for the index" do
       @index.local_options[:charset_type].should == "utf16"
     end
-
+    
     it "should store non-Sphinx settings for the index" do
       @index.local_options[:group_concat_max_len].should == 1024
     end
   end
-
+  
   describe "delta options" do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name
-
+        
         set_property :delta => true
       end
     end
-
+    
     it "should not keep the delta setting in source options" do
       @index.sources.first.options.should be_empty
     end
-
+    
     it "should not keep the delta setting in index options" do
       @index.local_options.should be_empty
     end
-
+    
     it "should set the index delta object set" do
       @index.delta_object.should be_a_kind_of(ThinkingSphinx::Deltas::DefaultDelta)
     end
   end
-
+  
   context 'index options' do
     before :each do
       @index = ThinkingSphinx::Index::Builder.generate(Person) do
         indexes first_name
-
+        
         set_property :index_exact_words => true
       end
     end
-
+    
     it "should track the index_exact_words option to the index" do
       @index.local_options[:index_exact_words].should be_true
     end
   end
-
+  
   context 'with an explicit name' do
     it "should set the index's name using the provided value" do
       index = ThinkingSphinx::Index::Builder.generate(Person, 'custom') do
         indexes first_name
       end
-
+      
       index.name.should == 'custom'
     end
   end
-
-  describe "sanitize_sql" do
-    def index
-      @index ||= ThinkingSphinx::Index::Builder.generate(Person) do
-        indexes first_name, last_name
-        where sanitize_sql(["gender = ?", "female"])
-      end
-    end
-
-    it "should be aliased to ActiveRecord::Base.sanitize_sql" do
-      index.sources.first.conditions.first.should == index.model.send(:sanitize_sql, ["gender = ?", "female"])
-    end
-  end
 end