elasticsearch-transport 1.0.7 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee365b72ccd59176d473e7cfd057d4f246eacd0f
-  data.tar.gz: 2b9ab7f0a21f779cc24957f0b1aad4b0a9c449c1
+  metadata.gz: 85aa43e17d7dbb5e43514c2c6c8d61030db7bf0f
+  data.tar.gz: 7220157362dbd60f5f003fbe457cb97d5f03983f
 SHA512:
-  metadata.gz: 23ea14e8d2901165ac026bf0dd4c9e17c1b8560629bc946418d05f24321f31410389edc185cf06701e94b7fc915ac2031d988d35be0ba1b449cf0ff483afa56c
-  data.tar.gz: 7ea2f669de99b231e41e02db9b801bef7ec0a1753e796ad71da98095e5e56192cb3aa48d5600b050eb653bcf0c4e4badbd6f90853077641631db20ba942a504e
+  metadata.gz: e86b6d6fdd5d38114b5a8ff506c114a0270d6ee8bccade584badb9bb5aac51c59f181afa162cfb8cfb5da01b9967507a513dafa1a3e157eed20874253424fd4d
+  data.tar.gz: 44569f981a390c4ad0f1a4bb5a3cb766bd03f5fd114f384c4a705c5b59bf69d73759b0e75b445ecd5b4ca7e67a0e9239f4ae8faad76d4228ac281626657dff12

data/README.md

@@ -27,10 +27,11 @@ Features overview:
 * Request retries and dead connections handling
 * Node reloading (based on cluster state) on errors or on demand
 
-For optimal performance, you should use a HTTP library which supports persistent ("keep-alive") connections,
-e.g. [Patron](https://github.com/toland/patron) or [Typhoeus](https://github.com/typhoeus/typhoeus).
-Just `require 'patron'` or `require 'typhoeus'; require 'typhoeus/adapters/faraday'` in your code,
-and it will be automatically used; other automatically used libraries are
+For optimal performance, use a HTTP library which supports persistent ("keep-alive") connections,
+such as [Typhoeus](https://github.com/typhoeus/typhoeus).
+Just require the library (`require 'typhoeus'; require 'typhoeus/adapters/faraday'`) in your code,
+and it will be automatically used; currently these libraries will be automatically detected and used:
+[Patron](https://github.com/toland/patron),
 [HTTPClient](https://rubygems.org/gems/httpclient) and
 [Net::HTTP::Persistent](https://rubygems.org/gems/net-http-persistent).
 
@@ -170,7 +171,8 @@ on a different host:
 
     Elasticsearch::Client.new hosts: ['localhost:9200', 'localhost:9201'], retry_on_failure: true
 
-You can specify how many times should the client retry the request before it raises an exception:
+You can specify how many times should the client retry the request before it raises an exception
+(the default is 3 times):
 
     Elasticsearch::Client.new hosts: ['localhost:9200', 'localhost:9201'], retry_on_failure: 5
 

data/elasticsearch-transport.gemspec

@@ -46,7 +46,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "curb"   unless defined? JRUBY_VERSION
   s.add_development_dependency "patron" unless defined? JRUBY_VERSION
   s.add_development_dependency "typhoeus", '~> 0.6'
-  s.add_development_dependency "manticore" if defined? JRUBY_VERSION
+  s.add_development_dependency "manticore", '~> 0.3.5' if defined? JRUBY_VERSION
+  s.add_development_dependency "hashie"
 
   # Prevent unit test failures on Ruby 1.8
   if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'

data/lib/elasticsearch/transport/client.rb

@@ -128,7 +128,7 @@ module Elasticsearch
       # @api private
       #
       def __extract_hosts(hosts_config, options={})
-        if hosts_config.respond_to?(:to_hash)
+        if hosts_config.is_a?(Hash)
           hosts = [ hosts_config ]
         else
           if hosts_config.is_a?(String) && hosts_config.include?(',')
@@ -136,29 +136,29 @@ module Elasticsearch
           else
             hosts = Array(hosts_config)
           end
+        end
 
-          hosts.map! do |host|
-            case host
-            when String
-              if host =~ /^[a-z]+\:\/\//
-                uri = URI.parse(host)
-                { :scheme => uri.scheme, :user => uri.user, :password => uri.password, :host => uri.host, :path => uri.path, :port => uri.port.to_s }
-              else
-                host, port = host.split(':')
-                { :host => host, :port => port }
-              end
-            when URI
-              { :scheme => host.scheme, :user => host.user, :password => host.password, :host => host.host, :path => host.path, :port => host.port.to_s }
-            when Hash
-              host
+        result = hosts.map do |host|
+          case host
+          when String
+            if host =~ /^[a-z]+\:\/\//
+              uri = URI.parse(host)
+              { :scheme => uri.scheme, :user => uri.user, :password => uri.password, :host => uri.host, :path => uri.path, :port => uri.port.to_s }
             else
-              raise ArgumentError, "Please pass host as a String, URI or Hash -- #{host.class} given."
+              host, port = host.split(':')
+              { :host => host, :port => port }
             end
+          when URI
+            { :scheme => host.scheme, :user => host.user, :password => host.password, :host => host.host, :path => host.path, :port => host.port.to_s }
+          when Hash
+            host
+          else
+            raise ArgumentError, "Please pass host as a String, URI or Hash -- #{host.class} given."
           end
         end
 
-        hosts.shuffle! if options[:randomize_hosts]
-        hosts
+        result.shuffle! if options[:randomize_hosts]
+        result
       end
 
       # Auto-detect the best adapter (HTTP "driver") available, based on libraries

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

@@ -23,7 +23,7 @@ module Elasticsearch
           def initialize(arguments={})
             selector_class = arguments[:selector_class] || DEFAULT_SELECTOR
             @connections   = arguments[:connections]    || []
-            @selector      = arguments[:selector]       || selector_class.new(arguments)
+            @selector      = arguments[:selector]       || selector_class.new(arguments.merge(:connections => self))
           end
 
           # Returns an Array of hosts information in this collection as Hashes.

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

@@ -48,7 +48,6 @@ module Elasticsearch
                 host[:port]     ||= DEFAULT_PORT
 
                 client = ::Curl::Easy.new
-                client.resolve_mode = :ipv4
                 client.headers      = {'User-Agent' => "Curb #{Curl::CURB_VERSION}"}
                 client.url          = __full_url(host)
 

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

@@ -7,7 +7,7 @@ module Elasticsearch
         # Alternative HTTP transport implementation for JRuby,
         # using the [_Manticore_](https://github.com/cheald/manticore) client,
         #
-        # @example
+        # @example HTTP
         #
         #     require 'elasticsearch/transport/transport/http/manticore'
         #
@@ -19,6 +19,27 @@ module Elasticsearch
         #     client.info['status']
         #     => 200
         #
+        #  @example HTTPS (All SSL settings are optional,
+        #                  see http://www.rubydoc.info/gems/manticore/Manticore/Client:initialize)
+        #
+        #     require 'elasticsearch/transport/transport/http/manticore'
+        #
+        #     client = Elasticsearch::Client.new \
+        #       url: 'https://elasticsearch.example.com',
+        #       transport_class: Elasticsearch::Transport::Transport::HTTP::Manticore,
+        #       ssl: {
+        #         truststore: '/tmp/truststore.jks',
+        #         truststore_password: 'password',
+        #         keystore: '/tmp/keystore.jks',
+        #         keystore_password: 'secret',
+        #       }
+        #
+        #     client.transport.connections.first.connection
+        #     => #<Manticore::Client:0xdeadbeef ...>
+        #
+        #     client.info['status']
+        #     => 200
+        #
         # @see Transport::Base
         #
         class Manticore
@@ -63,7 +84,7 @@ module Elasticsearch
               @request_options[:headers] = options[:headers]
             end
 
-            client_options = setup_ssl(options[:ssl] || {})
+            client_options = {:ssl => options[:ssl] || {}}
 
             Connections::Collection.new \
               :connections => hosts.map { |host|
@@ -77,7 +98,7 @@ module Elasticsearch
 
                 Connections::Connection.new \
                   :host => host,
-                  :connection => ::Manticore::Client.new(:options => client_options)
+                  :connection => ::Manticore::Client.new(client_options)
               },
               :selector_class => options[:selector_class],
               :selector => options[:selector]
@@ -95,22 +116,6 @@ module Elasticsearch
               ::Manticore::ResolutionFailure
             ]
           end
-
-          private
-          # TODO: not threadsafe
-          def setup_ssl(ssl_options)
-            if ssl_options[:truststore]
-              java.lang.System.setProperty "javax.net.ssl.trustStore", ssl_options[:truststore]
-            end
-            if ssl_options[:truststore_password]
-              java.lang.System.setProperty "javax.net.ssl.trustStorePassword", ssl_options[:truststore_password]
-            end
-            if ssl_options[:verify] == false then
-              { :ignore_ssl_validation => true }
-            else
-              {}
-            end
-          end
         end
       end
     end

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "1.0.7"
+    VERSION = "1.0.9"
   end
 end

data/test/integration/transport_test.rb

@@ -65,7 +65,7 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       response = client.perform_request 'GET', ''
 
       assert_respond_to(response.body, :to_hash)
-      assert_not_nil response.body['cluster_name']
+      assert_not_nil response.body['name']
       assert_equal 'application/json', response.headers['content-type']
     end unless JRUBY
   end

data/test/test_helper.rb

@@ -36,6 +36,8 @@ require 'require-prof' if ENV["REQUIRE_PROF"]
 require 'elasticsearch-transport'
 require 'logger'
 
+require 'hashie'
+
 RequireProf.print_timing_infos if ENV["REQUIRE_PROF"]
 
 if defined?(RUBY_VERSION) && RUBY_VERSION > '1.9'

data/test/unit/client_test.rb

@@ -115,7 +115,12 @@ class Elasticsearch::Transport::ClientTest < Test::Unit::TestCase
 
       should "extract from hash" do
         hosts = @client.__extract_hosts( { :host => 'myhost', :scheme => 'https' } )
+        assert_equal 'myhost', hosts[0][:host]
+        assert_equal 'https',  hosts[0][:scheme]
+      end
 
+      should "extract from Hashie::Mash" do
+        hosts = @client.__extract_hosts( Hashie::Mash.new(:host => 'myhost', :scheme => 'https') )
         assert_equal 'myhost', hosts[0][:host]
         assert_equal 'https',  hosts[0][:scheme]
       end

data/test/unit/connection_collection_test.rb

@@ -60,6 +60,11 @@ class Elasticsearch::Transport::Transport::Connections::CollectionTest < Test::U
         assert_equal ['BAR'], @collection.dead.map { |c| c.host.upcase }
       end
 
+      should "not return dead connections, when alive connections exist" do
+        assert_equal 1, @collection.size
+        @collection.all.size.times { refute @collection.get_connection.dead? }
+      end
+
       should "resurrect dead connection with least failures when no alive is available" do
         c1 = Connection.new(:host => 'foo').dead!.dead!
         c2 = Connection.new(:host => 'bar').dead!

data/test/unit/transport_manticore_test.rb

@@ -99,12 +99,8 @@ else
           }
         }
 
-        ::Manticore::Client.expects(:new).with(:options => {:ignore_ssl_validation => true})
-
+        ::Manticore::Client.expects(:new).with(options)
         transport = Manticore.new :hosts => [ { :host => 'foobar', :port => 1234 } ], :options => options
-
-        assert_equal java.lang.System.getProperty("javax.net.ssl.trustStore"), "test.jks"
-        assert_equal java.lang.System.getProperty("javax.net.ssl.trustStorePassword"), "test"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.9
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -220,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement