elasticsearch-transport 7.14.1.pre → 7.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69804f86ed3bff5b4277e47adb97b727e3324cc2f5a7a7da2155266433d29b39
-  data.tar.gz: 4ed9685fca9531e8caff5396cfefe5b7f2e429b2b9b2a48dc325e73d3bae7c9f
+  metadata.gz: d57ef8d3855aa9061389ac3953409508cc4f0fac7950aeb4528ec3330c3d79bb
+  data.tar.gz: 9281fa9aeb210e67f9b6156bf554724f1910f9698103b4b2beafe7307255ea05
 SHA512:
-  metadata.gz: b958fb03c5494824be0c6683c751ec22cdac5d7cf270824ba62e746b93abbefc9ede940955408e8f228adb424f78364cd7452e28c965019476a65854026ad07a
-  data.tar.gz: b2f73320b43a84a8bb1de43c6afa9d37fa162d48fe587c7a9b8b78fd3c4a010c240f6f160ccbc596bb0e393d5279aa913fa930d46e6ced540ec2b5b6982c8781
+  metadata.gz: e7844a2287b107ada0688c912b3089ff0919d3cdb4d4eb9c24f9a47bdac69a59fb3366affed78c51c584de3eeb73cbc75fa6aa92f811085ab0193190bd25f09b
+  data.tar.gz: 9a1c89327547bc96556890e486ffb2b7efcccc13f13d56b4082de7cd2998a22df26ad282fdc6521bae7edded45ac2c5f68520e87b1a9d0e1476d141f21acd5c8

data/lib/elasticsearch/transport/transport/base.rb

@@ -272,7 +272,6 @@ module Elasticsearch
           end
 
           params = params.clone
-
           ignore = Array(params.delete(:ignore)).compact.map { |s| s.to_i }
 
           begin
@@ -284,9 +283,7 @@ module Elasticsearch
             end
 
             url      = connection.full_url(path, params)
-
             response = block.call(connection, url)
-
             connection.healthy! if connection.failures > 0
 
             # Raise an exception so we can catch it for `retry_on_status`
@@ -336,14 +333,10 @@ module Elasticsearch
           duration = Time.now - start
 
           if response.status.to_i >= 300
-            __log_response    method, path, params, body, url, response, nil, 'N/A', duration
-            __trace  method, path, params, connection.connection.headers, body, url, response, nil, 'N/A', duration if tracer
-
+            __log_response(method, path, params, body, url, response, nil, 'N/A', duration)
+            __trace(method, path, params, connection_headers(connection), body, url, response, nil, 'N/A', duration) if tracer
             # Log the failure only when `ignore` doesn't match the response status
-            unless ignore.include?(response.status.to_i)
-              log_fatal "[#{response.status}] #{response.body}"
-            end
-
+            log_fatal "[#{response.status}] #{response.body}" unless ignore.include?(response.status.to_i)
             __raise_transport_error response unless ignore.include?(response.status.to_i)
           end
 
@@ -354,10 +347,8 @@ module Elasticsearch
             __log_response   method, path, params, body, url, response, json, took, duration
           end
 
-          __trace  method, path, params, connection.connection.headers, body, url, response, nil, 'N/A', duration if tracer
-
+          __trace(method, path, params, connection_headers(connection), body, url, response, nil, 'N/A', duration) if tracer
           warnings(response.headers['warning']) if response.headers&.[]('warning')
-
           Response.new response.status, json || response.body, response.headers
         ensure
           @last_request_at = Time.now
@@ -435,6 +426,14 @@ module Elasticsearch
         def warnings(warning)
           warn("warning: #{warning}")
         end
+
+        def connection_headers(connection)
+          if defined?(Elasticsearch::Transport::Transport::HTTP::Manticore) && self.class == Elasticsearch::Transport::Transport::HTTP::Manticore
+            @request_options[:headers]
+          else
+            connection.connection.headers
+          end
+        end
       end
     end
   end

data/lib/elasticsearch/transport/version.rb

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

data/test/integration/jruby_test.rb

@@ -0,0 +1,43 @@
+# 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'
+
+if JRUBY
+  require 'elasticsearch/transport/transport/http/manticore'
+
+  class Elasticsearch::Transport::ClientManticoreIntegrationTest < Elasticsearch::Test::IntegrationTestCase
+    context "Transport" do
+      setup do
+        @host, @port = ELASTICSEARCH_HOSTS.first.split(':')
+      end
+
+      shutdown do
+        begin; Object.send(:remove_const, :Manticore); rescue NameError; end
+      end
+
+      should 'allow to customize the Faraday adapter to Manticore' do
+        client = Elasticsearch::Transport::Client.new(
+          transport_class: Elasticsearch::Transport::Transport::HTTP::Manticore,
+          trace: true,
+          hosts: [ { host: @host, port: @port } ]
+        )
+        response = client.perform_request 'GET', ''
+        assert_respond_to(response.body, :to_hash)
+      end
+    end
+  end
+end

data/test/integration/transport_test.rb

@@ -29,6 +29,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
   context "Transport" do
     setup do
       @host, @port = ELASTICSEARCH_HOSTS.first.split(':')
+      @hosts = { hosts: [ { host: @host, port: @port } ] }
       begin; Object.send(:remove_const, :Patron);   rescue NameError; end
     end
 
@@ -36,11 +37,10 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       require 'typhoeus'
       require 'typhoeus/adapters/faraday'
 
-      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new \
-        :hosts => [ { host: @host, port: @port } ] do |f|
-          f.response :logger
-          f.adapter  :typhoeus
-        end
+      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new(@hosts) do |f|
+        f.response :logger
+        f.adapter  :typhoeus
+      end
 
       client = Elasticsearch::Transport::Client.new transport: transport
       client.perform_request 'GET', ''
@@ -49,8 +49,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
     should "allow to customize the Faraday adapter to NetHttpPersistent" do
       require 'net/http/persistent'
 
-      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new \
-                                                                       :hosts => [ { host: @host, port: @port } ] do |f|
+      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new(@hosts) do |f|
         f.response :logger
         f.adapter  :net_http_persistent
       end
@@ -60,13 +59,10 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
     end
 
     should "allow to define connection parameters and pass them" do
-      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new \
-                    :hosts => [ { host: @host, port: @port } ],
-                    :options => { :transport_options => {
-                                    :params => { :format => 'yaml' }
-                                  }
-                                }
-
+      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new(
+        hosts: [ { host: @host, port: @port } ],
+        options: { transport_options: { params: { :format => 'yaml' } } }
+      )
       client = Elasticsearch::Transport::Client.new transport: transport
       response = client.perform_request 'GET', ''
 
@@ -76,24 +72,20 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
     should "use the Curb client" do
       require 'curb'
       require 'elasticsearch/transport/transport/http/curb'
-
-      transport = Elasticsearch::Transport::Transport::HTTP::Curb.new \
-        :hosts => [ { host: @host, port: @port } ] do |curl|
-          curl.verbose = true
-        end
+      transport = Elasticsearch::Transport::Transport::HTTP::Curb.new(@hosts) do |curl|
+        curl.verbose = true
+      end
 
       client = Elasticsearch::Transport::Client.new transport: transport
       client.perform_request 'GET', ''
-    end unless JRUBY
+    end unless jruby?
 
     should "deserialize JSON responses in the Curb client" do
       require 'curb'
       require 'elasticsearch/transport/transport/http/curb'
-
-      transport = Elasticsearch::Transport::Transport::HTTP::Curb.new \
-        :hosts => [ { host: @host, port: @port } ] do |curl|
-          curl.verbose = true
-        end
+      transport = Elasticsearch::Transport::Transport::HTTP::Curb.new(@hosts) do |curl|
+        curl.verbose = true
+      end
 
       client = Elasticsearch::Transport::Client.new transport: transport
       response = client.perform_request 'GET', ''
@@ -101,7 +93,6 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       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 unless jruby?
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 7.14.1.pre
+  version: 7.14.1
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -395,6 +395,7 @@ files:
 - spec/elasticsearch/transport/meta_header_spec.rb
 - spec/elasticsearch/transport/sniffer_spec.rb
 - spec/spec_helper.rb
+- test/integration/jruby_test.rb
 - test/integration/transport_test.rb
 - test/profile/client_benchmark_test.rb
 - test/test_helper.rb
@@ -425,11 +426,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Ruby client for Elasticsearch.
@@ -441,6 +442,7 @@ test_files:
 - spec/elasticsearch/transport/meta_header_spec.rb
 - spec/elasticsearch/transport/sniffer_spec.rb
 - spec/spec_helper.rb
+- test/integration/jruby_test.rb
 - test/integration/transport_test.rb
 - test/profile/client_benchmark_test.rb
 - test/test_helper.rb