thinking-sphinx 4.4.1 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8afa50f4e183cba6d6ce4776b66ab3f274dd538af0ae98e1afd2d73132bc73d
-  data.tar.gz: b4a17507c4f023936ff6dabf1c8d4ae9cff2e08ba94808299ae7d7e9edc6c38d
+  metadata.gz: 4829363e45789cd8824b01645737455277dff8ce8d3ab4dd7ea9cd6bd748179b
+  data.tar.gz: c605d34504bef55fcb03d92d42e86348296689697df8fc0cd0fc2fb36ac7f097
 SHA512:
-  metadata.gz: 0cac814c511fc65b6bd477ff5b7861bedc551394d53655c75294d834bdc48ae6fa5b361e5e6b3e7a76c4280bc737c65188f21ed72abf18e352a55d967c354249
-  data.tar.gz: d79216c06faaa641ea71a30234ad6923fbbb9f2c0b5b0a75a2f7ce62720e6cbf91233965f6d2b0c7133e6e63c81c89db59306c3eb13da194c51fc009bf124041
+  metadata.gz: 2e768c63a2df5057432a0e28ab5fdb335cd28cf47fe3f2ac115e34eb7c10b4abe62721543c36ffe29aeaca013434fb069262b9fda5d752b2396f2df43d0d1c17
+  data.tar.gz: 5ab46830963db408b4789b5c3a694cd13b6c0cece4be23b23e68e589d4e54561c1c597ffa2b579324fa3e825a335cc611ecde17cc9d4e13f0117f6cd31a6b4fc

data/.circleci/config.yml

@@ -0,0 +1,218 @@
+version: 2.1
+
+orbs:
+  ruby: circleci/ruby@1.0
+
+workflows:
+  test:
+    jobs:
+      - test:
+          name: "Sphinx 2.2"
+          sphinx_version: 2.2.11
+          sphinx_engine: sphinx
+          debian: jessie
+          ruby: '2.4.6'
+          matrix:
+            parameters:
+              database: [ 'mysql2', 'postgresql' ]
+              rails: [ '4_2', '5_0', '5_1', '5_2' ]
+      - test:
+          name: "Sphinx 3.4"
+          sphinx_version: 3.4.1
+          sphinx_engine: sphinx
+          debian: buster
+          matrix:
+            parameters:
+              database: [ 'mysql2' ]
+              ruby: [ '2.4.10', '2.5.9', '2.6.9', '2.7.5', '3.0.3' ]
+              rails: [ '4_2', '5_0', '5_1', '5_2' ]
+            exclude:
+              - rails: '4_2'
+                ruby: '2.5.9'
+              - rails: '4_2'
+                ruby: '2.6.9'
+              - rails: '4_2'
+                ruby: '2.7.5'
+              - rails: '4_2'
+                ruby: '3.0.3'
+              - rails: '5_0'
+                ruby: '3.0.3'
+              - rails: '5_1'
+                ruby: '3.0.3'
+              - rails: '5_2'
+                ruby: '3.0.3'
+              - rails: '6_0'
+                ruby: '2.4.10'
+              - rails: '6_1'
+                ruby: '2.4.10'
+              - rails: '7_0'
+                ruby: '2.4.10'
+              - rails: '7_0'
+                ruby: '2.5.9'
+              - rails: '7_0'
+                ruby: '2.6.9'
+      - test:
+          name: "Manticore 3.5"
+          sphinx_version: 3.5.4
+          sphinx_engine: manticore
+          debian: buster
+          matrix:
+            parameters:
+              database: [ 'mysql2', 'postgresql' ]
+              ruby: [ '2.4.10', '2.5.9', '2.6.9', '2.7.5', '3.0.3' ]
+              rails: [ '4_2', '5_0', '5_1', '5_2' ]
+            exclude:
+              - rails: '4_2'
+                ruby: '2.5.9'
+              - rails: '4_2'
+                ruby: '2.6.9'
+              - rails: '4_2'
+                ruby: '2.7.5'
+              - rails: '4_2'
+                ruby: '3.0.3'
+              - rails: '5_0'
+                ruby: '3.0.3'
+              - rails: '5_1'
+                ruby: '3.0.3'
+              - rails: '5_2'
+                ruby: '3.0.3'
+              - rails: '6_0'
+                ruby: '2.4.10'
+              - rails: '6_1'
+                ruby: '2.4.10'
+              - rails: '7_0'
+                ruby: '2.4.10'
+              - rails: '7_0'
+                ruby: '2.5.9'
+              - rails: '7_0'
+                ruby: '2.6.9'
+      - test:
+          name: "Manticore 4.0"
+          sphinx_version: 4.0.2
+          sphinx_engine: manticore
+          debian: buster
+          matrix:
+            parameters:
+              database: [ 'mysql2', 'postgresql' ]
+              ruby: [ '2.4.10', '2.5.9', '2.6.9', '2.7.5', '3.0.3' ]
+              rails: [ '4_2', '5_0', '5_1', '5_2' ]
+            exclude:
+              - rails: '4_2'
+                ruby: '2.5.9'
+              - rails: '4_2'
+                ruby: '2.6.9'
+              - rails: '4_2'
+                ruby: '2.7.5'
+              - rails: '4_2'
+                ruby: '3.0.3'
+              - rails: '5_0'
+                ruby: '3.0.3'
+              - rails: '5_1'
+                ruby: '3.0.3'
+              - rails: '5_2'
+                ruby: '3.0.3'
+              - rails: '6_0'
+                ruby: '2.4.10'
+              - rails: '6_1'
+                ruby: '2.4.10'
+              - rails: '7_0'
+                ruby: '2.4.10'
+              - rails: '7_0'
+                ruby: '2.5.9'
+              - rails: '7_0'
+                ruby: '2.6.9'
+
+jobs:
+  test:
+    parameters:
+      ruby:
+        type: string
+      rails:
+        type: string
+      database:
+        type: string
+      sphinx_version:
+        type: string
+      sphinx_engine:
+        type: string
+      debian:
+        type: string
+
+    docker:
+      - image: circleci/ruby:<< parameters.ruby >>-<< parameters.debian >>
+
+      - image: circleci/postgres:10
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: thinking_sphinx
+          POSTGRES_DB: thinking_sphinx
+
+      - image: circleci/mysql:5.7
+        environment:
+          MYSQL_ROOT_PASSWORD: thinking_sphinx
+          MYSQL_DATABASE: thinking_sphinx
+
+    working_directory: ~/app
+
+    steps:
+      - checkout
+
+      - restore_cache:
+          keys:
+            - v1-dependencies-<< parameters.ruby >>-<< parameters.rails >>
+
+      - run:
+          name: install bundler
+          command: |
+            if [ "<< parameters.ruby >>" == "2.7.5" ]; then
+              export BUNDLER_VERSION=2.1.4
+            elif [ "<< parameters.ruby >>" == "3.0.3" ]; then
+              export BUNDLER_VERSION=2.1.4
+            else
+              export BUNDLER_VERSION=1.17.3
+            fi
+            export BUNDLE_PATH=vendor/bundle
+            gem install bundler:$BUNDLER_VERSION
+
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+            bundle update
+
+      - run:
+          name: set up appraisal
+          command: bundle exec appraisal generate
+
+      - run:
+          name: update gems
+          environment:
+            BUNDLE_GEMFILE: "./gemfiles/rails_<< parameters.rails >>.gemfile"
+          command: |
+            if [[ -f $BUNDLE_GEMFILE ]]
+            then
+                bundle update
+            fi
+
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-<< parameters.ruby >>-<< parameters.rails >>
+
+      - run:
+          name: set up sphinx
+          command: "./bin/loadsphinx << parameters.sphinx_version >> << parameters.sphinx_engine >>"
+
+      - run:
+          name: tests
+          environment:
+            CI: "true"
+            DATABASE: << parameters.database >>
+            SPHINX_VERSION: << parameters.sphinx_version >>
+            SPHINX_ENGINE: << parameters.sphinx_engine >>
+            BUNDLE_GEMFILE: "./gemfiles/rails_<< parameters.rails >>.gemfile"
+          command: |
+            if [[ -f $BUNDLE_GEMFILE ]]
+            then
+                bundle exec rspec
+            fi

data/.travis.yml

@@ -1,39 +1,30 @@
 language: ruby
 dist: xenial
 rvm:
-- 2.3.8
-- 2.4.6
-- 2.5.5
-- 2.6.3
+- 2.4.10
+- 2.5.8
+- 2.6.6
+- 2.7.1
 before_install:
-- pip install --upgrade --user awscli
 - gem update --system
-- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-- gem install bundler -v '< 2'
+- gem install bundler -v '1.17.3'
+install: bundle _1.17.3_ install --jobs=3 --retry=3
 before_script:
 - mysql -e 'create database thinking_sphinx;' > /dev/null
 - psql -c 'create database thinking_sphinx;' -U postgres >/dev/null
 - "./bin/loadsphinx $SPHINX_VERSION $SPHINX_ENGINE"
-- bundle exec appraisal install
-script: bundle exec appraisal rspec
+- bundle _1.17.3_ exec appraisal install
+script: bundle _1.17.3_ exec appraisal rspec
 env:
-  global:
-  - secure: cUPinkilBafqDSPsTkl/PXYc2aXNKUQKXGK8poBBMqKN9/wjfJx1DWgtowDKalekdZELxDhc85Ye3bL1xlW4nLjOu+U6Tkt8eNw2Nhs1flodHzA/RyENdBLr/tBHt43EjkrDehZx5sBHmWQY4miHs8AJz0oKO9Ae2inTOHx9Iuc=
   matrix:
-  - DATABASE=mysql2 SPHINX_VERSION=2.1.9 SPHINX_ENGINE=sphinx
-  - DATABASE=postgresql SPHINX_VERSION=2.1.9 SPHINX_ENGINE=sphinx
   - DATABASE=mysql2 SPHINX_VERSION=2.2.11 SPHINX_ENGINE=sphinx
   - DATABASE=postgresql SPHINX_VERSION=2.2.11 SPHINX_ENGINE=sphinx
-  - DATABASE=mysql2 SPHINX_VERSION=3.0.3 SPHINX_ENGINE=sphinx
-  - DATABASE=postgresql SPHINX_VERSION=3.0.3 SPHINX_ENGINE=sphinx
-  - DATABASE=mysql2 SPHINX_VERSION=3.1.1 SPHINX_ENGINE=sphinx
-  - DATABASE=mysql2 SPHINX_VERSION=2.6.4 SPHINX_ENGINE=manticore
-  - DATABASE=postgresql SPHINX_VERSION=2.6.4 SPHINX_ENGINE=manticore
-  - DATABASE=mysql2 SPHINX_VERSION=2.7.5 SPHINX_ENGINE=manticore
-  - DATABASE=postgresql SPHINX_VERSION=2.7.5 SPHINX_ENGINE=manticore
+  - DATABASE=mysql2 SPHINX_VERSION=3.3.1 SPHINX_ENGINE=sphinx
   - DATABASE=mysql2 SPHINX_VERSION=2.8.2 SPHINX_ENGINE=manticore
   - DATABASE=postgresql SPHINX_VERSION=2.8.2 SPHINX_ENGINE=manticore
-  # - DATABASE=postgresql SPHINX_VERSION=3.1.1 SPHINX_ENGINE=sphinx
+  - DATABASE=mysql2 SPHINX_VERSION=3.5.0 SPHINX_ENGINE=manticore
+  - DATABASE=postgresql SPHINX_VERSION=3.5.0 SPHINX_ENGINE=manticore
+  # - DATABASE=postgresql SPHINX_VERSION=3.3.1 SPHINX_ENGINE=sphinx
 sudo: false
 addons:
   postgresql: '9.4'

data/Appraisals

@@ -1,22 +1,7 @@
-appraise 'rails_3_2' do
-  gem 'rails',  '~> 3.2.22.2'
-  gem 'mysql2', '~> 0.3.10', :platform => :ruby
-end if RUBY_VERSION.to_f <= 2.3
-
-appraise 'rails_4_0' do
-  gem 'rails',  '~> 4.0.13'
-  gem 'mysql2', '~> 0.3.10', :platform => :ruby
-end if RUBY_VERSION.to_f <= 2.3
-
-appraise 'rails_4_1' do
-  gem 'rails',  '~> 4.1.15'
-  gem 'mysql2', '~> 0.3.13', :platform => :ruby
-end if RUBY_VERSION.to_f <= 2.3
-
 appraise 'rails_4_2' do
   gem 'rails',  '~> 4.2.6'
   gem 'mysql2', '~> 0.4.0', :platform => :ruby
-end if RUBY_VERSION.to_f <= 2.3
+end if RUBY_VERSION.to_f <= 2.4
 
 appraise 'rails_5_0' do
   if RUBY_PLATFORM == "java"
@@ -30,21 +15,33 @@ appraise 'rails_5_0' do
   gem 'jdbc-mysql',                          '~> 5.1.36', :platform => :jruby
   gem 'activerecord-jdbcmysql-adapter',      '~> 50.0',   :platform => :jruby
   gem 'activerecord-jdbcpostgresql-adapter', '~> 50.0',   :platform => :jruby
-end if RUBY_PLATFORM != "java" || ENV["SPHINX_VERSION"].to_f > 2.1
+end if (RUBY_PLATFORM != "java" || ENV["SPHINX_VERSION"].to_f > 2.1) && RUBY_VERSION.to_f < 3.0
 
 appraise 'rails_5_1' do
   gem 'rails',  '~> 5.1.0'
   gem 'mysql2', '~> 0.4.0', :platform => :ruby
-end if RUBY_PLATFORM != 'java'
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f < 3.0
 
 appraise 'rails_5_2' do
   gem 'rails',  '~> 5.2.0'
   gem 'mysql2', '~> 0.5.0', :platform => :ruby
   gem 'pg',     '~> 1.0',   :platform => :ruby
-end if RUBY_PLATFORM != 'java'
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f < 3.0
 
 appraise 'rails_6_0' do
   gem 'rails',  '~> 6.0.0'
   gem 'mysql2', '~> 0.5.0', :platform => :ruby
   gem 'pg',     '~> 1.0',   :platform => :ruby
 end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 2.5
+
+appraise 'rails_6_1' do
+  gem 'rails',  '~> 6.1.0'
+  gem 'mysql2', '~> 0.5.0', :platform => :ruby
+  gem 'pg',     '~> 1.0',   :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 2.5
+
+appraise 'rails_7_0' do
+  gem 'rails',  '~> 7.0.0'
+  gem 'mysql2', '~> 0.5.0', :platform => :ruby
+  gem 'pg',     '~> 1.0',   :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 2.7

data/CHANGELOG.markdown

@@ -2,6 +2,99 @@
 
 All notable changes to this project (at least, from v3.0.0 onwards) are documented in this file.
 
+## 5.4.0 - 2021-12-21
+
+[Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v5.4.0)
+
+### Added
+
+* Rails 7 support, including contributions from @anthonyshull in [#1205](https://github.com/pat/thinking-sphinx/pull/1205).
+
+### Changed
+
+* Confirmed support by testing against Manticore 4.0 and Sphinx 3.4.
+
+### Fixed
+
+* Include instance_exec in ThinkingSphinx::Search::CORE_METHODS by @jdelStrother in [#1210](https://github.com/pat/thinking-sphinx/pull/1210).
+* Use File.exist? instead of the deprecated File.exists? ([#1211](https://github.com/pat/thinking-sphinx/issues/1211)).
+
+## 5.3.0 - 2021-08-19
+
+[Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v5.3.0)
+
+### Changed
+
+* StaleIdsExceptions now include a URL in their error message with recommendations on how to resolve the problem.
+* Fire real-time callbacks on `after_commit` (including deletions) to ensure data is fully persisted to the database before updating Sphinx. More details in [#1204](https://github.com/pat/thinking-sphinx/pull/1204).
+
+### Fixed
+
+* Ensure Thinking Sphinx's ActiveRecord components are loaded by either Rails' after_initialise hook or ActiveSupport's on_load notification, because the order of these two events are not consistent.
+* Remove `app/indices` from eager_load_paths in Rails 4.2 and 5, to match the behaviour in 6.
+
+## 5.2.1 - 2021-08-09
+
+[Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v5.2.1)
+
+### Fixed
+
+* Ensure ActiveRecord components are loaded for rake tasks, but only after the Rails application has initialised. More details in [#1199](https://github.com/pat/thinking-sphinx/issues/1199).
+
+## 5.2.0 - 2021-06-12
+
+[Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v5.2.0)
+
+### Added
+
+* Confirmed support for Ruby 3.0.
+* Orphaned records in real-time indices can now be cleaned up without running `rails ts:rebuild`. Disabled by default, can be enabled by setting `real_time_tidy` to true per environment in `config/thinking_sphinx.yml` (and will need `ts:rebuild` to restructure indices upon initial deploy). More details in [#1192](https://github.com/pat/thinking-sphinx/pull/1192).
+
+### Fixed
+
+* Avoid loading ActiveRecord during Rails initialisation so app configuration can still have an impact ([@jdelStrother](https://github.com/jdelStrother) in [#1194](https://github.com/pat/thinking-sphinx/pull/1194)).
+* Remove `app/indices` (in both the Rails app and engines) from Rails' eager load paths, which was otherwise leading to indices being loaded more than once. (See [#1191](https://github.com/pat/thinking-sphinx/issues/1191) and [#1195](https://github.com/pat/thinking-sphinx/issues/1195)).
+
+## 5.1.0 - 2020-12-28
+
+[Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v5.1.0)
+
+### Added
+
+* Support for Sphinx v3.3 and Manticore v3.5.
+* Support for Rails 6.1 (via [joiner](https://rubygems.org/gems/joiner) v0.6.0).
+
+### Changed
+
+* `enable_star` is no longer available as a configuration option, as it's been enabled by default in Sphinx since v2.2.2, and is no longer allowed in Sphinx v3.3.1.
+* All timestamp attributes are now considered plain integer values from Sphinx's perspective. Sphinx was already expecting integers, but since Sphinx v3.3.1 it doesn't recognise timestamps as a data type. There is no functional difference with this change - Thinking Sphinx was always converting times to their UNIX epoch integer values.
+* Allow configuration of the maximum statement length ([@kalsan](https://github.com/kalsan) in [#1179](https://github.com/pat/thinking-sphinx/pull/1179)).
+* Respect `:path` values to navigate associations for Thinking Sphinx callbacks on SQL-backed indices. Discussed in [#1182](https://github.com/pat/thinking-sphinx/issues/1182).
+
+### Fixed
+
+* Don't attempt to update delta flags on frozen model instances.
+
+## 5.0.0 - 2020-07-20
+
+[Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v5.0.0)
+
+### Added
+
+* New interface for adding callbacks to indexed models (which is no longer done automatically). Discussed in [#1173](https://github.com/pat/thinking-sphinx/issues/1173) and committed via [#1175](https://github.com/pat/thinking-sphinx/pull/1175). **This is a breaking change - you will need to add these callbacks. See [the full release notes](https://github.com/pat/thinking-sphinx/releases/tag/v5.0.0) for examples.**
+* Fields and attributes can be overriden - whichever's defined last with a given name is the definition that's used. This is an edge case, but useful if you want to override any of the default fields/indices. (Requested by @kalsan in [#1172](https://github.com/pat/thinking-sphinx/issues/1172).)
+* Custom index_set_class implementations can now expect the `:instances` option to be set alongside `:classes`, which is useful in cases to limit the indices returned if you're splitting index data for given classes/models into shards. (Introduced in PR [#1171](https://github.com/pat/thinking-sphinx/pull/1171) after discussions with @lunaru in [#1166](https://github.com/pat/thinking-sphinx/issues/1166).)
+
+### Changed
+
+* Sphinx 2.2.11 or newer is required, or Manticore 2.8.2 or newer.
+* Ruby 2.4 or newer is required.
+* Rails 4.2 or newer is required.
+* Remove internal uses of `send`, replaced with `public_send` as that's available in all supported Ruby versions.
+* Deletion statements are simplified by avoiding the need to calculate document keys/offsets (@njakobsen via [#1134](https://github.com/pat/thinking-sphinx/issues/1134)).
+* Real-time data is deleted before replacing it, to avoid duplicate data when offsets change (@njakobsen via [#1134](https://github.com/pat/thinking-sphinx/issues/1134)).
+* Use `reference_name` as per custom `index_set_class` definitions. Previously, the class method was called on `ThinkingSphinx::IndexSet` even if a custom subclass was configured. (As per discussions with @kalsan in [#1172](https://github.com/pat/thinking-sphinx/issues/1172).)
+
 ## 4.4.1 - 2019-08-23
 
 [Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v4.4.1)

data/README.textile

@@ -1,22 +1,22 @@
 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 v4.4.1.
+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 v5.4.0.
 
 h2. 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.
 
-The documentation also has more details on what's involved for upgrading from "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.
+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',    :platform => :ruby
+<pre><code>gem 'mysql2',          '~> 0.4',    :platform => :ruby
 gem 'jdbc-mysql',      '~> 5.1.35', :platform => :jruby
-gem 'thinking-sphinx', '~> 4.4'</code></pre>
+gem 'thinking-sphinx', '~> 5.4'</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. If you're using JRuby with a version of Sphinx prior to 2.2.11, there is "currently an issue with Sphinx and jdbc-mysql 5.1.36 or newer":http://sphinxsearch.com/forum/view.html?id=13939, so you'll need to stick to nothing more recent than 5.1.35, or upgrade Sphinx.
+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":https://freelancing-gods.com/thinking-sphinx/installing_sphinx.html.
 
@@ -29,30 +29,30 @@ h2. Requirements
 The current release of Thinking Sphinx works with the following versions of its dependencies:
 
 |_. Library |_. Minimum |_. Tested Against |
-| Ruby | v2.3 | v2.3.8, v2.4.5, v2.5.3, v2.6.1 |
-| Sphinx | v2.1.2 | v2.1.9, v2.2.11, v3.0.3, v3.1.1 |
-| Manticore | v2.6.3 | v2.6.4, v2.7.5, v2.8.1 |
-| ActiveRecord | v3.2 | v3.2..v6.0 |
+| Ruby | v2.4 | v2.4, v2.5, v2.6, v2.7, v3.0 |
+| Sphinx | v2.2.11 | v2.2.11, v3.3.1 |
+| Manticore | v2.8 | v3.5, v4.0 |
+| ActiveRecord | v4.2 | v4.2..v7.0 |
 
 It _might_ work with older versions of Ruby, but it's highly recommended to update to a supported release.
 
-It should also work with JRuby, but the test environment on Travis CI has been timing out, hence that's not actively tested against at the moment.
+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.
 
 h3. Sphinx or Manticore
 
-Thinking Sphinx v3 is currently built for Sphinx 2.1.2 or newer, or Manticore v2.6+.
+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).
 
-h3. Rails and ActiveRecord
+If you're opting for Manticore instead, v2.8 or newer works, but v3 or newer is recommended as that's what is actively tested against.
 
-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.
+h3. Rails and ActiveRecord
 
-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.
+Currently Thinking Sphinx is built to support Rails/ActiveRecord 4.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.
 
-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.
+If you want ActiveRecord 3.2-4.1 support, then refer to the 4.x releases of Thinking Sphinx. Or, for ActiveRecord 3.1 support, then refer to the 3.0.x releases. 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.
 
 h3. Ruby
 
-You'll need either the standard Ruby (v2.3 or newer) or JRuby (9.1 or newer).
+You'll need either the standard Ruby (v2.4 or newer) or JRuby (9.1 or newer).
 
 h3. Database Versions
 
@@ -81,4 +81,4 @@ You can then run the unit tests with @rake spec:unit@, the acceptance tests with
 
 h2. Licence
 
-Copyright (c) 2007-2019, 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-2021, 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/bin/loadsphinx

@@ -14,7 +14,7 @@ load_sphinx () {
       format="deb"
       distro="trusty";;
     2.2.11)
-      url="http://sphinxsearch.com/files/sphinxsearch_2.2.11-release-1~xenial_amd64.deb"
+      url="http://sphinxsearch.com/files/sphinxsearch_2.2.11-release-1~jessie_amd64.deb"
       format="deb";;
     3.0.3)
       url="http://sphinxsearch.com/files/sphinx-3.0.3-facc3fb-linux-amd64.tar.gz"
@@ -22,6 +22,15 @@ load_sphinx () {
     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;;
@@ -34,7 +43,9 @@ load_sphinx () {
 
   if [ "$format" == "deb" ]; then
     curl --location $url -o sphinx.deb
-    sudo apt-get install ./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
@@ -51,14 +62,21 @@ load_manticore () {
     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-4e81114-release-stemmer.xenial_amd64-bin.deb";;
+      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_buster/pool/m/manticore/manticore_3.5.4-201211-13f8d08d_amd64.deb";;
+    4.0.2)
+      url="https://repo.manticoresearch.com/repository/manticoresearch_buster/pool/m/manticore/manticore_4.0.2-210921-af497f245_amd64.deb";;
     *)
       echo "No Manticore version $version available"
       exit 1;;
   esac
 
   curl --location $url -o manticore.deb
-  sudo apt-get install ./manticore.deb
+  sudo dpkg -i ./manticore.deb
+  sudo apt-get install -f
 }
 
 if [ "$engine" == "sphinx" ]; then

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

@@ -31,7 +31,7 @@ class ThinkingSphinx::ActiveRecord::AssociationProxy::AttributeFinder
     @indices ||= begin
       configuration.preload_indices
       configuration.indices_for_references(
-        *ThinkingSphinx::IndexSet.reference_name(@association.klass)
+        *configuration.index_set_class.reference_name(@association.klass)
       ).reject &:distributed?
     end
   end

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

@@ -4,7 +4,7 @@ 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/base.rb

@@ -4,11 +4,6 @@ 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
-
     if ActiveRecord::VERSION::STRING.to_i >= 5
       [
         ::ActiveRecord::Reflection::HasManyReflection,
@@ -17,8 +12,9 @@ module ThinkingSphinx::ActiveRecord::Base
         reflection_class.include DefaultReflectionAssociations
       end
     else
-      ::ActiveRecord::Associations::CollectionProxy.send :include,
+      ::ActiveRecord::Associations::CollectionProxy.include(
         ThinkingSphinx::ActiveRecord::AssociationProxy
+      )
     end
   end
 

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