thinking-sphinx 3.0.0.pre → 3.0.0.rc

data/spec/thinking_sphinx/active_record/base_spec.rb

@@ -13,31 +13,37 @@ describe ThinkingSphinx::ActiveRecord::Base do
       def self.name; 'SubModel'; end
     end
   }
-  let(:search) { double('search', :options => {})}
 
   describe '.search' do
-    before :each do
-      ThinkingSphinx.stub :search => search
-    end
-
     it "returns a new search object" do
-      model.search.should == search
+      model.search.should be_a(ThinkingSphinx::Search)
     end
 
-    it "passes through arguments to the search object initializer" do
-      ThinkingSphinx.should_receive(:search).with('pancakes', anything)
-
-      model.search 'pancakes'
+    it "passes through arguments to the search object" do
+      model.search('pancakes').query.should == 'pancakes'
     end
 
     it "scopes the search to a given model" do
       model.search('pancakes').options[:classes].should == [model]
     end
-    
+
     it "merges the :classes option with the model" do
-      search_options = {:classes=>[sub_model]}
-      search.stub :options => search_options
-      model.search('pancakes', search_options).options[:classes].should == [sub_model, model]
+      model.search('pancakes', :classes => [sub_model]).
+        options[:classes].should == [sub_model, model]
+    end
+
+    it "applies the default scope if there is one" do
+      model.stub :default_sphinx_scope => :default,
+        :sphinx_scopes => {:default => Proc.new { {:order => :created_at} }}
+
+      model.search.options[:order].should == :created_at
+    end
+
+    it "does not apply a default scope if one is not set" do
+      model.stub :default_sphinx_scope => nil,
+        :default => {:order => :created_at}
+
+      model.search.options[:order].should be_nil
     end
   end
 

data/spec/thinking_sphinx/active_record/callbacks/delete_callbacks_spec.rb

@@ -31,9 +31,9 @@ describe ThinkingSphinx::ActiveRecord::Callbacks::DeleteCallbacks do
   end
 
   describe '#after_destroy' do
-    let(:config)     { double('config', :connection => connection,
-      :indices_for_references => [index], :preload_indices => true) }
-    let(:connection) { double('connection', :query => nil) }
+    let(:config)     { double('config', :indices_for_references => [index],
+      :preload_indices => true) }
+    let(:connection) { double('connection', :execute => nil) }
     let(:index)      {
       double('index', :name => 'foo_core', :document_id_for_key => 14)
     }
@@ -41,11 +41,12 @@ describe ThinkingSphinx::ActiveRecord::Callbacks::DeleteCallbacks do
 
     before :each do
       ThinkingSphinx::Configuration.stub :instance => config
+      ThinkingSphinx::Connection.stub    :new => connection
       Riddle::Query.stub :update => 'UPDATE STATEMENT'
     end
 
     it "updates the deleted flag to false" do
-      connection.should_receive(:query).with('UPDATE STATEMENT')
+      connection.should_receive(:execute).with('UPDATE STATEMENT')
 
       callbacks.after_destroy
     end
@@ -72,7 +73,7 @@ describe ThinkingSphinx::ActiveRecord::Callbacks::DeleteCallbacks do
     end
 
     it "doesn't care about Sphinx errors" do
-      connection.stub(:query).and_raise(Mysql2::Error.new(''))
+      connection.stub(:execute).and_raise(Mysql2::Error.new(''))
 
       lambda { callbacks.after_destroy }.should_not raise_error
     end

data/spec/thinking_sphinx/active_record/callbacks/update_callbacks_spec.rb

@@ -15,10 +15,10 @@ describe ThinkingSphinx::ActiveRecord::Callbacks::UpdateCallbacks do
       ThinkingSphinx::ActiveRecord::Callbacks::UpdateCallbacks.new instance }
     let(:instance)      { double('instance', :class => klass, :id => 2) }
     let(:klass)         { double(:name => 'Article') }
-    let(:configuration) { double('configuration', :connection => connection,
+    let(:configuration) { double('configuration',
       :settings => {'attribute_updates' => true},
       :indices_for_references => [index]) }
-    let(:connection)    { double('connection', :query => '') }
+    let(:connection)    { double('connection', :execute => '') }
     let(:index)         { double('index', :name => 'article_core',
       :sources => [source], :document_id_for_key => 3) }
     let(:source)        { double('source', :attributes => []) }
@@ -26,6 +26,7 @@ describe ThinkingSphinx::ActiveRecord::Callbacks::UpdateCallbacks do
     before :each do
       stub_const 'ThinkingSphinx::Configuration',
         double(:instance => configuration)
+      stub_const 'ThinkingSphinx::Connection', double(:new => connection)
       stub_const 'Riddle::Query', double(:update => 'SphinxQL')
 
       source.attributes.replace([
@@ -42,7 +43,7 @@ describe ThinkingSphinx::ActiveRecord::Callbacks::UpdateCallbacks do
     it "does not send any updates to Sphinx if updates are disabled" do
       configuration.settings['attribute_updates'] = false
 
-      connection.should_not_receive(:query)
+      connection.should_not_receive(:execute)
 
       callbacks.after_update
     end
@@ -55,13 +56,13 @@ describe ThinkingSphinx::ActiveRecord::Callbacks::UpdateCallbacks do
     end
 
     it "sends the update query through to Sphinx" do
-      connection.should_receive(:query).with('SphinxQL')
+      connection.should_receive(:execute).with('SphinxQL')
 
       callbacks.after_update
     end
 
     it "doesn't care if the update fails at Sphinx's end" do
-      connection.stub(:query).and_raise(Mysql2::Error.new(''))
+      connection.stub(:execute).and_raise(Mysql2::Error.new(''))
 
       lambda { callbacks.after_update }.should_not raise_error
     end

data/spec/thinking_sphinx/active_record/index_spec.rb

@@ -196,7 +196,7 @@ describe ThinkingSphinx::ActiveRecord::Index do
 
   describe '#render' do
     it "interprets the provided definition" do
-      index.should_receive(:interpret_definition!)
+      index.should_receive(:interpret_definition!).at_least(:once)
 
       begin
         index.render

data/spec/thinking_sphinx/active_record/sql_source_spec.rb

@@ -7,7 +7,8 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
     double('connection', :instance_variable_get => db_config) }
   let(:db_config)  { {:host => 'localhost', :user => 'root',
     :database => 'default'} }
-  let(:source)     { ThinkingSphinx::ActiveRecord::SQLSource.new(model) }
+  let(:source)     { ThinkingSphinx::ActiveRecord::SQLSource.new(model,
+    :position => 3) }
   let(:adapter)    { double('adapter') }
 
   before :each do
@@ -86,15 +87,16 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
     end
 
     it "uses the inheritance column if it exists for the sphinx class field" do
+      adapter.stub :quoted_table_name => '"users"', :quote => '"type"'
       adapter.stub(:convert_nulls) { |clause, default|
         "ifnull(#{clause}, #{default})"
       }
-      model.stub :column_names => ['type']
+      model.stub :column_names => ['type'], :sti_name => 'User'
 
       source.fields.detect { |field|
         field.name == 'sphinx_internal_class'
       }.columns.first.__name.
-        should == "ifnull(type, 'User')"
+        should == "ifnull(\"users\".\"type\", 'User')"
     end
 
     it "marks the internal class field as a facet" do
@@ -105,29 +107,15 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
   end
 
   describe '#name' do
-    it "defaults to the model name downcased with the core suffix" do
-      source.name.should == 'user_core'
+    it "defaults to the model name downcased with the given position" do
+      source.name.should == 'user_3'
     end
 
-    it "changes the suffix to delta if set to true" do
+    it "allows for custom names, but adds the position suffix" do
       source = ThinkingSphinx::ActiveRecord::SQLSource.new model,
-        :delta? => true
-
-      source.name.should == 'user_delta'
-    end
-
-    it "allows for custom names, but adds the core suffix" do
-      source = ThinkingSphinx::ActiveRecord::SQLSource.new model,
-        :name => 'people'
-
-      source.name.should == 'people_core'
-    end
-
-    it "allows for custom names and adds the delta suffix if a delta source" do
-      source = ThinkingSphinx::ActiveRecord::SQLSource.new model,
-        :name => 'people', :delta? => true
+        :name => 'people', :position => 2
 
-      source.name.should == 'people_delta'
+      source.name.should == 'people_2'
     end
   end
 
@@ -258,8 +246,8 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
     end
 
     it "adds fields with attributes to sql_field_string" do
-      source.fields << double('field',
-        :name => 'title', :with_attribute? => true, :file? => false)
+      source.fields << double('field', :name => 'title', :source_type => nil,
+        :with_attribute? => true, :file? => false, :wordcount? => false)
 
       source.render
 
@@ -267,15 +255,35 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
     end
 
     it "adds any joined or file fields" do
-      source.fields << double('field',
-        :name => 'title', :file? => true, :with_attribute? => false)
+      source.fields << double('field', :name => 'title', :file? => true,
+        :with_attribute? => false, :wordcount? => false,  :source_type => nil)
 
       source.render
 
       source.sql_file_field.should include('title')
     end
 
-    it "adds any joined fields"
+    it "adds wordcounted fields to sql_field_str2wordcount" do
+      source.fields << double('field', :name => 'title', :source_type => nil,
+        :with_attribute? => false, :file? => false, :wordcount? => true)
+
+      source.render
+
+      source.sql_field_str2wordcount.should include('title')
+    end
+
+    it "adds any joined fields" do
+      ThinkingSphinx::ActiveRecord::PropertyQuery.stub(
+        :new => double(:to_s => 'query for title')
+      )
+      source.fields << double('field', :name => 'title',
+        :source_type => :query, :with_attribute? => false, :file? => false,
+        :wordcount? => false)
+
+      source.render
+
+      source.sql_joined_field.should include('query for title')
+    end
 
     it "adds integer attributes to sql_attr_uint" do
       source.attributes << double('attribute')

data/spec/thinking_sphinx/configuration_spec.rb

@@ -26,46 +26,7 @@ describe ThinkingSphinx::Configuration do
   describe '#configuration_file' do
     it "uses the Rails environment in the configuration file name" do
       config.configuration_file.
-        should == Rails.root.join('config', 'test.sphinx.conf')
-    end
-  end
-
-  describe '#connection' do
-    let(:connection) { double('connection') }
-
-    before :each do
-      Mysql2::Client.stub :new => connection
-    end
-
-    it "connects using the searchd address and port" do
-      config.searchd.stub :address => '127.0.0.1', :mysql41 => 121
-
-      Mysql2::Client.should_receive(:new).with(
-        :host  => '127.0.0.1',
-        :port  => 121,
-        :flags => Mysql2::Client::MULTI_STATEMENTS
-      ).and_return(connection)
-
-      config.connection
-    end
-
-    it "returns the connection" do
-      config.connection.should == connection
-    end
-
-    it "respects any connection options in the settings" do
-      write_configuration(
-        'connection_options' => {:username => 'pat', :port => 9312}
-      )
-
-      Mysql2::Client.should_receive(:new).with(
-        :host     => '127.0.0.1',
-        :port     => 9312,
-        :flags    => Mysql2::Client::MULTI_STATEMENTS,
-        :username => 'pat'
-      ).and_return(connection)
-
-      config.connection
+        should == File.join(Rails.root, 'config', 'test.sphinx.conf')
     end
   end
 
@@ -97,7 +58,7 @@ describe ThinkingSphinx::Configuration do
 
   describe '#index_paths' do
     it "uses app/indices in the Rails app by default" do
-      config.index_paths.should == [Rails.root.join('app', 'indices')]
+      config.index_paths.should == [File.join(Rails.root, 'app', 'indices')]
     end
   end
 
@@ -113,23 +74,25 @@ describe ThinkingSphinx::Configuration do
 
   describe '#indices_location' do
     it "stores index files in db/sphinx/ENVIRONMENT" do
-      config.indices_location.should == Rails.root.join('db', 'sphinx', 'test')
+      config.indices_location.
+        should == File.join(Rails.root, 'db', 'sphinx', 'test')
     end
   end
 
   describe '#initialize' do
     it "sets the daemon pid file within log for the Rails app" do
       config.searchd.pid_file.
-        should == Rails.root.join('log', 'test.sphinx.pid')
+        should == File.join(Rails.root, 'log', 'test.sphinx.pid')
     end
 
     it "sets the daemon log within log for the Rails app" do
-      config.searchd.log.should == Rails.root.join('log', 'test.searchd.log')
+      config.searchd.log.
+        should == File.join(Rails.root, 'log', 'test.searchd.log')
     end
 
     it "sets the query log within log for the Rails app" do
       config.searchd.query_log.
-        should == Rails.root.join('log', 'test.searchd.query.log')
+        should == File.join(Rails.root, 'log', 'test.searchd.query.log')
     end
   end
 

data/spec/thinking_sphinx/deltas/default_delta_spec.rb

@@ -19,19 +19,18 @@ describe ThinkingSphinx::Deltas::DefaultDelta do
   end
 
   describe '#delete' do
-    let(:config)     { double('config', :connection => connection) }
-    let(:connection) { double('connection', :query => nil) }
+    let(:connection) { double('connection', :execute => nil) }
     let(:index)      { double('index', :name => 'foo_core',
       :document_id_for_key => 14) }
     let(:instance)   { double('instance', :id => 7) }
 
     before :each do
-      ThinkingSphinx::Configuration.stub :instance => config
+      ThinkingSphinx::Connection.stub :new => connection
       Riddle::Query.stub :update => 'UPDATE STATEMENT'
     end
 
     it "updates the deleted flag to false" do
-      connection.should_receive(:query).with('UPDATE STATEMENT')
+      connection.should_receive(:execute).with('UPDATE STATEMENT')
 
       delta.delete index, instance
     end
@@ -58,7 +57,7 @@ describe ThinkingSphinx::Deltas::DefaultDelta do
     end
 
     it "doesn't care about Sphinx errors" do
-      connection.stub(:query).and_raise(Mysql2::Error.new(''))
+      connection.stub(:execute).and_raise(Mysql2::Error.new(''))
 
       lambda { delta.delete index, instance }.should_not raise_error
     end

data/spec/thinking_sphinx/deltas_spec.rb

@@ -11,6 +11,12 @@ describe ThinkingSphinx::Deltas do
       klass = Class.new
       ThinkingSphinx::Deltas.processor_for(klass).should == klass
     end
+    
+    it "instantiates a class from the name as a string" do
+      ThinkingSphinx::Deltas.
+        processor_for('ThinkingSphinx::Deltas::DefaultDelta').
+        should == ThinkingSphinx::Deltas::DefaultDelta
+    end
   end
 
   describe '.suspend' do

data/spec/thinking_sphinx/excerpter_spec.rb

@@ -2,13 +2,12 @@ require 'spec_helper'
 
 describe ThinkingSphinx::Excerpter do
   let(:excerpter)  { ThinkingSphinx::Excerpter.new('index', 'all words') }
-  let(:config)     { double('config', :connection => connection) }
   let(:connection) {
     double('connection', :query => [{'snippet' => 'some highlighted words'}])
   }
 
   before :each do
-    ThinkingSphinx::Configuration.stub :instance => config
+    ThinkingSphinx::Connection.stub :new => connection
     Riddle::Query.stub :snippets => 'CALL SNIPPETS'
   end
 

data/spec/thinking_sphinx/index_spec.rb

@@ -1,14 +1,15 @@
 require 'spec_helper'
 
 describe ThinkingSphinx::Index do
+  let(:configuration)  { Struct.new(:indices, :settings).new([], {}) }
+  
+  before :each do
+    ThinkingSphinx::Configuration.stub :instance => configuration
+  end
+  
   describe '.define' do
     let(:index)   { double('index', :definition_block= => nil) }
-    let(:config)  { Struct.new(:indices).new([]) }
-
-    before :each do
-      ThinkingSphinx::Configuration.stub :instance => config
-    end
-
+    
     context 'with ActiveRecord' do
       before :each do
         ThinkingSphinx::ActiveRecord::Index.stub :new => index
@@ -29,7 +30,7 @@ describe ThinkingSphinx::Index do
       it "adds the index to the collection of indices" do
         ThinkingSphinx::Index.define(:user, :with => :active_record)
 
-        config.indices.should include(index)
+        configuration.indices.should include(index)
       end
 
       it "sets the block in the index" do
@@ -73,8 +74,8 @@ describe ThinkingSphinx::Index do
             :with  => :active_record,
             :delta => true
 
-          config.indices.should include(index)
-          config.indices.should include(delta_index)
+          configuration.indices.should include(index)
+          configuration.indices.should include(delta_index)
         end
 
         it "sets the block in the index" do
@@ -110,7 +111,7 @@ describe ThinkingSphinx::Index do
       it "adds the index to the collection of indices" do
         ThinkingSphinx::Index.define(:user, :with => :real_time)
 
-        config.indices.should include(index)
+        configuration.indices.should include(index)
       end
 
       it "sets the block in the index" do
@@ -122,4 +123,16 @@ describe ThinkingSphinx::Index do
       end
     end
   end
+  
+  describe '#initialize' do
+    it "is fine with no defaults from settings" do
+      ThinkingSphinx::Index.new(:user, {}).options.should == {}
+    end
+    
+    it "respects defaults from settings" do
+      configuration.settings['index_options'] = {'delta' => true}
+      
+      ThinkingSphinx::Index.new(:user, {}).options.should == {:delta => true}
+    end
+  end
 end