elasticsearch-transport 1.0.4 → 1.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWFlNjhjYzk0N2Q0NGE0OTVkNzc5ODY3Y2Q2YTQ0YTVmMjgwOWYwYg==
+    NTYyMTcyOTVlNjgyNTAzMzk4YTRmNDhkNmNmYTJmZTVjNTEwYjQwOA==
   data.tar.gz: !binary |-
-    ZTIyNzc1OGM0YzE3YWNiMDYzZjcyZjljYjMzNzA4OWI5MDNhMGM0Mw==
+    MzBiOTgwYjA3NGIxYmNhZTU0YTI3NGY2NWRkZmRjMjk2MzEzYzViZA==
 SHA512:
   metadata.gz: !binary |-
-    YmQzY2JiODk5Yjg3Njc0ZmY3MWU4N2IwOTRmN2IzYjhmYjExYjczNGI2M2Rj
-    OTE5NDVkNTNkNGY1N2E4MDRmN2FlODI1MTQ5OGE0MDU5MTg2YWIyMTU0MGY5
-    NjY2ZWRmMmZmYmE0MmVjNGMzMGQyMGEwYjk1YWFjMjgxNmIyNTY=
+    MmYwMTBmYzE5NmJkYjhiOTUxMGIyOWQzZTkyNDYzZmM2MTkzMGE2YmM5YTdk
+    MjdlYmE4NDYyMWIzZWY5MTRmNDAyNDlkMjE1YmUwMmZkZDBlNjJlMTFmNDY5
+    YTRjMTE4M2RkZmU3ZTVmMjQ2OWI0NGU5MjBmZDRhY2EyMzVjN2E=
   data.tar.gz: !binary |-
-    YjEwZmI5YjIyYWNlMzM0ZGY1NmU3MzRiNDZmMGJlZjhmMTNjMDNjOTZiNGQx
-    ZDI1MjYyMjhkN2U3NjJkOTE5ZjNhMmQ2MDkxMzIxODQxYmZjYzdhY2UyZTk2
-    YWQyYzc0OGE2NWJmZDMzMTNmMGExZGEzN2I5MGJmNDFmMDQ0OGE=
+    ODEwMzczYzc3ODdhMmJlZGIxODkzNDRlMDY1MDJkOTBkOTBhMTBkYWRjYmE3
+    ODZmMmI5NjlhODg0MTg5OGUxYjQxNDQwY2E4MjkwNjE0MWM3ZDMwMDUzYTE0
+    ZTE3OTFjZmIwZjA4NTJmMmY2MmEyMDQzNmU2ODc5ZjFjZjY1ZGQ=

data/README.md

@@ -323,6 +323,23 @@ The serialization component is pluggable, though, so you can write your own by i
 {Elasticsearch::Transport::Transport::Serializer::Base} module, implementing the required contract,
 and passing it to the client as the `serializer_class` or `serializer` parameter.
 
+### Exception Handling
+
+The library defines a [number of exception classes](https://github.com/elasticsearch/elasticsearch-ruby/blob/master/elasticsearch-transport/lib/elasticsearch/transport/transport/errors.rb)
+for various client and server errors, as well as unsuccessful HTTP responses,
+making it possible to `rescue` specific exceptions with desired granularity.
+
+The highest-level exception is {Elasticsearch::Transport::Transport::Error}
+and will be raised for any generic client *or* server errors.
+
+{Elasticsearch::Transport::Transport::ServerError} will be raised for server errors only.
+
+As an example for response-specific errors, a `404` response status will raise
+an {Elasticsearch::Transport::Transport::Errors::NotFound} exception.
+
+Finally, {Elasticsearch::Transport::Transport::SnifferTimeoutError} will be raised
+when connection reloading ("sniffing") times out.
+
 ## Development and Community
 
 For local development, clone the repository and run `bundle install`. See `rake -T` for a list of

data/elasticsearch-transport.gemspec

@@ -40,7 +40,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "turn"
   s.add_development_dependency "yard"
   s.add_development_dependency "pry"
-  s.add_development_dependency "ci_reporter"
+  s.add_development_dependency "ci_reporter", "~> 1.9"
 
   # Gems for testing integrations
   s.add_development_dependency "curb"   unless defined? JRUBY_VERSION
@@ -60,7 +60,6 @@ Gem::Specification.new do |s|
     s.add_development_dependency "simplecov"
     s.add_development_dependency "simplecov-rcov"
     s.add_development_dependency "cane"
-    s.add_development_dependency "coveralls"
   end
 
   s.description = <<-DESC.gsub(/^    /, '')

data/lib/elasticsearch/transport/client.rb

@@ -33,6 +33,8 @@ module Elasticsearch
 
       # Create a client connected to an Elasticsearch cluster.
       #
+      # Specify the URL via arguments or set the `ELASTICSEARCH_URL` environment variable.
+      #
       # @option arguments [String,Array] :hosts Single host passed as a String or Hash, or multiple hosts
       #                                         passed as an Array; `host` or `url` keys are also valid
       #
@@ -73,7 +75,7 @@ module Elasticsearch
       #                                        {Elasticsearch::Transport::Transport::Connections::Selector::Base}.
       #
       def initialize(arguments={})
-        hosts            = arguments[:hosts] || arguments[:host] || arguments[:url]
+        hosts = arguments[:hosts] || arguments[:host] || arguments[:url] || ENV.fetch('ELASTICSEARCH_URL', 'localhost:9200')
 
         arguments[:logger] ||= arguments[:log]   ? DEFAULT_LOGGER.call() : nil
         arguments[:tracer] ||= arguments[:trace] ? DEFAULT_TRACER.call() : nil
@@ -114,8 +116,8 @@ module Elasticsearch
       #
       # @api private
       #
-      def __extract_hosts(hosts_config=nil, options={})
-        hosts_config = hosts_config.nil? ? ['localhost'] : Array(hosts_config)
+      def __extract_hosts(hosts_config, options={})
+        hosts_config = Array(hosts_config)
 
         hosts = hosts_config.map do |host|
           case host

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

@@ -70,7 +70,7 @@ module Elasticsearch
           # @return [Array]
           #
           def host_unreachable_exceptions
-            [::Curl::Err::HostResolutionError, ::Curl::Err::ConnectionFailedError]
+            [::Curl::Err::HostResolutionError, ::Curl::Err::ConnectionFailedError, ::Curl::Err::GotNothingError, ::Curl::Err::RecvError, ::Curl::Err::SendError]
           end
         end
 

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   end
 end

data/test/unit/client_test.rb

@@ -70,16 +70,20 @@ class Elasticsearch::Transport::ClientTest < Test::Unit::TestCase
         assert_equal 'foobar', c2.transport.hosts.first[:host]
         assert_equal 'foobar', c3.transport.hosts.first[:host]
       end
+
     end
 
-    context "extracting hosts" do
-      should "handle defaults" do
-        hosts = @client.__extract_hosts
+    context "when the URL is set in the environment variable" do
+      setup    { ENV['ELASTICSEARCH_URL'] = 'foobar' }
+      teardown { ENV.delete('ELASTICSEARCH_URL')     }
 
-        assert_equal 'localhost', hosts[0][:host]
-        assert_nil                hosts[0][:port]
+      should "use it" do
+        c = Elasticsearch::Transport::Client.new
+        assert_equal 'foobar', c.transport.hosts.first[:host]
       end
+    end
 
+    context "extracting hosts" do
       should "extract from string" do
         hosts = @client.__extract_hosts 'myhost'
 

data/test/unit/transport_curb_test.rb

@@ -16,6 +16,10 @@ class Elasticsearch::Transport::Transport::HTTP::FaradayTest < Test::Unit::TestC
       @transport = Curb.new :hosts => [ { :host => 'foobar', :port => 1234 } ]
     end
 
+    should "implement host_unreachable_exceptions" do
+      assert_instance_of Array, @transport.host_unreachable_exceptions
+    end
+
     should "implement __build_connections" do
       assert_equal 1, @transport.hosts.size
       assert_equal 1, @transport.connections.size

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -168,16 +168,16 @@ dependencies:
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -304,20 +304,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  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'
 description: ! 'Ruby client for Elasticsearch. See the `elasticsearch` gem for full
   integration.