thinking-sphinx 5.6.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9312857a98ecddb77183d29a5967d0a7b9bd1e5aecd4ba058931281d15ae073c
-  data.tar.gz: 2cad1197f8f6f99fd8007cc532d4ae0709bae06e3ecd6b064a443817842753f5
+  metadata.gz: 5cba08942e61d8ca739c20ac29a9ee471b229c200c4b78a2047ddf82e4dca686
+  data.tar.gz: d933fa8e4d057d7bab8609fce6430a80d79dca0c2ba0ea03b06060b9fc27ddb4
 SHA512:
-  metadata.gz: '08c9725de4f436fbcf36b71a91940e5920d03b40f237dacd64a7e6ecd8dceffc917b9da353992e677538ddee12cf34b9065bf70bbbfcb698b9dfa5c68e51305c'
-  data.tar.gz: 43a8d688ca74d7e7bdb1d30368aa6ae5908b84250b0e60e37cd484143d91ac2cd2dbde8ab8115aa7538e09ff6619de13ba1c95c603baa224e77c8d46bb7d075f
+  metadata.gz: 280fea099e92acd152f776562879739712b739d8c73f620d923f215c6d83d3472fb7d029569274562881a8e1eafa1ce122ac44ddae709bd02be9b55502d90c87
+  data.tar.gz: 073533d77fd5073e17c6fc48a1463d7eeaa491071ab0fd54414ae152894e3eeff3601f9dea07234e8a0bc2570286b4c2a26dd6ae08572436250af5ce2acf1320

data/.github/workflows/ci.yml

@@ -1,102 +1,48 @@
 name: test
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    branches:
+      - main
+      - develop
 
-jobs:
-  sphinx:
-    runs-on: ubuntu-22.04
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.7', '3.0', '3.1', '3.2' ]
-        rails: [ '5_0', '5_1', '5_2', '6_0', '6_1', '7_0', '7_1' ]
-        database: [ 'mysql2', 'postgresql' ]
-        sphinx_version: [ '2.2.11', '3.4.1' ]
-        sphinx_engine: [ 'sphinx' ]
-        exclude:
-          - database: 'postgresql'
-            sphinx_version: '3.4.1'
-            sphinx_engine: 'sphinx'
-          - ruby: '3.0'
-            rails: '5_0'
-          - ruby: '3.0'
-            rails: '5_1'
-          - ruby: '3.0'
-            rails: '5_2'
-          - ruby: '3.1'
-            rails: '5_0'
-          - ruby: '3.1'
-            rails: '5_1'
-          - ruby: '3.1'
-            rails: '5_2'
-          - ruby: '3.2'
-            rails: '5_0'
-          - ruby: '3.2'
-            rails: '5_1'
-          - ruby: '3.2'
-            rails: '5_2'
+jobs:
+  test-matrix:
+    runs-on: ubuntu-latest
 
-    services:
-      postgres:
-        image: postgres:10
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: thinking_sphinx
-          POSTGRES_DB: thinking_sphinx
-        ports: ['5432:5432']
-        # needed because the postgres container does not provide a healthcheck
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
-      mysql:
-        image: mysql:5.7
-        env:
-          MYSQL_ROOT_PASSWORD: thinking_sphinx
-          MYSQL_DATABASE: thinking_sphinx
-        ports: ['3306:3306']
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    outputs:
+      matrix: ${{ steps.matrix.outputs.matrix }}
 
     steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/test
+      - uses: actions/checkout@v6
+      - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: ${{ matrix.ruby }}
-          rails-version: ${{ matrix.rails }}
-          sphinx-version: ${{ matrix.sphinx_version }}
-          sphinx-engine: ${{ matrix.sphinx_engine }}
-          database: ${{ matrix.database }}
-        timeout-minutes: 12
+          ruby-version: 4.0
+          bundler-cache: true
 
-  manticore:
+      - id: matrix
+        run: echo "matrix=$(./bin/testmatrix)" | tee -a "$GITHUB_OUTPUT"
+
+      - run: echo "$MATRIX" | yq -P
+        env:
+          MATRIX: ${{ steps.matrix.outputs.matrix }}
+
+  test:
     runs-on: ubuntu-22.04
+    needs: [test-matrix]
 
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.7', '3.0', '3.1', '3.2' ]
-        rails: [ '5_0', '5_1', '5_2', '6_0', '6_1', '7_0', '7_1' ]
-        database: [ 'mysql2', 'postgresql' ]
-        sphinx_version: [ '4.0.2', '6.0.0' ]
-        sphinx_engine: [ 'manticore' ]
-        exclude:
-          - ruby: '3.0'
-            rails: '5_0'
-          - ruby: '3.0'
-            rails: '5_1'
-          - ruby: '3.0'
-            rails: '5_2'
-          - ruby: '3.1'
-            rails: '5_0'
-          - ruby: '3.1'
-            rails: '5_1'
-          - ruby: '3.1'
-            rails: '5_2'
-          - ruby: '3.2'
-            rails: '5_0'
-          - ruby: '3.2'
-            rails: '5_1'
-          - ruby: '3.2'
-            rails: '5_2'
+        include: ${{ fromJSON(needs.test-matrix.outputs.matrix) }}
 
     services:
       postgres:
@@ -110,7 +56,7 @@ jobs:
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
       mysql:
-        image: mysql:8.0
+        image: mysql:5.7
         env:
           MYSQL_ROOT_PASSWORD: thinking_sphinx
           MYSQL_DATABASE: thinking_sphinx
@@ -118,7 +64,7 @@ jobs:
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/test
         with:
           ruby-version: ${{ matrix.ruby }}

data/Appraisals

@@ -51,3 +51,21 @@ appraise 'rails_7_1' do
   gem 'mysql2', '~> 0.5.0', :platform => :ruby
   gem 'pg',     '~> 1.0',   :platform => :ruby
 end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 2.7
+
+appraise 'rails_7_2' do
+  gem 'rails',  '~> 7.2.0'
+  gem 'mysql2', '~> 0.5.0', :platform => :ruby
+  gem 'pg',     '~> 1.0',   :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 3.1
+
+appraise 'rails_8_0' do
+  gem 'rails',  '~> 8.0.0'
+  gem 'mysql2', '~> 0.5.0', :platform => :ruby
+  gem 'pg',     '~> 1.0',   :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 3.2
+
+appraise 'rails_8_1' do
+  gem 'rails',  '~> 8.1.0'
+  gem 'mysql2', '~> 0.5.0', :platform => :ruby
+  gem 'pg',     '~> 1.0',   :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 3.2

data/CHANGELOG.markdown

@@ -2,6 +2,17 @@
 
 All notable changes to this project (at least, from v3.0.0 onwards) are documented in this file.
 
+## 6.0.0 - 2026-01-11
+
+### Breaking
+
+* Dropping support for Ruby versions prior to v3.0.
+* Dropping support for Rails versions prior to v6.1.
+
+### Changed
+
+* Improved support for Rails 7.2-8.1.
+
 ## 5.6.0 - 2024-07-07
 
 ### Added

data/Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'logger'
 gem 'mysql2', '~> 0.5.0',  :platform => :ruby
 gem 'pg',     '~> 0.18.4', :platform => :ruby
 

data/README.textile

@@ -1,6 +1,6 @@
 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 v5.6.0.
+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
 
@@ -14,7 +14,7 @@ It's a gem, so install it like you would any other gem. You will also need to sp
 
 <pre><code>gem 'mysql2',          '~> 0.4',    :platform => :ruby
 gem 'jdbc-mysql',      '~> 5.1.35', :platform => :jruby
-gem 'thinking-sphinx', '~> 5.5'</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.
 
@@ -29,12 +29,12 @@ h2. Requirements
 The current release of Thinking Sphinx works with the following versions of its dependencies:
 
 |_. Library |_. Minimum |_. Tested Against |
-| Ruby | v2.4 | v2.4, v2.5, v2.6, v2.7, v3.0, v3.1, v3.2 |
+| 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 | v4.2 | v4.2..v7.0 |
+| ActiveRecord | v6.1 | v6.1..v8.1 |
 
-It _might_ work with older versions of Ruby, but it's highly recommended to update to a supported release.
+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.
 
 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.
 
@@ -46,13 +46,28 @@ If you're opting for Manticore instead, v2.8 or newer works, but v4 or newer is
 
 h3. Rails and ActiveRecord
 
-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.
+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.
 
-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.
+The last releases for older Rails versions:
+
+|_. 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 |
+
+Please note that these older versions are no longer actively supported.
 
 h3. Ruby
 
-You'll need either the standard Ruby (v2.4 or newer) or JRuby (9.1 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
 
@@ -81,4 +96,4 @@ You can then run the unit tests with @rake spec:unit@, the acceptance tests with
 
 h2. Licence
 
-Copyright (c) 2007-2024, 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/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/active_record/filter_reflection.rb

@@ -2,7 +2,7 @@
 
 class ThinkingSphinx::ActiveRecord::FilterReflection
   ReflectionGenerator = case ActiveRecord::VERSION::STRING.to_f
-  when 5.2..7.1
+  when (5.2..)
     ThinkingSphinx::ActiveRecord::Depolymorph::OverriddenReflection
   when 4.1..5.1
     ThinkingSphinx::ActiveRecord::Depolymorph::AssociationReflection

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'bundler'
+require 'logger'
 
 Bundler.require :default, :development
 

data/thinking-sphinx.gemspec

@@ -5,7 +5,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'thinking-sphinx'
-  s.version     = '5.6.0'
+  s.version     = '6.0.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
@@ -14,6 +14,11 @@ Gem::Specification.new do |s|
   s.description = %Q{An intelligent layer for ActiveRecord (via Rails and Sinatra) for the Sphinx full-text search tool.}
   s.license     = 'MIT'
 
+  s.metadata['homepage_uri'] = s.homepage
+  s.metadata['source_code_uri'] = 'https://github.com/pat/thinking-sphinx'
+  s.metadata['changelog_uri'] = 'https://github.com/pat/thinking-sphinx/blob/develop/CHANGELOG.markdown'
+  s.metadata['rubygems_mfa_required'] = 'true'
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f|
@@ -21,12 +26,13 @@ Gem::Specification.new do |s|
   }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'activerecord', '>= 4.2.0'
-  s.add_runtime_dependency 'builder',      '>= 2.1.2'
-  s.add_runtime_dependency 'joiner',       '>= 0.3.4'
+  s.required_ruby_version = '>= 3.0'
+
+  s.add_runtime_dependency 'activerecord', '>= 6.1.0'
+  s.add_runtime_dependency 'joiner',       '>= 0.6.0'
   s.add_runtime_dependency 'middleware',   '>= 0.1.0'
-  s.add_runtime_dependency 'innertube',    '>= 1.0.2'
-  s.add_runtime_dependency 'riddle',       '~> 2.3'
+  s.add_runtime_dependency 'innertube',    '>= 1.1.0'
+  s.add_runtime_dependency 'riddle',       '~> 2.4'
 
   s.add_development_dependency 'appraisal',        '~> 1.0.2'
   s.add_development_dependency 'combustion',       '~> 1.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 5.6.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-07 00:00:00.000000000 Z
+date: 2026-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,42 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
-- !ruby/object:Gem::Dependency
-  name: builder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: joiner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +58,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: riddle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +157,7 @@ email:
 executables:
 - console
 - loadsphinx
+- testmatrix
 extensions: []
 extra_rdoc_files: []
 files:
@@ -188,6 +175,7 @@ files:
 - Rakefile
 - bin/console
 - bin/loadsphinx
+- bin/testmatrix
 - lib/thinking-sphinx.rb
 - lib/thinking/sphinx.rb
 - lib/thinking_sphinx.rb
@@ -514,7 +502,11 @@ files:
 homepage: https://pat.github.io/thinking-sphinx/
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://pat.github.io/thinking-sphinx/
+  source_code_uri: https://github.com/pat/thinking-sphinx
+  changelog_uri: https://github.com/pat/thinking-sphinx/blob/develop/CHANGELOG.markdown
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -523,14 +515,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A smart wrapper over Sphinx for ActiveRecord