thinking-sphinx 5.5.1 → 6.0.0

data/spec/thinking_sphinx/middlewares/sphinxql_spec.rb

@@ -61,7 +61,7 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
       allow(index_set.first).to receive_messages :reference => :user
 
       expect(set_class).to receive(:new).
-        with(:classes => [klass], :indices => ['user_core']).
+        with({ :classes => [klass], :indices => ['user_core'] }).
         and_return(index_set)
 
       middleware.call [context]
@@ -215,7 +215,7 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
     end
 
     it "filters out deleted values by default" do
-      expect(sphinx_sql).to receive(:where).with(:sphinx_deleted => false).
+      expect(sphinx_sql).to receive(:where).with({ :sphinx_deleted => false }).
         and_return(sphinx_sql)
 
       middleware.call [context]
@@ -253,7 +253,7 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
       search.options[:with_all] = {:tag_ids => [1, 7]}
 
       expect(sphinx_sql).to receive(:where_all).
-        with(:tag_ids => [1, 7]).and_return(sphinx_sql)
+        with({ :tag_ids => [1, 7] }).and_return(sphinx_sql)
 
       middleware.call [context]
     end
@@ -262,7 +262,7 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
       search.options[:without_all] = {:tag_ids => [1, 7]}
 
       expect(sphinx_sql).to receive(:where_not_all).
-        with(:tag_ids => [1, 7]).and_return(sphinx_sql)
+        with({ :tag_ids => [1, 7] }).and_return(sphinx_sql)
 
       middleware.call [context]
     end

data/spec/thinking_sphinx/panes/excerpts_pane_spec.rb

@@ -45,7 +45,7 @@ describe ThinkingSphinx::Panes::ExcerptsPane do
       search.options[:excerpts] = {:before_match => 'foo'}
 
       expect(ThinkingSphinx::Excerpter).to receive(:new).
-        with(anything, anything, :before_match => 'foo').and_return(excerpter)
+        with(anything, anything, { :before_match => 'foo' }).and_return(excerpter)
 
       pane.excerpts
     end

data/spec/thinking_sphinx/real_time/interpreter_spec.rb

@@ -49,7 +49,7 @@ describe ThinkingSphinx::RealTime::Interpreter do
 
     it "passes through options to the attribute" do
       expect(ThinkingSphinx::RealTime::Attribute).to receive(:new).
-        with(column, :as => :other_name).and_return(attribute)
+        with(column, { :as => :other_name }).and_return(attribute)
 
       instance.has column, :as => :other_name
     end
@@ -84,7 +84,7 @@ describe ThinkingSphinx::RealTime::Interpreter do
 
     it "passes through options to the field" do
       expect(ThinkingSphinx::RealTime::Field).to receive(:new).
-        with(column, :as => :other_name).and_return(field)
+        with(column, { :as => :other_name }).and_return(field)
 
       instance.indexes column, :as => :other_name
     end
@@ -112,7 +112,7 @@ describe ThinkingSphinx::RealTime::Interpreter do
 
       it "adds the _sort suffix to the field's name" do
         expect(ThinkingSphinx::RealTime::Attribute).to receive(:new).
-          with(column, :as => :col_sort, :type => :string).
+          with(column, { :as => :col_sort, :type => :string }).
           and_return(attribute)
 
         instance.indexes column, :sortable => true
@@ -120,7 +120,7 @@ describe ThinkingSphinx::RealTime::Interpreter do
 
       it "respects given aliases" do
         expect(ThinkingSphinx::RealTime::Attribute).to receive(:new).
-          with(column, :as => :other_sort, :type => :string).
+          with(column, { :as => :other_sort, :type => :string }).
           and_return(attribute)
 
         instance.indexes column, :sortable => true, :as => :other
@@ -128,7 +128,7 @@ describe ThinkingSphinx::RealTime::Interpreter do
 
       it "respects symbols instead of columns" do
         expect(ThinkingSphinx::RealTime::Attribute).to receive(:new).
-          with(:title, :as => :title_sort, :type => :string).
+          with(:title, { :as => :title_sort, :type => :string }).
           and_return(attribute)
 
         instance.indexes :title, :sortable => true

data/spec/thinking_sphinx_spec.rb

@@ -16,7 +16,7 @@ describe ThinkingSphinx do
     end
 
     it "passes through the given query and options" do
-      expect(ThinkingSphinx::Search).to receive(:new).with('foo', :bar => :baz).
+      expect(ThinkingSphinx::Search).to receive(:new).with('foo', { :bar => :baz }).
         and_return(search)
 
       ThinkingSphinx.count('foo', :bar => :baz)
@@ -35,7 +35,7 @@ describe ThinkingSphinx do
     end
 
     it "passes through the given query and options" do
-      expect(ThinkingSphinx::Search).to receive(:new).with('foo', :bar => :baz).
+      expect(ThinkingSphinx::Search).to receive(:new).with('foo', { :bar => :baz }).
         and_return(search)
 
       ThinkingSphinx.search('foo', :bar => :baz)

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.5.1'
+  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,16 +26,17 @@ 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'
-  s.add_development_dependency 'database_cleaner', '~> 1.6.0'
-  s.add_development_dependency 'rspec',            '~> 3.7.0'
+  s.add_development_dependency 'database_cleaner', '~> 2.0.2'
+  s.add_development_dependency 'rspec',            '~> 3.12.0'
   s.add_development_dependency 'rspec-retry',      '~> 0.5.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 5.5.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Pat Allan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-31 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
@@ -128,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.12.0
 - !ruby/object:Gem::Dependency
   name: rspec-retry
   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