elastic-transport 8.1.2 → 8.2.0

data/spec/spec_helper.rb

@@ -21,7 +21,6 @@ end
 
 require 'elastic-transport'
 require 'logger'
-require 'ansi/code'
 require 'hashie/mash'
 if defined?(JRUBY_VERSION)
   require 'elastic/transport/transport/http/manticore'
@@ -74,6 +73,10 @@ def default_client
   $client ||= Elastic::Transport::Client.new(hosts: ELASTICSEARCH_HOSTS)
 end
 
+def is_faraday_v2?
+  Gem::Version.new(Faraday::VERSION) >= Gem::Version.new(2)
+end
+
 module Config
   def self.included(context)
     # Get the hosts to use to connect an elasticsearch client.

data/test/integration/jruby_test.rb

@@ -21,7 +21,7 @@ if JRUBY
   require 'elastic/transport/transport/http/manticore'
 
   class Elastic::Transport::ClientManticoreIntegrationTest < Minitest::Test
-    context "Transport" do
+    context 'Transport' do
       setup do
         uri = URI(HOST)
         @host = {

data/test/integration/transport_test.rb

@@ -18,9 +18,8 @@
 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,
@@ -30,69 +29,116 @@ class Elastic::Transport::ClientIntegrationTest < Minitest::Test
       }
     end
 
-    should "allow to customize the Faraday adapter to Typhoeus" do
-      require 'typhoeus'
-      require 'typhoeus/adapters/faraday'
-
+    should 'use the default Faraday adapter' do
       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::NetHttp)
       client.perform_request 'GET', ''
-    end unless jruby?
+    end
 
-    should "allow to customize the Faraday adapter to NetHttpPersistent" do
-      require 'net/http/persistent'
+    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
 
-      transport = Elastic::Transport::Transport::HTTP::Faraday.new(hosts: [@host]) do |f|
-        f.response :logger
-        f.adapter  :net_http_persistent
+      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
 
-      client = Elastic::Transport::Client.new(transport: transport)
-      client.perform_request 'GET', ''
-    end
+      should 'deserialize JSON responses in the Curb client' do
+        require 'curb'
+        require 'elastic/transport/transport/http/curb'
 
-    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' } } }
-      )
+        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', ''
+        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}"
+        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 "use the Curb client" do
-      require 'curb'
-      require 'elastic/transport/transport/http/curb'
+    should 'allow to customize the Faraday adapter to NetHttpPersistent' do
+      require 'faraday/net_http_persistent'
 
-      transport = Elastic::Transport::Transport::HTTP::Curb.new(hosts: [@host]) do |curl|
-        curl.verbose = true
+      transport = Elastic::Transport::Transport::HTTP::Faraday.new(hosts: [@host]) do |f|
+        f.response :logger
+        f.adapter  :net_http_persistent
       end
 
       client = Elastic::Transport::Client.new(transport: transport)
+      assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::NetHttpPersistent)
       client.perform_request 'GET', ''
-    end unless JRUBY
+    end
 
-    should "deserialize JSON responses in the Curb client" do
-      require 'curb'
-      require 'elastic/transport/transport/http/curb'
+    should 'allow to customize the Faraday adapter to HTTPClient' do
+      require 'faraday/httpclient'
 
-      transport = Elastic::Transport::Transport::HTTP::Curb.new(hosts: [@host]) do |curl|
-        curl.verbose = true
+      transport = Elastic::Transport::Transport::HTTP::Faraday.new(hosts: [@host]) do |f|
+        f.response :logger
+        f.adapter  :httpclient
       end
 
       client = Elastic::Transport::Client.new(transport: transport)
-      response = client.perform_request 'GET', ''
+      assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::HTTPClient)
+      client.perform_request 'GET', ''
+    end
 
-      assert_respond_to(response.body, :to_hash)
-      assert_not_nil response.body['name']
-      assert_equal 'application/json', response.headers['content-type']
-    end unless jruby?
+    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' } } }
+      )
+
+      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
   end
 end

data/test/test_helper.rb

@@ -14,6 +14,7 @@
 # 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'
@@ -31,15 +32,13 @@ end
 
 require 'minitest/autorun'
 require 'minitest/reporters'
-require 'shoulda/context'
 require 'mocha/minitest'
-require 'ansi/code'
+require 'shoulda/context'
 
-require 'require-prof' if ENV["REQUIRE_PROF"]
 require 'elastic-transport'
-require 'logger'
-
 require 'hashie'
+require 'logger'
+require 'require-prof' if ENV["REQUIRE_PROF"]
 
 RequireProf.print_timing_infos if ENV["REQUIRE_PROF"]
 
@@ -80,4 +79,8 @@ 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/adapters_test.rb

@@ -0,0 +1,88 @@
+# 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

data/test/unit/transport_curb_test.rb

@@ -83,11 +83,10 @@ 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', response.headers['content-type']
+        assert_equal 'application/json; charset=UTF-8', 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.2
+  version: 8.2.0
 platform: ruby
 authors:
 - Karel Minarik
@@ -10,44 +10,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-31 00:00:00.000000000 Z
+date: 2023-01-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -55,7 +41,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,7 +55,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -83,7 +69,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -97,7 +83,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -152,34 +138,6 @@ 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
@@ -278,20 +236,6 @@ 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
@@ -311,7 +255,7 @@ description: 'Low level Ruby client for Elastic. See the `elasticsearch` or `ela
 
   '
 email:
-- clients-team@elastic.co
+- support@elastic.co
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -325,6 +269,7 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
+- Gemfile-faraday1.gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -361,6 +306,7 @@ 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
@@ -392,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Low level Ruby client for Elastic services.
@@ -411,6 +357,7 @@ 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