elasticsearch-transport 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44170b2419c63a6ab5d33557fa3d49a7efede792
-  data.tar.gz: 59ec164cf8865491cf0e4c59628d62ce5a9a0dd2
+  metadata.gz: 9141220bdecbb5cd5fe9eef893010d24419a62a6
+  data.tar.gz: e2a2ad61469a9398e749b4004909ec2234360262
 SHA512:
-  metadata.gz: a12ea012f3a6b64322a8542dc21af3cc6ad2c5774c7a632246b429ca0bcfa212c0c9d8ce8925210e403284c612fff5ac037c084e02b297b4439bc75cc6d99ec5
-  data.tar.gz: a9bc5d3679d9ca6925f2e6b45e1961fa879865978b0f10a25edf41b4eda101515393ff10f420996b7796ec50c9ad91c0cf8ebee0665153867e729fc1adbd27f6
+  metadata.gz: 47916a61140347aba5eb71728587d4c611f0219e8f03d3584405fde93d10fe991f38652b5125e073ad37f16cedd72fe452faea82197f892b539c95809db5cf74
+  data.tar.gz: 9130c01c4a9d7687f42fa57848c3dac0ae7382972e1c68776319c829b079307ccda469846f6231e2e64c783225c43a75386d35b6de8f3d5614516266d24e80c8

data/lib/elasticsearch/transport/client.rb

@@ -181,6 +181,9 @@ module Elasticsearch
             @arguments[:http][k] ||= v
           end
 
+          # Remove the trailing slash
+          host_parts[:path].chomp!('/') if host_parts[:path]
+
           host_parts
         end
 

data/lib/elasticsearch/transport/transport/connections/connection.rb

@@ -39,7 +39,7 @@ module Elasticsearch
           #
           def full_url(path, params={})
             url  = "#{host[:protocol]}://"
-            url += "#{host[:user]}:#{host[:password]}@" if host[:user]
+            url += "#{CGI.escape(host[:user])}:#{CGI.escape(host[:password])}@" if host[:user]
             url += "#{host[:host]}:#{host[:port]}"
             url += "#{host[:path]}" if host[:path]
             url += "/#{full_path(path, params)}"

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

@@ -21,7 +21,10 @@ module Elasticsearch
 
               case method
                 when 'HEAD'
+                  connection.connection.set :nobody, true
                 when 'GET', 'POST', 'PUT', 'DELETE'
+                  connection.connection.set :nobody, false
+
                   connection.connection.put_data = __convert_to_json(body) if body
                 else raise ArgumentError, "Unsupported HTTP method: #{method}"
               end

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "5.0.4"
+    VERSION = "5.0.5"
   end
 end

data/test/integration/client_test.rb

@@ -2,11 +2,11 @@ require 'test_helper'
 
 class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::IntegrationTestCase
   startup do
-    Elasticsearch::Extensions::Test::Cluster.start(nodes: 2) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
+    Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 2) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 2)
   end
 
   shutdown do
-    Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] and Elasticsearch::Extensions::Test::Cluster.running?
+    Elasticsearch::Extensions::Test::Cluster.stop(number_of_nodes: 2) if ENV['SERVER'] and Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 2)
   end
 
   context "Elasticsearch client" do

data/test/integration/transport_test.rb

@@ -2,11 +2,11 @@ require 'test_helper'
 
 class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::IntegrationTestCase
   startup do
-    Elasticsearch::Extensions::Test::Cluster.start(nodes: 2) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?
+    Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 2) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 2)
   end
 
   shutdown do
-    Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] and Elasticsearch::Extensions::Test::Cluster.running?
+    Elasticsearch::Extensions::Test::Cluster.stop(number_of_nodes: 2) if ENV['SERVER'] and Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 2)
   end
 
   context "Transport" do

data/test/unit/client_test.rb

@@ -228,6 +228,14 @@ class Elasticsearch::Transport::ClientTest < Test::Unit::TestCase
         assert_equal 'bar', hosts[1][:host]
       end
 
+      should "remove trailing slash from URL path" do
+        hosts = @client.__extract_hosts 'http://myhost/'
+        assert_equal '', hosts[0][:path]
+
+        hosts = @client.__extract_hosts 'http://myhost/foo/bar/'
+        assert_equal '/foo/bar', hosts[0][:path]
+      end
+
       should "raise error for incompatible argument" do
         assert_raise ArgumentError do
           @client.__extract_hosts 123

data/test/unit/connection_test.rb

@@ -30,6 +30,11 @@ class Elasticsearch::Transport::Transport::Connections::ConnectionTest < Test::U
       assert_equal 'http://U:P@localhost:9200/_search?foo=bar', c.full_url('_search', {:foo => 'bar'})
     end
 
+    should "return full url with escaped credentials" do
+      c = Connection.new :host => { :protocol => 'http', :user => 'U$$$', :password => 'P^^^', :host => 'localhost', :port => '9200' }
+      assert_equal 'http://U%24%24%24:P%5E%5E%5E@localhost:9200/_search?foo=bar', c.full_url('_search', {:foo => 'bar'})
+    end
+
     should "return full url with path" do
       c = Connection.new :host => { :protocol => 'http', :host => 'localhost', :port => '9200', :path => '/foo' }
       assert_equal 'http://localhost:9200/foo/_search?foo=bar', c.full_url('_search', {:foo => 'bar'})

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -415,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby client for Elasticsearch.