elasticsearch-transport 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c3784ade70a4f287b4e121b2498e9cd36c693ba
-  data.tar.gz: 83d63462da4185255e095f975aa5be874bd0f6d3
+  metadata.gz: 2b270a67bd3d6c3566fb5503a86965472087c5ef
+  data.tar.gz: 629cce04c30b1968ce0d7fab0e4347cd99b70bda
 SHA512:
-  metadata.gz: 27a8f8fbde68ca78613400b7b885f96724ed65865afe06ec07ffafa77c6efe3fd66fa3eebbf385873ae4fcf1eadd8396a7b5d2555514719e456710efe6a916b9
-  data.tar.gz: 230ef52cf57b3d629c10c31a0e0d74eb645c2de88b7397819b75b5dabdc92de1778144097e9fbd1e18cef17cba616ba297c72bb08843df9c921075f41e1a15a4
+  metadata.gz: 5849da863dfc15089eb5f443c9364cdbe476cebc8e02b9db89d95c5c225622b694fd40e3fedc71c18f94e8a62702c099ade7931a708cd271481c47dbb02b910c
+  data.tar.gz: e3824c7169dfdc5061fb4b1dd2e4ad0919cc9ac33180c1c3220027ea08e92c0ee8224cad3e0ea128f76da14757a21c8eec97b469eb949c3b5191165b8acc3551

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", __FILE__)
+if File.exist? File.expand_path("../../elasticsearch-extensions/elasticsearch-extensions.gemspec", __FILE__)
   gem 'elasticsearch-extensions', :path => File.expand_path("../../elasticsearch-extensions", __FILE__), :require => false
 end
 

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

@@ -49,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?(Fixnum) ? options[:reload_connections] : DEFAULT_RELOAD_AFTER
+          @reload_after    = options[:reload_connections].is_a?(Integer) ? options[:reload_connections] : DEFAULT_RELOAD_AFTER
           @resurrect_after = options[:resurrect_after] || DEFAULT_RESURRECT_AFTER
-          @max_retries     = options[:retry_on_failure].is_a?(Fixnum)   ? options[:retry_on_failure]   : DEFAULT_MAX_RETRIES
+          @max_retries     = options[:retry_on_failure].is_a?(Integer)   ? options[:retry_on_failure]   : DEFAULT_MAX_RETRIES
           @retry_on_status = Array(options[:retry_on_status]).map { |d| d.to_i }
         end
 
@@ -244,6 +244,10 @@ module Elasticsearch
           start = Time.now if logger || tracer
           tries = 0
 
+          params = params.clone
+
+          ignore = Array(params.delete(:ignore)).compact.map { |s| s.to_i }
+
           begin
             tries     += 1
             connection = get_connection or raise Error.new("Cannot get new connection from pool.")
@@ -309,7 +313,9 @@ module Elasticsearch
             __log    method, path, params, body, url, response, nil, 'N/A', duration if logger
             __trace  method, path, params, body, url, response, nil, 'N/A', duration if tracer
             __log_failed response if logger
-            __raise_transport_error response
+
+            # Swallow the exception when the `ignore` parameter matches response status
+            __raise_transport_error response unless ignore.include?(response.status.to_i)
           end
 
           json     = serializer.load(response.body) if response.body && !response.body.empty? && response.headers && response.headers["content-type"] =~ /json/

data/lib/elasticsearch/transport/version.rb

@@ -1,5 +1,5 @@
 module Elasticsearch
   module Transport
-    VERSION = "5.0.0"
+    VERSION = "5.0.1"
   end
 end

data/test/integration/client_test.rb

@@ -53,6 +53,14 @@ class Elasticsearch::Transport::ClientIntegrationTest < Elasticsearch::Test::Int
       end
     end
 
+    should "ignore specified response codes" do
+      response = @client.perform_request 'GET', '/_foobar', ignore: 400
+      assert_equal 400, response.status
+
+      assert_instance_of Hash, response.body
+      assert_match /illegal_argument_exception/, response.body.inspect
+    end
+
     should "pass options to the transport" do
       @client = Elasticsearch::Client.new \
         host: "127.0.0.1:#{@port}",

data/test/unit/transport_base_test.rb

@@ -246,6 +246,21 @@ class Elasticsearch::Transport::Transport::BaseTest < Test::Unit::TestCase
       end
     end
 
+    should "not raise an error when the :ignore argument has been passed" do
+      @transport.stubs(:get_connection).returns(stub_everything :failures => 1)
+
+      assert_raise Elasticsearch::Transport::Transport::Errors::BadRequest do
+        @transport.perform_request 'GET', '/' do
+          Elasticsearch::Transport::Transport::Response.new 400, 'CLIENT ERROR'
+        end
+      end
+
+      # No `BadRequest` error
+      @transport.perform_request 'GET', '/', :ignore => 400 do
+        Elasticsearch::Transport::Transport::Response.new 400, 'CLIENT ERROR'
+      end
+    end
+
     should "mark the connection as dead on failure" do
       c = stub_everything :failures => 1
       @transport.expects(:get_connection).returns(c)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch-transport
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Karel Minarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2017-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json