Merge branch 'release/v5.5.1'

pat · Dec 31, 2022 · be5e48b · be5e48b
2 parents 2a67818 + 4d5ac1c
commit be5e48b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
         ruby: [ '2.7', '3.0', '3.1', '3.2' ]
         rails: [ '5_0', '5_1', '5_2', '6_0', '6_1', '7_0' ]
         database: [ 'mysql2', 'postgresql' ]
-        sphinx_version: [ '3.4.1' ]
+        sphinx_version: [ '2.2.11', '3.4.1' ]
         sphinx_engine: [ 'sphinx' ]
         exclude:
           - database: 'postgresql'
@@ -74,22 +74,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.5', '2.6', '2.7', '3.0' ]
+        ruby: [ '2.7', '3.0', '3.1', '3.2' ]
         rails: [ '5_0', '5_1', '5_2', '6_0', '6_1', '7_0' ]
         database: [ 'mysql2', 'postgresql' ]
         sphinx_version: [ '3.5.4', '4.0.2' ]
         sphinx_engine: [ 'manticore' ]
         exclude:
-          - ruby: '2.5'
-            rails: '7_0'
-          - ruby: '2.6'
-            rails: '7_0'
           - 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'
 
     services:
       postgres:

diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
@@ -2,6 +2,14 @@
 
 All notable changes to this project (at least, from v3.0.0 onwards) are documented in this file.
 
+## 5.5.1 - 2022-12-31
+
+[Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v5.5.1)
+
+### Changed
+
+* Fixed total count of results in pagination information for Manticore 5.0+, by disabling the cutoff limit. ([#1239](https://github.com/pat/thinking-sphinx/pull/1239)).
+
 ## 5.5.0 - 2022-12-30
 
 [Release Notes](https://github.com/pat/thinking-sphinx/releases/tag/v5.5.0)

diff --git a/README.textile b/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.5.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 v5.5.1.
 
 h2. Upgrading
 

diff --git a/bin/loadsphinx b/bin/loadsphinx
@@ -15,7 +15,8 @@ load_sphinx () {
       distro="trusty";;
     2.2.11)
       url="http://sphinxsearch.com/files/sphinxsearch_2.2.11-release-1~jessie_amd64.deb"
-      format="deb";;
+      format="deb"
+      distro="trusty";;
     3.0.3)
       url="http://sphinxsearch.com/files/sphinx-3.0.3-facc3fb-linux-amd64.tar.gz"
       format="gz";;

diff --git a/lib/thinking_sphinx/settings.rb b/lib/thinking_sphinx/settings.rb
@@ -20,7 +20,8 @@ class ThinkingSphinx::Settings
     "workers"                  => "threads",
     "mysql_encoding"           => "utf8",
     "maximum_statement_length" => (2 ** 23) - 5,
-    "real_time_tidy"           => false
+    "real_time_tidy"           => false,
+    "cutoff"                   => 0
   }.freeze
   YAML_SAFE_LOAD = YAML.method(:safe_load).parameters.any? do |parameter|
     parameter == [:key, :aliases]

diff --git a/thinking-sphinx.gemspec b/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.5.0'
+  s.version     = '5.5.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["[email protected]"]