elasticsearch-transport 7.13.3 → 7.17.11

data/test/integration/transport_test.rb

@@ -17,7 +17,7 @@
 
 require 'test_helper'
 
-class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::IntegrationTestCase
+class Elasticsearch::Transport::Transport::ClientIntegrationTest < Elasticsearch::Test::IntegrationTestCase
   startup do
     Elasticsearch::Extensions::Test::Cluster.start(number_of_nodes: 2) if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running?(number_of_nodes: 2)
   end
@@ -29,79 +29,116 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
   context "Transport" do
     setup do
       @host, @port = ELASTICSEARCH_HOSTS.first.split(':')
-      begin; Object.send(:remove_const, :Patron);   rescue NameError; end
+      @hosts = { hosts: [ { host: @host, port: @port } ] }
     end
 
-    should "allow to customize the Faraday adapter to Typhoeus" do
-      require 'typhoeus'
-      require 'typhoeus/adapters/faraday'
+    should "use the default Faraday adapter" do
+      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new(@hosts) do |f|
+        f.response :logger
+      end
+
+      client = Elasticsearch::Transport::Client.new transport: transport
+      assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::NetHttp)
+      client.perform_request 'GET', ''
+    end
+
+    unless jruby?
+      should "allow to customize the Faraday adapter to Typhoeus" do
+        if is_faraday_v2?
+          require 'faraday/typhoeus'
+        else
+          require 'typhoeus'
+        end
 
-      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new \
-        :hosts => [ { host: @host, port: @port } ] do |f|
+        transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new(@hosts) do |f|
           f.response :logger
           f.adapter  :typhoeus
         end
 
-      client = Elasticsearch::Transport::Client.new transport: transport
-      client.perform_request 'GET', ''
-    end unless jruby?
+        client = Elasticsearch::Transport::Client.new transport: transport
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::Typhoeus)
+        client.perform_request 'GET', ''
+      end
 
-    should "allow to customize the Faraday adapter to NetHttpPersistent" do
-      require 'net/http/persistent'
+      should "use the Curb client" do
+        require 'curb'
+        require 'elasticsearch/transport/transport/http/curb'
+        transport = Elasticsearch::Transport::Transport::HTTP::Curb.new(@hosts) do |curl|
+          curl.verbose = true
+        end
 
-      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new \
-                                                                       :hosts => [ { host: @host, port: @port } ] do |f|
-        f.response :logger
-        f.adapter  :net_http_persistent
+        client = Elasticsearch::Transport::Client.new transport: transport
+        assert_equal(client.transport.class, Elasticsearch::Transport::Transport::HTTP::Curb)
+        client.perform_request 'GET', ''
       end
 
-      client = Elasticsearch::Transport::Client.new transport: transport
-      client.perform_request 'GET', ''
-    end
+      should "deserialize JSON responses in the Curb client" do
+        require 'curb'
+        require 'elasticsearch/transport/transport/http/curb'
+        transport = Elasticsearch::Transport::Transport::HTTP::Curb.new(@hosts) do |curl|
+          curl.verbose = true
+        end
 
-    should "allow to define connection parameters and pass them" do
-      transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new \
-                    :hosts => [ { host: @host, port: @port } ],
-                    :options => { :transport_options => {
-                                    :params => { :format => 'yaml' }
-                                  }
-                                }
+        client = Elasticsearch::Transport::Client.new transport: transport
+        response = client.perform_request 'GET', ''
 
-      client = Elasticsearch::Transport::Client.new transport: transport
-      response = client.perform_request 'GET', ''
+        assert_respond_to(response.body, :to_hash)
+        assert_not_nil response.body['name']
+        assert_equal 'application/json', response.headers['content-type']
+      end
 
-      assert response.body.start_with?("---\n"), "Response body should be YAML: #{response.body.inspect}"
-    end
+      should 'allow to customize the Faraday adapter to Patron' do
+        if is_faraday_v2?
+          require 'faraday/patron'
+        else
+          require 'patron'
+        end
+        transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new(@hosts) do |f|
+          f.response :logger
+          f.adapter  :patron
+        end
 
-    should "use the Curb client" do
-      require 'curb'
-      require 'elasticsearch/transport/transport/http/curb'
+        client = Elasticsearch::Transport::Client.new(transport: transport)
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::Patron)
+        client.perform_request 'GET', ''
+      end
 
-      transport = Elasticsearch::Transport::Transport::HTTP::Curb.new \
-        :hosts => [ { host: @host, port: @port } ] do |curl|
-          curl.verbose = true
+      should "allow to customize the Faraday adapter to NetHttpPersistent" do
+        require 'faraday/net_http_persistent'
+
+        transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new(@hosts) do |f|
+          f.response :logger
+          f.adapter  :net_http_persistent
         end
 
-      client = Elasticsearch::Transport::Client.new transport: transport
-      client.perform_request 'GET', ''
-    end unless JRUBY
+        client = Elasticsearch::Transport::Client.new transport: transport
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::NetHttpPersistent)
+        client.perform_request 'GET', ''
+      end
 
-    should "deserialize JSON responses in the Curb client" do
-      require 'curb'
-      require 'elasticsearch/transport/transport/http/curb'
+      should 'allow to customize the Faraday adapter to HTTPClient' do
+        require 'faraday/httpclient'
 
-      transport = Elasticsearch::Transport::Transport::HTTP::Curb.new \
-        :hosts => [ { host: @host, port: @port } ] do |curl|
-          curl.verbose = true
+        transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new(@hosts) do |f|
+          f.response :logger
+          f.adapter  :httpclient
         end
 
-      client = Elasticsearch::Transport::Client.new transport: transport
-      response = client.perform_request 'GET', ''
+        client = Elasticsearch::Transport::Client.new(transport: transport)
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::HTTPClient)
+        client.perform_request 'GET', ''
+      end
 
-      assert_respond_to(response.body, :to_hash)
-      assert_not_nil response.body['name']
-      assert_equal 'application/json', response.headers['content-type']
-    end unless JRUBY
-  end
+      should "allow to define connection parameters and pass them" do
+        transport = Elasticsearch::Transport::Transport::HTTP::Faraday.new(
+          hosts: [ { host: @host, port: @port } ],
+          options: { transport_options: { params: { :format => 'yaml' } } }
+        )
+        client = Elasticsearch::Transport::Client.new transport: transport
+        response = client.perform_request 'GET', ''
 
+        assert response.body.start_with?("---\n"), "Response body should be YAML: #{response.body.inspect}"
+      end
+    end
+  end
 end

data/test/test_helper.rb

@@ -20,30 +20,17 @@ ELASTICSEARCH_HOSTS = if hosts = ENV['TEST_ES_SERVER'] || ENV['ELASTICSEARCH_HOS
                         hosts.split(',').map do |host|
                           /(http\:\/\/)?(\S+)/.match(host)[2]
                         end
+                      else
+                        ['localhost:9200']
                       end.freeze
 
 TEST_HOST, TEST_PORT = ELASTICSEARCH_HOSTS.first.split(':') if ELASTICSEARCH_HOSTS
 
-RUBY_1_8 = defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
 JRUBY    = defined?(JRUBY_VERSION)
 
-if RUBY_1_8 and not ENV['BUNDLE_GEMFILE']
-  require 'rubygems'
-  gem 'test-unit'
-end
-
-require 'rubygems' if RUBY_1_8
-
-if ENV['COVERAGE'] && ENV['CI'].nil? && !RUBY_1_8
+if ENV['COVERAGE']
   require 'simplecov'
-  SimpleCov.start { add_filter "/test|test_/" }
-end
-
-if ENV['CI'] && !RUBY_1_8
-  require 'simplecov'
-  require 'simplecov-rcov'
-  SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
-  SimpleCov.start { add_filter "/test|test_" }
+  SimpleCov.start { add_filter %r{^/test/} }
 end
 
 # Register `at_exit` handler for integration tests shutdown.
@@ -52,7 +39,6 @@ if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
   at_exit { Elasticsearch::Test::IntegrationTestCase.__run_at_exit_hooks }
 end
 
-require 'test/unit' if RUBY_1_8
 require 'minitest/autorun'
 require 'minitest/reporters'
 require 'shoulda/context'
@@ -111,6 +97,10 @@ module Minitest
   end
 end
 
+def is_faraday_v2?
+  Gem::Version.new(Faraday::VERSION) >= Gem::Version.new(2)
+end
+
 Minitest::Reporters.use! FixedMinitestSpecReporter.new
 
 module Elasticsearch
@@ -119,8 +109,7 @@ module Elasticsearch
       extend Elasticsearch::Extensions::Test::StartupShutdown
 
       shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? && Elasticsearch::Extensions::Test::Cluster.running? }
-      context "IntegrationTest" do; should "noop on Ruby 1.8" do; end; end if RUBY_1_8
-    end if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'
+    end
   end
 
   module Test
@@ -129,7 +118,6 @@ module Elasticsearch
       extend Elasticsearch::Extensions::Test::Profiling
 
       shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? && Elasticsearch::Extensions::Test::Cluster.running? }
-      context "IntegrationTest" do; should "noop on Ruby 1.8" do; end; end if RUBY_1_8
-    end unless RUBY_1_8 || JRUBY
+    end unless JRUBY
   end
 end

data/test/unit/adapters_test.rb

@@ -0,0 +1,88 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'test_helper'
+
+class Elasticsearch::Transport::Transport::ClientAdaptersUnitTest < Minitest::Test
+  context 'Adapters' do
+    setup do
+      begin
+        Object.send(:remove_const, :Patron)
+      rescue NameError
+      end
+    end
+
+    should 'use the default Faraday adapter' do
+      fork do
+        client = Elasticsearch::Transport::Client.new
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::NetHttp)
+      end
+    end
+
+    should 'use Patron Faraday adapter' do
+      fork do
+        if is_faraday_v2?
+          require 'faraday/patron'
+        else
+          require 'patron'
+        end
+
+        client = Elasticsearch::Transport::Client.new
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::Patron)
+      end
+    end
+
+    should 'use Typhoeus Faraday adapter' do
+      fork do
+        if is_faraday_v2?
+          require 'faraday/typhoeus'
+        else
+          require 'typhoeus'
+        end
+
+        client = Elasticsearch::Transport::Client.new
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::Typhoeus)
+      end
+    end
+
+    should 'use NetHttpPersistent Faraday adapter' do
+      fork do
+        if is_faraday_v2?
+          require 'faraday/net_http_persistent'
+        else
+          require 'net/http/persistent'
+        end
+
+        client = Elasticsearch::Transport::Client.new
+        assert_equal(client.transport.connections.first.connection.adapter, Faraday::Adapter::NetHttpPersistent)
+      end
+    end
+
+    should 'use HTTPClient Faraday adapter' do
+      fork do
+        if is_faraday_v2?
+          require 'faraday/httpclient'
+        else
+          require 'httpclient'
+        end
+
+        client = Elasticsearch::Transport::Client.new
+        assert_equal(Faraday::Adapter::HTTPClient, client.transport.connections.first.connection.adapter)
+      end
+    end
+  end unless jruby?
+end

data/test/unit/response_test.rb

@@ -26,7 +26,7 @@ class Elasticsearch::Transport::Transport::ResponseTest < Minitest::Test
 
       response = Elasticsearch::Transport::Transport::Response.new 200, body
       assert_equal 'UTF-8', response.body.encoding.name
-    end unless RUBY_1_8
+    end
 
   end
 end

data/test/unit/transport_base_test.rb

@@ -263,6 +263,15 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
       end
     end
 
+    should 'raise TooManyRequestsError on 429' do
+      @transport.expects(:get_connection).returns(stub_everything :failures => 1)
+      assert_raise Elasticsearch::Transport::Transport::Errors::TooManyRequests do
+        @transport.perform_request 'GET', '/' do
+          Elasticsearch::Transport::Transport::Response.new 429, 'ERROR'
+        end
+      end
+    end
+
     should "not raise an error when the :ignore argument has been passed" do
       @transport.stubs(:get_connection).returns(stub_everything :failures => 1)
 
@@ -310,7 +319,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
       @transport.perform_request('GET', '/', &@block)
       assert_equal 2, @transport.counter
     end
-  end unless RUBY_1_8
+  end
 
   context "performing a request with retry on connection failures" do
     setup do
@@ -344,7 +353,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
         @transport.perform_request('GET', '/', &@block)
       end
     end
-  end unless RUBY_1_8
+  end
 
   context "performing a request with retry on status" do
     setup do
@@ -391,7 +400,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
         @transport.perform_request('GET', '/', &@block)
       end
     end
-  end  unless RUBY_1_8
+  end
 
   context "logging" do
     setup do
@@ -447,7 +456,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
       assert_raise Elasticsearch::Transport::Transport::Errors::InternalServerError do
         @transport.perform_request('POST', '_search', &@block)
       end
-    end unless RUBY_1_8
+    end
 
     should "not log a failed Elasticsearch request as fatal" do
       @block = Proc.new { |c, u| puts "ERROR" }
@@ -458,7 +467,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
 
       # No `BadRequest` error
       @transport.perform_request('POST', '_search', :ignore => 500, &@block)
-    end unless RUBY_1_8
+    end
 
     should "log and re-raise a Ruby exception" do
       @block = Proc.new { |c, u| puts "ERROR" }
@@ -468,7 +477,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
       @transport.logger.expects(:fatal)
 
       assert_raise(Exception) { @transport.perform_request('POST', '_search', &@block) }
-    end unless RUBY_1_8
+    end
   end
 
   context "tracing" do
@@ -522,7 +531,7 @@ class Elasticsearch::Transport::Transport::BaseTest < Minitest::Test
       assert_raise Elasticsearch::Transport::Transport::Errors::InternalServerError do
         @transport.perform_request('POST', '_search', &@block)
       end
-    end unless RUBY_1_8
+    end
 
   end
 

data/test/unit/transport_curb_test.rb

@@ -84,7 +84,6 @@ else
         @transport.connections.first.connection.expects(:http).with(:GET).returns(stub_everything)
         @transport.connections.first.connection.expects(:body_str).returns('{"foo":"bar"}')
         @transport.connections.first.connection.expects(:header_str).returns('HTTP/1.1 200 OK\r\nContent-Type: application/json; charset=UTF-8\r\nContent-Length: 311\r\n\r\n')
-
         response = @transport.perform_request 'GET', '/'
 
         assert_equal 'application/json', response.headers['content-type']