thinking-sphinx 1.2.13 → 1.4.0

data/spec/{lib/thinking_sphinx → thinking_sphinx}/core/array_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Array do
   describe '.===' do

data/spec/{lib/thinking_sphinx → thinking_sphinx}/core/string_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe String do  
   describe "to_crc32 instance method" do

data/spec/{lib/thinking_sphinx → thinking_sphinx}/excerpter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Excerpter do
   before :each do
@@ -40,14 +40,6 @@ describe ThinkingSphinx::Excerpter do
       @excerpter.big_name
     end
     
-    it "should escape the text in the excerpt" do
-      @search.should_receive(:excerpt_for) do |string, model|
-        string.should == 'test "escaping" <characters>'
-      end
-      
-      @excerpter.string_to_escape
-    end
-    
     it "should still raise an exception if no column or method exists" do
       lambda {
         @excerpter.foo

data/spec/{lib/thinking_sphinx → thinking_sphinx}/facet_search_spec.rb

@@ -1,28 +1,26 @@
-require 'spec/spec_helper'
+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/{lib/thinking_sphinx → thinking_sphinx}/facet_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Facet do
   describe ".name_for" do
@@ -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/{lib/thinking_sphinx → thinking_sphinx}/field_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Field do
   before :each do
@@ -77,47 +77,6 @@ describe ThinkingSphinx::Field do
     end
   end
   
-  describe "column_with_prefix method" do
-    before :each do
-      @field = ThinkingSphinx::Field.new @source, [
-        ThinkingSphinx::Index::FauxColumn.new(:col_name)
-      ]
-      @field.columns.each { |col| @field.associations[col] = [] }
-      @field.model = Person
-      
-      @first_join   = Object.new
-      @first_join.stub!(:aliased_table_name => "tabular")
-      @second_join  = Object.new
-      @second_join.stub!(:aliased_table_name => "data")
-      
-      @first_assoc  = ThinkingSphinx::Association.new nil, nil
-      @first_assoc.stub!(:join => @first_join, :has_column? => true)
-      @second_assoc = ThinkingSphinx::Association.new nil, nil
-      @second_assoc.stub!(:join => @second_join, :has_column? => true)
-    end
-    
-    it "should return the column name if the column is a string" do
-      @field.columns = [ThinkingSphinx::Index::FauxColumn.new("string")]
-      @field.send(:column_with_prefix, @field.columns.first).should == "string"
-    end
-    
-    it "should return the column with model's table prefix if there's no associations for the column" do
-      @field.send(:column_with_prefix, @field.columns.first).should == "`people`.`col_name`"
-    end
-    
-    it "should return the column with its join table prefix if an association exists" do
-      column = @field.columns.first
-      @field.associations[column] = [@first_assoc]
-      @field.send(:column_with_prefix, column).should == "`tabular`.`col_name`"
-    end
-    
-    it "should return multiple columns concatenated if more than one association exists" do
-      column = @field.columns.first
-      @field.associations[column] = [@first_assoc, @second_assoc]
-      @field.send(:column_with_prefix, column).should == "`tabular`.`col_name`, `data`.`col_name`"
-    end
-  end
-  
   describe "is_many? method" do
     before :each do
       @assoc_a = stub('assoc', :is_many? => true)

data/spec/{lib/thinking_sphinx → thinking_sphinx}/index/builder_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Index::Builder do
   describe ".generate without source scope" do
@@ -31,10 +31,10 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields[1].unique_name.should == :last_name
     end
     
-    it "should have two attributes alongside the four internal ones" do
-      @source.attributes.length.should == 6
-      @source.attributes[4].unique_name.should == :birthday
-      @source.attributes[5].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
@@ -95,8 +95,8 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields.length.should == 1
     end
     
-    it "should have one attribute alongside the four internal ones" do
-      @source.attributes.length.should == 5
+    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
@@ -109,6 +109,22 @@ describe ThinkingSphinx::Index::Builder do
     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
@@ -126,8 +142,8 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields.length.should == 1
     end
     
-    it "should have one attribute alongside the four internal ones" do
-      @source.attributes.length.should == 5
+    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
@@ -158,8 +174,8 @@ describe ThinkingSphinx::Index::Builder do
       Alpha.sphinx_facets.delete_at(-1)
     end
     
-    it "should have just one attribute alongside the four internal ones" do
-      @source.attributes.length.should == 5
+    it "should have just one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
   end
   
@@ -177,8 +193,8 @@ describe ThinkingSphinx::Index::Builder do
       Person.sphinx_facets.delete_at(-1)
     end
     
-    it "should have just one attribute alongside the four internal ones" do
-      @source.attributes.length.should == 5
+    it "should have just one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
   end
   
@@ -196,8 +212,8 @@ describe ThinkingSphinx::Index::Builder do
       Beta.sphinx_facets.delete_at(-1)
     end
     
-    it "should have just one attribute alongside the four internal ones" do
-      @source.attributes.length.should == 5
+    it "should have just one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
   end
   
@@ -215,8 +231,8 @@ describe ThinkingSphinx::Index::Builder do
       Alpha.sphinx_facets.delete_at(-1)
     end
     
-    it "should have just one attribute alongside the four internal ones" do
-      @source.attributes.length.should == 5
+    it "should have just one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
   end
   
@@ -234,8 +250,8 @@ describe ThinkingSphinx::Index::Builder do
       Person.sphinx_facets.delete_at(-1)
     end
     
-    it "should have two attributes alongside the four internal ones" do
-      @source.attributes.length.should == 6
+    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
@@ -266,8 +282,8 @@ describe ThinkingSphinx::Index::Builder do
       Person.sphinx_facets.delete_at(-1)
     end
     
-    it "should have two attributes alongside the four internal ones" do
-      @source.attributes.length.should == 6
+    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
@@ -305,8 +321,8 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields.length.should == 1
     end
     
-    it "should have one attribute alongside the four internal ones" do
-      @source.attributes.length.should == 5
+    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
@@ -365,10 +381,10 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields[1].unique_name.should == :last_name
     end
     
-    it "should have two attributes alongside the four internal ones" do
-      @source.attributes.length.should == 6
-      @source.attributes[4].unique_name.should == :birthday
-      @source.attributes[5].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
   
@@ -401,13 +417,13 @@ describe ThinkingSphinx::Index::Builder do
       end
     end
     
-    it "should have two attributes alongside the eight internal ones" do
-      @index.attributes.length.should == 10
+    it "should have two attributes alongside the six internal ones" do
+      @index.attributes.length.should == 8
     end
     
-    it "should have one attribute in each source alongside the four 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 == 5
+        source.attributes.length.should == 4
       end
     end
   end
@@ -452,4 +468,28 @@ describe ThinkingSphinx::Index::Builder 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
 end

data/spec/{lib/thinking_sphinx → thinking_sphinx}/index/faux_column_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe ThinkingSphinx::Index::FauxColumn do  
   describe "coerce class method" do
@@ -27,4 +27,10 @@ describe ThinkingSphinx::Index::FauxColumn do
       ]
     end
   end
-end
+  
+  describe '#to_ary' do
+    it "should return an array with the instance inside it" do
+      subject.to_ary.should == [subject]
+    end
+  end
+end