Merge branch 'master' into cleanup-unused-dev-deps

Author: erimicel

.github/workflows/tests.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.0', '3.2', '3.3', '3.4']
+        ruby-version: ['3.0', '3.2', '3.3', '3.4', '4.0']
     services:
       typesense:
-        image: typesense/typesense:30.0.alpha1
+        image: typesense/typesense:30.2
         ports:
           - 8108:8108
         volumes:

.rubocop.yml

@@ -47,5 +47,13 @@ RSpec/ExampleLength:
 RSpec/MultipleExpectations:
   Enabled: false
 
+RSpec/Output:
+  Exclude:
+    - spec/spec_helper.rb
+
+Naming/PredicateMethod:
+  Exclude:
+    - spec/spec_helper.rb
+
 Style/HashSyntax:
   Enabled: false # We still want to support older versions of Ruby

Gemfile

@@ -6,13 +6,13 @@ git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Dev dependencies
 gem 'awesome_print', '~> 1.8'
-gem 'bundler', '~> 2.0'
+gem 'bundler', '>= 2.0'
 gem 'guard', '~> 2.16'
 gem 'guard-rubocop', '~> 1.3'
 gem 'rake', '~> 13.0'
 gem 'rspec', '~> 3.9'
-gem 'rubocop', '1.72.2'
-gem 'rubocop-rspec', '~> 3.6', require: false
+gem 'rubocop', '~> 1.86'
+gem 'rubocop-rspec', '~> 3.9', require: false
 gem 'simplecov', '~> 0.18'
 gem 'timecop', '~> 0.9'
 gem 'webmock', '~> 3.8'

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   typesense:
-    image: typesense/typesense:29.0
+    image: typesense/typesense:30.2
     ports:
       - "127.0.0.1:8108:8108"
     volumes:

spec/typesense/collection_spec.rb

@@ -52,7 +52,7 @@
     it 'updates the specified collection' do
       update_schema = {
         'fields' => [
-          'name' => 'field', 'drop' => true
+          { 'name' => 'field', 'drop' => true }
         ]
       }
       stub_request(:patch, Typesense::ApiCall.new(typesense.configuration).send(:uri_for, '/collections/companies', typesense.configuration.nodes[0]))

spec/typesense/curation_set_spec.rb

@@ -27,7 +27,9 @@
           'id' => 'rule-1',
           'rule' => {
             'query' => 'test',
-            'match' => 'exact'
+            'match' => 'exact',
+            'stem' => false,
+            'synonyms' => false
           },
           'includes' => [{ 'id' => '123', 'position' => 1 }],
           'excludes' => [],

spec/typesense/curation_sets_spec.rb

@@ -27,7 +27,9 @@
           'id' => 'rule-1',
           'rule' => {
             'query' => 'test',
-            'match' => 'exact'
+            'match' => 'exact',
+            'stem' => false,
+            'synonyms' => false
           },
           'includes' => [{ 'id' => '123', 'position' => 1 }],
           'excludes' => [],

typesense.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'base64', '~> 0.2.0'
+  spec.add_dependency 'base64', '~> 0.2'
   spec.add_dependency 'faraday', '~> 2.8'
   spec.add_dependency 'json', '~> 2.9'
   spec.metadata['rubygems_mfa_required'] = 'true'