elastic-transport 8.1.0.pre2 → 8.1.1

data/test/integration/transport_test.rb

@@ -18,8 +18,9 @@
 require 'test_helper'
 
 class Elastic::Transport::ClientIntegrationTest < Minitest::Test
-  context 'Transport' do
+  context "Transport" do
     setup do
+      begin; Object.send(:remove_const, :Patron);   rescue NameError; end
       uri = URI(HOST)
       @host = {
         host: uri.host,
@@ -29,108 +30,32 @@ class Elastic::Transport::ClientIntegrationTest < Minitest::Test
       }
     end
 
-    should 'use the default Faraday adapter' do
-      transport = Elastic::Transport::Transport::HTTP::Faraday.new(hosts: [@host]) do |f|
-        f.response :logger
-      end
-
-      client = Elastic::Transport::Client.new(transport: transport)
-      assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::NetHttp)
-      client.perform_request 'GET', ''
-    end
-
-    unless jruby?
-      should 'allow to customize the Faraday adapter to Typhoeus' do
-        if is_faraday_v2?
-          require 'faraday/typhoeus'
-        else
-          require 'typhoeus'
-        end
-
-        transport = Elastic::Transport::Transport::HTTP::Faraday.new(hosts: [@host]) do |f|
-          f.response :logger
-          f.adapter  :typhoeus
-        end
-
-        client = Elastic::Transport::Client.new(transport: transport)
-        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::Typhoeus)
-        client.perform_request 'GET', ''
-      end
-
-      should 'use the Curb client' do
-        require 'curb'
-        require 'elastic/transport/transport/http/curb'
-
-        transport = Elastic::Transport::Transport::HTTP::Curb.new(hosts: [@host]) do |curl|
-          curl.verbose = true
-        end
-
-        client = Elastic::Transport::Client.new(transport: transport)
-        assert_equal(client.transport.class, Elastic::Transport::Transport::HTTP::Curb)
-        client.perform_request 'GET', ''
-      end
-
-      should 'deserialize JSON responses in the Curb client' do
-        require 'curb'
-        require 'elastic/transport/transport/http/curb'
-
-        transport = Elastic::Transport::Transport::HTTP::Curb.new(hosts: [@host]) do |curl|
-          curl.verbose = true
-        end
-
-        client = Elastic::Transport::Client.new(transport: transport)
-        response = client.perform_request 'GET', ''
-
-        assert_respond_to(response.body, :to_hash)
-        assert_not_nil response.body['name']
-        assert_equal 'application/json', response.headers['content-type']
-        assert_equal 'Elasticsearch', response.headers['x-elastic-product']
-      end
-
-      should 'allow to customize the Faraday adapter to Patron' do
-        if is_faraday_v2?
-          require 'faraday/patron'
-        else
-          require 'patron'
-        end
-        transport = Elastic::Transport::Transport::HTTP::Faraday.new(hosts: [@host]) do |f|
-          f.response :logger
-          f.adapter  :patron
-        end
-
-        client = Elastic::Transport::Client.new(transport: transport)
-        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::Patron)
-        client.perform_request 'GET', ''
-      end
-    end
-
-    should 'allow to customize the Faraday adapter to NetHttpPersistent' do
-      require 'faraday/net_http_persistent'
+    should "allow to customize the Faraday adapter to Typhoeus" do
+      require 'typhoeus'
+      require 'typhoeus/adapters/faraday'
 
       transport = Elastic::Transport::Transport::HTTP::Faraday.new(hosts: [@host]) do |f|
         f.response :logger
-        f.adapter  :net_http_persistent
+        f.adapter  :typhoeus
       end
 
       client = Elastic::Transport::Client.new(transport: transport)
-      assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::NetHttpPersistent)
       client.perform_request 'GET', ''
-    end
+    end unless jruby?
 
-    should 'allow to customize the Faraday adapter to HTTPClient' do
-      require 'faraday/httpclient'
+    should "allow to customize the Faraday adapter to NetHttpPersistent" do
+      require 'net/http/persistent'
 
       transport = Elastic::Transport::Transport::HTTP::Faraday.new(hosts: [@host]) do |f|
         f.response :logger
-        f.adapter  :httpclient
+        f.adapter  :net_http_persistent
       end
 
       client = Elastic::Transport::Client.new(transport: transport)
-      assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::HTTPClient)
       client.perform_request 'GET', ''
     end
 
-    should 'allow to define connection parameters and pass them' do
+    should "allow to define connection parameters and pass them" do
       transport = Elastic::Transport::Transport::HTTP::Faraday.new(
         hosts: [@host],
         options: { transport_options: { params: { format: 'yaml' } } }
@@ -138,7 +63,36 @@ class Elastic::Transport::ClientIntegrationTest < Minitest::Test
 
       client = Elastic::Transport::Client.new transport: transport
       response = client.perform_request 'GET', ''
+
       assert response.body.start_with?("---\n"), "Response body should be YAML: #{response.body.inspect}"
     end
+
+    should "use the Curb client" do
+      require 'curb'
+      require 'elastic/transport/transport/http/curb'
+
+      transport = Elastic::Transport::Transport::HTTP::Curb.new(hosts: [@host]) do |curl|
+        curl.verbose = true
+      end
+
+      client = Elastic::Transport::Client.new(transport: transport)
+      client.perform_request 'GET', ''
+    end unless JRUBY
+
+    should "deserialize JSON responses in the Curb client" do
+      require 'curb'
+      require 'elastic/transport/transport/http/curb'
+
+      transport = Elastic::Transport::Transport::HTTP::Curb.new(hosts: [@host]) do |curl|
+        curl.verbose = true
+      end
+
+      client = Elastic::Transport::Client.new(transport: transport)
+      response = client.perform_request 'GET', ''
+
+      assert_respond_to(response.body, :to_hash)
+      assert_not_nil response.body['name']
+      assert_equal 'application/json', response.headers['content-type']
+    end unless jruby?
   end
 end

data/test/test_helper.rb

@@ -14,7 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-require 'uri'
 
 password = ENV['ELASTIC_PASSWORD'] || 'changeme'
 host = ENV['TEST_ES_SERVER'] || 'http://localhost:9200'
@@ -30,16 +29,17 @@ if ENV['COVERAGE']
   SimpleCov.start { add_filter %r{^/test/} }
 end
 
-require 'ansi/code'
 require 'minitest/autorun'
 require 'minitest/reporters'
-require 'mocha/minitest'
 require 'shoulda/context'
+require 'mocha/minitest'
+require 'ansi/code'
 
+require 'require-prof' if ENV["REQUIRE_PROF"]
 require 'elastic-transport'
-require 'hashie'
 require 'logger'
-require 'require-prof' if ENV["REQUIRE_PROF"]
+
+require 'hashie'
 
 RequireProf.print_timing_infos if ENV["REQUIRE_PROF"]
 
@@ -80,8 +80,4 @@ module Minitest
   end
 end
 
-def is_faraday_v2?
-  Gem::Version.new(Faraday::VERSION) >= Gem::Version.new(2)
-end
-
 Minitest::Reporters.use! FixedMinitestSpecReporter.new

data/test/unit/transport_base_test.rb

@@ -255,10 +255,9 @@ class Elastic::Transport::Transport::BaseTest < Minitest::Test
     should "raise an error on connection failure" do
       @transport.expects(:get_connection).returns(stub_everything :failures => 1)
 
-      # `block.expects(:call).raises(::Errno::ECONNREFUSED)` fails on Ruby 1.8
-      block = lambda { |a,b| raise ::Errno::ECONNREFUSED }
+      block = lambda { |a,b| raise Elastic::Transport::Transport::Error }
 
-      assert_raise ::Errno::ECONNREFUSED do
+      assert_raise Elastic::Transport::Transport::Error do
         @transport.perform_request 'GET', '/', &block
       end
     end
@@ -291,11 +290,11 @@ class Elastic::Transport::Transport::BaseTest < Minitest::Test
       c = stub_everything :failures => 1
       @transport.expects(:get_connection).returns(c)
 
-      block = lambda { |a,b| raise ::Errno::ECONNREFUSED }
+      block = lambda { |a, b| raise Errno::ECONNREFUSED }
 
       c.expects(:dead!)
 
-      assert_raise( ::Errno::ECONNREFUSED ) { @transport.perform_request 'GET', '/', &block }
+      assert_raise( Elastic::Transport::Transport::Error ) { @transport.perform_request 'GET', '/', &block }
     end
   end
 
@@ -311,7 +310,7 @@ class Elastic::Transport::Transport::BaseTest < Minitest::Test
 
     should "reload connections when host is unreachable" do
       @block.expects(:call).times(2).
-            raises(Errno::ECONNREFUSED).
+        raises(Errno::ECONNREFUSED).
             then.returns(stub_everything :failures => 1)
 
       @transport.expects(:reload_connections!).returns([])
@@ -343,13 +342,13 @@ class Elastic::Transport::Transport::BaseTest < Minitest::Test
 
     should "raise an error after max tries" do
       @block.expects(:call).times(4).
-            raises(Errno::ECONNREFUSED).
+        raises(Errno::ECONNREFUSED).
             then.raises(Errno::ECONNREFUSED).
             then.raises(Errno::ECONNREFUSED).
             then.raises(Errno::ECONNREFUSED).
             then.returns(stub_everything :failures => 1)
 
-      assert_raise Errno::ECONNREFUSED do
+      assert_raise Elastic::Transport::Transport::Error do
         @transport.perform_request('GET', '/', &@block)
       end
     end

data/test/unit/transport_curb_test.rb

@@ -83,10 +83,11 @@ else
       should "set application/json response header" do
         @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")
+        @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; charset=UTF-8', response.headers['content-type']
+
+        assert_equal 'application/json', response.headers['content-type']
       end
 
       should "handle HTTP methods" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-transport
 version: !ruby/object:Gem::Version
-  version: 8.1.0.pre2
+  version: 8.1.1
 platform: ruby
 authors:
 - Karel Minarik
@@ -10,10 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -27,13 +27,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -41,7 +55,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -55,7 +69,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,7 +83,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,7 +97,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,6 +152,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  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'
+- !ruby/object:Gem::Dependency
+  name: patron
+  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'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -236,6 +278,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -255,7 +311,7 @@ description: 'Low level Ruby client for Elastic. See the `elasticsearch` or `ela
 
   '
 email:
-- support@elastic.co
+- clients-team@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -269,7 +325,6 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
-- Gemfile-faraday1.gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -306,7 +361,6 @@ files:
 - test/integration/transport_test.rb
 - test/profile/client_benchmark_test.rb
 - test/test_helper.rb
-- test/unit/adapters_test.rb
 - test/unit/connection_test.rb
 - test/unit/response_test.rb
 - test/unit/serializer_test.rb
@@ -334,11 +388,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: Low level Ruby client for Elastic services.
@@ -357,7 +411,6 @@ test_files:
 - test/integration/transport_test.rb
 - test/profile/client_benchmark_test.rb
 - test/test_helper.rb
-- test/unit/adapters_test.rb
 - test/unit/connection_test.rb
 - test/unit/response_test.rb
 - test/unit/serializer_test.rb

data/Gemfile-faraday1.gemfile

@@ -1,39 +0,0 @@
-# Licensed to Elasticsearch B.V. under one or more contributor
-# license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright
-# ownership. Elasticsearch B.V. licenses this file to you under
-# 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
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-source 'https://rubygems.org'
-
-# Usage:
-#
-# $ BUNDLE_GEMFILE=./Gemfile-faraday1.gemfile bundle install
-# $ BUNDLE_GEMFILE=./Gemfile-faraday1.gemfile bundle exec rake test:faraday1:unit
-
-gem 'faraday', '~> 1'
-gemspec path: './'
-
-group :development, :test do
-  gem 'httpclient'
-  gem 'net-http-persistent'
-  gem 'patron' unless defined? JRUBY_VERSION
-  gem 'rspec'
-  gem 'typhoeus'
-  if defined?(JRUBY_VERSION)
-    gem 'pry-nav'
-  else
-    gem 'pry-byebug'
-  end
-end

data/test/unit/adapters_test.rb

@@ -1,88 +0,0 @@
-# Licensed to Elasticsearch B.V. under one or more contributor
-# license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright
-# ownership. Elasticsearch B.V. licenses this file to you under
-# 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
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-require 'test_helper'
-
-class Elastic::Transport::ClientAdaptersUnitTest < Minitest::Test
-  context 'Adapters' do
-    setup do
-      begin
-        Object.send(:remove_const, :Patron)
-      rescue NameError
-      end
-    end
-
-    should 'use the default Faraday adapter' do
-      fork do
-        client = Elastic::Transport::Client.new
-        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::NetHttp)
-      end
-    end
-
-    should 'use Patron Faraday adapter' do
-      fork do
-        if is_faraday_v2?
-          require 'faraday/patron'
-        else
-          require 'patron'
-        end
-
-        client = Elastic::Transport::Client.new
-        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::Patron)
-      end
-    end
-
-    should 'use Typhoeus Faraday adapter' do
-      fork do
-        if is_faraday_v2?
-          require 'faraday/typhoeus'
-        else
-          require 'typhoeus'
-        end
-
-        client = Elastic::Transport::Client.new
-        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::Typhoeus)
-      end
-    end
-
-    should 'use NetHttpPersistent Faraday adapter' do
-      fork do
-        if is_faraday_v2?
-          require 'faraday/net_http_persistent'
-        else
-          require 'net/http/persistent'
-        end
-
-        client = Elastic::Transport::Client.new
-        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::NetHttpPersistent)
-      end
-    end
-
-    should 'use HTTPClient Faraday adapter' do
-      fork do
-        if is_faraday_v2?
-          require 'faraday/httpclient'
-        else
-          require 'httpclient'
-        end
-
-        client = Elastic::Transport::Client.new
-        assert_equal(Faraday::Adapter::HTTPClient, client.transport.connections.first.connection.adapter)
-      end
-    end
-  end unless jruby?
-end