thinking-sphinx 3.1.4 → 3.2.0

data/spec/thinking_sphinx/active_record/sql_source_spec.rb

@@ -9,7 +9,7 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
   let(:db_config)  { {:host => 'localhost', :user => 'root',
     :database => 'default'} }
   let(:source)     { ThinkingSphinx::ActiveRecord::SQLSource.new(model,
-    :position => 3) }
+    :position => 3, :primary_key => model.primary_key || :id ) }
   let(:adapter)    { double('adapter') }
 
   before :each do
@@ -53,12 +53,14 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
     let(:processor)       { double('processor') }
     let(:source)          {
       ThinkingSphinx::ActiveRecord::SQLSource.new model,
-        :delta_processor => processor_class
+        :delta_processor => processor_class,
+        :primary_key => model.primary_key || :id
     }
     let(:source_with_options)    {
       ThinkingSphinx::ActiveRecord::SQLSource.new model,
         :delta_processor => processor_class,
-        :delta_options   => { :opt_key => :opt_value }
+        :delta_options   => { :opt_key => :opt_value },
+        :primary_key => model.primary_key || :id
     }
 
     it "loads the processor with the adapter" do
@@ -81,7 +83,8 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
   describe '#delta?' do
     it "returns the given delta setting" do
       source = ThinkingSphinx::ActiveRecord::SQLSource.new model,
-        :delta? => true
+        :delta? => true,
+        :primary_key => model.primary_key || :id
 
       source.should be_a_delta
     end
@@ -90,7 +93,8 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
   describe '#disable_range?' do
     it "returns the given range setting" do
       source = ThinkingSphinx::ActiveRecord::SQLSource.new model,
-        :disable_range? => true
+        :disable_range? => true,
+        :primary_key => model.primary_key || :id
 
       source.disable_range?.should be_true
     end
@@ -129,7 +133,7 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
 
     it "allows for custom names, but adds the position suffix" do
       source = ThinkingSphinx::ActiveRecord::SQLSource.new model,
-        :name => 'people', :position => 2
+        :name => 'people', :position => 2, :primary_key => model.primary_key || :id
 
       source.name.should == 'people_2'
     end
@@ -137,7 +141,8 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
 
   describe '#offset' do
     it "returns the given offset" do
-      source = ThinkingSphinx::ActiveRecord::SQLSource.new model, :offset => 12
+      source = ThinkingSphinx::ActiveRecord::SQLSource.new model,
+        :offset => 12, :primary_key => model.primary_key || :id
 
       source.offset.should == 12
     end
@@ -153,6 +158,19 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
 
       source.options[:utf8?].should be_true
     end
+
+    describe "#primary key" do
+      let(:model)  { double('model', :connection => connection,
+                           :name => 'User', :column_names => [], :inheritance_column => 'type') }
+      let(:source) { ThinkingSphinx::ActiveRecord::SQLSource.new(model,
+                           :position => 3, :primary_key => :custom_key) }
+      let(:template) { ThinkingSphinx::ActiveRecord::SQLSource::Template.new(source) }
+
+      it 'template should allow primary key from options' do
+        template.apply
+        template.source.attributes.collect(&:columns) == :custom_key
+      end
+    end
   end
 
   describe '#render' do
@@ -194,14 +212,6 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
       source.sql_query_pre.should == ['Change Setting']
     end
 
-    it "appends the builder's sql_query_post_index value" do
-      builder.stub! :sql_query_post_index => ['RESET DELTAS']
-
-      source.render
-
-      source.sql_query_post_index.should include('RESET DELTAS')
-    end
-
     it "adds fields with attributes to sql_field_string" do
       source.fields << double('field', :name => 'title', :source_type => nil,
         :with_attribute? => true, :file? => false, :wordcount? => false)
@@ -398,6 +408,24 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
 
       source.sql_sock.should == '/unix/socket'
     end
+
+    it "sets the mysql_ssl_cert from the model's database settings" do
+      source.set_database_settings :sslcert => '/path/to/cert.pem'
+
+      source.mysql_ssl_cert.should  eq '/path/to/cert.pem'
+    end
+
+    it "sets the mysql_ssl_key from the model's database settings" do
+      source.set_database_settings :sslkey => '/path/to/key.pem'
+
+      source.mysql_ssl_key.should  eq '/path/to/key.pem'
+    end
+
+    it "sets the mysql_ssl_ca from the model's database settings" do
+      source.set_database_settings :sslca => '/path/to/ca.pem'
+
+      source.mysql_ssl_ca.should  eq '/path/to/ca.pem'
+    end
   end
 
   describe '#type' do

data/spec/thinking_sphinx/errors_spec.rb

@@ -33,6 +33,13 @@ describe ThinkingSphinx::SphinxError do
         should be_a(ThinkingSphinx::ConnectionError)
     end
 
+    it 'translates out-of-bounds errors' do
+      error.stub :message => "offset out of bounds (offset=1001, max_matches=1000)"
+
+      ThinkingSphinx::SphinxError.new_from_mysql(error).
+        should be_a(ThinkingSphinx::OutOfBoundsError)
+    end
+
     it 'prefixes the connection error message' do
       error.stub :message => "Can't connect to MySQL server on '127.0.0.1' (61)"
 

data/spec/thinking_sphinx/middlewares/active_record_translator_spec.rb

@@ -11,9 +11,10 @@ describe ThinkingSphinx::Middlewares::ActiveRecordTranslator do
   let(:app)        { double('app', :call => true) }
   let(:middleware) {
     ThinkingSphinx::Middlewares::ActiveRecordTranslator.new app }
-  let(:context)    { {:raw => [], :results => []} }
+  let(:context)    { {:raw => [], :results => [] } }
   let(:model)      { double('model', :primary_key => :id) }
   let(:search)     { double('search', :options => {}) }
+  let(:configuration) { double('configuration', :settings => {:primary_key => :id}) }
 
   def raw_result(id, model_name)
     {'sphinx_internal_id' => id, 'sphinx_internal_class' => model_name}
@@ -22,6 +23,7 @@ describe ThinkingSphinx::Middlewares::ActiveRecordTranslator do
   describe '#call' do
     before :each do
       context.stub :search => search
+      context.stub :configuration => configuration
       model.stub :unscoped => model
     end
 
@@ -101,6 +103,18 @@ describe ThinkingSphinx::Middlewares::ActiveRecordTranslator do
       context[:results].should == [instance_1, instance_2]
     end
 
+    it "handles model without primary key" do
+      no_primary_key_model = double('no primary key model')
+      no_primary_key_model.stub :unscoped => no_primary_key_model
+      model_name = double('article', :constantize => no_primary_key_model)
+      instance   = double('instance', :id => 1)
+      no_primary_key_model.stub :where => [instance]
+
+      context[:results] << raw_result(1, model_name)
+
+      middleware.call [context]
+    end
+
     context 'SQL options' do
       let(:relation) { double('relation', :where => []) }
 

data/spec/thinking_sphinx/middlewares/stale_id_checker_spec.rb

@@ -41,6 +41,7 @@ describe ThinkingSphinx::Middlewares::StaleIdChecker do
         middleware.call [context]
       }.should raise_error(ThinkingSphinx::Search::StaleIdsException) { |err|
         err.ids.should == [42]
+        err.context.should == context
       }
     end
   end

data/spec/thinking_sphinx/middlewares/stale_id_filter_spec.rb

@@ -23,7 +23,7 @@ describe ThinkingSphinx::Middlewares::StaleIdFilter do
         app.stub(:call) do
           @calls ||= 0
           @calls += 1
-          raise ThinkingSphinx::Search::StaleIdsException, [12] if @calls == 1
+          raise ThinkingSphinx::Search::StaleIdsException.new([12], context) if @calls == 1
         end
       end
 
@@ -47,8 +47,8 @@ describe ThinkingSphinx::Middlewares::StaleIdFilter do
         app.stub(:call) do
           @calls ||= 0
           @calls += 1
-          raise ThinkingSphinx::Search::StaleIdsException, [12] if @calls == 1
-          raise ThinkingSphinx::Search::StaleIdsException, [13] if @calls == 2
+          raise ThinkingSphinx::Search::StaleIdsException.new([12], context) if @calls == 1
+          raise ThinkingSphinx::Search::StaleIdsException.new([13], context) if @calls == 2
         end
       end
 
@@ -73,9 +73,9 @@ describe ThinkingSphinx::Middlewares::StaleIdFilter do
           @calls ||= 0
           @calls += 1
 
-          raise ThinkingSphinx::Search::StaleIdsException, [12] if @calls == 1
-          raise ThinkingSphinx::Search::StaleIdsException, [13] if @calls == 2
-          raise ThinkingSphinx::Search::StaleIdsException, [14] if @calls == 3
+          raise ThinkingSphinx::Search::StaleIdsException.new([12], context) if @calls == 1
+          raise ThinkingSphinx::Search::StaleIdsException.new([13], context) if @calls == 2
+          raise ThinkingSphinx::Search::StaleIdsException.new([14], context) if @calls == 3
         end
       end
 
@@ -87,5 +87,25 @@ describe ThinkingSphinx::Middlewares::StaleIdFilter do
         }
       end
     end
+
+    context  'stale ids exceptions with multiple contexts' do
+      let(:context2) { {:raw => [], :results => []} }
+      let(:search2) { double('search2', :options => {}) }
+      before :each do
+        context2.stub :search => search2
+        app.stub(:call) do
+          @calls ||= 0
+          @calls += 1
+          raise ThinkingSphinx::Search::StaleIdsException.new([12], context2) if @calls == 1
+        end
+      end
+
+      it "appends the ids to the without_ids filter in the correct context" do
+        middleware.call [context, context2]
+        search.options[:without_ids].should == nil
+        search2.options[:without_ids].should == [12]
+      end
+    end
+
   end
 end

data/spec/thinking_sphinx/real_time/callbacks/real_time_callbacks_spec.rb

@@ -33,7 +33,7 @@ describe ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks do
 
     it "creates an insert statement with all fields and attributes" do
       Riddle::Query::Insert.should_receive(:new).
-        with('my_index', ['id', 'name', 'created_at'], [123, 'Foo', time]).
+        with('my_index', ['id', 'name', 'created_at'], [[123, 'Foo', time]]).
         and_return(insert)
 
       callbacks.after_save instance
@@ -62,7 +62,7 @@ describe ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks do
 
       it "creates an insert statement with all fields and attributes" do
         Riddle::Query::Insert.should_receive(:new).
-          with('my_index', ['id', 'name', 'created_at'], [123, 'Foo', time]).
+          with('my_index', ['id', 'name', 'created_at'], [[123, 'Foo', time]]).
           and_return(insert)
 
         callbacks.after_save instance
@@ -94,7 +94,7 @@ describe ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks do
 
       it "creates insert statements with all fields and attributes" do
         Riddle::Query::Insert.should_receive(:new).twice.
-          with('my_index', ['id', 'name', 'created_at'], [123, 'Foo', time]).
+          with('my_index', ['id', 'name', 'created_at'], [[123, 'Foo', time]]).
           and_return(insert)
 
         callbacks.after_save instance
@@ -128,7 +128,7 @@ describe ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks do
 
       it "creates insert statements with all fields and attributes" do
         Riddle::Query::Insert.should_receive(:new).twice.
-          with('my_index', ['id', 'name', 'created_at'], [123, 'Foo', time]).
+          with('my_index', ['id', 'name', 'created_at'], [[123, 'Foo', time]]).
           and_return(insert)
 
         callbacks.after_save instance

data/spec/thinking_sphinx_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe ThinkingSphinx do
   describe '.count' do
-    let(:search) { double('search', :total_entries => 23) }
+    let(:search) { double('search', :total_entries => 23, :populated? => false,
+      :options => {}) }
 
     before :each do
       ThinkingSphinx::Search.stub :new => search

data/thinking-sphinx.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'thinking-sphinx'
-  s.version     = '3.1.4'
+  s.version     = '3.2.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.2.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -204,6 +204,7 @@ files:
 - lib/thinking_sphinx/active_record/property_query.rb
 - lib/thinking_sphinx/active_record/property_sql_presenter.rb
 - lib/thinking_sphinx/active_record/simple_many_query.rb
+- lib/thinking_sphinx/active_record/source_joins.rb
 - lib/thinking_sphinx/active_record/sql_builder.rb
 - lib/thinking_sphinx/active_record/sql_builder/clause_builder.rb
 - lib/thinking_sphinx/active_record/sql_builder/query.rb
@@ -219,6 +220,7 @@ files:
 - lib/thinking_sphinx/configuration/consistent_ids.rb
 - lib/thinking_sphinx/configuration/defaults.rb
 - lib/thinking_sphinx/configuration/distributed_indices.rb
+- lib/thinking_sphinx/configuration/duplicate_names.rb
 - lib/thinking_sphinx/configuration/minimum_fields.rb
 - lib/thinking_sphinx/connection.rb
 - lib/thinking_sphinx/controller.rb
@@ -248,6 +250,8 @@ files:
 - lib/thinking_sphinx/guard/files.rb
 - lib/thinking_sphinx/index.rb
 - lib/thinking_sphinx/index_set.rb
+- lib/thinking_sphinx/indexing_strategies/all_at_once.rb
+- lib/thinking_sphinx/indexing_strategies/one_at_a_time.rb
 - lib/thinking_sphinx/logger.rb
 - lib/thinking_sphinx/masks.rb
 - lib/thinking_sphinx/masks/group_enumerators_mask.rb
@@ -283,6 +287,7 @@ files:
 - lib/thinking_sphinx/real_time/populator.rb
 - lib/thinking_sphinx/real_time/property.rb
 - lib/thinking_sphinx/real_time/transcriber.rb
+- lib/thinking_sphinx/real_time/translator.rb
 - lib/thinking_sphinx/scopes.rb
 - lib/thinking_sphinx/search.rb
 - lib/thinking_sphinx/search/batch_inquirer.rb
@@ -366,6 +371,7 @@ files:
 - spec/internal/db/schema.rb
 - spec/internal/tmp/.gitkeep
 - spec/spec_helper.rb
+- spec/support/json_column.rb
 - spec/support/multi_schema.rb
 - spec/support/sphinx_yaml_helpers.rb
 - spec/thinking_sphinx/active_record/association_spec.rb
@@ -375,6 +381,7 @@ files:
 - spec/thinking_sphinx/active_record/callbacks/delta_callbacks_spec.rb
 - spec/thinking_sphinx/active_record/callbacks/update_callbacks_spec.rb
 - spec/thinking_sphinx/active_record/column_spec.rb
+- spec/thinking_sphinx/active_record/column_sql_presenter_spec.rb
 - spec/thinking_sphinx/active_record/database_adapters/abstract_adapter_spec.rb
 - spec/thinking_sphinx/active_record/database_adapters/mysql_adapter_spec.rb
 - spec/thinking_sphinx/active_record/database_adapters/postgresql_adapter_spec.rb
@@ -443,7 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: thinking-sphinx
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A smart wrapper over Sphinx for ActiveRecord
@@ -516,6 +523,7 @@ test_files:
 - spec/internal/db/schema.rb
 - spec/internal/tmp/.gitkeep
 - spec/spec_helper.rb
+- spec/support/json_column.rb
 - spec/support/multi_schema.rb
 - spec/support/sphinx_yaml_helpers.rb
 - spec/thinking_sphinx/active_record/association_spec.rb
@@ -525,6 +533,7 @@ test_files:
 - spec/thinking_sphinx/active_record/callbacks/delta_callbacks_spec.rb
 - spec/thinking_sphinx/active_record/callbacks/update_callbacks_spec.rb
 - spec/thinking_sphinx/active_record/column_spec.rb
+- spec/thinking_sphinx/active_record/column_sql_presenter_spec.rb
 - spec/thinking_sphinx/active_record/database_adapters/abstract_adapter_spec.rb
 - spec/thinking_sphinx/active_record/database_adapters/mysql_adapter_spec.rb
 - spec/thinking_sphinx/active_record/database_adapters/postgresql_adapter_spec.rb