thinking-sphinx 2.0.5 → 2.0.6

data/spec/thinking_sphinx/active_record/scopes_spec.rb

@@ -4,32 +4,32 @@ describe ThinkingSphinx::ActiveRecord::Scopes do
   after :each do
     Alpha.remove_sphinx_scopes
   end
-  
+
   it "should be included into models with indexes" do
     Alpha.included_modules.should include(ThinkingSphinx::ActiveRecord::Scopes)
   end
-  
+
   it "should not be included into models without indexes" do
     Gamma.included_modules.should_not include(
       ThinkingSphinx::ActiveRecord::Scopes
     )
   end
-  
+
   describe '.sphinx_scope' do
     before :each do
       Alpha.sphinx_scope(:by_name) { |name| {:conditions => {:name => name}} }
     end
-    
+
     it "should define a method on the model" do
       Alpha.should respond_to(:by_name)
     end
   end
-  
+
   describe '.sphinx_scopes' do
     before :each do
       Alpha.sphinx_scope(:by_name) { |name| {:conditions => {:name => name}} }
     end
-    
+
     it "should return an array of defined scope names as symbols" do
       Alpha.sphinx_scopes.should == [:by_name]
     end
@@ -40,11 +40,11 @@ describe ThinkingSphinx::ActiveRecord::Scopes do
       Alpha.sphinx_scope(:scope_used_as_default_scope) { {:conditions => {:name => 'name'}} }
       Alpha.default_sphinx_scope :scope_used_as_default_scope
     end
-    
+
     it "should return an array of defined scope names as symbols" do
       Alpha.sphinx_scopes.should == [:scope_used_as_default_scope]
     end
-    
+
     it "should have a default_sphinx_scope" do
       Alpha.has_default_sphinx_scope?.should be_true
     end
@@ -55,11 +55,11 @@ describe ThinkingSphinx::ActiveRecord::Scopes do
       Alpha.sphinx_scope(:by_name) { |name| {:conditions => {:name => name}} }
       Alpha.remove_sphinx_scopes
     end
-    
+
     it "should remove sphinx scope methods" do
       Alpha.should_not respond_to(:by_name)
     end
-    
+
     it "should empty the list of sphinx scopes" do
       Alpha.sphinx_scopes.should be_empty
     end
@@ -99,44 +99,44 @@ describe ThinkingSphinx::ActiveRecord::Scopes do
       Alpha.sphinx_scope(:by_foo)  { |foo|  {:conditions => {:foo  => foo}}  }
       Alpha.sphinx_scope(:with_betas) { {:classes => [Beta]} }
     end
-    
+
     it "should return a ThinkingSphinx::Search object" do
       Alpha.by_name('foo').should be_a(ThinkingSphinx::Search)
     end
-    
+
     it "should set the classes option" do
       Alpha.by_name('foo').options[:classes].should == [Alpha]
     end
-    
+
     it "should be able to be called on a ThinkingSphinx::Search object" do
       search = ThinkingSphinx::Search.new(:classes => [Alpha])
       lambda {
         search.by_name('foo')
       }.should_not raise_error
     end
-    
+
     it "should return the search object it gets called upon" do
       search = ThinkingSphinx::Search.new(:classes => [Alpha])
-      search.by_name('foo').should == search
+      search.by_name('foo').object_id.should == search.object_id
     end
-    
+
     it "should apply the scope options to the underlying search object" do
       search = ThinkingSphinx::Search.new(:classes => [Alpha])
       search.by_name('foo').options[:conditions].should == {:name => 'foo'}
     end
-    
+
     it "should combine hash option scopes such as :conditions" do
       search = ThinkingSphinx::Search.new(:classes => [Alpha])
       search.by_name('foo').by_foo('bar').options[:conditions].
         should == {:name => 'foo', :foo => 'bar'}
     end
-    
+
     it "should combine array option scopes such as :classes" do
       search = ThinkingSphinx::Search.new(:classes => [Alpha])
       search.with_betas.options[:classes].should == [Alpha, Beta]
     end
   end
-  
+
   describe '.search_count_with_scope' do
     before :each do
       @config = ThinkingSphinx::Configuration.instance
@@ -147,24 +147,24 @@ describe ThinkingSphinx::ActiveRecord::Scopes do
       Alpha.sphinx_scope(:by_name) { |name| {:conditions => {:name => name}} }
       Alpha.sphinx_scope(:ids_only) { {:ids_only => true} }
     end
-    
+
     it "should return the total number of results" do
       Alpha.by_name('foo').search_count.should == 43
     end
-    
+
     it "should not make any calls to the database" do
       Alpha.should_not_receive(:find)
-      
+
       Alpha.by_name('foo').search_count
     end
-    
+
     it "should not leave the :ids_only option set and the results populated if it was not set before" do
       stored_scope = Alpha.by_name('foo')
       stored_scope.search_count
       stored_scope.options[:ids_only].should be_false
       stored_scope.populated?.should be_false
     end
-    
+
     it "should leave the :ids_only option set and the results populated if it was set before" do
       stored_scope = Alpha.by_name('foo').ids_only
       stored_scope.search_count
@@ -172,5 +172,5 @@ describe ThinkingSphinx::ActiveRecord::Scopes do
       stored_scope.populated?.should be_true
     end
   end
-  
+
 end

data/spec/thinking_sphinx/active_record_spec.rb

@@ -4,80 +4,81 @@ describe ThinkingSphinx::ActiveRecord do
   before :each do
     @existing_alpha_indexes = Alpha.sphinx_indexes.clone
     @existing_beta_indexes  = Beta.sphinx_indexes.clone
-    
+
     Alpha.send :defined_indexes=, false
     Beta.send  :defined_indexes=, false
-    
+
     Alpha.sphinx_indexes.clear
     Beta.sphinx_indexes.clear
   end
-  
+
   after :each do
     Alpha.sphinx_indexes.replace @existing_alpha_indexes
     Beta.sphinx_indexes.replace  @existing_beta_indexes
-    
+
     Alpha.send :defined_indexes=, true
     Beta.send  :defined_indexes=, true
-    
+
     Alpha.sphinx_index_blocks.clear
     Beta.sphinx_index_blocks.clear
   end
-  
+
   describe '.define_index' do
     it "should do nothing if indexes are disabled" do
       ThinkingSphinx.define_indexes = false
       ThinkingSphinx::Index.should_not_receive(:new)
-      
+
       Alpha.define_index { }
       Alpha.define_indexes
-      
+
       ThinkingSphinx.define_indexes = true
     end
-    
+
     it "should not evaluate the index block automatically" do
       lambda {
         Alpha.define_index { raise StandardError }
       }.should_not raise_error
     end
-    
+
     it "should add the model to the context collection" do
       Alpha.define_index { indexes :name }
-      
+
       ThinkingSphinx.context.indexed_models.should include("Alpha")
     end
-    
+
     it "should die quietly if there is a database error" do
-      ThinkingSphinx::Index::Builder.stub(:generate) { raise Mysql::Error }
+      ThinkingSphinx::Index::Builder.stub(:generate).
+        and_raise(Mysql2::Error.new(''))
       Alpha.define_index { indexes :name }
-      
+
       lambda {
         Alpha.define_indexes
       }.should_not raise_error
-    end
-    
+    end unless RUBY_PLATFORM == 'java'
+
     it "should die noisily if there is a non-database error" do
       ThinkingSphinx::Index::Builder.stub(:generate) { raise StandardError }
       Alpha.define_index { indexes :name }
-      
+
       lambda {
         Alpha.define_indexes
       }.should raise_error
     end
-    
+
     it "should set the index's name using the parameter if provided" do
       Alpha.define_index('custom') { indexes :name }
       Alpha.define_indexes
-      
+
       Alpha.sphinx_indexes.first.name.should == 'custom'
     end
-    
+
     context 'callbacks' do
       it "should add a before_validation callback to define_indexes" do
         Alpha.should_receive(:before_validation).with(:define_indexes)
 
         Alpha.define_index { }
       end
-      
+
       it "should not add a before_validation callback twice" do
         Alpha.should_receive(:before_validation).with(:define_indexes).once
 
@@ -90,44 +91,44 @@ describe ThinkingSphinx::ActiveRecord do
 
         Alpha.define_index { }
       end
-      
+
       it "should not add a before_destroy callback twice" do
         Alpha.should_receive(:before_destroy).with(:define_indexes).once
 
         Alpha.define_index { }
         Alpha.define_index { }
       end
-      
+
       it "should add a toggle_deleted callback when defined" do
         Alpha.should_receive(:after_destroy).with(:toggle_deleted)
-      
+
         Alpha.define_index { indexes :name }
         Alpha.define_indexes
       end
-      
+
       it "should not add toggle_deleted callback more than once" do
         Alpha.should_receive(:after_destroy).with(:toggle_deleted).once
-      
+
         Alpha.define_index { indexes :name }
         Alpha.define_index { indexes :name }
         Alpha.define_indexes
       end
-      
+
       it "should add a update_attribute_values callback when defined" do
         Alpha.should_receive(:after_save).with(:update_attribute_values)
-      
+
         Alpha.define_index { indexes :name }
         Alpha.define_indexes
       end
-    
+
       it "should not add update_attribute_values callback more than once" do
         Alpha.should_receive(:after_save).with(:update_attribute_values).once
-      
+
         Alpha.define_index { indexes :name }
         Alpha.define_index { indexes :name }
         Alpha.define_indexes
       end
-      
+
       it "should add a toggle_delta callback if deltas are enabled" do
         Beta.should_receive(:before_save).with(:toggle_delta)
 
@@ -137,14 +138,14 @@ describe ThinkingSphinx::ActiveRecord do
         }
         Beta.define_indexes
       end
-      
+
       it "should not add a toggle_delta callback if deltas are disabled" do
         Alpha.should_not_receive(:before_save).with(:toggle_delta)
 
         Alpha.define_index { indexes :name }
         Alpha.define_indexes
       end
-      
+
       it "should add the toggle_delta callback if deltas are disabled in other indexes" do
         Beta.should_receive(:before_save).with(:toggle_delta).once
 
@@ -155,7 +156,7 @@ describe ThinkingSphinx::ActiveRecord do
         }
         Beta.define_indexes
       end
-      
+
       it "should only add the toggle_delta callback once" do
         Beta.should_receive(:before_save).with(:toggle_delta).once
 
@@ -169,7 +170,7 @@ describe ThinkingSphinx::ActiveRecord do
         }
         Beta.define_indexes
       end
-      
+
       it "should add an index_delta callback if deltas are enabled" do
         Beta.stub!(:after_save => true)
         Beta.should_receive(:after_commit).with(:index_delta)
@@ -180,14 +181,14 @@ describe ThinkingSphinx::ActiveRecord do
         }
         Beta.define_indexes
       end
-      
+
       it "should not add an index_delta callback if deltas are disabled" do
         Alpha.should_not_receive(:after_commit).with(:index_delta)
 
         Alpha.define_index { indexes :name }
         Alpha.define_indexes
       end
-      
+
       it "should add the index_delta callback if deltas are disabled in other indexes" do
         Beta.stub!(:after_commit => true)
         Beta.should_receive(:after_commit).with(:index_delta).once
@@ -199,7 +200,7 @@ describe ThinkingSphinx::ActiveRecord do
         }
         Beta.define_indexes
       end
-      
+
       it "should only add the index_delta callback once" do
         Beta.stub!(:after_commit => true)
         Beta.should_receive(:after_commit).with(:index_delta).once
@@ -214,23 +215,23 @@ describe ThinkingSphinx::ActiveRecord do
         }
         Beta.define_indexes
       end
-    end    
+    end
   end
-  
+
   describe '.define_indexes' do
     it "should process define_index blocks" do
       Beta.define_index { indexes :name }
       Beta.sphinx_indexes.length.should == 0
-      
+
       Beta.define_indexes
       Beta.sphinx_indexes.length.should == 1
     end
-    
+
     it "should not re-add indexes" do
       Beta.define_index { indexes :name }
       Beta.define_indexes
       Beta.define_indexes
-      
+
       Beta.sphinx_indexes.length.should == 1
     end
   end
@@ -244,23 +245,23 @@ describe ThinkingSphinx::ActiveRecord do
       Admin::Person.source_of_sphinx_index.should == Person
     end
   end
-  
+
   describe '.to_crc32' do
     it "should return an integer" do
       Person.to_crc32.should be_a_kind_of(Integer)
     end
   end
-    
+
   describe '.to_crc32s' do
     it "should return an array" do
       Person.to_crc32s.should be_a_kind_of(Array)
     end
   end
-    
+
   describe "toggle_deleted method" do
     before :each do
       ThinkingSphinx.stub!(:sphinx_running? => true)
-      
+
       @configuration = ThinkingSphinx::Configuration.instance
       @configuration.stub!(
         :address  => "an address",
@@ -269,37 +270,37 @@ describe ThinkingSphinx::ActiveRecord do
       @client = Riddle::Client.new
       @client.stub!(:update => true)
       @person = Person.find(:first)
-      
+
       @configuration.stub!(:client => @client)
       Person.sphinx_indexes.each { |index| index.stub!(:delta? => false) }
       Person.stub!(:search_for_id => true)
     end
-    
+
     it "should update the core index's deleted flag if in core index" do
       @client.should_receive(:update).with(
         "person_core", ["sphinx_deleted"], {@person.sphinx_document_id => [1]}
       )
-      
+
       @person.toggle_deleted
     end
-    
+
     it "shouldn't update the core index's deleted flag if the record isn't in it" do
       Person.stub!(:search_for_id => false)
       @client.should_not_receive(:update).with(
         "person_core", ["sphinx_deleted"], {@person.sphinx_document_id => [1]}
       )
-      
+
       @person.toggle_deleted
     end
-    
+
     it "shouldn't attempt to update the deleted flag if sphinx isn't running" do
       ThinkingSphinx.stub!(:sphinx_running? => false)
       @client.should_not_receive(:update)
       Person.should_not_receive(:search_for_id)
-      
+
       @person.toggle_deleted
     end
-    
+
     it "should update the delta index's deleted flag if delta indexes are enabled and the instance's delta is true" do
       ThinkingSphinx.deltas_enabled = true
       Person.sphinx_indexes.each { |index| index.stub!(:delta? => true) }
@@ -307,10 +308,10 @@ describe ThinkingSphinx::ActiveRecord do
       @client.should_receive(:update).with(
         "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => [1]}
       )
-      
+
       @person.toggle_deleted
     end
-    
+
     it "should not update the delta index's deleted flag if delta indexes are enabled and the instance's delta is false" do
       ThinkingSphinx.deltas_enabled = true
       Person.sphinx_indexes.each { |index| index.stub!(:delta? => true) }
@@ -318,10 +319,10 @@ describe ThinkingSphinx::ActiveRecord do
       @client.should_not_receive(:update).with(
         "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => [1]}
       )
-      
+
       @person.toggle_deleted
     end
-    
+
     it "should not update the delta index's deleted flag if delta indexes are enabled and the instance's delta is equivalent to false" do
       ThinkingSphinx.deltas_enabled = true
       Person.sphinx_indexes.each { |index| index.stub!(:delta? => true) }
@@ -338,17 +339,17 @@ describe ThinkingSphinx::ActiveRecord do
       @client.should_not_receive(:update).with(
         "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => [1]}
       )
-      
+
       @person.toggle_deleted
     end
-    
+
     it "should not update either index if updates are disabled" do
       ThinkingSphinx.updates_enabled = false
       ThinkingSphinx.deltas_enabled  = true
       Person.sphinx_indexes.each { |index| index.stub!(:delta? => true) }
       @person.delta = true
       @client.should_not_receive(:update)
-      
+
       @person.toggle_deleted
     end
   end
@@ -367,92 +368,92 @@ describe ThinkingSphinx::ActiveRecord do
       }.should_not raise_error(ActiveRecord::StatementInvalid)
     end
   end
-  
+
   describe '#sphinx_document_id' do
     before :each do
       Alpha.define_index { indexes :name }
       Beta.define_index  { indexes :name }
     end
-    
+
     it "should return values with the expected offset" do
       person      = Person.find(:first)
       model_count = ThinkingSphinx.context.indexed_models.length
       Person.stub!(:sphinx_offset => 3)
-      
+
       (person.id * model_count + 3).should == person.sphinx_document_id
     end
   end
-  
+
   describe '#primary_key_for_sphinx' do
     before :each do
       @person = Person.find(:first)
     end
-    
+
     after :each do
       Person.clear_primary_key_for_sphinx
     end
-    
+
     after :each do
       Person.set_sphinx_primary_key nil
     end
-    
+
     it "should return the id by default" do
       @person.primary_key_for_sphinx.should == @person.id
     end
-    
+
     it "should use the sphinx primary key to determine the value" do
       Person.set_sphinx_primary_key :first_name
       @person.primary_key_for_sphinx.should == @person.first_name
     end
-    
+
     it "should not use accessor methods but the attributes hash" do
       id = @person.id
       @person.stub!(:id => 'unique_hash')
       @person.primary_key_for_sphinx.should == id
     end
-    
+
     it "should be inherited by subclasses" do
       Person.set_sphinx_primary_key :first_name
       Parent.superclass.custom_primary_key_for_sphinx?
       Parent.primary_key_for_sphinx.should == Person.primary_key_for_sphinx
     end
   end
-  
+
   describe '.sphinx_index_names' do
     it "should return the core index" do
       Alpha.define_index { indexes :name }
       Alpha.define_indexes
       Alpha.sphinx_index_names.should == ['alpha_core']
     end
-    
+
     it "should return the delta index if enabled" do
       Beta.define_index {
         indexes :name
         set_property :delta => true
       }
       Beta.define_indexes
-      
+
       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
-  
+
   describe '.indexed_by_sphinx?' do
     it "should return true if there is at least one index on the model" do
       Alpha.define_index { indexes :name }
       Alpha.define_indexes
-      
+
       Alpha.should be_indexed_by_sphinx
     end
-    
+
     it "should return false if there are no indexes on the model" do
       Gamma.should_not be_indexed_by_sphinx
     end
   end
-  
+
   describe '.delta_indexed_by_sphinx?' do
     it "should return true if there is at least one delta index on the model" do
       Beta.define_index {
@@ -460,18 +461,18 @@ describe ThinkingSphinx::ActiveRecord do
         set_property :delta => true
       }
       Beta.define_indexes
-      
+
       Beta.should be_delta_indexed_by_sphinx
     end
-    
+
     it "should return false if there are no delta indexes on the model" do
       Alpha.define_index { indexes :name }
       Alpha.define_indexes
-      
+
       Alpha.should_not be_delta_indexed_by_sphinx
     end
   end
-  
+
   describe '.delete_in_index' do
     before :each do
       @client = stub('client')
@@ -479,97 +480,97 @@ describe ThinkingSphinx::ActiveRecord do
       ThinkingSphinx::Configuration.instance.stub!(:client => @client)
       Alpha.stub!(:search_for_id => true)
     end
-    
+
     it "should not update if the document isn't in the given index" do
       Alpha.stub!(:search_for_id => false)
       @client.should_not_receive(:update)
-      
+
       Alpha.delete_in_index('alpha_core', 42)
     end
-    
+
     it "should direct the update to the supplied index" do
       @client.should_receive(:update) do |index, attributes, values|
         index.should == 'custom_index_core'
       end
-      
+
       Alpha.delete_in_index('custom_index_core', 42)
     end
-    
+
     it "should set the sphinx_deleted flag to true" do
       @client.should_receive(:update) do |index, attributes, values|
         attributes.should == ['sphinx_deleted']
         values.should == {42 => [1]}
       end
-      
+
       Alpha.delete_in_index('alpha_core', 42)
     end
   end
-  
+
   describe '.core_index_names' do
     it "should return each index's core name" do
       Alpha.define_index('foo') { indexes :name }
       Alpha.define_index('bar') { indexes :name }
       Alpha.define_indexes
-      
+
       Alpha.core_index_names.should == ['foo_core', 'bar_core']
     end
   end
-  
+
   describe '.delta_index_names' do
     it "should return index delta names, for indexes with deltas enabled" do
       Alpha.define_index('foo') { indexes :name }
       Alpha.define_index('bar') { indexes :name }
       Alpha.define_indexes
       Alpha.sphinx_indexes.first.delta_object = stub('delta')
-      
+
       Alpha.delta_index_names.should == ['foo_delta']
     end
   end
-  
+
   describe '.sphinx_offset' do
     before :each do
       @context = ThinkingSphinx.context
     end
-    
+
     it "should return the index of the model's name in all known indexed models" do
       @context.stub!(:indexed_models => ['Alpha', 'Beta'])
-      
+
       Alpha.sphinx_offset.should == 0
       Beta.sphinx_offset.should  == 1
     end
-    
+
     it "should ignore classes that have indexed superclasses" do
       @context.stub!(:indexed_models => ['Alpha', 'Parent', 'Person'])
-      
+
       Person.sphinx_offset.should == 1
     end
-    
+
     it "should respect first known indexed parents" do
       @context.stub!(:indexed_models => ['Alpha', 'Parent', 'Person'])
-      
+
       Parent.sphinx_offset.should == 1
     end
   end
-  
+
   describe '.has_sphinx_indexes?' do
     it "should return true if there are sphinx indexes defined" do
       Alpha.sphinx_indexes.replace [stub('index')]
       Alpha.sphinx_index_blocks.replace []
-      
+
       Alpha.should have_sphinx_indexes
     end
-    
+
     it "should return true if there are sphinx index blocks defined" do
       Alpha.sphinx_indexes.replace []
       Alpha.sphinx_index_blocks.replace [stub('lambda')]
-      
+
       Alpha.should have_sphinx_indexes
     end
-    
+
     it "should return false if there are no sphinx indexes or blocks" do
       Alpha.sphinx_indexes.clear
       Alpha.sphinx_index_blocks.clear
-      
+
       Alpha.should_not have_sphinx_indexes
     end
   end