thinking-sphinx 3.1.4 → 6.0.0

data/Gemfile

@@ -1,9 +1,18 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
 
-gem 'mysql2', '~> 0.3.12b4', :platform => :ruby
-gem 'pg',     '~> 0.16.0',   :platform => :ruby
+gem 'logger'
+gem 'mysql2', '~> 0.5.0',  :platform => :ruby
+gem 'pg',     '~> 0.18.4', :platform => :ruby
+
+gem 'activerecord', '< 7' if RUBY_VERSION.to_f <= 2.4
 
-gem 'activerecord-jdbcmysql-adapter',      '~> 1.3.4', :platform => :jruby
-gem 'activerecord-jdbcpostgresql-adapter', '~> 1.3.4', :platform => :jruby
+if RUBY_PLATFORM == 'java'
+  gem 'jdbc-mysql',                          '5.1.35',    :platform => :jruby
+  gem 'activerecord-jdbcmysql-adapter',      '>= 1.3.23', :platform => :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.23', :platform => :jruby
+  gem 'activerecord', '>= 3.2.22'
+end

data/Procfile.support

@@ -0,0 +1,2 @@
+postgres: postgres -D data/postgres -p ${POSTGRES_PORT:-5432}
+mysql: $(brew --prefix mysql@5.7)/bin/mysqld --datadir=$(PWD)/data/mysql --port ${MYSQL_PORT:-3306} --socket=mysql.sock

data/README.textile

@@ -1,59 +1,73 @@
 h1. Thinking Sphinx
 
-Thinking Sphinx is a library for connecting ActiveRecord to the Sphinx full-text search tool, and integrates closely with Rails (but also works with other Ruby web frameworks). The current release is v3.1.4.
+Thinking Sphinx is a library for connecting ActiveRecord to the Sphinx full-text search tool, and integrates closely with Rails (but also works with other Ruby web frameworks). The current release is v6.0.0.
 
 h2. Upgrading
 
-Please refer to the release notes for any changes you need to make when upgrading:
+Please refer to "the changelog":https://github.com/pat/thinking-sphinx/blob/develop/CHANGELOG.markdown and "release notes":https://github.com/pat/thinking-sphinx/releases for any changes you need to make when upgrading. The release notes in particular are quite good at covering breaking changes and more details for new features.
 
-* "v3.1.4":https://github.com/pat/thinking-sphinx/releases/tag/v3.1.4
-* "v3.1.3":https://github.com/pat/thinking-sphinx/releases/tag/v3.1.3
-* "v3.1.2":https://github.com/pat/thinking-sphinx/releases/tag/v3.1.2
-* "v3.1.1":https://github.com/pat/thinking-sphinx/releases/tag/v3.1.1
-* "v3.1.0":https://github.com/pat/thinking-sphinx/releases/tag/v3.1.0
-* "v3.0.6":https://github.com/pat/thinking-sphinx/releases/tag/v3.0.6
-
-If you're upgrading from pre-v3, then the documentation has "pretty extensive notes":http://pat.github.io/thinking-sphinx/upgrading.html on what's changed.
+The documentation also has more details on what's involved for upgrading from "v4 to v5":https://freelancing-gods.com/thinking-sphinx/v5/upgrading.html, "v3 to v4":https://freelancing-gods.com/thinking-sphinx/v4/upgrading.html, and "v1/v2 to v3":https://freelancing-gods.com/thinking-sphinx/v3/upgrading.html.
 
 h2. Installation
 
 It's a gem, so install it like you would any other gem. You will also need to specify the mysql2 gem if you're using MRI, or jdbc-mysql if you're using JRuby:
 
-<pre><code>gem 'mysql2',          '~> 0.3.18', :platform => :ruby
+<pre><code>gem 'mysql2',          '~> 0.4',    :platform => :ruby
 gem 'jdbc-mysql',      '~> 5.1.35', :platform => :jruby
-gem 'thinking-sphinx', '~> 3.1.4'</code></pre>
+gem 'thinking-sphinx', '~> 6.0'</code></pre>
 
 The MySQL gems mentioned are required for connecting to Sphinx, so please include it even when you're using PostgreSQL for your database.
 
-You'll also need to install Sphinx - this is covered in "the extended documentation":http://pat.github.io/thinking-sphinx/installing_sphinx.html.
+You'll also need to install Sphinx - this is covered in "the extended documentation":https://freelancing-gods.com/thinking-sphinx/installing_sphinx.html.
 
 h2. Usage
 
-Begin by reading the "quick-start guide":http://pat.github.io/thinking-sphinx/quickstart.html, and beyond that, "the documentation":http://pat.github.io/thinking-sphinx/ should serve you pretty well.
+Begin by reading the "quick-start guide":https://freelancing-gods.com/thinking-sphinx/quickstart.html, and beyond that, "the documentation":https://freelancing-gods.com/thinking-sphinx/ should serve you pretty well.
+
+h2. Requirements
 
-h3. Extending with Middleware, Glazes and Panes
+The current release of Thinking Sphinx works with the following versions of its dependencies:
 
-These are covered in "a blog post":http://freelancing-gods.com/posts/rewriting_thinking_sphinx_middleware_glazes_and_panes.
+|_. Library |_. Minimum |_. Tested Against |
+| Ruby | v3.0 | v3.0..v4.0 |
+| Sphinx | v2.2.11 | v2.2.11, v3.4.1 |
+| Manticore | v2.8 | v4.0, v6.0 |
+| ActiveRecord | v6.1 | v6.1..v8.1 |
 
-h2. Requirements
+It _might_ work with older versions of Ruby (back to v2.7) and Rails (back to v5.0), but it's highly recommended to update to a supported release.
 
-h3. Sphinx
+It should also work with JRuby, but the test environment for that in CI has been unreliable, hence that's not actively tested against at the moment.
 
-Thinking Sphinx v3 is currently built for Sphinx 2.0.5 or newer, and releases since v3.1.0 expect Sphinx 2.1.2 or newer by default.
+h3. Sphinx or Manticore
+
+If you're using Sphinx, v2.2.11 is recommended even though it's quite old, as it works well with PostgreSQL databases (but if you're using MySQL - or real-time indices - then v3.3.1 should also be fine).
+
+If you're opting for Manticore instead, v2.8 or newer works, but v4 or newer is recommended as that's what is actively tested against. The v4.2 and 5.0 releases had bugs with facet searching, but that's been fixed in Manticore v6.0.
 
 h3. Rails and ActiveRecord
 
-Currently Thinking Sphinx 3 is built to support Rails/ActiveRecord 3.2 or newer. If you're using Sinatra and ActiveRecord instead of Rails, that's fine - just make sure you add the @:require => 'thinking_sphinx/sinatra'@ option when listing @thinking-sphinx@ in your Gemfile.
+Currently Thinking Sphinx is built to support Rails/ActiveRecord 6.1 or newer. If you're using Sinatra and ActiveRecord instead of Rails, that's fine - just make sure you add the @:require => 'thinking_sphinx/sinatra'@ option when listing @thinking-sphinx@ in your Gemfile.
 
-Please note that if you're referring to polymorphic associations in your index definitions, you'll want to be using Rails/ActiveRecord 4.0 or newer. Supporting polymorphic associations and Rails/ActiveRecord 3.2 is problematic, and likely will not be addressed in the future.
+The last releases for older Rails versions:
 
-If you want ActiveRecord 3.1 support, then refer to the 3.0.x releases of Thinking Sphinx. Anything older than that, then you're stuck with Thinking Sphinx v2.x (for Rails/ActiveRecord 3.0) or v1.x (Rails 2.3). Please note that these older versions are no longer actively supported.
+|_. Rails Version |_. Thinking Sphinx Version |
+| 6.0 | v5.6.0 |
+| 5.2 | v5.6.0 |
+| 5.1 | v5.6.0 |
+| 5.0 | v5.6.0 |
+| 4.2 | v5.6.0 |
+| 4.1 | v4.4.1 |
+| 4.0 | v4.4.1 |
+| 3.2 | v4.4.1 |
+| 3.1 | v3.0.6 |
+| 3.0 | v2.1.0 |
+| 2.3 | v1.5.0 |
 
-h3. Ruby
+Please note that these older versions are no longer actively supported.
 
-You'll need either the standard Ruby (v1.9.3 or newer) or JRuby (1.7.9 or newer). I'm open to patches to improve Rubinius support (if required - it may work with it right now).
+h3. Ruby
 
-JRuby is only supported as of Thinking Sphinx v3.1.0, and requires Sphinx 2.1.2 or newer.
+You'll need either the standard Ruby (v3.0 or newer) or JRuby (9.1 or newer). The last release to support Ruby 2.4-2.7 is v5.6.0.
 
 h3. Database Versions
 
@@ -61,7 +75,7 @@ MySQL 5.x and Postgres 8.4 or better are supported.
 
 h2. Contributing
 
-Please note that this project now has a "Contributor Code of Conduct":http://contributor-covenant.org/version/1/0/0/. By participating in this project you agree to abide by its terms.
+Please note that this project has a "Contributor Code of Conduct":http://contributor-covenant.org/version/1/0/0/. By participating in this project you agree to abide by its terms.
 
 To contribute, clone this repository and have a good look through the specs - you'll notice the distinction between acceptance tests that actually use Sphinx and go through the full stack, and unit tests (everything else) which use liberal test doubles to ensure they're only testing the behaviour of the class in question. I've found this leads to far better code design.
 
@@ -82,4 +96,4 @@ You can then run the unit tests with @rake spec:unit@, the acceptance tests with
 
 h2. Licence
 
-Copyright (c) 2007-2015, Thinking Sphinx is developed and maintained by Pat Allan, and is released under the open MIT Licence. Many thanks to "all who have contributed patches":https://github.com/pat/thinking-sphinx/contributors.
+Copyright (c) 2007-2026, Thinking Sphinx is developed and maintained by Pat Allan, and is released under the open MIT Licence. Many thanks to "all who have contributed patches":https://github.com/pat/thinking-sphinx/contributors.

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 require 'appraisal'
 

data/bin/console

@@ -0,0 +1,15 @@
+#! /usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "thinking_sphinx"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/loadsphinx

@@ -0,0 +1,99 @@
+#!/usr/bin/env bash
+
+version=$1
+engine=$2
+
+set -e
+
+load_sphinx () {
+  distro="xenial"
+
+  case $version in
+    2.1.9)
+      url="http://sphinxsearch.com/files/sphinxsearch_2.1.9-release-0ubuntu11~trusty_amd64.deb"
+      format="deb"
+      distro="trusty";;
+    2.2.11)
+      url="http://sphinxsearch.com/files/sphinxsearch_2.2.11-release-1~jessie_amd64.deb"
+      format="deb"
+      distro="trusty";;
+    3.0.3)
+      url="http://sphinxsearch.com/files/sphinx-3.0.3-facc3fb-linux-amd64.tar.gz"
+      format="gz";;
+    3.1.1)
+      url="http://sphinxsearch.com/files/sphinx-3.1.1-612d99f-linux-amd64.tar.gz"
+      format="gz";;
+    3.2.1)
+      url="http://sphinxsearch.com/files/sphinx-3.2.1-f152e0b-linux-amd64.tar.gz"
+      format="gz";;
+    3.3.1)
+      url="http://sphinxsearch.com/files/sphinx-3.3.1-b72d67b-linux-amd64.tar.gz"
+      format="gz";;
+    3.4.1)
+      url="http://sphinxsearch.com/files/sphinx-3.4.1-efbcc65-linux-amd64.tar.gz"
+      format="gz";;
+    *)
+      echo "No Sphinx version $version available"
+      exit 1;;
+  esac
+
+  if [ "$distro" == "trusty" ]; then
+    curl --location http://launchpadlibrarian.net/247512886/libmysqlclient18_5.6.28-1ubuntu3_amd64.deb -o libmysql.deb
+    sudo apt-get install ./libmysql.deb
+  fi
+
+  if [ "$format" == "deb" ]; then
+    curl --location $url -o sphinx.deb
+    sudo apt-get install libodbc1
+    sudo dpkg -i ./sphinx.deb
+    sudo apt-get install -f
+  else
+    curl $url -o sphinx.tar.gz
+    tar -zxvf sphinx.tar.gz
+    sudo mv sphinx-$version/bin/* /usr/local/bin/.
+  fi
+}
+
+load_manticore () {
+  url="https://github.com/manticoresoftware/manticore/releases/download/$version/manticore_$version.deb"
+
+  case $version in
+    2.6.4)
+      url="https://github.com/manticoresoftware/manticoresearch/releases/download/2.6.4/manticore_2.6.4-180503-37308c3-release-stemmer.xenial_amd64-bin.deb";;
+    2.7.5)
+      url="https://github.com/manticoresoftware/manticoresearch/releases/download/2.7.5/manticore_2.7.5-181204-4a31c54-release-stemmer.xenial_amd64-bin.deb";;
+    2.8.2)
+      url="https://github.com/manticoresoftware/manticoresearch/releases/download/2.8.2/manticore_2.8.2-190402-4e81114d-release-stemmer.stretch_amd64-bin.deb";;
+    3.4.2)
+      url="https://github.com/manticoresoftware/manticoresearch/releases/download/3.4.2/manticore_3.4.2-200410-6903305-release.xenial_amd64-bin.deb";;
+    3.5.4)
+      url="https://repo.manticoresearch.com/repository/manticoresearch_focal/dists/focal/main/binary-amd64/manticore_3.5.4-210107-f70faec5_amd64.deb";;
+    4.0.2)
+      url="https://repo.manticoresearch.com/repository/manticoresearch_focal/dists/focal/main/binary-amd64/manticore_4.0.2-210921-af497f245_amd64.deb";;
+    4.2.0)
+      url="https://repo.manticoresearch.com/repository/manticoresearch_focal/dists/focal/main/binary-amd64/manticore_4.2.0-211223-15e927b28_amd64.deb";;
+    6.0.0)
+      url="skipped";;
+    *)
+      echo "No Manticore version $version available"
+      exit 1;;
+  esac
+
+  if [ "$version" == "6.0.0" ]; then
+    curl --location https://repo.manticoresearch.com/manticore-repo.noarch.deb -o repo.deb
+    sudo dpkg -i repo.deb
+    sudo apt update
+    sudo apt install manticore
+  else
+    sudo apt-get install default-libmysqlclient-dev
+    curl --location $url -o manticore.deb
+    sudo dpkg -i ./manticore.deb
+    sudo apt-get install -f
+  fi
+}
+
+if [ "$engine" == "sphinx" ]; then
+  load_sphinx
+else
+  load_manticore
+fi

data/bin/testmatrix

@@ -0,0 +1,48 @@
+#! /usr/bin/env ruby
+# frozen_string_literal: true
+
+require "json"
+
+RUBIES = %w[ 3.0 3.1 3.2 3.3 3.4 4.0 ]
+DATABASES = %w[ mysql2 postgresql ]
+SPHINX_ENGINES = {
+  "sphinx" => %w[ 2.2.11 3.4.1 ],
+  "manticore" => %w[ 4.0.2 6.0.0 ]
+}.freeze
+RAILS_VERSIONS = [
+  { version: '6_1', min_ruby: 2.7, max_ruby: 3.3 },
+  { version: '7_0', min_ruby: 2.7, max_ruby: 4.0 },
+  { version: '7_1', min_ruby: 2.7, max_ruby: 4.0 },
+  { version: '7_2', min_ruby: 3.1, max_ruby: 4.0 },
+  { version: '8_0', min_ruby: 3.2, max_ruby: 4.0 },
+  { version: '8_1', min_ruby: 3.2, max_ruby: 4.0 },
+].freeze
+
+# Returns an array of hashes, with each hash being a valid testable
+# combination:
+output = []
+
+RUBIES.each do |ruby|
+  DATABASES.each do |database|
+    SPHINX_ENGINES.each do |sphinx_engine, sphinx_versions|
+      sphinx_versions.each do |sphinx_version|
+        # Sphinx 3.4.1 doesn't play nicely with Postgres.
+        next if database == 'postgresql' && sphinx_engine == 'sphinx' && sphinx_version == '3.4.1'
+
+        RAILS_VERSIONS.each do |rails|
+          next unless ruby.to_f >= rails[:min_ruby] && ruby.to_f <= rails[:max_ruby]
+
+          output << {
+            ruby: ruby,
+            rails: rails[:version],
+            database: database,
+            sphinx_engine: sphinx_engine,
+            sphinx_version: sphinx_version
+          }
+        end
+      end
+    end
+  end
+end
+
+puts JSON.generate(output.compact)

data/lib/thinking/sphinx.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'thinking_sphinx'

data/lib/thinking-sphinx.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'thinking_sphinx'

data/lib/thinking_sphinx/active_record/association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::Association
   def initialize(column)
     @column = column

data/lib/thinking_sphinx/active_record/association_proxy/attribute_finder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::AssociationProxy::AttributeFinder
   def initialize(association)
     @association = association
@@ -29,7 +31,7 @@ class ThinkingSphinx::ActiveRecord::AssociationProxy::AttributeFinder
     @indices ||= begin
       configuration.preload_indices
       configuration.indices_for_references(
-        *@association.klass.name.underscore.to_sym
+        *configuration.index_set_class.reference_name(@association.klass)
       ).reject &:distributed?
     end
   end

data/lib/thinking_sphinx/active_record/association_proxy/attribute_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::AssociationProxy::AttributeMatcher
     def initialize(attribute, foreign_key)
       @attribute, @foreign_key = attribute, foreign_key.to_s

data/lib/thinking_sphinx/active_record/association_proxy.rb

@@ -1,6 +1,6 @@
-module ThinkingSphinx::ActiveRecord::AssociationProxy
-  extend ActiveSupport::Concern
+# frozen_string_literal: true
 
+module ThinkingSphinx::ActiveRecord::AssociationProxy
   def search(query = nil, options = {})
     perform_search super(*normalise_search_arguments(query, options))
   end
@@ -10,6 +10,7 @@ module ThinkingSphinx::ActiveRecord::AssociationProxy
   end
 
   private
+
   def normalise_search_arguments(query, options)
     query, options = nil, query if query.is_a?(Hash)
     options[:ignore_scopes] = true

data/lib/thinking_sphinx/active_record/attribute/sphinx_presenter.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::Attribute::SphinxPresenter
   SPHINX_TYPES = {
     :integer   => :uint,
     :boolean   => :bool,
-    :timestamp => :timestamp,
+    :timestamp => :uint,
     :float     => :float,
     :string    => :string,
     :bigint    => :bigint,

data/lib/thinking_sphinx/active_record/attribute/type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::Attribute::Type
   UPDATEABLE_TYPES = [:integer, :timestamp, :boolean, :float]
 
@@ -41,7 +43,7 @@ class ThinkingSphinx::ActiveRecord::Attribute::Type
   end
 
   def big_integer?
-    database_column.type == :integer && database_column.sql_type[/bigint/i]
+    type_symbol == :integer && database_column.sql_type[/bigint/i]
   end
 
   def column_name
@@ -72,19 +74,33 @@ class ThinkingSphinx::ActiveRecord::Attribute::Type
 
   def type_from_database
     raise ThinkingSphinx::MissingColumnError,
-      "column #{column_name} does not exist" if database_column.nil?
+      "Cannot determine the database type of column #{column_name}, as it does not exist" if database_column.nil?
 
     return :bigint if big_integer?
 
-    case database_column.type
+    case type_symbol
     when :datetime, :date
       :timestamp
     when :text
       :string
     when :decimal
       :float
+    when :integer, :boolean, :timestamp, :float, :string, :bigint, :json
+      type_symbol
     else
-      database_column.type
+      raise ThinkingSphinx::UnknownAttributeType,
+        <<-ERROR
+Unable to determine an equivalent Sphinx attribute type from #{database_column.type.class.name} for attribute #{attribute.name}. You may want to manually set the type.
+
+e.g.
+  has my_column, :type => :integer
+        ERROR
     end
   end
+
+  def type_symbol
+    return database_column.type if database_column.type.is_a?(Symbol)
+
+    database_column.type.class.name.demodulize.downcase.to_sym
+  end
 end

data/lib/thinking_sphinx/active_record/attribute/values.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::Attribute::Values
   def initialize(attribute)
     @attribute = attribute

data/lib/thinking_sphinx/active_record/attribute.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::Attribute <
   ThinkingSphinx::ActiveRecord::Property
 

data/lib/thinking_sphinx/active_record/base.rb

@@ -1,35 +1,67 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx::ActiveRecord::Base
   extend ActiveSupport::Concern
 
   included do
-    after_destroy ThinkingSphinx::ActiveRecord::Callbacks::DeleteCallbacks
-    before_save   ThinkingSphinx::ActiveRecord::Callbacks::DeltaCallbacks
-    after_update  ThinkingSphinx::ActiveRecord::Callbacks::UpdateCallbacks
-    after_commit  ThinkingSphinx::ActiveRecord::Callbacks::DeltaCallbacks
+    # Avoid method collisions for public Thinking Sphinx methods added to all
+    # ActiveRecord models. The `sphinx_`-prefixed versions will always exist,
+    # and the non-prefixed versions will be added if a method of that name
+    # doesn't already exist.
+    #
+    # If a method is overwritten later by something else, that's also fine - the
+    # prefixed versions will still be there.
+    class_module = ThinkingSphinx::ActiveRecord::Base::ClassMethods
+    class_module.public_instance_methods.each do |method_name|
+      short_method = method_name.to_s.delete_prefix("sphinx_").to_sym
+      next if methods.include?(short_method)
+
+      define_singleton_method(short_method, method(method_name))
+    end
+
+    if ActiveRecord::VERSION::STRING.to_i >= 5
+      [
+        ::ActiveRecord::Reflection::HasManyReflection,
+        ::ActiveRecord::Reflection::HasAndBelongsToManyReflection
+      ].each do |reflection_class|
+        reflection_class.include DefaultReflectionAssociations
+      end
+    else
+      ::ActiveRecord::Associations::CollectionProxy.include(
+        ThinkingSphinx::ActiveRecord::AssociationProxy
+      )
+    end
+  end
 
-    ::ActiveRecord::Associations::CollectionProxy.send :include,
-      ThinkingSphinx::ActiveRecord::AssociationProxy
+  module DefaultReflectionAssociations
+    def extensions
+      super + [ThinkingSphinx::ActiveRecord::AssociationProxy]
+    end
   end
 
   module ClassMethods
-    def facets(query = nil, options = {})
+    def sphinx_facets(query = nil, options = {})
       merge_search ThinkingSphinx.facets, query, options
     end
 
-    def search(query = nil, options = {})
+    def sphinx_search(query = nil, options = {})
       merge_search ThinkingSphinx.search, query, options
     end
 
-    def search_count(query = nil, options = {})
-      search(query, options).total_entries
+    def sphinx_search_count(query = nil, options = {})
+      search_for_ids(query, options).total_entries
     end
 
-    def search_for_ids(query = nil, options = {})
+    def sphinx_search_for_ids(query = nil, options = {})
       ThinkingSphinx::Search::Merger.new(
         search(query, options)
       ).merge! nil, :ids_only => true
     end
 
+    def sphinx_search_none
+      merge_search ThinkingSphinx.search, nil, none: true
+    end
+
     private
 
     def default_sphinx_scope?

data/lib/thinking_sphinx/active_record/callbacks/association_delta_callbacks.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class ThinkingSphinx::ActiveRecord::Callbacks::AssociationDeltaCallbacks
+  def initialize(path)
+    @path = path
+  end
+
+  def after_commit(instance)
+    Array(objects_for(instance)).each do |object|
+      object.update :delta => true unless object.frozen?
+    end
+  end
+
+  private
+
+  attr_reader :path
+
+  def objects_for(instance)
+    path.inject(instance) { |object, method| object.send method }
+  end
+end

data/lib/thinking_sphinx/active_record/callbacks/delete_callbacks.rb

@@ -1,21 +1,27 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::Callbacks::DeleteCallbacks <
   ThinkingSphinx::Callbacks
 
-  callbacks :after_destroy
+  callbacks :after_commit, :after_destroy, :after_rollback
+
+  def after_commit
+    delete_from_sphinx
+  end
 
   def after_destroy
-    return if instance.new_record?
+    delete_from_sphinx
+  end
 
-    indices.each { |index|
-      ThinkingSphinx::Deletion.perform index, instance.id
-    }
+  def after_rollback
+    delete_from_sphinx
   end
 
   private
 
-  def indices
-    ThinkingSphinx::Configuration.instance.index_set_class.new(
-      :classes => [instance.class]
-    ).to_a
+  def delete_from_sphinx
+    return if ThinkingSphinx::Callbacks.suspended?
+
+    ThinkingSphinx::Processor.new(instance: instance).delete
   end
 end

data/lib/thinking_sphinx/active_record/callbacks/delta_callbacks.rb

@@ -1,12 +1,12 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::Callbacks::DeltaCallbacks <
   ThinkingSphinx::Callbacks
 
   callbacks :after_commit, :before_save
 
   def after_commit
-    return unless delta_indices? && processors.any? { |processor|
-      processor.toggled?(instance)
-    } && !ThinkingSphinx::Deltas.suspended?
+    return unless !suspended? && delta_indices? && toggled?
 
     delta_indices.each do |index|
       index.delta_processor.index index
@@ -18,7 +18,8 @@ class ThinkingSphinx::ActiveRecord::Callbacks::DeltaCallbacks <
   end
 
   def before_save
-    return unless delta_indices?
+    return unless !ThinkingSphinx::Callbacks.suspended? && delta_indices? &&
+      new_or_changed?
 
     processors.each { |processor| processor.toggle instance }
   end
@@ -42,10 +43,24 @@ class ThinkingSphinx::ActiveRecord::Callbacks::DeltaCallbacks <
   end
 
   def indices
-    @indices ||= config.index_set_class.new :classes => [instance.class]
+    @indices ||= config.index_set_class.new(
+      :instances => [instance], :classes => [instance.class]
+    ).select { |index| index.type == "plain" }
+  end
+
+  def new_or_changed?
+    instance.new_record? || instance.changed?
   end
 
   def processors
     delta_indices.collect &:delta_processor
   end
+
+  def suspended?
+    ThinkingSphinx::Callbacks.suspended? || ThinkingSphinx::Deltas.suspended?
+  end
+
+  def toggled?
+    processors.any? { |processor| processor.toggled?(instance) }
+  end
 end