elasticsearch-transport 5.0.5 → 6.8.3

data/test/profile/client_benchmark_test.rb

@@ -1,3 +1,7 @@
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
+
 require 'test_helper'
 
 class Elasticsearch::Transport::ClientProfilingTest < Elasticsearch::Test::ProfilingTest
@@ -9,15 +13,15 @@ class Elasticsearch::Transport::ClientProfilingTest < Elasticsearch::Test::Profi
     setup do
       @port = (ENV['TEST_CLUSTER_PORT'] || 9250).to_i
       client = Elasticsearch::Client.new host: "localhost:#{@port}", adapter: ::Faraday.default_adapter
-      client.perform_request 'DELETE', '/ruby_test_benchmark/' rescue nil
-      client.perform_request 'POST',   '/ruby_test_benchmark/', {index: {number_of_shards: 1, number_of_replicas: 0}}
-      100.times do client.perform_request 'POST',   '/ruby_test_benchmark_search/test/', {}, {foo: 'bar'}; end
-      client.perform_request 'POST',   '/ruby_test_benchmark_search/_refresh'
+      client.perform_request 'DELETE', 'ruby_test_benchmark' rescue nil
+      client.perform_request 'PUT',   'ruby_test_benchmark', {}, {settings: {index: {number_of_shards: 1, number_of_replicas: 0}}}
+      100.times do client.perform_request 'POST',   'ruby_test_benchmark_search/test', {}, {foo: 'bar'}; end
+      client.perform_request 'POST',   'ruby_test_benchmark_search/_refresh'
     end
     teardown do
       client = Elasticsearch::Client.new host: "localhost:#{@port}"
-      client.perform_request 'DELETE', '/ruby_test_benchmark/'
-      client.perform_request 'DELETE', '/ruby_test_benchmark_search/'
+      client.perform_request 'DELETE', 'ruby_test_benchmark' rescue nil
+      client.perform_request 'DELETE', 'ruby_test_benchmark_search' rescue nil
     end
 
     context "with a single-node cluster and the default adapter" do
@@ -30,11 +34,11 @@ class Elasticsearch::Transport::ClientProfilingTest < Elasticsearch::Test::Profi
       end
 
       measure "index a document" do
-        @client.perform_request 'POST', '/ruby_test_benchmark/test/', {}, {foo: 'bar'}
+        @client.perform_request 'POST', 'ruby_test_benchmark/test', {}, {foo: 'bar'}
       end
 
       measure "search" do
-        @client.perform_request 'POST', '/ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
+        @client.perform_request 'GET', 'ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
       end
     end
 
@@ -48,11 +52,11 @@ class Elasticsearch::Transport::ClientProfilingTest < Elasticsearch::Test::Profi
       end
 
       measure "index a document"do
-        @client.perform_request 'POST', '/ruby_test_benchmark/test/', {}, {foo: 'bar'}
+        @client.perform_request 'POST', 'ruby_test_benchmark/test', {}, {foo: 'bar'}
       end
 
       measure "search" do
-        @client.perform_request 'POST', '/ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
+        @client.perform_request 'GET', 'ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
       end
     end
 
@@ -69,25 +73,19 @@ class Elasticsearch::Transport::ClientProfilingTest < Elasticsearch::Test::Profi
       end
 
       measure "index a document" do
-        @client.perform_request 'POST', '/ruby_test_benchmark/test/', {}, {foo: 'bar'}
+        @client.perform_request 'POST', 'ruby_test_benchmark/test', {}, {foo: 'bar'}
       end
 
       measure "search" do
-        @client.perform_request 'POST', '/ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
+        @client.perform_request 'GET', 'ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
       end
     end
 
     context "with a single-node cluster and the Typhoeus client" do
-      require 'typhoeus'
-      require 'typhoeus/adapters/faraday'
-
       setup do
-        transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new \
-          :hosts => [ { :host => 'localhost', :port => @port } ] do |f|
-            f.adapter  :typhoeus
-          end
-
-        @client = Elasticsearch::Client.new transport: transport
+        require 'typhoeus'
+        require 'typhoeus/adapters/faraday'
+        @client = Elasticsearch::Client.new host: "localhost:#{@port}", adapter: :typhoeus
       end
 
       measure "get the cluster info", count: 1_000 do
@@ -95,11 +93,11 @@ class Elasticsearch::Transport::ClientProfilingTest < Elasticsearch::Test::Profi
       end
 
       measure "index a document" do
-        @client.perform_request 'POST', '/ruby_test_benchmark/test/', {}, {foo: 'bar'}
+        @client.perform_request 'POST', 'ruby_test_benchmark/test', {}, {foo: 'bar'}
       end
 
       measure "search" do
-        @client.perform_request 'POST', '/ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
+        @client.perform_request 'GET', 'ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
       end
     end
 
@@ -114,11 +112,11 @@ class Elasticsearch::Transport::ClientProfilingTest < Elasticsearch::Test::Profi
       end
 
       measure "index a document" do
-        @client.perform_request 'POST', '/ruby_test_benchmark/test/', {}, {foo: 'bar'}
+        @client.perform_request 'POST', 'ruby_test_benchmark/test', {}, {foo: 'bar'}
       end
 
       measure "search" do
-        @client.perform_request 'POST', '/ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
+        @client.perform_request 'GET', 'ruby_test_benchmark_search/test/_search', {}, {query: {match: {foo: 'bar'}}}
       end
     end
   end

data/test/test_helper.rb

@@ -1,6 +1,16 @@
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
+
 RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
 JRUBY    = defined?(JRUBY_VERSION)
 
+ELASTICSEARCH_HOSTS = if hosts = ENV['TEST_ES_SERVER'] || ENV['ELASTICSEARCH_HOSTS']
+                        hosts.split(',').map do |host|
+                          /(http\:\/\/)?(\S+)/.match(host)[2]
+                        end
+                      end.freeze
+
 if RUBY_1_8 and not ENV['BUNDLE_GEMFILE']
   require 'rubygems'
   gem 'test-unit'

data/test/unit/connection_collection_test.rb

@@ -1,3 +1,7 @@
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
+
 require 'test_helper'
 
 class Elasticsearch::Transport::Transport::Connections::CollectionTest < Test::Unit::TestCase

data/test/unit/connection_selector_test.rb

@@ -1,3 +1,7 @@
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
+
 require 'test_helper'
 
 class Elasticsearch::Transport::Transport::Connections::SelectorTest < Test::Unit::TestCase

data/test/unit/connection_test.rb

@@ -1,3 +1,7 @@
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
+
 require 'test_helper'
 
 class Elasticsearch::Transport::Transport::Connections::ConnectionTest < Test::Unit::TestCase

data/test/unit/response_test.rb

@@ -1,3 +1,7 @@
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
+
 require 'test_helper'
 
 class Elasticsearch::Transport::Transport::ResponseTest < Test::Unit::TestCase
@@ -12,4 +16,4 @@ class Elasticsearch::Transport::Transport::ResponseTest < Test::Unit::TestCase
     end unless RUBY_1_8
 
   end
-end
+end

data/test/unit/serializer_test.rb

@@ -1,3 +1,7 @@
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
+
 require 'test_helper'
 
 class Elasticsearch::Transport::Transport::SerializerTest < Test::Unit::TestCase

data/test/unit/transport_base_test.rb

@@ -1,3 +1,7 @@
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
+
 require 'test_helper'
 
 class Elasticsearch::Transport::Transport::BaseTest < Test::Unit::TestCase
@@ -353,7 +357,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
 
@@ -555,6 +559,22 @@ class Elasticsearch::Transport::Transport::BaseTest < Test::Unit::TestCase
       assert_equal 1, @transport.connections.size
       assert_equal 1, @transport.connections.all.size
     end
+
+    should "not duplicate connections" do
+      @transport.__rebuild_connections :hosts => [ { :host => 'node1', :port => 1 },
+                                                   { :host => 'node2', :port => 2 } ],
+                                       :options => { :http => {} }
+      assert_equal 2, @transport.connections.size
+
+      @transport.connections[0].dead!
+
+      @transport.__rebuild_connections :hosts => [ { :host => 'node1', :port => 1 },
+                                                   { :host => 'node2', :port => 2 } ],
+                                       :options => { :http => {} }
+
+      assert_equal 2, @transport.connections.all.size
+      assert_equal 1, @transport.connections.size
+    end
   end
 
   context "rebuilding connections" do

data/test/unit/transport_curb_test.rb

@@ -1,3 +1,7 @@
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
+
 require 'test_helper'
 
 if JRUBY
@@ -37,6 +41,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

@@ -1,3 +1,7 @@
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
+
 require 'test_helper'
 
 class Elasticsearch::Transport::Transport::HTTP::FaradayTest < Test::Unit::TestCase
@@ -42,6 +46,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

@@ -1,3 +1,7 @@
+# Licensed to Elasticsearch B.V under one or more agreements.
+# Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information
+
 require 'test_helper'
 
 unless JRUBY
@@ -55,6 +59,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)