elasticsearch-transport 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fad569e0b7e77d2dd34f6d94abb4e8fe385fda36
-  data.tar.gz: 31b8c5ba87aa078d0f2d452df7a8f905cd289ae3
+  metadata.gz: '0958ecd0da7c46d4bf09410e6d420e7d9379e89c'
+  data.tar.gz: f9e1a3bc7db0bb0b084475141b1efa002edc3261
 SHA512:
-  metadata.gz: 8cfa72d0e6b74444a1c623a760194217b029e7ca8f1fcb1e618bdc41e896e6d32d128c4fae4ea7287e04e4ddf306ca87d40878c29cf4d864b1dee254dafb29e2
-  data.tar.gz: d97bd081b718f29175aa108a5079a53a90ee16dad51161353d951053ae1b7f126f19f1e8e846288a074354c88c7d3a45b42928d7e6f31d32a9806ae892d68408
+  metadata.gz: c2d69cb26a0ba4f1e93bfb82b325f6eedc840458b4df1371d6036341c582231c637779713f1150b7002545c075def4796b5229344d64ae34f1bd88ec8baafff6
+  data.tar.gz: c3101a660dd94e88d8f5289b15ab4aab27497c83219e30860d75545ba780d8c2fbc6d2b0da844d4e41b095d81b36e754cd14e4a8b2734d48af4cde371eb55423

data/lib/elasticsearch/transport/client.rb

@@ -125,10 +125,10 @@ module Elasticsearch
 
       # Performs a request through delegation to {#transport}.
       #
-      def perform_request(method, path, params={}, body=nil)
+      def perform_request(method, path, params={}, body=nil, headers=nil)
         method = @send_get_body_as if 'GET' == method && body
 
-        transport.perform_request method, path, params, body
+        transport.perform_request method, path, params, body, headers
       end
 
       # Normalizes and returns hosts configuration.

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

@@ -184,11 +184,14 @@ module Elasticsearch
         #
         # @api private
         #
-        def __trace(method, path, params, body, url, response, json, took, duration)
+        def __trace(method, path, params, headers, body, url, response, json, took, duration)
           trace_url  = "http://localhost:9200/#{path}?pretty" +
                        ( params.empty? ? '' : "&#{::Faraday::Utils::ParamsHash[params].to_query}" )
           trace_body = body ? " -d '#{__convert_to_json(body, :pretty => true)}'" : ''
-          tracer.info  "curl -X #{method.to_s.upcase} '#{trace_url}'#{trace_body}\n"
+          trace_command = "curl -X #{method.to_s.upcase}"
+          trace_command += " -H '#{headers.inject('') { |memo,item| memo << item[0] + ': ' + item[1] }}'" if headers && !headers.empty?
+          trace_command += " '#{trace_url}'#{trace_body}\n"
+          tracer.info trace_command
           tracer.debug "# #{Time.now.iso8601} [#{response.status}] (#{format('%.3f', duration)}s)\n#"
           tracer.debug json ? serializer.dump(json, :pretty => true).gsub(/^/, '# ').sub(/\}$/, "\n# }")+"\n" : "# #{response.body}\n"
         end
@@ -233,6 +236,7 @@ module Elasticsearch
         # @param path   [String] The API endpoint
         # @param params [Hash]   Request parameters (will be serialized by {Connections::Connection#full_url})
         # @param body   [Hash]   Request body (will be serialized by the {#serializer})
+        # @param headers [Hash]   Request headers (will be serialized by the {#serializer})
         # @param block  [Proc]   Code block to evaluate, passed from the implementation
         #
         # @return [Response]
@@ -240,7 +244,7 @@ module Elasticsearch
         # @raise  [ServerError]   If request failed on server
         # @raise  [Error]         If no connection is available
         #
-        def perform_request(method, path, params={}, body=nil, &block)
+        def perform_request(method, path, params={}, body=nil, headers=nil, &block)
           raise NoMethodError, "Implement this method in your transport class" unless block_given?
           start = Time.now if logger || tracer
           tries = 0
@@ -311,7 +315,7 @@ module Elasticsearch
 
           if response.status.to_i >= 300
             __log    method, path, params, body, url, response, nil, 'N/A', duration if logger
-            __trace  method, path, params, body, url, response, nil, 'N/A', duration if tracer
+            __trace  method, path, params, headers, body, url, response, nil, 'N/A', duration if tracer
 
             # Log the failure only when `ignore` doesn't match the response status
             __log_failed response if logger && !ignore.include?(response.status.to_i)
@@ -323,7 +327,7 @@ module Elasticsearch
           took     = (json['took'] ? sprintf('%.3fs', json['took']/1000.0) : 'n/a') rescue 'n/a' if logger || tracer
 
           __log   method, path, params, body, url, response, json, took, duration if logger && !ignore.include?(response.status.to_i)
-          __trace method, path, params, body, url, response, json, took, duration if tracer
+          __trace method, path, params, headers, body, url, response, json, took, duration if tracer
 
           Response.new response.status, json || response.body, response.headers
         ensure

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

@@ -15,7 +15,7 @@ module Elasticsearch
           # @return [Response]
           # @see    Transport::Base#perform_request
           #
-          def perform_request(method, path, params={}, body=nil)
+          def perform_request(method, path, params={}, body=nil, headers=nil)
             super do |connection,url|
               connection.connection.url = url
 
@@ -26,6 +26,7 @@ module Elasticsearch
                   connection.connection.set :nobody, false
 
                   connection.connection.put_data = __convert_to_json(body) if body
+                  connection.connection.headers = headers if headers
                 else raise ArgumentError, "Unsupported HTTP method: #{method}"
               end
 

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

@@ -16,9 +16,9 @@ module Elasticsearch
           # @return [Response]
           # @see    Transport::Base#perform_request
           #
-          def perform_request(method, path, params={}, body=nil)
+          def perform_request(method, path, params={}, body=nil, headers=nil)
             super do |connection, url|
-              headers = connection.connection.headers
+              headers = headers || connection.connection.headers
 
               response = connection.connection.run_request \
                 method.downcase.to_sym,

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

@@ -63,9 +63,10 @@ module Elasticsearch
           # @return [Response]
           # @see    Transport::Base#perform_request
           #
-          def perform_request(method, path, params={}, body=nil)
+          def perform_request(method, path, params={}, body=nil, headers=nil)
             super do |connection, url|
               params[:body] = __convert_to_json(body) if body
+              params[:headers] = headers if headers
               params = params.merge @request_options
               case method
               when "GET"

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "6.0.1"
+    VERSION = "6.0.2"
   end
 end

data/test/integration/client_test.rb

@@ -73,6 +73,11 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       assert_equal 'application/yaml', response.headers['content-type']
     end
 
+    should "pass request headers to the transport" do
+      response = @client.perform_request 'GET', '/', {}, nil, {'Content-Type' => 'application/yaml'}
+      assert_match(/---/, response.body)
+    end
+
     should "pass options to the Faraday::Connection with a block" do
       @client = Elasticsearch::Client.new(
         host: "127.0.0.1:#{@port}",

data/test/unit/client_test.rb

@@ -41,10 +41,17 @@ class Elasticsearch::Transport::ClientTest < Test::Unit::TestCase
     should "send GET request as POST with the send_get_body_as option" do
       transport = DummyTransport.new
       client = Elasticsearch::Transport::Client.new :transport => transport, :send_get_body_as => 'POST'
-      transport.expects(:perform_request).with 'POST', '/', {}, '{"foo":"bar"}'
+      transport.expects(:perform_request).with 'POST', '/', {}, '{"foo":"bar"}', nil
       client.perform_request 'GET', '/', {}, '{"foo":"bar"}'
     end
 
+    should "call perform_request with custom headers" do
+      transport = DummyTransport.new
+      client = Elasticsearch::Transport::Client.new :transport => transport, :send_get_body_as => 'POST'
+      transport.expects(:perform_request).with 'POST', '/', {}, '{"foo":"bar"}', '{"Content-Type":"application/x-ndjson"}'
+      client.perform_request 'POST', '/', {}, '{"foo":"bar"}', '{"Content-Type":"application/x-ndjson"}'
+    end
+
     should "have default logger for transport" do
       client = Elasticsearch::Transport::Client.new :log => true
       assert_respond_to client.transport.logger, :info

data/test/unit/transport_base_test.rb

@@ -353,7 +353,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Test::Unit::TestCase
           never
 
       assert_raise Elasticsearch::Transport::Transport::Errors::BadRequest do
-        @transport.perform_request('GET', '/', &@block)
+        @transport.perform_request('GET', '/', {}, nil, &@block)
       end
     end
 

data/test/unit/transport_curb_test.rb

@@ -37,6 +37,14 @@ else
         @transport.perform_request 'GET', '/', {}, '{"foo":"bar"}'
       end
 
+      should "perform request with headers" do
+        @transport.connections.first.connection.expects(:put_data=).with('{"foo":"bar"}')
+        @transport.connections.first.connection.expects(:http).with(:POST).returns(stub_everything)
+        @transport.connections.first.connection.expects(:headers=).with({"Content-Type" => "application/x-ndjson"})
+
+        @transport.perform_request 'POST', '/', {}, {:foo => 'bar'}, {"Content-Type" => "application/x-ndjson"}
+      end
+
       should "set body for PUT request" do
         @transport.connections.first.connection.expects(:put_data=)
         @transport.connections.first.connection.expects(:http).with(:PUT).returns(stub_everything)

data/test/unit/transport_faraday_test.rb

@@ -42,6 +42,18 @@ class Elasticsearch::Transport::Transport::HTTP::FaradayTest < Test::Unit::TestC
       @transport.perform_request 'POST', '/', {}, {:foo => 'bar'}
     end
 
+    should "properly prepare the request with custom headers" do
+      @transport.connections.first.connection.expects(:run_request).with do |method, url, body, headers|
+        assert_equal :post, method
+        assert_equal '{"foo":"bar"}', body
+        assert_nil   headers['Accept']
+        assert_equal "application/x-ndjson", headers['Content-Type']
+        true
+      end.returns(stub_everything)
+
+      @transport.perform_request 'POST', '/', {}, {:foo => 'bar'}, {"Content-Type" => "application/x-ndjson"}
+    end
+
     should "properly pass the Content-Type header option" do
       transport = Faraday.new :hosts => [ { :host => 'foobar', :port => 1234 } ], :options => { :transport_options => { :headers => { 'Content-Type' => 'foo/bar' } } }
 

data/test/unit/transport_manticore_test.rb

@@ -55,6 +55,13 @@ else
         @transport.perform_request 'POST', '/', {}, {'foo' => 'bar'}
       end
 
+      should "set custom headers for PUT request" do
+        @transport.connections.first.connection.expects(:put).
+          with('http://127.0.0.1:8080//', {:body => '{"foo":"bar"}', :headers => {"Content-Type" => "application/x-ndjson"}})
+          .returns(stub_everything)
+        @transport.perform_request 'PUT', '/', {}, '{"foo":"bar"}', {"Content-Type" => "application/x-ndjson"}
+      end
+
       should "not serialize a String request body" do
         @transport.connections.first.connection.expects(:post).
           with('http://127.0.0.1:8080//', {:body => '{"foo":"bar"}'}).returns(stub_everything)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-28 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json