elasticsearch-transport 7.13.3 → 7.14.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a045f07e51e54095cdd4d050a786070b35eadc7356b5167c99da881738cf5607
-  data.tar.gz: 854f2d899cdbbb184ce945a6b6dfa0a1f7f463bcf3d818c4e7f66a28ca81a504
+  metadata.gz: 341409417b3cc66b9ee4cb700fe52dedad30c2278369837bd0c72d1e415b5bb1
+  data.tar.gz: bd9fd4f3852d78bd0e52023e7b4b7a0e6011d3fd1ffe6d204e1ef9778eb68d50
 SHA512:
-  metadata.gz: 89c3b0674a119afb4aa397bacf6282bd301862ca4a5aa107b0789c93493644f678414587dd695e3210fdbe8afaed6bf9db8a10ee1a3597767211afb2fb4d4da4
-  data.tar.gz: 6706d0c3441f9eed32b7e930e2cd808774bb8de1083109a6681a1433929dc407f324e97bdbaf1bf3dce9c452fc527abc3cbd7ccd071cfbff46977a93af31ba5d
+  metadata.gz: 206773e88adf3d19c10405e5729f664c3a90544c2030a432853bc7d2481cfe7d75b50f1f9fb8b5cf3c89b999c3ae6096b269e5b796e0d052535abb58134f74cb
+  data.tar.gz: 91e412682b10b32641f44951e40161e37ffa51d11642707aab7e2dd1e711621cc97a0054adcfb2a9b1994a354e5b6094bf1fe46b8ad2eabe731e9c9f90f4446c

data/Gemfile

@@ -20,16 +20,12 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in elasticsearch-transport.gemspec
 gemspec
 
-if File.exist? File.expand_path('../../elasticsearch-api/elasticsearch-api.gemspec', __FILE__)
-  gem 'elasticsearch-api', path: File.expand_path('../../elasticsearch-api', __FILE__), require: false
+if File.exist? File.expand_path('../elasticsearch-api/elasticsearch-api.gemspec', __dir__)
+  gem 'elasticsearch-api', path: File.expand_path('../elasticsearch-api', __dir__), require: false
 end
 
-if File.exist? File.expand_path('../../elasticsearch-extensions/elasticsearch-extensions.gemspec', __FILE__)
-  gem 'elasticsearch-extensions', path: File.expand_path('../../elasticsearch-extensions', __FILE__), require: false
-end
-
-if File.exist? File.expand_path('../../elasticsearch/elasticsearch.gemspec', __FILE__)
-  gem 'elasticsearch', path: File.expand_path('../../elasticsearch', __FILE__), require: false
+if File.exist? File.expand_path('../elasticsearch/elasticsearch.gemspec', __dir__)
+  gem 'elasticsearch', path: File.expand_path('../elasticsearch', __dir__), require: false
 end
 
 group :development, :test do

data/README.md

@@ -424,10 +424,7 @@ To configure the _Faraday_ instance directly, use a block:
       f.adapter  :patron
     end
 
-You can use any standard Faraday middleware and plugins in the configuration block, for example sign the requests for the [AWS Elasticsearch service](https://aws.amazon.com/elasticsearch-service/). See [the AWS documentation](https://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/es-request-signing.html#es-request-signing-ruby) for an example.
-
-You can also initialize the transport class yourself, and pass it to the client constructor
-as the `transport` argument:
+You can use any standard Faraday middleware and plugins in the configuration block. You can also initialize the transport class yourself, and pass it to the client constructor as the `transport` argument:
 
 ```ruby
 require 'patron'
@@ -561,16 +558,14 @@ Github's pull requests and issues are used to communicate, send bug reports and
 To work on the code, clone and bootstrap the main repository first --
 please see instructions in the main [README](../README.md#development).
 
-To run tests, launch a testing cluster -- again, see instructions
-in the main [README](../README.md#development) -- and use the Rake tasks:
+To run tests, launch a testing cluster and use the Rake tasks:
 
 ```
 time rake test:unit
 time rake test:integration
 ```
 
-Unit tests have to use Ruby 1.8 compatible syntax, integration tests
-can use Ruby 2.x syntax and features.
+Use `COVERAGE=true` before running a test task to check coverage with Simplecov.
 
 ## License
 

data/Rakefile

@@ -27,38 +27,37 @@ require 'rake/testtask'
 require 'rspec/core/rake_task'
 
 namespace :test do
-
-  desc "Wait for Elasticsearch to be in a green state"
+  desc 'Wait for Elasticsearch to be in a green state'
   task :wait_for_green do
     sh '../scripts/wait-cluster.sh'
   end
 
-  task :spec => :wait_for_green
   RSpec::Core::RakeTask.new(:spec)
 
   Rake::TestTask.new(:unit) do |test|
     test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/unit/**/*_test.rb"]
+    test.test_files = FileList['test/unit/**/*_test.rb']
     test.verbose = false
     test.warning = false
   end
 
   Rake::TestTask.new(:integration) do |test|
     test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/integration/**/*_test.rb"]
-    test.deps = [ 'test:wait_for_green', 'test:spec' ]
+    test.test_files = FileList['test/integration/**/*_test.rb']
+    test.deps = ['test:wait_for_green', 'test:spec']
     test.verbose = false
     test.warning = false
   end
 
-  Rake::TestTask.new(:all) do |test|
-    test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/unit/**/*_test.rb", "test/integration/**/*_test.rb"]
+  desc 'Run all tests'
+  task :all do
+    Rake::Task['test:unit'].invoke
+    Rake::Task['test:integration'].invoke
   end
 
   Rake::TestTask.new(:profile) do |test|
     test.libs << 'lib' << 'test'
-    test.test_files = FileList["test/profile/**/*_test.rb"]
+    test.test_files = FileList['test/profile/**/*_test.rb']
   end
 
   namespace :cluster do

data/elasticsearch-transport.gemspec

@@ -47,29 +47,29 @@ Gem::Specification.new do |s|
   s.add_dependency 'multi_json'
   s.add_dependency 'faraday', '~> 1'
 
+  s.add_development_dependency 'ansi'
+  s.add_development_dependency 'bundler'
   s.add_development_dependency 'cane'
-  s.add_development_dependency 'curb'   unless defined? JRUBY_VERSION
+  s.add_development_dependency 'curb' unless defined? JRUBY_VERSION
+  s.add_development_dependency 'elasticsearch', ['>= 7', '< 8.0.0']
   s.add_development_dependency 'elasticsearch-extensions'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'minitest-reporters'
-  s.add_development_dependency 'rake', '~> 13'
-  s.add_development_dependency 'require-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
-  s.add_development_dependency 'ruby-prof'    unless defined?(JRUBY_VERSION) || defined?(Rubinius)
-  s.add_development_dependency 'simplecov', '~> 0.17', '< 0.18'
-  s.add_development_dependency 'simplecov-rcov'
-  s.add_development_dependency 'ansi'
   s.add_development_dependency 'hashie'
   s.add_development_dependency 'httpclient'
-  s.add_development_dependency 'manticore', '~> 0.6' if defined? JRUBY_VERSION
+  s.add_development_dependency 'manticore' if defined? JRUBY_VERSION
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'minitest-reporters'
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'net-http-persistent'
   s.add_development_dependency 'patron' unless defined? JRUBY_VERSION
   s.add_development_dependency 'pry'
+  s.add_development_dependency 'rake', '~> 13'
+  s.add_development_dependency 'require-prof' unless defined?(JRUBY_VERSION) || defined?(Rubinius)
+  s.add_development_dependency 'ruby-prof'    unless defined?(JRUBY_VERSION) || defined?(Rubinius)
   s.add_development_dependency 'shoulda-context'
+  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'test-unit', '~> 2'
   s.add_development_dependency 'typhoeus', '~> 1.4'
   s.add_development_dependency 'yard'
-  s.add_development_dependency 'bundler'
 
   s.description = <<-DESC.gsub(/^    /, '')
     Ruby client for Elasticsearch. See the `elasticsearch` gem for full integration.

data/lib/elasticsearch/transport.rb

@@ -15,35 +15,23 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require "uri"
-require "time"
-require "timeout"
-require "multi_json"
-require "faraday"
+require 'uri'
+require 'time'
+require 'timeout'
+require 'multi_json'
+require 'faraday'
 
-require "elasticsearch/transport/transport/loggable"
-require "elasticsearch/transport/transport/serializer/multi_json"
-require "elasticsearch/transport/transport/sniffer"
-require "elasticsearch/transport/transport/response"
-require "elasticsearch/transport/transport/errors"
-require "elasticsearch/transport/transport/base"
-require "elasticsearch/transport/transport/connections/selector"
-require "elasticsearch/transport/transport/connections/connection"
-require "elasticsearch/transport/transport/connections/collection"
-require "elasticsearch/transport/transport/http/faraday"
-require "elasticsearch/transport/client"
-require "elasticsearch/transport/redacted"
+require 'elasticsearch/transport/transport/loggable'
+require 'elasticsearch/transport/transport/serializer/multi_json'
+require 'elasticsearch/transport/transport/sniffer'
+require 'elasticsearch/transport/transport/response'
+require 'elasticsearch/transport/transport/errors'
+require 'elasticsearch/transport/transport/base'
+require 'elasticsearch/transport/transport/connections/selector'
+require 'elasticsearch/transport/transport/connections/connection'
+require 'elasticsearch/transport/transport/connections/collection'
+require 'elasticsearch/transport/transport/http/faraday'
+require 'elasticsearch/transport/client'
+require 'elasticsearch/transport/redacted'
 
-require "elasticsearch/transport/version"
-
-module Elasticsearch
-  module Client
-
-    # A convenience wrapper for {::Elasticsearch::Transport::Client#initialize}.
-    #
-    def new(arguments={}, &block)
-      Elasticsearch::Transport::Client.new(arguments, &block)
-    end
-    extend self
-  end
-end
+require 'elasticsearch/transport/version'

data/lib/elasticsearch/transport/client.rb

@@ -20,14 +20,13 @@ require 'elasticsearch/transport/meta_header'
 
 module Elasticsearch
   module Transport
-
     # Handles communication with an Elasticsearch cluster.
     #
     # See {file:README.md README} for usage and code examples.
     #
     class Client
       include MetaHeader
-      DEFAULT_TRANSPORT_CLASS  = Transport::HTTP::Faraday
+      DEFAULT_TRANSPORT_CLASS = Transport::HTTP::Faraday
 
       DEFAULT_LOGGER = lambda do
         require 'logger'

data/lib/elasticsearch/transport/transport/errors.rb

@@ -64,6 +64,7 @@ module Elasticsearch
         418 => 'ImATeapot',
         421 => 'TooManyConnectionsFromThisIP',
         426 => 'UpgradeRequired',
+        429 => 'TooManyRequests',
         450 => 'BlockedByWindowsParentalControls',
         494 => 'RequestHeaderTooLarge',
         497 => 'HTTPToHTTPS',

data/lib/elasticsearch/transport/transport/http/curb.rb

@@ -37,33 +37,44 @@ module Elasticsearch
               connection.connection.url = connection.full_url(path, params)
 
               case method
-                when 'HEAD'
-                  connection.connection.set :nobody, true
-                when 'GET', 'POST', 'PUT', 'DELETE'
-                  connection.connection.set :nobody, false
-
-                  connection.connection.put_data = __convert_to_json(body) if body
-
-                  if headers
-                    if connection.connection.headers
-                      connection.connection.headers.merge!(headers)
-                    else
-                      connection.connection.headers = headers
-                    end
+              when 'HEAD'
+                connection.connection.set :nobody, true
+              when 'GET', 'POST', 'PUT', 'DELETE'
+                connection.connection.set :nobody, false
+                connection.connection.put_data = __convert_to_json(body) if body
+                if headers
+                  if connection.connection.headers
+                    connection.connection.headers.merge!(headers)
+                  else
+                    connection.connection.headers = headers
                   end
-
-                else raise ArgumentError, "Unsupported HTTP method: #{method}"
+                end
+              else
+                raise ArgumentError, "Unsupported HTTP method: #{method}"
               end
 
               connection.connection.http(method.to_sym)
 
-              response_headers = {}
-              response_headers['content-type'] = 'application/json' if connection.connection.header_str =~ /\/json/
+              Response.new(
+                connection.connection.response_code,
+                decompress_response(connection.connection.body_str),
+                headers(connection)
+              )
+            end
+          end
 
-              Response.new connection.connection.response_code,
-                           decompress_response(connection.connection.body_str),
-                           response_headers
+          def headers(connection)
+            headers_string = connection.connection.header_str
+            return nil if headers_string.nil?
+
+            response_headers = headers_string&.split(/\\r\\n|\r\n/).reject(&:empty?)
+            response_headers.shift # Removes HTTP status string
+            processed_header = response_headers.flat_map { |s| s.scan(/^(\S+): (.+)/) }
+            headers_hash = Hash[processed_header].transform_keys(&:downcase)
+            if headers_hash['content-type']&.match?(/application\/json/)
+              headers_hash['content-type'] = 'application/json'
             end
+            headers_hash
           end
 
           # Builds and returns a connection
@@ -72,9 +83,8 @@ module Elasticsearch
           #
           def __build_connection(host, options={}, block=nil)
             client = ::Curl::Easy.new
-
             apply_headers(client, options)
-            client.url     = __full_url(host)
+            client.url = __full_url(host)
 
             if host[:user]
               client.http_auth_types = host[:auth_type] || :basic
@@ -106,13 +116,13 @@ module Elasticsearch
 
           def user_agent_header(client)
             @user_agent ||= begin
-              meta = ["RUBY_VERSION: #{RUBY_VERSION}"]
-              if RbConfig::CONFIG && RbConfig::CONFIG['host_os']
-                meta << "#{RbConfig::CONFIG['host_os'].split('_').first[/[a-z]+/i].downcase} #{RbConfig::CONFIG['target_cpu']}"
-              end
-              meta << "Curb #{Curl::CURB_VERSION}"
-              "elasticsearch-ruby/#{VERSION} (#{meta.join('; ')})"
-            end
+                              meta = ["RUBY_VERSION: #{RUBY_VERSION}"]
+                              if RbConfig::CONFIG && RbConfig::CONFIG['host_os']
+                                meta << "#{RbConfig::CONFIG['host_os'].split('_').first[/[a-z]+/i].downcase} #{RbConfig::CONFIG['target_cpu']}"
+                              end
+                              meta << "Curb #{Curl::CURB_VERSION}"
+                              "elasticsearch-ruby/#{VERSION} (#{meta.join('; ')})"
+                            end
           end
         end
       end

data/lib/elasticsearch/transport/transport/http/faraday.rb

@@ -19,7 +19,6 @@ module Elasticsearch
   module Transport
     module Transport
       module HTTP
-
         # The default transport implementation, using the [_Faraday_](https://rubygems.org/gems/faraday)
         # library for abstracting the HTTP client.
         #
@@ -45,10 +44,12 @@ module Elasticsearch
                           headers
                         end
 
-              response = connection.connection.run_request(method.downcase.to_sym,
-                                                           url,
-                                                           ( body ? __convert_to_json(body) : nil ),
-                                                           headers)
+              response = connection.connection.run_request(
+                method.downcase.to_sym,
+                url,
+                (body ? __convert_to_json(body) : nil),
+                headers
+              )
 
               Response.new response.status, decompress_response(response.body), response.headers
             end

data/lib/elasticsearch/transport/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module Transport
-    VERSION = '7.13.3'.freeze
+    VERSION = '7.14.0.pre'.freeze
   end
 end

data/spec/elasticsearch/transport/base_spec.rb

@@ -32,14 +32,14 @@ describe Elasticsearch::Transport::Transport::Base do
         expect(logger).not_to receive(:error).with(/secret_password/)
 
         expect {
-          client.cluster.stats
+          client.perform_request('GET', '_cluster/stats')
         }.to raise_exception(Faraday::ConnectionFailed)
       end
 
       it 'replaces the password with the string \'REDACTED\'' do
         expect(logger).to receive(:error).with(/REDACTED/)
         expect {
-          client.cluster.stats
+          client.perform_request('GET', '_cluster/stats')
         }.to raise_exception(Faraday::ConnectionFailed)
       end
     end
@@ -65,7 +65,27 @@ describe Elasticsearch::Transport::Transport::Base do
         }
       end
 
-      it_behaves_like 'a redacted string'
+      if jruby?
+        let(:client) { Elasticsearch::Transport::Client.new(arguments) }
+        let(:logger) { double('logger', fatal?: true, fatal: '') }
+
+        it 'does not include the password in the logged string' do
+          expect(logger).not_to receive(:fatal).with(/secret_password/)
+
+          expect {
+            client.perform_request('GET', '_cluster/stats')
+          }.to raise_exception(Faraday::SSLError)
+        end
+
+        it 'replaces the password with the string \'REDACTED\'' do
+          expect(logger).to receive(:fatal).with(/REDACTED/)
+          expect {
+            client.perform_request('GET', '_cluster/stats')
+          }.to raise_exception(Faraday::SSLError)
+        end
+      else
+        it_behaves_like 'a redacted string'
+      end
     end
 
     context 'when the user and password are provided in the URI object' do
@@ -75,8 +95,27 @@ describe Elasticsearch::Transport::Transport::Base do
           logger: logger
         }
       end
-
-      it_behaves_like 'a redacted string'
+      if jruby?
+        let(:client) { Elasticsearch::Transport::Client.new(arguments) }
+        let(:logger) { double('logger', fatal?: true, fatal: '') }
+
+        it 'does not include the password in the logged string' do
+          expect(logger).not_to receive(:fatal).with(/secret_password/)
+
+          expect {
+            client.perform_request('GET', '_cluster/stats')
+          }.to raise_exception(Faraday::SSLError)
+        end
+
+        it 'replaces the password with the string \'REDACTED\'' do
+          expect(logger).to receive(:fatal).with(/REDACTED/)
+          expect {
+            client.perform_request('GET', '_cluster/stats')
+          }.to raise_exception(Faraday::SSLError)
+        end
+      else
+        it_behaves_like 'a redacted string'
+      end
     end
   end
 
@@ -94,7 +133,7 @@ describe Elasticsearch::Transport::Transport::Base do
     end
 
     it 'raises an exception' do
-      expect { client.info }.to raise_exception(Faraday::ConnectionFailed)
+      expect { client.perform_request('GET', '/') }.to raise_exception(Faraday::ConnectionFailed)
     end
   end
 
@@ -129,7 +168,7 @@ describe Elasticsearch::Transport::Transport::Base do
 
       let(:arguments) do
         {
-          hosts: ['http://localhost:9250'],
+          hosts: ELASTICSEARCH_HOSTS,
           retry_on_status: ['404']
         }
       end

data/spec/elasticsearch/transport/client_spec.rb

@@ -24,10 +24,6 @@ describe Elasticsearch::Transport::Client do
     end
   end
 
-  it 'is aliased as Elasticsearch::Client' do
-    expect(Elasticsearch::Client.new).to be_a(described_class)
-  end
-
   it 'has a default transport' do
     expect(client.transport).to be_a(Elasticsearch::Transport::Client::DEFAULT_TRANSPORT_CLASS)
   end
@@ -231,13 +227,14 @@ describe Elasticsearch::Transport::Client do
 
   describe 'adapter' do
     context 'when no adapter is specified' do
-      let(:adapter) do
-        client.transport.connections.all.first.connection.builder.adapter
-      end
+      fork do
+        let(:client) { described_class.new }
+        let(:adapter) { client.transport.connections.all.first.connection.builder.adapter }
 
-      it 'uses Faraday NetHttp' do
-        expect(adapter).to eq Faraday::Adapter::NetHttp
-      end
+        it 'uses Faraday NetHttp' do
+          expect(adapter).to eq Faraday::Adapter::NetHttp
+        end
+      end unless jruby?
     end
 
     context 'when the adapter is patron' do
@@ -1416,14 +1413,14 @@ describe Elasticsearch::Transport::Client do
         let(:client) { described_class.new(host: hosts) }
 
         it 'doesnae raise an ArgumentError' do
-          expect { client.search(opaque_id: 'no_error') }.not_to raise_error
+          expect { client.perform_request('GET', '_search', opaque_id: 'no_error') }.not_to raise_error
         end
 
         it 'uses X-Opaque-Id in the header' do
           allow(client).to receive(:perform_request) { OpenStruct.new(body: '') }
-          expect { client.search(opaque_id: 'opaque_id') }.not_to raise_error
+          expect { client.perform_request('GET', '_search', {}, nil, opaque_id: 'opaque_id') }.not_to raise_error
           expect(client).to have_received(:perform_request)
-                              .with('GET', '_search', { opaque_id: 'opaque_id' }, nil, {})
+                              .with('GET', '_search', {}, nil, { opaque_id: 'opaque_id' })
         end
       end
     end
@@ -1500,7 +1497,7 @@ describe Elasticsearch::Transport::Client do
 
       it 'performs the request with the header' do
         allow(client).to receive(:perform_request) { OpenStruct.new(body: '') }
-        expect { client.search(headers: headers) }.not_to raise_error
+        expect { client.perform_request('GET', '_search', {}, nil, headers) }.not_to raise_error
         expect(client).to have_received(:perform_request)
                             .with('GET', '_search', {}, nil, headers)
       end
@@ -1514,7 +1511,7 @@ describe Elasticsearch::Transport::Client do
         )
       end
       let(:instance_headers) { { set_in_instantiation: 'header value' } }
-      let(:param_headers) {{'user-agent' => 'My Ruby Tests', 'set-on-method-call' => 'header value'}}
+      let(:param_headers) { {'user-agent' => 'My Ruby Tests', 'set-on-method-call' => 'header value'} }
 
       it 'performs the request with the header' do
         expected_headers = client.transport.connections.connections.first.connection.headers.merge(param_headers)
@@ -1523,7 +1520,7 @@ describe Elasticsearch::Transport::Client do
           .to receive(:run_request)
                 .with(:get, "http://#{hosts[0]}/_search", nil, expected_headers) { OpenStruct.new(body: '')}
 
-        client.search(headers: param_headers)
+        client.perform_request('GET', '_search', {}, nil, param_headers)
       end
     end
   end
@@ -1560,7 +1557,6 @@ describe Elasticsearch::Transport::Client do
     end
 
     context 'when a request is made' do
-
       let!(:response) do
         client.perform_request('GET', '_cluster/health')
       end
@@ -1571,9 +1567,7 @@ describe Elasticsearch::Transport::Client do
     end
 
     describe '#initialize' do
-
       context 'when options are specified' do
-
         let(:transport_options) do
           { headers: { accept: 'application/yaml', content_type: 'application/yaml' } }
         end
@@ -1589,9 +1583,8 @@ describe Elasticsearch::Transport::Client do
       end
 
       context 'when a block is provided' do
-
         let(:client) do
-          Elasticsearch::Client.new(host: ELASTICSEARCH_HOSTS.first, logger: logger) do |client|
+          described_class.new(host: ELASTICSEARCH_HOSTS.first, logger: logger) do |client|
             client.headers['Accept'] = 'application/yaml'
           end
         end
@@ -1607,7 +1600,7 @@ describe Elasticsearch::Transport::Client do
 
         context 'when the Faraday adapter is set in the block' do
           let(:client) do
-            Elasticsearch::Client.new(host: ELASTICSEARCH_HOSTS.first, logger: logger) do |client|
+            described_class.new(host: ELASTICSEARCH_HOSTS.first, logger: logger) do |client|
               client.adapter(:net_http_persistent)
             end
           end
@@ -1821,11 +1814,12 @@ describe Elasticsearch::Transport::Client do
       end
 
       context 'when using Curb as the transport', unless: jruby? do
-
         let(:client) do
-          described_class.new(hosts: ELASTICSEARCH_HOSTS,
-                              compression: true,
-                              transport_class: Elasticsearch::Transport::Transport::HTTP::Curb)
+          described_class.new(
+            hosts: ELASTICSEARCH_HOSTS,
+            compression: true,
+            transport_class: Elasticsearch::Transport::Transport::HTTP::Curb
+          )
         end
 
         it 'compresses the request and decompresses the response' do
@@ -1842,7 +1836,6 @@ describe Elasticsearch::Transport::Client do
       end
 
       context 'when using Manticore as the transport', if: jruby? do
-
         let(:client) do
           described_class.new(hosts: ELASTICSEARCH_HOSTS,
                               compression: true,
@@ -1856,9 +1849,7 @@ describe Elasticsearch::Transport::Client do
     end
 
     describe '#perform_request' do
-
       context 'when a request is made' do
-
         before do
           client.perform_request('DELETE', '_all')
           client.perform_request('DELETE', 'myindex') rescue
@@ -1881,7 +1872,6 @@ describe Elasticsearch::Transport::Client do
       end
 
       context 'when an invalid url is specified' do
-
         it 'raises an exception' do
           expect {
             client.perform_request('GET', 'myindex/mydoc/1?routing=FOOBARBAZ')
@@ -1890,7 +1880,6 @@ describe Elasticsearch::Transport::Client do
       end
 
       context 'when the \'ignore\' parameter is specified' do
-
         let(:response) do
           client.perform_request('PUT', '_foobar', ignore: 400)
         end
@@ -1927,7 +1916,7 @@ describe Elasticsearch::Transport::Client do
           end
 
           let(:node_names) do
-            client.nodes.stats['nodes'].collect do |name, stats|
+            client.perform_request('GET', '_nodes/stats').body('nodes').collect do |name, stats|
               stats['name']
             end
           end
@@ -1946,7 +1935,6 @@ describe Elasticsearch::Transport::Client do
       end
 
       context 'when patron is used as an adapter', unless: jruby? do
-
         before do
           require 'patron'
         end

data/spec/elasticsearch/transport/meta_header_spec.rb

@@ -16,6 +16,7 @@
 # under the License.
 
 require 'spec_helper'
+require 'elasticsearch'
 
 describe Elasticsearch::Transport::Client do
   context 'meta-header' do
@@ -109,11 +110,17 @@ describe Elasticsearch::Transport::Client do
         let(:adapter) { :net_http_persistent }
 
         it 'sets adapter in the meta header version to 0 when not loaded' do
-          fork {
-            expect(headers['x-elastic-client-meta']).to match(regexp)
-            meta = "#{meta_header},np=0"
-            expect(headers).to include('x-elastic-client-meta' => meta)
-          }
+          was_required = defined?(Net::HTTP::Persistent)
+          if was_required
+            @klass = Net::HTTP::Persistent.clone
+            Net::HTTP.send(:remove_const, :Persistent)
+          end
+
+          expect(headers['x-elastic-client-meta']).to match(regexp)
+          meta = "#{meta_header},np=0"
+          expect(headers).to include('x-elastic-client-meta' => meta)
+
+          Net::HTTP::Persistent = @klass if was_required
         end unless jruby?
 
         it 'sets adapter in the meta header' do
@@ -128,15 +135,22 @@ describe Elasticsearch::Transport::Client do
         let(:adapter) { :httpclient }
 
         it 'sets adapter in the meta header version to 0 when not loaded' do
-          fork {
-            expect(headers['x-elastic-client-meta']).to match(regexp)
-            meta = "#{meta_header},hc=0"
-            expect(headers).to include('x-elastic-client-meta' => meta)
-          }
+          was_required = defined?(HTTPClient)
+          if was_required
+            @klass = HTTPClient.clone
+            Object.send(:remove_const, :HTTPClient)
+          end
+
+          expect(headers['x-elastic-client-meta']).to match(regexp)
+          meta = "#{meta_header},hc=0"
+          expect(headers).to include('x-elastic-client-meta' => meta)
+
+          HTTPClient = @klass if was_required
         end unless jruby?
 
         it 'sets adapter in the meta header' do
           require 'httpclient'
+
           expect(headers['x-elastic-client-meta']).to match(regexp)
           meta = "#{meta_header},hc=#{HTTPClient::VERSION}"
           expect(headers).to include('x-elastic-client-meta' => meta)
@@ -147,11 +161,17 @@ describe Elasticsearch::Transport::Client do
         let(:adapter) { :typhoeus }
 
         it 'sets adapter in the meta header version to 0 when not loaded' do
-          fork {
-            expect(headers['x-elastic-client-meta']).to match(regexp)
-            meta = "#{meta_header},ty=0"
-            expect(headers).to include('x-elastic-client-meta' => meta)
-          }
+          was_required = defined?(Typhoeus)
+          if was_required
+            @klass = Typhoeus.clone
+            Object.send(:remove_const, :Typhoeus)
+          end
+
+          expect(headers['x-elastic-client-meta']).to match(regexp)
+          meta = "#{meta_header},ty=0"
+          expect(headers).to include('x-elastic-client-meta' => meta)
+
+          Typhoeus = @klass if was_required
         end unless jruby?
 
         it 'sets adapter in the meta header' do
@@ -167,11 +187,17 @@ describe Elasticsearch::Transport::Client do
 
         context 'using patron without requiring it' do
           it 'sets adapter in the meta header version to 0 when not loaded' do
-            fork {
-              expect(headers['x-elastic-client-meta']).to match(regexp)
-              meta = "#{meta_header},pt=0"
-              expect(headers).to include('x-elastic-client-meta' => meta)
-            }
+            was_required = defined?(Patron)
+            if was_required
+              @klass = Patron.clone
+              Object.send(:remove_const, :Patron)
+            end
+
+            expect(headers['x-elastic-client-meta']).to match(regexp)
+            meta = "#{meta_header},pt=0"
+            expect(headers).to include('x-elastic-client-meta' => meta)
+
+            Patron = @klass if was_required
           end
         end
 
@@ -206,7 +232,9 @@ describe Elasticsearch::Transport::Client do
     if defined?(JRUBY_VERSION)
       context 'when using manticore' do
         let(:client) do
-          Elasticsearch::Client.new(transport_class: Elasticsearch::Transport::Transport::HTTP::Manticore)
+          described_class.new(transport_class: Elasticsearch::Transport::Transport::HTTP::Manticore).tap do |client|
+            client.instance_variable_set('@verified', true)
+          end
         end
         let(:subject) { client.transport.connections.first.connection.instance_variable_get("@options")[:headers]}
 
@@ -218,7 +246,9 @@ describe Elasticsearch::Transport::Client do
     else
       context 'when using curb' do
         let(:client) do
-          Elasticsearch::Client.new(transport_class: Elasticsearch::Transport::Transport::HTTP::Curb)
+          described_class.new(transport_class: Elasticsearch::Transport::Transport::HTTP::Curb).tap do |client|
+            client.instance_variable_set('@verified', true)
+          end
         end
 
         it 'sets curb in the metaheader' do
@@ -229,12 +259,14 @@ describe Elasticsearch::Transport::Client do
     end
 
     context 'when using custom transport implementation' do
-      class MyTransport
-        include Elasticsearch::Transport::Transport::Base
-        def initialize(args); end
+      let(:transport_class) do
+        Class.new do
+          def initialize(args)
+          end
+        end
       end
-      let(:client) { Elasticsearch::Client.new(transport_class: MyTransport) }
-      let(:subject){ client.instance_variable_get("@arguments")[:transport_options][:headers] }
+      let(:client) { Elasticsearch::Transport::Client.new(transport_class: transport_class) }
+      let(:subject) { client.instance_variable_get('@arguments')[:transport_options][:headers] }
       let(:meta_header) do
         if jruby?
           "es=#{meta_version},rb=#{RUBY_VERSION},t=#{Elasticsearch::Transport::VERSION},jv=#{ENV_JAVA['java.version']},jr=#{JRUBY_VERSION}"
@@ -254,7 +286,11 @@ describe Elasticsearch::Transport::Client do
         stub_const('Elastic::ELASTICSEARCH_SERVICE_VERSION', [:ent, '8.0.0'])
       end
 
-      let(:client) { Elasticsearch::Client.new }
+      let(:client) do
+        described_class.new.tap do |client|
+          client.instance_variable_set('@verified', true)
+        end
+      end
 
       it 'sets the service version in the metaheader' do
         expect(subject['x-elastic-client-meta']).to match(regexp)

data/spec/spec_helper.rb

@@ -14,8 +14,11 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+if ENV['COVERAGE'] && ENV['CI'].nil?
+  require 'simplecov'
+  SimpleCov.start { add_filter %r{^/test|spec/} }
+end
 
-require 'elasticsearch'
 require 'elasticsearch-transport'
 require 'logger'
 require 'ansi/code'
@@ -32,10 +35,12 @@ end
 # The hosts to use for creating a elasticsearch client.
 #
 # @since 7.0.0
-ELASTICSEARCH_HOSTS = if hosts = ENV['TEST_ES_SERVER'] || ENV['ELASTICSEARCH_HOSTS']
+ELASTICSEARCH_HOSTS = if (hosts = ENV['TEST_ES_SERVER'] || ENV['ELASTICSEARCH_HOSTS'])
                         hosts.split(',').map do |host|
                           /(http\:\/\/)?(\S+)/.match(host)[2]
                         end
+                      else
+                        ['localhost:9200']
                       end.freeze
 
 TEST_HOST, TEST_PORT = ELASTICSEARCH_HOSTS.first.split(':') if ELASTICSEARCH_HOSTS
@@ -55,7 +60,8 @@ end
 #
 # @since 7.0.0
 def node_names
-  $node_names ||= default_client.nodes.stats['nodes'].collect do |name, stats|
+  node_stats = default_client.perform_request('GET', '_nodes/stats').body
+  $node_names ||= node_stats['nodes'].collect do |name, stats|
     stats['name']
   end
 end
@@ -70,9 +76,7 @@ def default_client
 end
 
 module Config
-
   def self.included(context)
-
     # Get the hosts to use to connect an elasticsearch client.
     #
     # @since 7.0.0

data/test/test_helper.rb

@@ -20,30 +20,17 @@ ELASTICSEARCH_HOSTS = if hosts = ENV['TEST_ES_SERVER'] || ENV['ELASTICSEARCH_HOS
                         hosts.split(',').map do |host|
                           /(http\:\/\/)?(\S+)/.match(host)[2]
                         end
+                      else
+                        ['localhost:9200']
                       end.freeze
 
 TEST_HOST, TEST_PORT = ELASTICSEARCH_HOSTS.first.split(':') if ELASTICSEARCH_HOSTS
 
-RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
 JRUBY    = defined?(JRUBY_VERSION)
 
-if RUBY_1_8 and not ENV['BUNDLE_GEMFILE']
-  require 'rubygems'
-  gem 'test-unit'
-end
-
-require 'rubygems' if RUBY_1_8
-
-if ENV['COVERAGE'] && ENV['CI'].nil? && !RUBY_1_8
+if ENV['COVERAGE']
   require 'simplecov'
-  SimpleCov.start { add_filter "/test|test_/" }
-end
-
-if ENV['CI'] && !RUBY_1_8
-  require 'simplecov'
-  require 'simplecov-rcov'
-  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-  SimpleCov.start { add_filter "/test|test_" }
+  SimpleCov.start { add_filter %r{^/test/} }
 end
 
 # Register `at_exit` handler for integration tests shutdown.
@@ -52,7 +39,6 @@ if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
   at_exit { Elasticsearch::Test::IntegrationTestCase.__run_at_exit_hooks }
 end
 
-require 'test/unit' if RUBY_1_8
 require 'minitest/autorun'
 require 'minitest/reporters'
 require 'shoulda/context'
@@ -119,8 +105,7 @@ module Elasticsearch
       extend Elasticsearch::Extensions::Test::StartupShutdown
 
       shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? && Elasticsearch::Extensions::Test::Cluster.running? }
-      context "IntegrationTest" do; should "noop on Ruby 1.8" do; end; end if RUBY_1_8
-    end if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
+    end
   end
 
   module Test
@@ -129,7 +114,6 @@ module Elasticsearch
       extend Elasticsearch::Extensions::Test::Profiling
 
       shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? && Elasticsearch::Extensions::Test::Cluster.running? }
-      context "IntegrationTest" do; should "noop on Ruby 1.8" do; end; end if RUBY_1_8
-    end unless RUBY_1_8 || JRUBY
+    end unless JRUBY
   end
 end

data/test/unit/response_test.rb

@@ -26,7 +26,7 @@ class Elasticsearch::Transport::Transport::ResponseTest < Minitest::Test
 
       response = Elasticsearch::Transport::Transport::Response.new 200, body
       assert_equal 'UTF-8', response.body.encoding.name
-    end unless RUBY_1_8
+    end
 
   end
 end

data/test/unit/transport_base_test.rb

@@ -263,6 +263,15 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
       end
     end
 
+    should 'raise TooManyRequestsError on 429' do
+      @transport.expects(:get_connection).returns(stub_everything :failures => 1)
+      assert_raise Elasticsearch::Transport::Transport::Errors::TooManyRequests do
+        @transport.perform_request 'GET', '/' do
+          Elasticsearch::Transport::Transport::Response.new 429, 'ERROR'
+        end
+      end
+    end
+
     should "not raise an error when the :ignore argument has been passed" do
       @transport.stubs(:get_connection).returns(stub_everything :failures => 1)
 
@@ -310,7 +319,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
       @transport.perform_request('GET', '/', &@block)
       assert_equal 2, @transport.counter
     end
-  end unless RUBY_1_8
+  end
 
   context "performing a request with retry on connection failures" do
     setup do
@@ -344,7 +353,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
         @transport.perform_request('GET', '/', &@block)
       end
     end
-  end unless RUBY_1_8
+  end
 
   context "performing a request with retry on status" do
     setup do
@@ -391,7 +400,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
         @transport.perform_request('GET', '/', &@block)
       end
     end
-  end  unless RUBY_1_8
+  end
 
   context "logging" do
     setup do
@@ -447,7 +456,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
       assert_raise Elasticsearch::Transport::Transport::Errors::InternalServerError do
         @transport.perform_request('POST', '_search', &@block)
       end
-    end unless RUBY_1_8
+    end
 
     should "not log a failed Elasticsearch request as fatal" do
       @block = Proc.new { |c, u| puts "ERROR" }
@@ -458,7 +467,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
 
       # No `BadRequest` error
       @transport.perform_request('POST', '_search', :ignore => 500, &@block)
-    end unless RUBY_1_8
+    end
 
     should "log and re-raise a Ruby exception" do
       @block = Proc.new { |c, u| puts "ERROR" }
@@ -468,7 +477,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
       @transport.logger.expects(:fatal)
 
       assert_raise(Exception) { @transport.perform_request('POST', '_search', &@block) }
-    end unless RUBY_1_8
+    end
   end
 
   context "tracing" do
@@ -522,7 +531,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
       assert_raise Elasticsearch::Transport::Transport::Errors::InternalServerError do
         @transport.perform_request('POST', '_search', &@block)
       end
-    end unless RUBY_1_8
+    end
 
   end
 

data/test/unit/transport_curb_test.rb

@@ -84,7 +84,6 @@ else
         @transport.connections.first.connection.expects(:http).with(:GET).returns(stub_everything)
         @transport.connections.first.connection.expects(:body_str).returns('{"foo":"bar"}')
         @transport.connections.first.connection.expects(:header_str).returns('HTTP/1.1 200 OK\r\nContent-Type: application/json; charset=UTF-8\r\nContent-Length: 311\r\n\r\n')
-
         response = @transport.perform_request 'GET', '/'
 
         assert_equal 'application/json', response.headers['content-type']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 7.13.3
+  version: 7.14.0.pre
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: elasticsearch-extensions
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,35 +95,41 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: elasticsearch-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: require-prof
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,27 +157,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.17'
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -185,7 +185,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ansi
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -199,7 +199,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -213,7 +213,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: patron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -227,7 +227,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -241,7 +241,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-http-persistent
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13'
+- !ruby/object:Gem::Dependency
+  name: require-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -255,7 +269,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: patron
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -269,7 +283,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -283,7 +297,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-context
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -338,20 +352,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 'Ruby client for Elasticsearch. See the `elasticsearch` gem for full
   integration.
 
@@ -425,9 +425,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.15
 signing_key: