elasticsearch-transport 5.0.5 → 6.8.2

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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 6.8.2
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2020-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -28,46 +28,32 @@ dependencies:
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: elasticsearch-extensions
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ansi
+  name: elasticsearch-extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-context
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: turn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,21 +151,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ci_reporter
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: patron
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,19 +193,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +221,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,35 +255,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: ruby-prof
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: require-prof
+  name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -291,7 +297,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: patron
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -305,7 +311,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov-rcov
+  name: require-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -319,7 +325,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cane
+  name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -332,20 +338,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !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.
 
@@ -367,6 +359,7 @@ files:
 - lib/elasticsearch-transport.rb
 - lib/elasticsearch/transport.rb
 - lib/elasticsearch/transport/client.rb
+- lib/elasticsearch/transport/redacted.rb
 - lib/elasticsearch/transport/transport/base.rb
 - lib/elasticsearch/transport/transport/connections/collection.rb
 - lib/elasticsearch/transport/transport/connections/connection.rb
@@ -379,25 +372,30 @@ files:
 - lib/elasticsearch/transport/transport/serializer/multi_json.rb
 - lib/elasticsearch/transport/transport/sniffer.rb
 - lib/elasticsearch/transport/version.rb
-- test/integration/client_test.rb
+- spec/elasticsearch/transport/base_spec.rb
+- spec/elasticsearch/transport/client_spec.rb
+- spec/elasticsearch/transport/sniffer_spec.rb
+- spec/spec_helper.rb
 - test/integration/transport_test.rb
 - test/profile/client_benchmark_test.rb
 - test/test_helper.rb
-- test/unit/client_test.rb
 - test/unit/connection_collection_test.rb
 - test/unit/connection_selector_test.rb
 - test/unit/connection_test.rb
 - test/unit/response_test.rb
 - test/unit/serializer_test.rb
-- test/unit/sniffer_test.rb
 - test/unit/transport_base_test.rb
 - test/unit/transport_curb_test.rb
 - test/unit/transport_faraday_test.rb
 - test/unit/transport_manticore_test.rb
-homepage: https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-transport
+homepage: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/current/index.html
 licenses:
-- Apache 2
-metadata: {}
+- Apache-2.0
+metadata:
+  homepage_uri: https://www.elastic.co/guide/en/elasticsearch/client/ruby-api/current/index.html
+  changelog_uri: https://github.com/elastic/elasticsearch-ruby/blob/6.x/CHANGELOG.md
+  source_code_uri: https://github.com/elastic/elasticsearch-ruby/tree/6.x/elasticsearch-transport
+  bug_tracker_uri: https://github.com/elastic/elasticsearch-ruby/issues
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -407,30 +405,30 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby client for Elasticsearch.
 test_files:
-- test/integration/client_test.rb
+- spec/elasticsearch/transport/base_spec.rb
+- spec/elasticsearch/transport/client_spec.rb
+- spec/elasticsearch/transport/sniffer_spec.rb
+- spec/spec_helper.rb
 - test/integration/transport_test.rb
 - test/profile/client_benchmark_test.rb
 - test/test_helper.rb
-- test/unit/client_test.rb
 - test/unit/connection_collection_test.rb
 - test/unit/connection_selector_test.rb
 - test/unit/connection_test.rb
 - test/unit/response_test.rb
 - test/unit/serializer_test.rb
-- test/unit/sniffer_test.rb
 - test/unit/transport_base_test.rb
 - test/unit/transport_curb_test.rb
 - test/unit/transport_faraday_test.rb

data/test/integration/client_test.rb

@@ -1,237 +0,0 @@
-require 'test_helper'
-
-class Elasticsearch::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
-
-  shutdown do
-    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
-    teardown do
-      begin; Object.send(:remove_const, :Typhoeus);                rescue NameError; end
-      begin; Net::HTTP.send(:remove_const, :Persistent); rescue NameError; end
-    end
-
-    setup do
-      @port = (ENV['TEST_CLUSTER_PORT'] || 9250).to_i
-      system "curl -X DELETE http://127.0.0.1:#{@port}/_all > /dev/null 2>&1"
-
-      @logger =  Logger.new(STDERR)
-      @logger.formatter = proc do |severity, datetime, progname, msg|
-        color = case severity
-          when /INFO/ then :green
-          when /ERROR|WARN|FATAL/ then :red
-          when /DEBUG/ then :cyan
-          else :white
-        end
-        ANSI.ansi(severity[0] + ' ', color, :faint) + ANSI.ansi(msg, :white, :faint) + "\n"
-      end
-
-      @client = Elasticsearch::Client.new host: "127.0.0.1:#{@port}"
-    end
-
-    should "connect to the cluster" do
-      assert_nothing_raised do
-        response = @client.perform_request 'GET', '_cluster/health'
-        assert_equal 2, response.body['number_of_nodes']
-      end
-    end
-
-    should "handle paths and URL parameters" do
-      @client.perform_request 'PUT', 'myindex/mydoc/1', {routing: 'XYZ'}, {foo: 'bar'}
-      @client.perform_request 'GET', '_cluster/health?wait_for_status=green', {}
-
-      response = @client.perform_request 'GET', 'myindex/mydoc/1?routing=XYZ'
-      assert_equal 200, response.status
-      assert_equal 'bar', response.body['_source']['foo']
-
-      assert_raise Elasticsearch::Transport::Transport::Errors::NotFound do
-        @client.perform_request 'GET', 'myindex/mydoc/1?routing=ABC'
-      end
-    end
-
-    should "ignore specified response codes" do
-      response = @client.perform_request 'GET', '/_foobar', ignore: 400
-      assert_equal 400, response.status
-
-      assert_instance_of Hash, response.body
-      assert_match /illegal_argument_exception/, response.body.inspect
-    end
-
-    should "pass options to the transport" do
-      @client = Elasticsearch::Client.new \
-        host: "127.0.0.1:#{@port}",
-        logger: (ENV['QUIET'] ? nil : @logger),
-        transport_options: { headers: { accept: 'application/yaml', content_type: 'application/yaml' } }
-
-      response = @client.perform_request 'GET', '_cluster/health'
-
-      assert response.body.to_s.start_with?("---\n"), "Response body should be YAML: #{response.body.inspect}"
-      assert_equal 'application/yaml', response.headers['content-type']
-    end
-
-    should "pass options to the Faraday::Connection with a block" do
-      @client = Elasticsearch::Client.new(
-        host: "127.0.0.1:#{@port}",
-        logger: (ENV['QUIET'] ? nil : @logger)
-      ) do |client|
-        client.headers['Content-Type'] = 'application/yaml' # For ES 2.x
-        client.headers['Accept'] = 'application/yaml'       # For ES 5.x
-      end
-
-      response = @client.perform_request 'GET', '_cluster/health'
-
-      assert response.body.to_s.start_with?("---\n"), "Response body should be YAML: #{response.body.inspect}"
-      assert_equal 'application/yaml', response.headers['content-type']
-    end
-
-    context "with round robin selector" do
-      setup do
-        @client = Elasticsearch::Client.new \
-                    hosts:  ["127.0.0.1:#{@port}", "127.0.0.1:#{@port+1}" ],
-                    logger: (ENV['QUIET'] ? nil : @logger)
-      end
-
-      should "rotate nodes" do
-        # Hit node 1
-        response = @client.perform_request 'GET', '_nodes/_local'
-        assert_equal 'node-1', response.body['nodes'].to_a[0][1]['name']
-
-        # Hit node 2
-        response = @client.perform_request 'GET', '_nodes/_local'
-        assert_equal 'node-2', response.body['nodes'].to_a[0][1]['name']
-
-        # Hit node 1
-        response = @client.perform_request 'GET', '_nodes/_local'
-        assert_equal 'node-1', response.body['nodes'].to_a[0][1]['name']
-      end
-    end
-
-    context "with a sick node and retry on failure" do
-      setup do
-        @port = (ENV['TEST_CLUSTER_PORT'] || 9250).to_i
-        @client = Elasticsearch::Client.new \
-                    hosts: ["127.0.0.1:#{@port}", "foobar1"],
-                    logger: (ENV['QUIET'] ? nil : @logger),
-                    retry_on_failure: true
-      end
-
-      should "retry the request with next server" do
-        assert_nothing_raised do
-          5.times { @client.perform_request 'GET', '_nodes/_local' }
-        end
-      end
-
-      should "raise exception when it cannot get any healthy server" do
-        @client = Elasticsearch::Client.new \
-                  hosts: ["127.0.0.1:#{@port}", "foobar1", "foobar2", "foobar3"],
-                  logger: (ENV['QUIET'] ? nil : @logger),
-                  retry_on_failure: 1
-
-        assert_nothing_raised do
-          # First hit is OK
-          @client.perform_request 'GET', '_nodes/_local'
-        end
-
-        assert_raise Faraday::Error::ConnectionFailed do
-          # Second hit fails
-          @client.perform_request 'GET', '_nodes/_local'
-        end
-      end
-    end
-
-    context "with a sick node and reloading on failure" do
-      setup do
-        @client = Elasticsearch::Client.new \
-                  hosts: ["127.0.0.1:#{@port}", "foobar1", "foobar2"],
-                  logger: (ENV['QUIET'] ? nil : @logger),
-                  reload_on_failure: true
-      end
-
-      should "reload the connections" do
-        assert_equal 3, @client.transport.connections.size
-        assert_nothing_raised do
-          5.times { @client.perform_request 'GET', '_nodes/_local' }
-        end
-        assert_equal 2, @client.transport.connections.size
-      end
-    end
-
-    context "with retrying on status" do
-      should "retry when the status does match" do
-        @client = Elasticsearch::Client.new \
-                  hosts: ["127.0.0.1:#{@port}"],
-                  logger: (ENV['QUIET'] ? nil : @logger),
-                  retry_on_status: 400
-
-        # Set the logger when the `QUIET` option is set
-        @client.transport.logger ||= Logger.new(STDERR)
-
-        @client.transport.logger.stubs(:fatal)
-        @client.transport.logger
-          .expects(:warn)
-          .with( regexp_matches(/Attempt \d to get response/) )
-          .times(4)
-
-        assert_raise Elasticsearch::Transport::Transport::Errors::BadRequest do
-          @client.perform_request 'GET', '_foobar'
-        end
-      end
-    end
-
-    context "when reloading connections" do
-      should "keep existing connections" do
-        require 'patron' # We need a client with keep-alive
-        client = Elasticsearch::Transport::Client.new host: "127.0.0.1:#{@port}",
-                                                      adapter: :patron,
-                                                      logger: (ENV['QUIET'] ? nil : @logger)
-
-        assert_equal 'Faraday::Adapter::Patron',
-                      client.transport.connections.first.connection.builder.handlers.first.name
-
-        response = client.perform_request 'GET', '_nodes/stats/http'
-
-        a = response.body['nodes'].values.select { |n| n['name'] == 'node-1' }.first['http']['total_opened']
-
-        client.transport.reload_connections!
-
-        response = client.perform_request 'GET', '_nodes/stats/http'
-        b = response.body['nodes'].values.select { |n| n['name'] == 'node-1' }.first['http']['total_opened']
-
-        assert_equal a, b
-      end unless JRUBY
-    end
-
-    context "with Faraday adapters" do
-      should "set the adapter with a block" do
-        require 'net/http/persistent'
-
-        client = Elasticsearch::Transport::Client.new url: "127.0.0.1:#{@port}" do |f|
-          f.adapter :net_http_persistent
-        end
-
-        assert_equal 'Faraday::Adapter::NetHttpPersistent',
-                     client.transport.connections.first.connection.builder.handlers.first.name
-
-        response = @client.perform_request 'GET', '_cluster/health'
-        assert_equal 200, response.status
-      end
-
-      should "automatically use the Patron client when loaded" do
-        teardown { begin; Object.send(:remove_const, :Patron); rescue NameError; end }
-
-        require 'patron'
-        client = Elasticsearch::Transport::Client.new host: "127.0.0.1:#{@port}"
-
-        assert_equal 'Faraday::Adapter::Patron',
-                      client.transport.connections.first.connection.builder.handlers.first.name
-
-        response = @client.perform_request 'GET', '_cluster/health'
-        assert_equal 200, response.status
-      end unless JRUBY
-    end
-  end
-end