thinking-sphinx 4.3.0 → 5.0.0

data/lib/thinking_sphinx/subscribers/populator_subscriber.rb

@@ -46,7 +46,3 @@ Error transcribing #{instance.class} #{instance.id}:
   delegate :output, :to => ThinkingSphinx
   delegate :puts, :print, :to => :output
 end
-
-ThinkingSphinx::Subscribers::PopulatorSubscriber.attach_to(
-  'thinking_sphinx.real_time'
-)

data/spec/acceptance/big_integers_spec.rb

@@ -52,7 +52,7 @@ describe '64 bit document ids', :live => true do
   context 'with Real-Time' do
     it 'handles large 32 bit integers with an offset multiplier' do
       product = Product.create! :name => "Widget"
-      product.update_attributes :id => 980190962
+      product.update :id => 980190962
       expect(
         Product.search('widget', :indices => ['product_core']).to_a
       ).to eq([product])

data/spec/acceptance/merging_spec.rb

@@ -34,7 +34,7 @@ describe "Merging deltas", :live => true do
       Book.search("Space", :indices => ["book_core"]).to_a
     ).to eq([race])
 
-    race.reload.update_attributes :title => "The Hate Race"
+    race.reload.update :title => "The Hate Race"
     sleep 0.25
     expect(
       Book.search("Race", :indices => ["book_delta"]).to_a

data/spec/acceptance/real_time_updates_spec.rb

@@ -11,7 +11,7 @@ describe 'Updates to records in real-time indices', :live => true do
 
   it "handles attributes for sortable fields accordingly" do
     product = Product.create! :name => 'Red Fish'
-    product.update_attributes :name => 'Blue Fish'
+    product.update :name => 'Blue Fish'
 
     expect(Product.search('blue fish', :indices => ['product_core']).to_a).
       to eq([product])
@@ -22,7 +22,7 @@ describe 'Updates to records in real-time indices', :live => true do
 
     expect(Admin::Person.search('Death').to_a).to eq([person])
 
-    person.update_attributes :name => 'Mort'
+    person.update :name => 'Mort'
 
     expect(Admin::Person.search('Death').to_a).to be_empty
     expect(Admin::Person.search('Mort').to_a).to eq([person])

data/spec/acceptance/sql_deltas_spec.rb

@@ -25,7 +25,7 @@ describe 'SQL delta indexing', :live => true do
 
     expect(Book.search('Harry').to_a).to eq([book])
 
-    book.reload.update_attributes(:author => 'Terry Pratchett')
+    book.reload.update(:author => 'Terry Pratchett')
     sleep 0.25
 
     expect(Book.search('Terry').to_a).to eq([book])
@@ -37,7 +37,7 @@ describe 'SQL delta indexing', :live => true do
 
     expect(Book.search('Harry').to_a).to eq([book])
 
-    book.reload.update_attributes(:author => 'Terry Pratchett')
+    book.reload.update(:author => 'Terry Pratchett')
     sleep 0.25
 
     expect(Book.search('Harry')).to be_empty
@@ -49,7 +49,7 @@ describe 'SQL delta indexing', :live => true do
 
     expect(Album.search('Whitloms').to_a).to eq([album])
 
-    album.reload.update_attributes(:artist => 'The Whitlams')
+    album.reload.update(:artist => 'The Whitlams')
     sleep 0.25
 
     expect(Book.search('Whitloms')).to be_empty

data/spec/acceptance/suspended_deltas_spec.rb

@@ -10,7 +10,7 @@ describe 'Suspend deltas for a given action', :live => true do
     expect(Book.search('Harry').to_a).to eq([book])
 
     ThinkingSphinx::Deltas.suspend :book do
-      book.reload.update_attributes(:author => 'Terry Pratchett')
+      book.reload.update(:author => 'Terry Pratchett')
       sleep 0.25
 
       expect(Book.search('Terry').to_a).to eq([])
@@ -27,7 +27,7 @@ describe 'Suspend deltas for a given action', :live => true do
     expect(Book.search('Harry').to_a).to eq([book])
 
     ThinkingSphinx::Deltas.suspend :book do
-      book.reload.update_attributes(:author => 'Terry Pratchett')
+      book.reload.update(:author => 'Terry Pratchett')
       sleep 0.25
 
       expect(Book.search('Terry').to_a).to eq([])
@@ -44,7 +44,7 @@ describe 'Suspend deltas for a given action', :live => true do
     expect(Book.search('Harry').to_a).to eq([book])
 
     ThinkingSphinx::Deltas.suspend_and_update :book do
-      book.reload.update_attributes(:author => 'Terry Pratchett')
+      book.reload.update(:author => 'Terry Pratchett')
       sleep 0.25
 
       expect(Book.search('Terry').to_a).to eq([])

data/spec/internal/app/models/admin/person.rb

@@ -3,5 +3,7 @@
 class Admin::Person < ActiveRecord::Base
   self.table_name = 'admin_people'
 
-  after_save ThinkingSphinx::RealTime.callback_for('admin/person')
+  ThinkingSphinx::Callbacks.append(
+    self, 'admin/person', :behaviours => [:sql, :real_time]
+  )
 end

data/spec/internal/app/models/album.rb

@@ -6,7 +6,9 @@ class Album < ActiveRecord::Base
   before_validation :set_id, :on => :create
   before_validation :set_integer_id, :on => :create
 
-  after_save ThinkingSphinx::RealTime.callback_for(:album)
+  ThinkingSphinx::Callbacks.append(
+    self, :behaviours => [:sql, :real_time, :deltas]
+  )
 
   validates :id,         :presence => true, :uniqueness => true
   validates :integer_id, :presence => true, :uniqueness => true

data/spec/internal/app/models/animal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
 class Animal < ActiveRecord::Base
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql])
 end

data/spec/internal/app/models/article.rb

@@ -4,4 +4,6 @@ class Article < ActiveRecord::Base
   belongs_to :user
   has_many :taggings
   has_many :tags, :through => :taggings
+
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql, :updates])
 end

data/spec/internal/app/models/bird.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
 class Bird < Animal
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql])
 end

data/spec/internal/app/models/book.rb

@@ -5,6 +5,8 @@ class Book < ActiveRecord::Base
 
   has_and_belongs_to_many :genres
 
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql, :deltas])
+
   sphinx_scope(:by_query) { |query| query }
   sphinx_scope(:by_year) do |year|
     {:with => {:year => year}}

data/spec/internal/app/models/car.rb

@@ -3,5 +3,5 @@
 class Car < ActiveRecord::Base
   belongs_to :manufacturer
 
-  after_save ThinkingSphinx::RealTime.callback_for(:car)
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:real_time])
 end

data/spec/internal/app/models/city.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 class City < ActiveRecord::Base
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql])
+
   scope :ordered, lambda { order(:name) }
 end

data/spec/internal/app/models/product.rb

@@ -4,5 +4,5 @@ class Product < ActiveRecord::Base
   has_many :categorisations
   has_many :categories, :through => :categorisations
 
-  after_save ThinkingSphinx::RealTime.callback_for(:product)
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:real_time])
 end

data/spec/internal/app/models/tee.rb

@@ -2,4 +2,6 @@
 
 class Tee < ActiveRecord::Base
   belongs_to :colour
+
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql])
 end

data/spec/internal/app/models/user.rb

@@ -3,6 +3,8 @@
 class User < ActiveRecord::Base
   has_many :articles
 
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql])
+
   default_scope { order(:id) }
   scope :recent, lambda { where('created_at > ?', 1.week.ago) }
 end

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

@@ -19,12 +19,13 @@ describe ThinkingSphinx::ActiveRecord::Callbacks::UpdateCallbacks do
     let(:klass)         { double(:name => 'Article') }
     let(:configuration) { double('configuration',
       :settings => {'attribute_updates' => true},
-      :indices_for_references => [index]) }
+      :indices_for_references => [index], :index_set_class => set_class) }
     let(:connection)    { double('connection', :execute => '') }
     let(:index)         { double 'index', :name => 'article_core',
       :sources => [source], :document_id_for_key => 3, :distributed? => false,
       :type => 'plain', :primary_key => :id}
     let(:source)        { double('source', :attributes => []) }
+    let(:set_class)     { double(:reference_name => :article) }
 
     before :each do
       stub_const 'ThinkingSphinx::Configuration',

data/spec/thinking_sphinx/active_record/index_spec.rb

@@ -94,18 +94,6 @@ describe ThinkingSphinx::ActiveRecord::Index do
     end
   end
 
-  describe '#docinfo' do
-    it "defaults to extern" do
-      expect(index.docinfo).to eq(:extern)
-    end
-
-    it "can be disabled" do
-      config.settings["skip_docinfo"] = true
-
-      expect(index.docinfo).to be_nil
-    end
-  end
-
   describe '#document_id_for_key' do
     it "calculates the document id based on offset and number of indices" do
       allow(config).to receive_message_chain(:indices, :count).and_return(5)

data/spec/thinking_sphinx/active_record/interpreter_spec.rb

@@ -15,8 +15,13 @@ describe ThinkingSphinx::ActiveRecord::Interpreter do
   let(:block)   { Proc.new { } }
 
   before :each do
-    allow(ThinkingSphinx::ActiveRecord::SQLSource).to receive_messages :new => source
-    allow(source).to receive_messages :model => model
+    allow(ThinkingSphinx::ActiveRecord::SQLSource).to receive_messages(
+      :new => source
+    )
+
+    allow(source).to receive_messages(
+      :model => model, :add_attribute => nil, :add_field => nil
+    )
   end
 
   describe '.translate!' do
@@ -94,17 +99,15 @@ describe ThinkingSphinx::ActiveRecord::Interpreter do
     end
 
     it "adds an attribute to the source" do
-      instance.has column
+      expect(source).to receive(:add_attribute).with(attribute)
 
-      expect(source.attributes).to include(attribute)
+      instance.has column
     end
 
     it "adds multiple attributes when passed multiple columns" do
-      instance.has column, column
+      expect(source).to receive(:add_attribute).with(attribute).twice
 
-      expect(source.attributes.select { |saved_attribute|
-        saved_attribute == attribute
-      }.length).to eq(2)
+      instance.has column, column
     end
   end
 
@@ -144,17 +147,15 @@ describe ThinkingSphinx::ActiveRecord::Interpreter do
     end
 
     it "adds a field to the source" do
-      instance.indexes column
+      expect(source).to receive(:add_field).with(field)
 
-      expect(source.fields).to include(field)
+      instance.indexes column
     end
 
     it "adds multiple fields when passed multiple columns" do
-      instance.indexes column, column
+      expect(source).to receive(:add_field).with(field).twice
 
-      expect(source.fields.select { |saved_field|
-        saved_field == field
-      }.length).to eq(2)
+      instance.indexes column, column
     end
   end
 

data/spec/thinking_sphinx/active_record/sql_source_spec.rb

@@ -30,6 +30,44 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
     end
   end
 
+  describe '#add_attribute' do
+    let(:attribute) { double('attribute', name: 'my_attribute') }
+
+    it "appends attributes to the collection" do
+      source.add_attribute attribute
+
+      expect(source.attributes.collect(&:name)).to include('my_attribute')
+    end
+
+    it "replaces attributes with the same name" do
+      source.add_attribute double('attribute', name: 'my_attribute')
+      source.add_attribute attribute
+
+      matching = source.attributes.select { |attr| attr.name == attribute.name }
+
+      expect(matching).to eq([attribute])
+    end
+  end
+
+  describe '#add_field' do
+    let(:field) { double('field', name: 'my_field') }
+
+    it "appends fields to the collection" do
+      source.add_field field
+
+      expect(source.fields.collect(&:name)).to include('my_field')
+    end
+
+    it "replaces fields with the same name" do
+      source.add_field double('field', name: 'my_field')
+      source.add_field field
+
+      matching = source.fields.select { |fld| fld.name == field.name }
+
+      expect(matching).to eq([field])
+    end
+  end
+
   describe '#attributes' do
     it "has the internal id attribute by default" do
       expect(source.attributes.collect(&:name)).to include('sphinx_internal_id')

data/spec/thinking_sphinx/configuration_spec.rb

@@ -4,11 +4,18 @@ require 'spec_helper'
 
 describe ThinkingSphinx::Configuration do
   let(:config) { ThinkingSphinx::Configuration.instance }
+  let(:use_load?) { ActiveRecord::VERSION::MAJOR > 5 }
+  let(:loading_object) { use_load? ? config : ActiveSupport::Dependencies }
+  let(:loading_method) { use_load? ? :load : :require_or_load }
 
   after :each do
     ThinkingSphinx::Configuration.reset
   end
 
+  def expect_loading_of(file)
+    expect(loading_object).to receive(loading_method).with(file).once
+  end
+
   describe '.instance' do
     it "returns an instance of ThinkingSphinx::Configuration" do
       expect(ThinkingSphinx::Configuration.instance).
@@ -254,10 +261,8 @@ describe ThinkingSphinx::Configuration do
         '/path/to/indices/bar_index.rb'
       ]
 
-      expect(ActiveSupport::Dependencies).to receive(:require_or_load).
-        with('/path/to/indices/foo_index.rb').once
-      expect(ActiveSupport::Dependencies).to receive(:require_or_load).
-        with('/path/to/indices/bar_index.rb').once
+      expect_loading_of('/path/to/indices/foo_index.rb')
+      expect_loading_of('/path/to/indices/bar_index.rb')
 
       config.preload_indices
     end
@@ -269,10 +274,8 @@ describe ThinkingSphinx::Configuration do
         '/path/to/indices/bar_index.rb'
       ]
 
-      expect(ActiveSupport::Dependencies).to receive(:require_or_load).
-        with('/path/to/indices/foo_index.rb').once
-      expect(ActiveSupport::Dependencies).to receive(:require_or_load).
-        with('/path/to/indices/bar_index.rb').once
+      expect_loading_of('/path/to/indices/foo_index.rb')
+      expect_loading_of('/path/to/indices/bar_index.rb')
 
       config.preload_indices
       config.preload_indices
@@ -316,10 +319,8 @@ describe ThinkingSphinx::Configuration do
         '/path/to/indices/bar_index.rb'
       ]
 
-      expect(ActiveSupport::Dependencies).to receive(:require_or_load).
-        with('/path/to/indices/foo_index.rb').once
-      expect(ActiveSupport::Dependencies).to receive(:require_or_load).
-        with('/path/to/indices/bar_index.rb').once
+      expect_loading_of('/path/to/indices/foo_index.rb')
+      expect_loading_of('/path/to/indices/bar_index.rb')
 
       config.render
     end
@@ -331,10 +332,8 @@ describe ThinkingSphinx::Configuration do
         '/path/to/indices/bar_index.rb'
       ]
 
-      expect(ActiveSupport::Dependencies).to receive(:require_or_load).
-        with('/path/to/indices/foo_index.rb').once
-      expect(ActiveSupport::Dependencies).to receive(:require_or_load).
-        with('/path/to/indices/bar_index.rb').once
+      expect_loading_of('/path/to/indices/foo_index.rb')
+      expect_loading_of('/path/to/indices/bar_index.rb')
 
       config.preload_indices
       config.preload_indices
@@ -372,6 +371,8 @@ describe ThinkingSphinx::Configuration do
     end
 
     it "skips creating a directory when the binlog_path is blank" do
+      allow(loading_object).to receive(loading_method)
+
       allow(FileUtils).to receive_messages :mkdir_p => true
       allow(config).to receive_messages :searchd => double(:binlog_path => '')
 

data/spec/thinking_sphinx/deletion_spec.rb

@@ -6,7 +6,7 @@ describe ThinkingSphinx::Deletion do
   describe '.perform' do
     let(:connection) { double('connection', :execute => nil) }
     let(:index)      { double('index', :name => 'foo_core',
-      :document_id_for_key => 14, :type => 'plain', :distributed? => false) }
+      :type => 'plain', :distributed? => false) }
 
     before :each do
       allow(ThinkingSphinx::Connection).to receive(:take).and_yield(connection)
@@ -15,8 +15,9 @@ describe ThinkingSphinx::Deletion do
 
     context 'index is SQL-backed' do
       it "updates the deleted flag to false" do
-        expect(connection).to receive(:execute).
-          with('UPDATE foo_core SET sphinx_deleted = 1 WHERE id IN (14)')
+        expect(connection).to receive(:execute).with(
+          'UPDATE foo_core SET sphinx_deleted = 1 WHERE sphinx_internal_id IN (7)'
+        )
 
         ThinkingSphinx::Deletion.perform index, 7
       end
@@ -38,7 +39,7 @@ describe ThinkingSphinx::Deletion do
 
       it "deletes the record to false" do
         expect(connection).to receive(:execute).
-          with('DELETE FROM foo_core WHERE id = 14')
+          with('DELETE FROM foo_core WHERE sphinx_internal_id IN (7)')
 
         ThinkingSphinx::Deletion.perform index, 7
       end

data/spec/thinking_sphinx/index_set_spec.rb

@@ -30,6 +30,16 @@ describe ThinkingSphinx::IndexSet do
   end
 
   describe '#to_a' do
+    let(:article_index) do
+      double(:reference => :article, :distributed? => false)
+    end
+    let(:opinion_article_index) do
+      double(:reference => :opinion_article, :distributed? => false)
+    end
+    let(:page_index) do
+      double(:reference => :page, :distributed? => false)
+    end
+
     it "ensures the indices are loaded" do
       expect(configuration).to receive(:preload_indices)
 
@@ -50,21 +60,29 @@ describe ThinkingSphinx::IndexSet do
 
     it "uses indices for the given classes" do
       configuration.indices.replace [
-        double(:reference => :article,         :distributed? => false),
-        double(:reference => :opinion_article, :distributed? => false),
-        double(:reference => :page,            :distributed? => false)
+        article_index, opinion_article_index, page_index
       ]
 
       options[:classes] = [class_double('Article', :column_names => [])]
 
-      expect(set.to_a.length).to eq(1)
+      expect(set.to_a).to eq([article_index])
+    end
+
+    it "uses indices for the given instance's class" do
+      configuration.indices.replace [
+        article_index, opinion_article_index, page_index
+      ]
+
+      instance_class = class_double('Article', :column_names => [])
+
+      options[:instances] = [double(:instance, :class => instance_class)]
+
+      expect(set.to_a).to eq([article_index])
     end
 
     it "requests indices for any STI superclasses" do
       configuration.indices.replace [
-        double(:reference => :article,         :distributed? => false),
-        double(:reference => :opinion_article, :distributed? => false),
-        double(:reference => :page,            :distributed? => false)
+        article_index, opinion_article_index, page_index
       ]
 
       article = class_double('Article', :column_names => [:type])
@@ -73,14 +91,12 @@ describe ThinkingSphinx::IndexSet do
 
       options[:classes] = [opinion]
 
-      expect(set.to_a.length).to eq(2)
+      expect(set.to_a).to eq([article_index, opinion_article_index])
     end
 
     it "does not use MTI superclasses" do
       configuration.indices.replace [
-        double(:reference => :article,         :distributed? => false),
-        double(:reference => :opinion_article, :distributed? => false),
-        double(:reference => :page,            :distributed? => false)
+        article_index, opinion_article_index, page_index
       ]
 
       article = class_double('Article', :column_names => [])
@@ -88,7 +104,7 @@ describe ThinkingSphinx::IndexSet do
 
       options[:classes] = [opinion]
 
-      expect(set.to_a.length).to eq(1)
+      expect(set.to_a).to eq([opinion_article_index])
     end
 
     it "uses named indices if names are provided" do