elasticsearch-transport 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b270a67bd3d6c3566fb5503a86965472087c5ef
-  data.tar.gz: 629cce04c30b1968ce0d7fab0e4347cd99b70bda
+  metadata.gz: e41972a48c8437f78891cb2d82ec8b2a623d825f
+  data.tar.gz: 7093946c35ecfe27353f4678b7194951c378addf
 SHA512:
-  metadata.gz: 5849da863dfc15089eb5f443c9364cdbe476cebc8e02b9db89d95c5c225622b694fd40e3fedc71c18f94e8a62702c099ade7931a708cd271481c47dbb02b910c
-  data.tar.gz: e3824c7169dfdc5061fb4b1dd2e4ad0919cc9ac33180c1c3220027ea08e92c0ee8224cad3e0ea128f76da14757a21c8eec97b469eb949c3b5191165b8acc3551
+  metadata.gz: 14f15746ec09b0ea4389298e15326ef3026a8adf683198d5b2fdc2b40114bf5390d76b60ae8cd5a587e05b5776a22b365ccd0736ef0a348a56db7c63760c3b68
+  data.tar.gz: 355d03fafbeb574b421448e683bfe6c34b5fac51be774513ee3c62ed397b0769de90ee422d1bb8627e73ca4646fc465feb6e45fd082dff66572ddec11051bab0

data/lib/elasticsearch/transport/client.rb

@@ -102,6 +102,9 @@ module Elasticsearch
 
         @arguments[:transport_options].update(:request => { :timeout => @arguments[:request_timeout] } ) if @arguments[:request_timeout]
 
+        @arguments[:transport_options][:headers] ||= {}
+        @arguments[:transport_options][:headers].update 'Content-Type' => 'application/json' unless @arguments[:transport_options][:headers].keys.any? {|k| k.to_s.downcase =~ /content\-?\_?type/}
+
         @send_get_body_as = @arguments[:send_get_body_as] || 'GET'
 
         transport_class  = @arguments[:transport_class] || DEFAULT_TRANSPORT_CLASS

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

@@ -43,7 +43,11 @@ module Elasticsearch
           #
           def __build_connection(host, options={}, block=nil)
             client = ::Curl::Easy.new
-            client.headers = {'User-Agent' => "Curb #{Curl::CURB_VERSION}"}
+
+            headers = options[:headers] || {}
+            headers.update('User-Agent' => "Curb #{Curl::CURB_VERSION}")
+
+            client.headers = headers
             client.url     = __full_url(host)
 
             if host[:user]

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "5.0.1"
+    VERSION = "5.0.2"
   end
 end

data/test/unit/client_test.rb

@@ -73,6 +73,11 @@ class Elasticsearch::Transport::ClientTest < Test::Unit::TestCase
       assert_equal 120, client.transport.options[:transport_options][:request][:timeout]
     end
 
+    should "set the 'Content-Type' header to 'application/json' by default" do
+      client = Elasticsearch::Transport::Client.new
+      assert_equal 'application/json', client.transport.options[:transport_options][:headers]['Content-Type']
+    end
+
     context "when passed hosts" do
       should "have localhost by default" do
         c = Elasticsearch::Transport::Client.new

data/test/unit/transport_curb_test.rb

@@ -77,6 +77,12 @@ else
         assert_raise(ArgumentError) { @transport.perform_request 'FOOBAR', '/' }
       end
 
+      should "properly pass the Content-Type header option" do
+        transport = Curb.new :hosts => [ { :host => 'foobar', :port => 1234 } ], :options => { :transport_options => { :headers => { 'Content-Type' => 'foo/bar' } } }
+
+        assert_equal "foo/bar", transport.connections.first.connection.headers["Content-Type"]
+      end
+
       should "allow to set options for Curb" do
         transport = Curb.new :hosts => [ { :host => 'foobar', :port => 1234 } ] do |curl|
           curl.headers["User-Agent"] = "myapp-0.0"

data/test/unit/transport_faraday_test.rb

@@ -42,6 +42,17 @@ class Elasticsearch::Transport::Transport::HTTP::FaradayTest < Test::Unit::TestC
       @transport.perform_request 'POST', '/', {}, {:foo => 'bar'}
     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' } } }
+
+      transport.connections.first.connection.expects(:run_request).with do |method, url, body, headers|
+        assert_equal 'foo/bar', headers['Content-Type']
+        true
+      end.returns(stub_everything)
+
+      transport.perform_request 'GET', '/'
+    end
+
     should "serialize the request body" do
       @transport.connections.first.connection.expects(:run_request).returns(stub_everything)
       @transport.serializer.expects(:dump)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-21 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -332,8 +332,24 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |
-  Ruby client for Elasticsearch. See the `elasticsearch` gem for full integration.
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+description: 'Ruby client for Elasticsearch. See the `elasticsearch` gem for full
+  integration.
+
+'
 email:
 - karel.minarik@elasticsearch.org
 executables: []
@@ -399,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Ruby client for Elasticsearch.