elastomer-client 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3bb86cf79cf4c35faa602b5b887790916354830
-  data.tar.gz: 0d20d421a0c1c396efaaa01edfc0c7eb621deb37
+  metadata.gz: 81dcb0ea764810dd5a824281170423608a0ab5f2
+  data.tar.gz: 089264a40b4574bccf618b35cc258266bb06ec94
 SHA512:
-  metadata.gz: 0043c22c958488f7952e814a05390df0dfb1b3746414b66d33b22ea5951f489155bd2ac820d47c541f9b3146f73a1a7a9c93af0b88769318ff1229bf112a160e
-  data.tar.gz: ca7cf1438d19f70fa2f73bf4b2ff7a22e8ef74453f8914dfa646b83163b4df0a4216fbd6cc5666b153dc2bcebd3af602f7240f28b449b22f07d61808fd27a608
+  metadata.gz: fd7298fd7537c9bcdc07f7be3bae04bcd77c83c20cbd3b0c7e410d339cc55f2ecaebb4f9dd3bc53305705cd19a44311cbd301f4f813c172035e2f36a1d1dcf12
+  data.tar.gz: 8eb7574b104215ee1a66a346a29c10d8ee00ea1273a4a213c8756b8ebdb1f07a25c8fe118bccfdca073c6a607e4a77e1bb32e14f999d855e5e9a8b7795c05238

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.4.1 (2014-10-14)
+- Support for index `_recovery` endpoint
+- Fix Faraday 0.8 support
+- Wrap all Faraday exceptions
+- Correctly wrap single-command reroute with a command array
+
 ## 0.4.0 (2014-10-08)
 - BREAKING: docs.add alias for docs.index removed
 - BREAKING: Faraday exceptions are now raised as Elastomer exceptions

data/docs/notifications.md

@@ -54,6 +54,7 @@ The event namespace is `request.client.elastomer`.
 - index.mapping
 - index.open
 - index.optimize
+- index.recovery
 - index.refresh
 - index.segments
 - index.snapshot

data/lib/elastomer/client.rb

@@ -187,23 +187,11 @@ module Elastomer
 
       handle_errors response
 
-    rescue Faraday::Error::TimeoutError => boom
-      raise TimeoutError.new(boom, method.upcase, path)
-
-    rescue Faraday::Error::ConnectionFailed => boom
-      raise ConnectionFailed.new(boom, method.upcase, path)
-
-    rescue Faraday::Error::ResourceNotFound => boom
-      raise ResourceNotFound.new(boom, method.upcase, path)
-
-    rescue Faraday::Error::ParsingError => boom
-      raise ParsingError.new(boom, method.upcase, path)
-
-    rescue Faraday::Error::SSLError => boom
-      raise SSLError.new(boom, method.upcase, path)
-
+    # wrap Faraday errors with appropriate Elastomer::Client error classes
     rescue Faraday::Error::ClientError => boom
-      raise Error.new(boom, method.upcase, path)
+      error_name = boom.class.name.split('::').last
+      error_class = Elastomer::Client.const_get(error_name) rescue Elastomer::Client::Error
+      raise error_class.new(boom, method.upcase, path)
 
     # ensure
     #   # FIXME: this is here until we get a real logger in place

data/lib/elastomer/client/cluster.rb

@@ -129,11 +129,24 @@ module Elastomer
       #     { :allocate => { :index => 'test', :shard => 1, :node => 'node3' }}
       #   ])
       #
+      #   reroute(:commands => [
+      #     { :move     => { :index => 'test', :shard => 0, :from_node => 'node1', :to_node => 'node2' }},
+      #     { :allocate => { :index => 'test', :shard => 1, :node => 'node3' }}
+      #   ])
+      #
       # See http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/cluster-reroute.html
       #
       # Returns the response as a Hash
       def reroute( commands, params = {} )
-        body = {:commands => Array(commands)}
+        if commands.is_a?(Hash) && commands.key?(:commands)
+          body = commands
+        elsif commands.is_a?(Hash)
+          # Array() on a Hash does not do what you think it does - that is why
+          # we are explicitly wrapping the Hash via [commands] here.
+          body = {:commands => [commands]}
+        else
+          body = {:commands => Array(commands)}
+        end
 
         response = client.post '/_cluster/reroute', params.merge(:body => body, :action => 'cluster.reroute')
         response.body

data/lib/elastomer/client/errors.rb

@@ -77,5 +77,16 @@ module Elastomer
     TimeoutError.fatal     = false
     ConnectionFailed.fatal = false
 
+    # Define an Elastomer::Client exception class on the fly for
+    # Faraday exception classes that we don't specifically wrap.
+    Faraday::Error.constants.each do |error_name|
+      next if ::Elastomer::Client.const_get(error_name) rescue nil
+
+      error_class = Faraday::Error.const_get(error_name)
+      next unless error_class < Faraday::Error::ClientError
+
+      ::Elastomer::Client.const_set(error_name, Class.new(Error))
+    end
+
   end  # Client
 end  # Elastomer

data/lib/elastomer/client/index.rb

@@ -282,6 +282,19 @@ module Elastomer
         response.body
       end
 
+      # Provides insight into on-going index shard recoveries. Recovery status
+      # may be reported for specific indices, or cluster-wide.
+      #
+      # See http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-recovery.html
+      #
+      # params - Parameters Hash
+      #
+      # Returns the response body as a Hash
+      def recovery( params = {} )
+        response = client.get '{/index}/_recovery', update_params(params, :action => 'index.recovery')
+        response.body
+      end
+
       # Clear caches for one or more indices. Individual caches can be
       # specified with parameters.
       # See http://www.elasticsearch.org/guide/reference/api/admin-indices-clearcache/

data/lib/elastomer/version.rb

@@ -1,5 +1,5 @@
 module Elastomer
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 
   def self.version
     VERSION

data/test/client/index_test.rb

@@ -240,6 +240,13 @@ describe Elastomer::Client::Index do
       end
     end
 
+    if es_version_1_x?
+      it 'recovery' do
+        response = @index.recovery
+        assert_includes response, "elastomer-index-test"
+      end
+    end
+
     it 'clears caches' do
       response = @index.clear_cache
       assert_equal 0, response["_shards"]["failed"]

data/test/client/{stubbed_client_tests.rb → stubbed_client_test.rb}

@@ -27,7 +27,7 @@ describe 'stubbed client tests' do
 
   describe Elastomer::Client::Nodes do
     it 'performs a shutdown of the node(s)' do
-      @stubs.post('/_cluster/nodes/_shutdown')       { [200, {'Content-Type' => 'application/json'}, '{"nodes":{"1":{"name":"Node1"}}}'] }
+      @stubs.post('/_cluster/nodes/_all/_shutdown')  { [200, {'Content-Type' => 'application/json'}, '{"nodes":{"1":{"name":"Node1"}}}'] }
       @stubs.post('/_cluster/nodes/node2/_shutdown') { [200, {'Content-Type' => 'application/json'}, '{"nodes":{"2":{"name":"Node2"}}}'] }
 
       h = @client.nodes.shutdown

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastomer-client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tim Pease
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -176,7 +176,7 @@ files:
 - test/client/repository_test.rb
 - test/client/scan_test.rb
 - test/client/snapshot_test.rb
-- test/client/stubbed_client_tests.rb
+- test/client/stubbed_client_test.rb
 - test/client/template_test.rb
 - test/client/warmer_test.rb
 - test/client_test.rb
@@ -221,7 +221,7 @@ test_files:
 - test/client/repository_test.rb
 - test/client/scan_test.rb
 - test/client/snapshot_test.rb
-- test/client/stubbed_client_tests.rb
+- test/client/stubbed_client_test.rb
 - test/client/template_test.rb
 - test/client/warmer_test.rb
 - test/client_test.rb