elasticsearch-transport 7.17.7 → 7.17.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 515176cfbf829f3153d85e4975eebed91424aaa14256d332f0dc3f87030ce671
-  data.tar.gz: c8bdcb22a2f81446f55d4d3025f05863020629eb0ff139e80832a3dc8f43eb8b
+  metadata.gz: aa58b200c57b9fffe2bd1f4d1b1665c7155e472168b25c46f39204d575c8851d
+  data.tar.gz: bd07e27115bf220d45fe68c116b7074257cdeb15b2abf1107c9f4956e9bbee47
 SHA512:
-  metadata.gz: 850fc6102767844a698044cbc3cef9e63f01895ef5735e9c9e831db4e62dac9f448c71cc6eac591f5ce3e225b35106a083366ead9e3267d24f8723f81a792f8c
-  data.tar.gz: 18ba115ba8d1b55866806c75845c8a39dd920c9bd227b64e586ecdedc7274530c28dcc3f62bfb70f61510091f2acc3aa67511323e0b6b70c5afdbf5df035f175
+  metadata.gz: 41c06e083d55da44b859644eaa75f57bf25aec8c3ba6a9c7617487d9d62453a1ae06f8326c354711105544193bdc231de060d47ecff627277267fd8361f8285b
+  data.tar.gz: 0b47cc13fd1e3b4c0663256d547793efd7031ecb7888c200c5abbb40d8e7e0b8a49a3d5a614707f63cbf766644dca76ce102c77c24bb2d3fa701fb011e9c1fb1

data/Gemfile

@@ -33,6 +33,6 @@ group :development, :test do
   if defined?(JRUBY_VERSION)
     gem 'pry-nav'
   else
-    gem 'pry-byebug'
+    gem 'pry-byebug', '~> 3.9'
   end
 end

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

@@ -87,14 +87,13 @@ module Elasticsearch
           # @return [Response]
           # @see    Transport::Base#perform_request
           #
-          def perform_request(method, path, params={}, body=nil, headers=nil, opts={})
+          def perform_request(method, path, params = {}, body = nil, headers = nil, opts = {})
             super do |connection, url|
               body = body ? __convert_to_json(body) : nil
-              body, headers = compress_request(body, @request_options[:headers])
-
+              body, headers = compress_request(body, parse_headers(headers))
               params[:body] = body if body
               params[:headers] = headers if headers
-              params = params.merge(@request_options)
+
               case method
               when 'GET'
                 resp = connection.connection.get(url, params)
@@ -161,8 +160,14 @@ module Elasticsearch
 
           private
 
+          def parse_headers(headers)
+            request_headers = @request_options.fetch(:headers, {})
+            headers = request_headers.merge(headers || {})
+            headers.empty? ? nil : headers
+          end
+
           def apply_headers(options)
-            headers = options[:headers] || options.dig(:transport_options, :headers) || {}
+            headers = options[:headers].clone || options.dig(:transport_options, :headers).clone || {}
             headers[CONTENT_TYPE_STR] = find_value(headers, CONTENT_TYPE_REGEX) || DEFAULT_CONTENT_TYPE
             headers[USER_AGENT_STR] = find_value(headers, USER_AGENT_REGEX) || find_value(@request_options[:headers], USER_AGENT_REGEX) || user_agent_header
             headers[ACCEPT_ENCODING] = GZIP if use_compression?

data/lib/elasticsearch/transport/transport/response.rb

@@ -28,7 +28,7 @@ module Elasticsearch
         # @param headers [Hash]    Response headers
         def initialize(status, body, headers={})
           @status, @body, @headers = status, body, headers
-          @body = body.force_encoding('UTF-8') if body.respond_to?(:force_encoding)
+          @body = body.force_encoding('UTF-8') if body.respond_to?(:force_encoding) && !body.frozen?
         end
       end
 

data/lib/elasticsearch/transport/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module Transport
-    VERSION = '7.17.7'.freeze
+    VERSION = '7.17.9'.freeze
   end
 end

data/spec/elasticsearch/transport/http/manticore_spec.rb

@@ -53,7 +53,7 @@ if defined?(JRUBY_VERSION)
         expect(perform_request).to be_kind_of(Elasticsearch::Transport::Transport::Response)
       end
 
-      it 'run body with preper params' do
+      it 'run body with proper params' do
         expect(
           client.transport.connections.first.connection
         ).to receive(:post).with('http://localhost:9200/', { body: body, headers: expected_headers }).and_return(response)
@@ -138,6 +138,24 @@ if defined?(JRUBY_VERSION)
           end
         end
       end
+
+      context 'headers' do
+        it 'sends custom headers' do
+          client = Elasticsearch::Transport::Client.new(
+            transport_class: described_class,
+            transport_options: { headers: { 'Elastic-Api-Version'=>'2023-10-31' } }
+          )
+          expect(
+            client.transport.connections.first.connection
+          ).to receive(:get).with(
+                 'http://localhost:9200/',
+                 {
+                   headers: expected_headers.merge({ 'Elastic-Api-Version'=>'2023-10-31' })
+                 }
+               ).and_return(response)
+          client.perform_request('GET', '/', {}, nil, headers)
+        end
+      end
     end
   end
 end

data/test/unit/transport_manticore_test.rb

@@ -111,7 +111,7 @@ if JRUBY
                     {
                       body: '{"foo":"bar"}',
                       headers: {
-                        'Content-Type' => 'application/json',
+                        'Content-Type' => 'application/x-ndjson',
                         'User-Agent' => @transport.send(:user_agent_header)
                       }
                     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 7.17.7
+  version: 7.17.9
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-25 00:00:00.000000000 Z
+date: 2023-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -433,7 +433,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Ruby client for Elasticsearch.