Update the opensearch-rails gem (RM-2427)

- Ruby 3.2 support
- Remove CI / CD support for unsupported Ruby & Rails versions
- Ensure compatibility with opensearch-ruby 3

.github/workflows/2.7.yml

@@ -13,7 +13,7 @@ jobs:
   tests:
     env:
       TEST_ES_SERVER: http://localhost:9200
-      RAILS_VERSIONS: '5.0,6.0'
+      RAILS_VERSIONS: '6.1,7.1'
     strategy:
       fail-fast: false
     runs-on: ubuntu-latest
@@ -34,7 +34,7 @@ jobs:
     - name: Bundle
       run: |
         sudo apt-get install libsqlite3-dev
-        gem install bundler
+        gem install bundler -v 2.4.22
         bundle install
         bundle exec rake bundle:clean
         bundle exec rake bundle:install

.github/workflows/2.4.yml → .github/workflows/3.2.yml

@@ -1,4 +1,4 @@
-name: Ruby 2.4
+name: Ruby 3.2
 on:
   push:
     branches:
@@ -13,7 +13,7 @@ jobs:
   tests:
     env:
       TEST_ES_SERVER: http://localhost:9200
-      RAILS_VERSIONS: '5.0'
+      RAILS_VERSIONS: '7.1'
     strategy:
       fail-fast: false
     runs-on: ubuntu-latest
@@ -30,7 +30,7 @@ jobs:
         cluster-version: 2
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.4
+        ruby-version: 3.2
     - name: Bundle
       run: |
         sudo apt-get install libsqlite3-dev

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.1.0
+
+No functional changes.
+
+- Ruby 3.2 support
+- Remove CI / CD support for unsupported Ruby & Rails versions
+- Ensure compatibility with opensearch-ruby 3
+
 ## 1.0.0
 
 * Support OpenSearch 2 by removing deprecated type and include_type_name parameters

README.md

@@ -1,9 +1,7 @@
 # OpenSearch
 
+[![Ruby 3.2](https://github.com/compliance-innovations/opensearch-rails/actions/workflows/3.2.yml/badge.svg)](https://github.com/compliance-innovations/opensearch-rails/actions/workflows/3.2.yml)
 [![Ruby 2.7](https://github.com/compliance-innovations/opensearch-rails/workflows/Ruby%202.7/badge.svg)](https://github.com/compliance-innovations/opensearch-rails/actions)
-[![Ruby 2.6](https://github.com/compliance-innovations/opensearch-rails/workflows/Ruby%202.6/badge.svg)](https://github.com/compliance-innovations/opensearch-rails/actions)
-[![Ruby 2.5](https://github.com/compliance-innovations/opensearch-rails/workflows/Ruby%202.5/badge.svg)](https://github.com/compliance-innovations/opensearch-rails/actions)
-[![Ruby 2.4](https://github.com/compliance-innovations/opensearch-rails/workflows/Ruby%202.4/badge.svg)](https://github.com/compliance-innovations/opensearch-rails/actions)
 [![JRuby](https://github.com/compliance-innovations/opensearch-rails/workflows/JRuby/badge.svg)](https://github.com/compliance-innovations/opensearch-rails/actions)
 
 This repository contains various Ruby and Rails integrations for [OpenSearch](https://opensearch.org/). This is a fork
@@ -92,7 +90,7 @@ You can generate a simple Ruby on Rails application with a single command
     --env "cluster.name=opensearch-rails" \
     --env "cluster.routing.allocation.disk.threshold_enabled=false" \
     --rm \
-    opensearchproject/opensearch:1.3.0
+    opensearchproject/opensearch:latest
 ```
 
 Once OpenSearch is running, you can generate the simple app with this command:
@@ -168,9 +166,9 @@ This software is licensed under the Apache 2 license, quoted below.
     the Apache License, Version 2.0 (the "License"); you may
     not use this file except in compliance with the License.
     You may obtain a copy of the License at
-    
+
     	http://www.apache.org/licenses/LICENSE-2.0
-    
+
     Unless required by applicable law or agreed to in writing,
     software distributed under the License is distributed on an
     "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

opensearch-model/Rakefile

@@ -21,8 +21,8 @@ desc 'Run unit tests'
 task default: 'test:all'
 task test:    'test:all'
 
-gemfiles = ['5.0.gemfile', '6.0.gemfile']
-gemfiles << '4.0.gemfile' if RUBY_VERSION < '2.7'
+gemfiles = ['7.1.gemfile']
+gemfiles << '6.1.gemfile' if RUBY_VERSION <= '3.0'
 GEMFILES = gemfiles.freeze
 
 namespace :bundle do

opensearch-model/gemfiles/6.0.gemfile → opensearch-model/gemfiles/6.1.gemfile

@@ -25,8 +25,8 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'activemodel',  '6.0.0'
-gem 'activerecord', '6.0.0'
+gem 'activemodel',  '~> 6.1'
+gem 'activerecord', '~> 6.1'
 gem 'sqlite3' unless defined?(JRUBY_VERSION)
 #gem 'mongoid', '~> 6'
 

opensearch-model/gemfiles/5.0.gemfile → opensearch-model/gemfiles/7.1.gemfile

@@ -17,17 +17,18 @@
 
 # Usage:
 #
-# $ BUNDLE_GEMFILE=./gemfiles/5.0.gemfile bundle install
-# $ BUNDLE_GEMFILE=./gemfiles/5.0.gemfile bundle exec rake test:integration
+# $ BUNDLE_GEMFILE=./gemfiles/6.0.gemfile bundle install
+# $ BUNDLE_GEMFILE=./gemfiles/6.0.gemfile bundle exec rake test:integration
+
 
 source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'activemodel',  '~> 5'
-gem 'activerecord', '~> 5'
+gem 'activemodel',  '~> 7.1'
+gem 'activerecord', '~> 7.1'
 gem 'sqlite3' unless defined?(JRUBY_VERSION)
-gem 'mongoid', '~> 6'
+#gem 'mongoid', '~> 6'
 
 group :development, :testing do
   gem 'rspec'

opensearch-model/lib/opensearch/model/version.rb

@@ -17,6 +17,6 @@
 
 module OpenSearch
   module Model
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

opensearch-model/opensearch-model.gemspec

@@ -24,7 +24,7 @@ require 'opensearch/model/version'
 Gem::Specification.new do |s|
   s.name          = 'opensearch-model'
   s.version       = OpenSearch::Model::VERSION
-  s.authors       = ['Compliance Innovations B.V.']
+  s.authors       = ['CDD Solutions B.V.']
   s.email         = ['[email protected]']
   s.description   = 'ActiveModel/Record integrations for OpenSearch.'
   s.summary       = 'ActiveModel/Record integrations for OpenSearch.'
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.4'
 
   s.add_dependency 'activesupport', '> 3'
-  s.add_dependency "opensearch-ruby", '~> 2.0'
+  s.add_dependency "opensearch-ruby", '>= 2'
   s.add_dependency 'hashie'
 
   s.add_development_dependency 'activemodel', '> 3'

opensearch-model/spec/opensearch/model/adapters/active_record/namespaced_model_spec.rb

@@ -32,7 +32,7 @@
     MyNamespace::Book.__opensearch__.refresh_index!
   end
 
-  after do
+  after(:all) do
     clear_indices(MyNamespace::Book)
     clear_tables(MyNamespace::Book)
   end

opensearch-model/spec/opensearch/model/adapters/active_record/serialization_spec.rb

@@ -52,7 +52,7 @@
     context 'when a document is updated' do
 
       before do
-        article.update_attributes(title: 'UPDATED', status: 'yellow')
+        article.update(title: 'UPDATED', status: 'yellow')
         ArticleWithCustomSerialization.__opensearch__.refresh_index!
       end
 

opensearch-model/spec/opensearch/model/adapters/mongoid_spec.rb

@@ -174,7 +174,7 @@ class DummyClassForMongoid; end
     context 'query criteria specified as a hash' do
 
       before do
-        expect(relation).to receive(:where).with(color: 'red').and_return(relation)
+        expect(relation).to receive(:where).with({ color: 'red' }).and_return(relation)
       end
 
       let(:query) do

opensearch-model/spec/opensearch/model/importing_spec.rb

@@ -133,8 +133,8 @@ def importing_mixin
     context 'when the method is called with the force option' do
 
       before do
-        expect(DummyImportingModel).to receive(:create_index!).with(force: true, index: 'foo').and_return(true)
-        expect(DummyImportingModel).to receive(:__find_in_batches).with(foo: 'bar').and_return(true)
+        expect(DummyImportingModel).to receive(:create_index!).with({ force: true, index: 'foo' }).and_return(true)
+        expect(DummyImportingModel).to receive(:__find_in_batches).with({ foo: 'bar' }).and_return(true)
       end
 
       it 'deletes and creates the index' do
@@ -145,8 +145,8 @@ def importing_mixin
     context 'when the method is called with the refresh option' do
 
       before do
-        expect(DummyImportingModel).to receive(:refresh_index!).with(index: 'foo').and_return(true)
-        expect(DummyImportingModel).to receive(:__find_in_batches).with(foo: 'bar').and_return(true)
+        expect(DummyImportingModel).to receive(:refresh_index!).with({ index: 'foo' }).and_return(true)
+        expect(DummyImportingModel).to receive(:__find_in_batches).with({ foo: 'bar' }).and_return(true)
       end
 
       it 'refreshes the index' do
@@ -158,7 +158,7 @@ def importing_mixin
 
       before do
         expect(DummyImportingModel).to receive(:client).and_return(client)
-        expect(client).to receive(:bulk).with(body: nil, index: 'my-new-index').and_return(response)
+        expect(client).to receive(:bulk).with({ body: nil, index: 'my-new-index' }).and_return(response)
       end
 
       it 'uses the alternate index name' do
@@ -219,7 +219,7 @@ def importing_mixin
 
       before do
         expect(DummyImportingModel).to receive(:client).and_return(client)
-        expect(client).to receive(:bulk).with(body: nil, index: 'foo', pipeline: 'my-pipeline').and_return(response)
+        expect(client).to receive(:bulk).with({ body: nil, index: 'foo', pipeline: 'my-pipeline' }).and_return(response)
       end
 
       it 'uses the pipeline option' do