Updates dependency on elasticsearch gem to 8

Replaces Elasticsearch::Transport with Elastic::Transport

Author: picandocodigo

Gemfile

@@ -19,7 +19,7 @@ source 'https://rubygems.org'
 
 gem 'ansi'
 gem 'cane'
-gem 'elasticsearch', '~> 7'
+gem 'elasticsearch', '~> 8'
 gem 'pry'
 gem 'rake', '~> 12'
 

Rakefile

@@ -163,7 +163,7 @@ task :wait_for_green do
         ready = true
         break
       end
-    rescue Elasticsearch::Transport::Transport::Errors::RequestTimeout => ex
+    rescue Elastic::Transport::Transport::Errors::RequestTimeout => ex
       puts "Couldn't confirm green status.\n#{ex.inspect}."
     rescue Faraday::ConnectionFailed => ex
       puts "Couldn't connect to Elasticsearch.\n#{ex.inspect}."

elasticsearch-model/README.md

@@ -6,18 +6,19 @@ It aims to simplify integration of Ruby classes ("models"), commonly found e.g.
 
 ## Compatibility
 
-This library is compatible with Ruby 2.4 and higher.
+This library is compatible with Ruby 3 and higher.
 
 The version numbers follow the Elasticsearch major versions. Currently the `main` branch is compatible with version `7.x` of the Elasticsearch stack. **We haven't tested and updated the code for Elasticsearch `8.0` yet**.
 
-| Rubygem       |   | Elasticsearch |
-|:-------------:|:-:| :-----------: |
-| 0.1           | → | 1.x           |
-| 2.x           | → | 2.x           |
-| 5.x           | → | 5.x           |
-| 6.x           | → | 6.x           |
-| 7.x           | → | 7.x           |
-| main          | → | 7.x           |
+| Rubygem |   | Elasticsearch |
+|:-------:|:-:|:-------------:|
+| 0.1     | → | 1.x           |
+| 2.x     | → | 2.x           |
+| 5.x     | → | 5.x           |
+| 6.x     | → | 6.x           |
+| 7.x     | → | 7.x           |
+| 8.x     | → | 8.x           |
+| main    | → | 8.x           |
 
 ## Installation
 
@@ -532,7 +533,7 @@ class Indexer
       when /delete/
         begin
           Client.delete index: 'articles', type: 'article', id: record_id
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound
+        rescue Elastic::Transport::Transport::Errors::NotFound
           logger.debug "Article not found, ID: #{record_id}"
         end
       else raise ArgumentError, "Unknown operation '#{operation}'"

elasticsearch-model/elasticsearch-model.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 3'
 
   s.add_dependency 'activesupport', '> 3'
-  s.add_dependency 'elasticsearch', '~> 7'
+  s.add_dependency 'elasticsearch', '~> 8'
   s.add_dependency 'hashie'
 
   s.add_development_dependency 'activemodel', '> 3'

elasticsearch-model/lib/elasticsearch/model/importing.rb

@@ -185,8 +185,6 @@ def __batch_to_bulk(batch, transform)
           batch.map { |model| transform.call(model) }
         end
       end
-
     end
-
   end
 end

elasticsearch-model/lib/elasticsearch/model/multimodel.rb

@@ -90,7 +90,7 @@ def document_type
 
       # Get the client common for all models
       #
-      # @return Elasticsearch::Transport::Client
+      # @return Elastic::Transport::Client
       #
       def client
         Elasticsearch::Model.client

elasticsearch-model/spec/elasticsearch/model/adapters/active_record/basic_spec.rb

@@ -20,7 +20,6 @@
 describe Elasticsearch::Model::Adapter::ActiveRecord do
 
   context 'when a document_type is not defined for the Model' do
-
     before do
       ActiveRecord::Schema.define(:version => 1) do
         create_table :article_no_types do |t|

elasticsearch-model/spec/elasticsearch/model/indexing_spec.rb

@@ -678,7 +678,7 @@ class ::DummyIndexingModelForRecreate
     context 'when the index is not found' do
       let(:logger) { nil }
       let(:transport) do
-        Elasticsearch::Transport::Client.new(logger: logger)
+        Elastic::Transport::Client.new(logger: logger)
       end
 
       let(:client) do
@@ -918,7 +918,7 @@ class ::DummyIndexingModelForRefresh
     end
 
     let(:transport) do
-      Elasticsearch::Transport::Client.new(logger: nil)
+      Elastic::Transport::Client.new(logger: nil)
     end
 
     let(:indices) do
@@ -949,7 +949,7 @@ class ::DummyIndexingModelForRefresh
           end
 
           let(:transport) do
-            Elasticsearch::Transport::Client.new(logger: logger)
+            Elastic::Transport::Client.new(logger: logger)
           end
 
           it 'does not raise an exception' do

elasticsearch-model/spec/elasticsearch/model/response/result_spec.rb

@@ -19,7 +19,6 @@
 require 'active_support/json/encoding'
 
 describe Elasticsearch::Model::Response::Result do
-
   let(:result) do
     described_class.new(foo: 'bar', bar: { bam: 'baz' })
   end

elasticsearch-persistence/lib/elasticsearch/persistence/repository/find.rb

@@ -87,7 +87,7 @@ def __find_one(id, options={})
           request[:type] = document_type if document_type
           document = client.get(request.merge(options))
           deserialize(document)
-        rescue Elasticsearch::Transport::Transport::Errors::NotFound => e
+        rescue Elastic::Transport::Transport::Errors::NotFound => e
           raise DocumentNotFound, e.message, caller
         end
 

elasticsearch-persistence/spec/repository/store_spec.rb

@@ -242,7 +242,7 @@ def to_hash
         it 'raises an exception' do
           expect {
             repository.update(1, doc: { text: 'testing_2' })
-          }.to raise_exception(Elasticsearch::Transport::Transport::Errors::NotFound)
+          }.to raise_exception(Elastic::Transport::Transport::Errors::NotFound)
         end
 
         context 'when upsert is provided' do
@@ -262,7 +262,7 @@ def to_hash
         it 'raises an exception' do
           expect {
             repository.update(id: 1, text: 'testing_2')
-          }.to raise_exception(Elasticsearch::Transport::Transport::Errors::NotFound)
+          }.to raise_exception(Elastic::Transport::Transport::Errors::NotFound)
         end
 
         context 'when upsert is provided' do
@@ -337,7 +337,7 @@ def to_hash
       it 'raises an exception' do
         expect {
           repository.delete(1)
-        }.to raise_exception(Elasticsearch::Transport::Transport::Errors::NotFound)
+        }.to raise_exception(Elastic::Transport::Transport::Errors::NotFound)
       end
     end
   end

elasticsearch-persistence/spec/repository_spec.rb

@@ -562,7 +562,7 @@ class RepositoryWithoutDSL
             it 'raises an error' do
               expect {
                 repository.create_index!
-              }.to raise_exception(Elasticsearch::Transport::Transport::Errors::BadRequest)
+              }.to raise_exception(Elastic::Transport::Transport::Errors::BadRequest)
             end
           end
         end