elasticsearch-transport 7.8.1 → 7.9.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9756e0b1fd31770784d234514a5adfa267025551dd6de0b803be689353933394
-  data.tar.gz: e954f524303a9352aecb5591c11409a4271b65bdb7a7669ad16462e835a49356
+  metadata.gz: 8e172f03d64feff3991f8ef723219c1f3f26824d624cfaee35195168c2224361
+  data.tar.gz: d8039d3a4e5a5f406aae9ff94a56ef0c1068dd985b71c36a4d21d553b3404775
 SHA512:
-  metadata.gz: 42e6e84d9981eb7a96353daa3e571792394d96fef21c7c74e84f97061f39203ba359b431a01e3c7ebdb61245534875a41fa74b4849be215373a1890c6de7ec80
-  data.tar.gz: 41f46cd5b6b5b30c822318a2743730a2a97bfc18c11abe9eee176e63f6e854a6ec8fce5df25a192f072d1e0536e16a137c9c8e3359cb56aad061382df9512de0
+  metadata.gz: 1ae8684bffd3b1c1badd932702491266d93dafbe63cc7b02de814601bd120c0955914ff6e3f3220e7cfafe0654f87ecca3fea652c6df4783d106b9749b69eaca
+  data.tar.gz: 8607504cde6a896a5c11d2e7ab753829dddb9c1d7c2ae960e3cdb3a9bfff2f3d46e9bec0790222e7d34f8309ea86d5c096e9646fdadd51cfae6b0891defed73d

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

@@ -47,7 +47,7 @@ module Elasticsearch
         #
         # @see Client#initialize
         #
-        def initialize(arguments={}, &block)
+        def initialize(arguments = {}, &block)
           @state_mutex = Mutex.new
 
           @hosts       = arguments[:hosts]   || []
@@ -234,9 +234,9 @@ module Elasticsearch
         def __full_url(host)
           url  = "#{host[:protocol]}://"
           url += "#{CGI.escape(host[:user])}:#{CGI.escape(host[:password])}@" if host[:user]
-          url += "#{host[:host]}"
+          url += host[:host]
           url += ":#{host[:port]}" if host[:port]
-          url += "#{host[:path]}" if host[:path]
+          url += host[:path] if host[:path]
           url
         end
 
@@ -258,8 +258,9 @@ module Elasticsearch
         # @raise  [ServerError]   If request failed on server
         # @raise  [Error]         If no connection is available
         #
-        def perform_request(method, path, params={}, body=nil, headers=nil, opts={}, &block)
-          raise NoMethodError, "Implement this method in your transport class" unless block_given?
+        def perform_request(method, path, params = {}, body = nil, headers = nil, opts = {}, &block)
+          raise NoMethodError, 'Implement this method in your transport class' unless block_given?
+
           start = Time.now
           tries = 0
           reload_on_failure = opts.fetch(:reload_on_failure, @options[:reload_on_failure])
@@ -276,15 +277,15 @@ module Elasticsearch
 
           begin
             tries     += 1
-            connection = get_connection or raise Error.new("Cannot get new connection from pool.")
+            connection = get_connection or raise Error.new('Cannot get new connection from pool.')
 
             if connection.connection.respond_to?(:params) && connection.connection.params.respond_to?(:to_hash)
               params = connection.connection.params.merge(params.to_hash)
             end
 
-            url        = connection.full_url(path, params)
+            url      = connection.full_url(path, params)
 
-            response   = block.call(connection, url)
+            response = block.call(connection, url)
 
             connection.healthy! if connection.failures > 0
 

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

@@ -135,14 +135,15 @@ module Elasticsearch
             }
           end
 
-          # Equality operator based on connection protocol, host and port
+          # Equality operator based on connection protocol, host, port and attributes
           #
           # @return [Boolean]
           #
           def ==(other)
             self.host[:protocol] == other.host[:protocol] && \
             self.host[:host] == other.host[:host] && \
-            self.host[:port].to_i == other.host[:port].to_i
+            self.host[:port].to_i == other.host[:port].to_i && \
+            self.host[:attributes] == other.host[:attributes]
           end
 
           # @return [String]

data/lib/elasticsearch/transport/transport/sniffer.rb

@@ -45,21 +45,21 @@ module Elasticsearch
         #
         def hosts
           Timeout::timeout(timeout, SnifferTimeoutError) do
-            nodes = transport.perform_request('GET', '_nodes/http', {}, nil, nil,
-                                              reload_on_failure: false).body
+            nodes = perform_sniff_request.body
 
             hosts = nodes['nodes'].map do |id, info|
-              if info[PROTOCOL]
-                host, port = parse_publish_address(info[PROTOCOL]['publish_address'])
+              next unless info[PROTOCOL]
+              host, port = parse_publish_address(info[PROTOCOL]['publish_address'])
 
-                { :id =>      id,
-                  :name =>    info['name'],
-                  :version => info['version'],
-                  :host =>    host,
-                  :port =>    port,
-                  :roles =>   info['roles'],
-                  :attributes => info['attributes'] }
-              end
+              {
+                id: id,
+                name: info['name'],
+                version: info['version'],
+                host: host,
+                port: port,
+                roles: info['roles'],
+                attributes: info['attributes']
+              }
             end.compact
 
             hosts.shuffle! if transport.options[:randomize_hosts]
@@ -69,6 +69,13 @@ module Elasticsearch
 
         private
 
+        def perform_sniff_request
+          transport.perform_request(
+            'GET', '_nodes/http', {}, nil, nil,
+            reload_on_failure: false
+          )
+        end
+
         def parse_publish_address(publish_address)
           # publish_address is in the format hostname/ip:port
           if publish_address =~ /\//

data/lib/elasticsearch/transport/version.rb

@@ -17,6 +17,6 @@
 
 module Elasticsearch
   module Transport
-    VERSION = "7.8.1"
+    VERSION = "7.9.0.pre"
   end
 end

data/spec/elasticsearch/transport/sniffer_spec.rb

@@ -18,7 +18,6 @@
 require 'spec_helper'
 
 describe Elasticsearch::Transport::Transport::Sniffer do
-
   let(:transport) do
     double('transport').tap do |t|
       allow(t).to receive(:perform_request).and_return(response)
@@ -45,7 +44,6 @@ describe Elasticsearch::Transport::Transport::Sniffer do
   end
 
   describe '#initialize' do
-
     it 'has a transport instance' do
       expect(sniffer.transport).to be(transport)
     end
@@ -56,7 +54,6 @@ describe Elasticsearch::Transport::Transport::Sniffer do
   end
 
   describe '#timeout' do
-
     let(:sniffer) do
       described_class.new(double('transport', options: {}))
     end
@@ -71,13 +68,11 @@ describe Elasticsearch::Transport::Transport::Sniffer do
   end
 
   describe '#hosts' do
-
     let(:hosts) do
       sniffer.hosts
     end
 
     context 'when the entire response is parsed' do
-
       let(:raw_response) do
         {
           "cluster_name" => "elasticsearch_test",
@@ -142,7 +137,6 @@ describe Elasticsearch::Transport::Transport::Sniffer do
     end
 
     context 'when the transport protocol does not match' do
-
       let(:raw_response) do
         { 'nodes' => { 'n1' => { 'foo' => { 'publish_address' => '127.0.0.1:9250' } } } }
       end
@@ -153,7 +147,6 @@ describe Elasticsearch::Transport::Transport::Sniffer do
     end
 
     context 'when a list of nodes is returned' do
-
       let(:raw_response) do
         { 'nodes' => { 'n1' => { 'http' => { 'publish_address' => '127.0.0.1:9250' } },
                        'n2' => { 'http' => { 'publish_address' => '127.0.0.1:9251' } } } }
@@ -175,7 +168,6 @@ describe Elasticsearch::Transport::Transport::Sniffer do
     end
 
     context 'when the host and port are an ip address and port' do
-
       it 'parses the response' do
         expect(hosts.size).to eq(1)
       end
@@ -190,7 +182,6 @@ describe Elasticsearch::Transport::Transport::Sniffer do
     end
 
     context 'when the host and port are a hostname and port' do
-
       let(:publish_address) do
         'testhost1.com:9250'
       end
@@ -213,7 +204,6 @@ describe Elasticsearch::Transport::Transport::Sniffer do
     end
 
     context 'when the host and port are in the format: hostname/ip:port' do
-
       let(:publish_address) do
         'example.com/127.0.0.1:9250'
       end
@@ -231,7 +221,6 @@ describe Elasticsearch::Transport::Transport::Sniffer do
       end
 
       context 'when the address is IPv6' do
-
         let(:publish_address) do
           'example.com/[::1]:9250'
         end
@@ -251,7 +240,6 @@ describe Elasticsearch::Transport::Transport::Sniffer do
     end
 
     context 'when the address is IPv6' do
-
       let(:publish_address) do
         '[::1]:9250'
       end
@@ -270,7 +258,6 @@ describe Elasticsearch::Transport::Transport::Sniffer do
     end
 
     context 'when the transport has :randomize_hosts option' do
-
       let(:raw_response) do
         { 'nodes' => { 'n1' => { 'http' => { 'publish_address' => '127.0.0.1:9250' } },
                        'n2' => { 'http' => { 'publish_address' => '127.0.0.1:9251' } } } }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 7.8.1
+  version: 7.9.0.pre
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-30 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -423,9 +423,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: