elasticsearch-transport 1.0.17 → 1.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03da4187dfe5748e0a63a03b5311e69a16c300ee
-  data.tar.gz: e5150265f830efda95bf5da80f2fe9e89cd8b98f
+  metadata.gz: edd2a65c4ed276f82bcb814fcaeef9e52b051b8d
+  data.tar.gz: d90638bf86192e4d0c1c6f47c8229bd08868abbb
 SHA512:
-  metadata.gz: 1fdb7e4a825042933383ec0fe4bddd3db31996e73f1095cc7c406889bbea887d14827e7c28357b9bf86eaeca4b6995a65f019897c3385f4f9da0b2f2849c364c
-  data.tar.gz: 6281a6bada7e2db9aac41397539cc1ab9aeec92fae134a9286b8461e1b4d05abb6f600a05ffe70325cd377d3c0164df5da118d1b43503b9793faf8404868d82b
+  metadata.gz: b7970770618a8f702964fe26b52ad92dc4fa0fd69b079bb415fee76f8bc1292320ea2f54e94676c9536469afa93a34e3d52b00ea251d2ac79da6094523b879d8
+  data.tar.gz: 017d031ab40353eaa29c6950250e13b92d871b9bbb093d346044f0cca11f1d024888d8d69a684f0c038f0e1bfa51c53a3dfed70a63b5477c2e31cd79debce82b

data/elasticsearch-transport.gemspec

@@ -28,7 +28,12 @@ Gem::Specification.new do |s|
   end
 
   s.add_development_dependency "bundler", "> 1"
-  s.add_development_dependency "rake", "< 11.0"
+
+  if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
+    s.add_development_dependency "rake", "~> 11.1"
+  else
+    s.add_development_dependency "rake", "< 11.0"
+  end
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
     s.add_development_dependency "elasticsearch-extensions"

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

@@ -108,7 +108,7 @@ module Elasticsearch
             __close_connections
 
             new_connections = __build_connections
-            stale_connections = @connections.select  { |c| ! new_connections.include?(c) }
+            stale_connections = @connections.all.select  { |c| ! new_connections.include?(c) }
             new_connections = new_connections.reject { |c| @connections.include?(c) }
 
             @connections.remove(stale_connections)
@@ -312,7 +312,7 @@ module Elasticsearch
             __raise_transport_error response
           end
 
-          json     = serializer.load(response.body) if response.headers && response.headers["content-type"] =~ /json/
+          json     = serializer.load(response.body) if response.body && !response.body.empty? && response.headers && response.headers["content-type"] =~ /json/
           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

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "1.0.17"
+    VERSION = "1.0.18"
   end
 end

data/test/unit/transport_base_test.rb

@@ -185,6 +185,17 @@ class Elasticsearch::Transport::Transport::BaseTest < Test::Unit::TestCase
       assert_equal 'FOOBAR', response.body
     end
 
+    should "not deserialize an empty response body" do
+      @transport.expects(:get_connection).returns(stub_everything :failures => 1)
+      @transport.serializer.expects(:load).never
+      response = @transport.perform_request 'GET', '/' do
+                   Elasticsearch::Transport::Transport::Response.new 200, '', {"content-type" => 'application/json'}
+                 end
+
+      assert_instance_of Elasticsearch::Transport::Transport::Response, response
+      assert_equal '', response.body
+    end
+
     should "serialize non-String objects" do
       @transport.serializer.expects(:dump).times(3)
       @transport.__convert_to_json({:foo => 'bar'})
@@ -504,6 +515,20 @@ class Elasticsearch::Transport::Transport::BaseTest < Test::Unit::TestCase
       assert_equal 2, @transport.connections.size
       assert_equal old_connection_id, @transport.connections.first.object_id
     end
+
+    should "remove dead connections" do
+      @transport.__rebuild_connections :hosts => [ { :host => 'node1', :port => 1 },
+                                                   { :host => 'node2', :port => 2 } ],
+                                       :options => { :http => {} }
+      assert_equal 2, @transport.connections.size
+
+      @transport.connections[1].dead!
+
+      @transport.__rebuild_connections :hosts => [ { :host => 'node1', :port => 1 } ], :options => { :http => {} }
+
+      assert_equal 1, @transport.connections.size
+      assert_equal 1, @transport.connections.all.size
+    end
   end
 
   context "rebuilding connections" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.0.18
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -56,16 +56,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: elasticsearch-extensions
   requirement: !ruby/object:Gem::Requirement