elasticsearch-transport 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfbb24f919ca5c508c660a9b121fb0937b16d5ab
-  data.tar.gz: 2efeb80ae1defb9578b2b62d2834f61b86e75983
+  metadata.gz: a1c41acb9864d25738a29b7ced81856e5eea8660
+  data.tar.gz: 1675e534fedd834b107e51c620767f11e1b9327f
 SHA512:
-  metadata.gz: aefe90beda8b000367535d535156786126c8f7b49d98cd637352a0cdc1a054f248fd7225973cc2b7a7be72207bfedf9b28bfd475f138144110b79082daa6c37b
-  data.tar.gz: e959b3c3c12990b2280ac9ad3836c3cdfb7c63a90ca5a46f2c78c50d974c3de921602b6f927749a7cc5d29f71809706bfb1705cd643a3e2680e0e1c01bb95ad2
+  metadata.gz: 2473aa1f15584614fcf9c96e75030bd37979817ba4ddcce78134781b275deedd35cf1a62a46af649c704d2d84a247751fe680be1c111de8ac8d25e6c33316817
+  data.tar.gz: 18aa296103d2c29b5ae11a3258f7e9c5f97c6787ad061ad4d0713a9e7fb916d920fb0c92604065bbbedf6fd7e15f75d2a253238a7cb26de141e7c48f0727f616

data/README.md

@@ -90,6 +90,9 @@ Instead of Strings, you can pass host information as an array of Hashes:
 
     Elasticsearch::Client.new hosts: [ { host: 'myhost1', port: 8080 }, { host: 'myhost2', port: 8080 } ]
 
+**NOTE:** When specifying multiple hosts, you probably want to enable the `retry_on_failure` option to
+          perform a failed request on another node (see the _Retrying on Failures_ chapter).
+
 Common URL parts -- scheme, HTTP authentication credentials, URL prefixes, etc -- are handled automatically:
 
     Elasticsearch::Client.new url: 'https://username:password@api.server.org:4430/search'

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

@@ -34,8 +34,12 @@ module Elasticsearch
           def __build_connections
             Connections::Collection.new \
               :connections => hosts.map { |host|
-                host[:protocol]   = host[:scheme] || DEFAULT_PROTOCOL
-                host[:port]     ||= DEFAULT_PORT
+                host[:protocol] = host[:scheme] || options[:scheme] || DEFAULT_PROTOCOL
+                host[:port] ||= options[:port] || DEFAULT_PORT
+                if options[:user] && !host[:user]
+                  host[:user] ||= options[:user]
+                  host[:password] ||= options[:password]
+                end
                 url               = __full_url(host)
 
                 Connections::Connection.new \

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

@@ -2,16 +2,16 @@ module Elasticsearch
   module Transport
     module Transport
 
-      # Handles node discovery ("sniffing").
+      # Handles node discovery ("sniffing")
       #
       class Sniffer
-        ES1_RE_URL  = /\/([^:]*):([0-9]+)\]/ # Use named groups on Ruby 1.9: /\/(?<host>[^:]*):(?<port>[0-9]+)\]/
-        ES2_RE_URL = /([^:]*):([0-9]+)/
+        ES1_RE_URL  = /\[([^\/]*)?\/?([^:]*):([0-9]+)\]/
+        ES2_RE_URL  = /([^\/]*)?\/?([^:]*):([0-9]+)/
 
         attr_reader   :transport
         attr_accessor :timeout
 
-        # @param transport [Object] A transport instance.
+        # @param transport [Object] A transport instance
         #
         def initialize(transport)
           @transport = transport
@@ -34,8 +34,9 @@ module Elasticsearch
               addr_str = info["#{transport.protocol}_address"].to_s
               matches = addr_str.match(ES1_RE_URL) || addr_str.match(ES2_RE_URL)
               if matches
-                # TODO: Implement lightweight "indifferent access" here
-                info.merge :host => matches[1], :port => matches[2], :id => id
+                host = matches[1].empty? ? matches[2] : matches[1]
+                port = matches[3]
+                info.merge :host => host, :port => port, :id => id
               end
             end.compact
 

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "1.0.13"
+    VERSION = "1.0.14"
   end
 end

data/test/unit/sniffer_test.rb

@@ -75,6 +75,33 @@ class Elasticsearch::Transport::Transport::SnifferTest < Test::Unit::TestCase
       assert_equal 'Node 1',       hosts.first['name']
     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
+
+      hosts = @sniffer.hosts
+
+      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']
+    end
+
     should "skip hosts without a matching transport protocol" do
       @transport = DummyTransport.new :options => { :protocol => 'memcached' }
       @sniffer   = Elasticsearch::Transport::Transport::Sniffer.new @transport

data/test/unit/transport_faraday_test.rb

@@ -135,6 +135,43 @@ class Elasticsearch::Transport::Transport::HTTP::FaradayTest < Test::Unit::TestC
       transport = Faraday.new :hosts => [ { :host => 'foobar', :port => 1234, :user => 'foo', :password => 'bar' } ]
       assert_equal 'Basic Zm9vOmJhcg==', transport.connections.first.connection.headers['Authorization']
     end
+
+    should "set the credentials if they exist in options" do
+      transport = Faraday.new :hosts => [ { :host => 'foobar', :port => 1234 } ],
+                              :options => { :user => 'foo', :password => 'bar' }
+      assert_equal 'Basic Zm9vOmJhcg==', transport.connections.first.connection.headers['Authorization']
+    end
+
+    should "override options credentials if passed explicitly" do
+      transport = Faraday.new :hosts => [ { :host => 'foobar', :port => 1234, :user => 'foo', :password => 'bar' },
+                                          { :host => 'foobar2', :port => 1234 } ],
+                              :options => { :user => 'foo2', :password => 'bar2' }
+      assert_equal 'Basic Zm9vOmJhcg==', transport.connections.first.connection.headers['Authorization']
+      assert_equal 'Basic Zm9vMjpiYXIy', transport.connections[1].connection.headers['Authorization']
+    end
+
+    should "set connection scheme to https if passed" do
+      transport = Faraday.new :hosts => [ { :host => 'foobar', :port => 1234, :scheme => 'https' } ]
+
+      assert_instance_of ::Faraday::Connection, transport.connections.first.connection
+      assert_equal 'https://foobar:1234/',       transport.connections.first.connection.url_prefix.to_s
+    end
+
+    should "set connection scheme to https if it exist in options" do
+      transport = Faraday.new :hosts => [ { :host => 'foobar', :port => 1234} ],
+                              :options => { :scheme => 'https' }
+
+      assert_instance_of ::Faraday::Connection, transport.connections.first.connection
+      assert_equal 'https://foobar:1234/',       transport.connections.first.connection.url_prefix.to_s
+    end
+
+    should "override options scheme if passed explicitly" do
+      transport = Faraday.new :hosts => [ { :host => 'foobar', :port => 1234, :scheme => 'http'} ],
+                              :options => { :scheme => 'https' }
+
+      assert_instance_of ::Faraday::Connection, transport.connections.first.connection
+      assert_equal 'http://foobar:1234/',       transport.connections.first.connection.url_prefix.to_s
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json