active_utils 3.3.12 → 3.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61e472217a759cb93bc5ee87e5c495f557f680a4
-  data.tar.gz: 065567242b3d417094e9fc0e40dfd491b5a9fa32
+  metadata.gz: 2419f33b62bb5ac91f29b58e341436e5fd8d636a
+  data.tar.gz: '09d2b0dd502873b3250358165a4d7e05e83174ef'
 SHA512:
-  metadata.gz: 0efa9a4885434ffd36ee75a2de7251848da6517425237ae8371dcb4cc5821b26e517655cff675b85bddd95431e6cd6360ad02a62397c9997a4aa7b1c68d24f5d
-  data.tar.gz: c37cc962951edfde8e72c4a855a1dc41105d78685695f1947996fc57fd95eba7ec81fd8a7e4d4d6011cb9e348b90bb737d8abb2567b07556a2af24ca9963a3e4
+  metadata.gz: 8d891d8cf21711ea9d1f303a96e01ada3e15c05f24916f0c2ea18c1cfed27ff268dede6f1e31cc144640353e6d32896af7c33a2dfcbc9afedb000b72b19e813e
+  data.tar.gz: 9f332193f661283e2e50b3b38d32e70fe4ddf1c32c31d7a1e0f6d1d4f9f3cf15a82cd8a71361a8c38ffdbfe815f3f2cb390214f7e24e8786f168c65e18549710

data/.github/probots.yml

@@ -0,0 +1,2 @@
+enabled:
+  - cla

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # ActiveUtils changelog
 
+### Version 3.3.13 (November 26, 2018)
+- Add support for custom retriable exceptions in `NetworkConnectionRetries#retry_exceptions`
+
+### Version 3.3.12 (July 11, 2018)
+- Update CA bundle
+
+### Version 3.3.11 (March 14, 2018)
+- Add the DigiCert Global Root G2 to the CA bundle
+
+### Version 3.3.10 (February 28, 2018)
+- Support ActiveSupport 5.2
+
 ### Version 3.3.9 (September 28, 2017)
 - Add remaining currencies to `ActiveUtils::CurrencyCode::ISO_CURRENCIES`
 - Update bundler in `travis.yml`

data/lib/active_utils/network_connection_retries.rb

@@ -10,18 +10,23 @@ module ActiveUtils
       OpenSSL::SSL::SSLError => "The SSL connection to the remote server could not be established"
     }
 
+    DEFAULT_RETRY_ERRORS = {
+      Errno::ECONNREFUSED => "The remote server refused the connection"
+    }
+
     def self.included(base)
       base.send(:attr_accessor, :retry_safe)
     end
 
     def retry_exceptions(options={})
       connection_errors = DEFAULT_CONNECTION_ERRORS.merge(options[:connection_exceptions] || {})
+      retry_errors = DEFAULT_RETRY_ERRORS.merge(options[:retriable_exceptions] || {})
 
       retry_network_exceptions(options) do
         begin
           yield
-        rescue Errno::ECONNREFUSED => e
-          raise ActiveUtils::RetriableConnectionError, "The remote server refused the connection"
+        rescue *retry_errors.keys => e
+          raise ActiveUtils::RetriableConnectionError, derived_error_message(retry_errors, e.class)
         rescue OpenSSL::X509::CertificateError => e
           NetworkConnectionRetries.log(options[:logger], :error, e.message, options[:tag])
           raise ActiveUtils::ClientCertificateError, "The remote server did not accept the provided SSL certificate"

data/lib/active_utils/version.rb

@@ -1,3 +1,3 @@
 module ActiveUtils
-  VERSION = "3.3.12"
+  VERSION = "3.3.13"
 end

data/test/unit/network_connection_retries_test.rb

@@ -207,4 +207,12 @@ class NetworkConnectionRetriesTest < Minitest::Test
       end
     end
   end
+
+  def test_retries_with_custom_error_specified
+    @requester.expects(:post).times(2).raises(Errno::ETIMEDOUT).then.returns(@ok)
+
+    retry_exceptions retriable_exceptions: { Errno::ETIMEDOUT => "The connection to the remote server timed out"} do
+      @requester.post
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_utils
 version: !ruby/object:Gem::Version
-  version: 3.3.12
+  version: 3.3.13
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -93,6 +93,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/probots.yml"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md