elasticsearch-transport 2.0.2 → 5.0.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2130b4dc3b3535f12040bf6855c0818512ff278b
-  data.tar.gz: ea2d71deae8bf8f7a02d55d83c6fa4b0dc5fdd48
+  metadata.gz: 568a5ed3db7d573112248d69314c74fd2a988c31
+  data.tar.gz: b453b165af67c3055f9d69029c50d502a87958b2
 SHA512:
-  metadata.gz: f525b4b8f8d816cf1275dfbda0fc057944763ab8a131bb5e5052c89efb8111f835fbc454822eb5f4003449c79ab403cb2816b2da5d02542147426e72452c1d4b
-  data.tar.gz: 7bf1a2f9167b63f89f2a9526040fbc69762d34110b95567ec5975d7501fa00e91375768690aea3261f40305ac564f61877f132abb2ecf09f7860892e0755c507
+  metadata.gz: 698088ec4e9741e569ee05e61ea4a3d8aee18cd48fdbb0fca04f595bc68d1711ec91d95e7166efcd75aec82a0d7aab07cbc5dfe3f1d055a464da6d57f5372744
+  data.tar.gz: 50a1533da40acedb10b2b310d29734ae27c0d3caabadd9844b1ef2b4d1093fd7bd15900895e925dfb47e66d2fef00f02575ecbbaeb8c139804aab9e5e65f7544

data/Gemfile

@@ -7,7 +7,7 @@ if File.exist? File.expand_path("../../elasticsearch-api/elasticsearch-api.gemsp
   gem 'elasticsearch-api', :path => File.expand_path("../../elasticsearch-api", __FILE__), :require => false
 end
 
-if File.exist? File.expand_path("../../elasticsearch-extensions/elasticsearch-extensions.gemspec", __FILE__)
+if File.exist? File.expand_path("../../elasticsearch-extensions", __FILE__)
   gem 'elasticsearch-extensions', :path => File.expand_path("../../elasticsearch-extensions", __FILE__), :require => false
 end
 

data/README.md

@@ -16,7 +16,7 @@ data serialization and transport.
 It does not handle calling the Elasticsearch API;
 see the [`elasticsearch-api`](https://github.com/elasticsearch/elasticsearch-ruby/tree/master/elasticsearch-api) library.
 
-The library is compatible with Ruby 1.8.7 or higher and with Elasticsearch 0.90 and 1.0.
+The library is compatible with Ruby 1.8.7 or higher and with all versions of Elasticsearch since 0.90.
 
 Features overview:
 

data/elasticsearch-transport.gemspec

@@ -58,7 +58,7 @@ Gem::Specification.new do |s|
   # Prevent unit test failures on Ruby 1.8
   if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
     s.add_development_dependency "test-unit", '~> 2'
-    s.add_development_dependency "json"
+    s.add_development_dependency "json", '~> 1.8'
   end
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'

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

@@ -34,7 +34,6 @@ module Elasticsearch
           @hosts       = arguments[:hosts]   || []
           @options     = arguments[:options] || {}
           @options[:http] ||= {}
-          @options[:retry_on_status] ||= []
 
           @block       = block
           @connections = __build_connections
@@ -50,9 +49,9 @@ module Elasticsearch
           @counter_mtx = Mutex.new
           @last_request_at = Time.now
           @reload_connections = options[:reload_connections]
-          @reload_after    = options[:reload_connections].is_a?(Integer) ? options[:reload_connections] : DEFAULT_RELOAD_AFTER
+          @reload_after    = options[:reload_connections].is_a?(Fixnum) ? options[:reload_connections] : DEFAULT_RELOAD_AFTER
           @resurrect_after = options[:resurrect_after] || DEFAULT_RESURRECT_AFTER
-          @max_retries     = options[:retry_on_failure].is_a?(Integer)   ? options[:retry_on_failure]   : DEFAULT_MAX_RETRIES
+          @max_retries     = options[:retry_on_failure].is_a?(Fixnum)   ? options[:retry_on_failure]   : DEFAULT_MAX_RETRIES
           @retry_on_status = Array(options[:retry_on_status]).map { |d| d.to_i }
         end
 

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

@@ -28,12 +28,12 @@ module Elasticsearch
 
               connection.connection.http(method.to_sym)
 
-              headers = {}
-              headers['content-type'] = 'application/json' if connection.connection.header_str =~ /\/json/
+              response_headers = {}
+              response_headers['content-type'] = 'application/json' if connection.connection.header_str =~ /\/json/
 
               Response.new connection.connection.response_code,
                            connection.connection.body_str,
-                           headers
+                           response_headers
             end
           end
 

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

@@ -18,11 +18,14 @@ module Elasticsearch
           #
           def perform_request(method, path, params={}, body=nil)
             super do |connection, url|
+              headers = connection.connection.headers
+
               response = connection.connection.run_request \
                 method.downcase.to_sym,
                 url,
                 ( body ? __convert_to_json(body) : nil ),
-                {}
+                headers
+
               Response.new response.status, response.body, response.headers
             end
           end

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

@@ -5,8 +5,7 @@ module Elasticsearch
       # Handles node discovery ("sniffing")
       #
       class Sniffer
-        ES1_RE_URL  = /\[([^\/]*)?\/?([^:]*):([0-9]+)\]/
-        ES2_RE_URL  = /([^\/]*)?\/?([^:]*):([0-9]+)/
+        PROTOCOL = 'http'
 
         attr_reader   :transport
         attr_accessor :timeout
@@ -30,13 +29,18 @@ module Elasticsearch
         def hosts
           Timeout::timeout(timeout, SnifferTimeoutError) do
             nodes = transport.perform_request('GET', '_nodes/http').body
+
             hosts = nodes['nodes'].map do |id,info|
-              addr_str = info["#{transport.protocol}_address"].to_s
-              matches = addr_str.match(ES1_RE_URL) || addr_str.match(ES2_RE_URL)
-              if matches
-                host = matches[1].empty? ? matches[2] : matches[1]
-                port = matches[3]
-                info.merge :host => host, :port => port, :id => id
+              if info[PROTOCOL]
+                host, port = info[PROTOCOL]['publish_address'].split(':')
+
+                { :id =>      id,
+                  :name =>    info['name'],
+                  :version => info['version'],
+                  :host =>    host,
+                  :port =>    port,
+                  :roles =>   info['roles'],
+                  :attributes => info['attributes'] }
               end
             end.compact
 

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "2.0.2"
+    VERSION = "5.0.0.pre"
   end
 end

data/test/integration/client_test.rb

@@ -17,7 +17,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
 
     setup do
       @port = (ENV['TEST_CLUSTER_PORT'] || 9250).to_i
-      system "curl -X DELETE http://localhost:#{@port}/_all > /dev/null 2>&1"
+      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|
@@ -30,7 +30,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
         ANSI.ansi(severity[0] + ' ', color, :faint) + ANSI.ansi(msg, :white, :faint) + "\n"
       end
 
-      @client = Elasticsearch::Client.new host: "localhost:#{@port}"
+      @client = Elasticsearch::Client.new host: "127.0.0.1:#{@port}"
     end
 
     should "connect to the cluster" do
@@ -55,32 +55,35 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
 
     should "pass options to the transport" do
       @client = Elasticsearch::Client.new \
-        host: "localhost:#{@port}",
+        host: "127.0.0.1:#{@port}",
         logger: (ENV['QUIET'] ? nil : @logger),
-        transport_options: { headers: { content_type: 'application/yaml' } }
+        transport_options: { headers: { accept: 'application/yaml', content_type: 'application/yaml' } }
 
       response = @client.perform_request 'GET', '_cluster/health'
-      assert_match /---\ncluster_name:/, response.body.to_s
+
+      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: "localhost:#{@port}",
+        host: "127.0.0.1:#{@port}",
         logger: (ENV['QUIET'] ? nil : @logger)
       ) do |client|
-        client.headers['Content-Type'] = 'application/yaml'
+        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.start_with?("---\n"), "Response body should be YAML: #{response.body.inspect}"
+      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:  ["localhost:#{@port}", "localhost:#{@port+1}" ],
+                    hosts:  ["127.0.0.1:#{@port}", "127.0.0.1:#{@port+1}" ],
                     logger: (ENV['QUIET'] ? nil : @logger)
       end
 
@@ -103,7 +106,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       setup do
         @port = (ENV['TEST_CLUSTER_PORT'] || 9250).to_i
         @client = Elasticsearch::Client.new \
-                    hosts: ["localhost:#{@port}", "foobar1"],
+                    hosts: ["127.0.0.1:#{@port}", "foobar1"],
                     logger: (ENV['QUIET'] ? nil : @logger),
                     retry_on_failure: true
       end
@@ -116,7 +119,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
 
       should "raise exception when it cannot get any healthy server" do
         @client = Elasticsearch::Client.new \
-                  hosts: ["localhost:#{@port}", "foobar1", "foobar2", "foobar3"],
+                  hosts: ["127.0.0.1:#{@port}", "foobar1", "foobar2", "foobar3"],
                   logger: (ENV['QUIET'] ? nil : @logger),
                   retry_on_failure: 1
 
@@ -135,7 +138,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
     context "with a sick node and reloading on failure" do
       setup do
         @client = Elasticsearch::Client.new \
-                  hosts: ["localhost:#{@port}", "foobar1", "foobar2"],
+                  hosts: ["127.0.0.1:#{@port}", "foobar1", "foobar2"],
                   logger: (ENV['QUIET'] ? nil : @logger),
                   reload_on_failure: true
       end
@@ -152,7 +155,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
     context "with retrying on status" do
       should "retry when the status does match" do
         @client = Elasticsearch::Client.new \
-                  hosts: ["localhost:#{@port}"],
+                  hosts: ["127.0.0.1:#{@port}"],
                   logger: (ENV['QUIET'] ? nil : @logger),
                   retry_on_status: 400
 
@@ -170,7 +173,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
     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: "localhost:#{@port}", adapter: :patron, logger: @logger
+        client = Elasticsearch::Transport::Client.new host: "127.0.0.1:#{@port}", adapter: :patron, logger: @logger
 
         assert_equal 'Faraday::Adapter::Patron',
                       client.transport.connections.first.connection.builder.handlers.first.name
@@ -192,7 +195,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       should "set the adapter with a block" do
         require 'net/http/persistent'
 
-        client = Elasticsearch::Transport::Client.new url: "localhost:#{@port}" do |f|
+        client = Elasticsearch::Transport::Client.new url: "127.0.0.1:#{@port}" do |f|
           f.adapter :net_http_persistent
         end
 
@@ -207,7 +210,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
         teardown { begin; Object.send(:remove_const, :Patron); rescue NameError; end }
 
         require 'patron'
-        client = Elasticsearch::Transport::Client.new host: "localhost:#{@port}"
+        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

data/test/unit/sniffer_test.rb

@@ -11,6 +11,38 @@ class Elasticsearch::Transport::Transport::SnifferTest < Test::Unit::TestCase
     Elasticsearch::Transport::Transport::Response.new 200, MultiJson.load(json)
   end
 
+  DEFAULT_NODES_INFO_RESPONSE = <<-JSON
+    {
+      "cluster_name" : "elasticsearch_test",
+      "nodes" : {
+        "N1" : {
+          "name" : "Node 1",
+          "transport_address" : "127.0.0.1:9300",
+          "host" : "testhost1",
+          "ip"   : "127.0.0.1",
+          "version" : "5.0.0",
+          "roles": [
+            "master",
+            "data",
+            "ingest"
+          ],
+          "attributes": {
+            "testattr": "test"
+          },
+          "http": {
+            "bound_address": [
+              "[fe80::1]:9250",
+              "[::1]:9250",
+              "127.0.0.1:9250"
+            ],
+            "publish_address": "127.0.0.1:9250",
+            "max_content_length_in_bytes": 104857600
+          }
+        }
+      }
+    }
+  JSON
+
   context "Sniffer" do
     setup do
       @transport = DummyTransport.new
@@ -21,47 +53,25 @@ class Elasticsearch::Transport::Transport::SnifferTest < Test::Unit::TestCase
       assert_equal @transport, @sniffer.transport
     end
 
-    should "return an array of hosts as hashes with Elasticsearch 1.x syntax" do
-      @transport.expects(:perform_request).returns __nodes_info <<-JSON
-        {
-          "ok" : true,
-          "cluster_name" : "elasticsearch_test",
-          "nodes" : {
-            "N1" : {
-              "name" : "Node 1",
-              "transport_address" : "inet[/192.168.1.23:9300]",
-              "hostname" : "testhost1",
-              "version" : "0.20.6",
-              "http_address" : "inet[/192.168.1.23:9200]",
-              "thrift_address" : "/192.168.1.23:9500",
-              "memcached_address" : "inet[/192.168.1.23:11211]"
-            }
-          }
-        }
-      JSON
+    should "return an array of hosts as hashes" do
+      @transport.expects(:perform_request).returns __nodes_info(DEFAULT_NODES_INFO_RESPONSE)
 
       hosts = @sniffer.hosts
 
       assert_equal 1, hosts.size
-      assert_equal '192.168.1.23', hosts.first[:host]
-      assert_equal '9200',         hosts.first[:port]
-      assert_equal 'Node 1',       hosts.first['name']
+      assert_equal '127.0.0.1', hosts.first[:host]
+      assert_equal '9250',      hosts.first[:port]
+      assert_equal 'Node 1',    hosts.first[:name]
     end
 
-    should "return an array of hosts as hashes with Elasticsearch 2.0 syntax" do
+    should "return an array of hosts as hostnames when a hostname is returned" do
       @transport.expects(:perform_request).returns __nodes_info <<-JSON
         {
-          "ok" : true,
-          "cluster_name" : "elasticsearch_test",
           "nodes" : {
             "N1" : {
-              "name" : "Node 1",
-              "transport_address" : "192.168.1.23:9300",
-              "hostname" : "testhost1",
-              "version" : "0.20.6",
-              "http_address" : "192.168.1.23:9200",
-              "thrift_address" : "192.168.1.23:9500",
-              "memcached_address" : "192.168.1.23:11211"
+              "http": {
+                "publish_address": "testhost1.com:9250"
+              }
             }
           }
         }
@@ -70,66 +80,36 @@ class Elasticsearch::Transport::Transport::SnifferTest < Test::Unit::TestCase
       hosts = @sniffer.hosts
 
       assert_equal 1, hosts.size
-      assert_equal '192.168.1.23', hosts.first[:host]
-      assert_equal '9200',         hosts.first[:port]
-      assert_equal 'Node 1',       hosts.first['name']
+      assert_equal 'testhost1.com', hosts.first[:host]
+      assert_equal '9250',         hosts.first[:port]
     end
 
-    should "return an array of hosts as hostnames when a hostname is returned" do
-      @transport.expects(:perform_request).returns __nodes_info <<-JSON
-        {
-          "ok" : true,
-          "cluster_name" : "elasticsearch_test",
-          "nodes" : {
-            "N1" : {
-              "name" : "Node 1",
-              "transport_address" : "inet[/192.168.1.23:9300]",
-              "hostname" : "testhost1",
-              "version" : "0.20.6",
-              "http_address" : "inet[testhost1.com/192.168.1.23:9200]",
-              "thrift_address" : "/192.168.1.23:9500",
-              "memcached_address" : "inet[/192.168.1.23:11211]"
-            }
-          }
-        }
-      JSON
+    should "return HTTP hosts for the HTTPS protocol in the transport" do
+      @transport = DummyTransport.new :options => { :protocol => 'https' }
+      @sniffer   = Elasticsearch::Transport::Transport::Sniffer.new @transport
 
-      hosts = @sniffer.hosts
+      @transport.expects(:perform_request).returns __nodes_info(DEFAULT_NODES_INFO_RESPONSE)
 
-      assert_equal 1, hosts.size
-      assert_equal 'testhost1.com', hosts.first[:host]
-      assert_equal '9200',         hosts.first[:port]
-      assert_equal 'Node 1',       hosts.first['name']
+      assert_equal 1, @sniffer.hosts.size
     end
 
     should "skip hosts without a matching transport protocol" do
-      @transport = DummyTransport.new :options => { :protocol => 'memcached' }
+      @transport = DummyTransport.new
       @sniffer   = Elasticsearch::Transport::Transport::Sniffer.new @transport
 
       @transport.expects(:perform_request).returns __nodes_info <<-JSON
         {
-          "ok" : true,
-          "cluster_name" : "elasticsearch_test",
           "nodes" : {
             "N1" : {
-              "name" : "Memcached Node",
-              "http_address" : "inet[/192.168.1.23:9200]",
-              "memcached_address" : "inet[/192.168.1.23:11211]"
-            },
-            "N2" : {
-              "name" : "HTTP Node",
-              "http_address" : "inet[/192.168.1.23:9200]"
+              "foobar": {
+                "publish_address": "foobar:1234"
+              }
             }
           }
         }
       JSON
 
-      hosts = @sniffer.hosts
-
-      assert_equal 1, hosts.size
-      assert_equal '192.168.1.23',   hosts.first[:host]
-      assert_equal '11211',          hosts.first[:port]
-      assert_equal 'Memcached Node', hosts.first['name']
+      assert_empty @sniffer.hosts
     end
 
     should "have configurable timeout" do

data/test/unit/transport_curb_test.rb

@@ -55,7 +55,7 @@ else
         @transport.perform_request 'POST', '/', {}, '{"foo":"bar"}'
       end
 
-      should "set application/json header" do
+      should "set application/json response header" do
         @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')

data/test/unit/transport_faraday_test.rb

@@ -33,8 +33,12 @@ class Elasticsearch::Transport::Transport::HTTP::FaradayTest < Test::Unit::TestC
 
     should "properly prepare the request" do
       @transport.connections.first.connection.expects(:run_request).with do |method, url, body, headers|
-        :post == method && '{"foo":"bar"}' == body
+        assert_equal :post, method
+        assert_equal '{"foo":"bar"}', body
+        assert_nil   headers['Accept']
+        true
       end.returns(stub_everything)
+
       @transport.perform_request 'POST', '/', {}, {:foo => 'bar'}
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 5.0.0.pre
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -410,12 +410,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby client for Elasticsearch.