stripe 5.4.1 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e5f20e4c43413ce6119c1b2ba7c064d2cdbec25abfe76a3cf90e52a5b9c0ec4
-  data.tar.gz: 6deab0e7d3057f7c38fa5c629fda1d079a4c99c3d6ef09cc495a589a63649815
+  metadata.gz: 04bf14074bb94dbb41edf733c9240f770026a9e51647359d4d1d55820c1f3c46
+  data.tar.gz: e5a8433b4284faf095da5ad4ebd102127b005a52b56b7651dadfa579a06188f1
 SHA512:
-  metadata.gz: cc079329105fdc6498addef346923e48e52ac9f77d02d605eacd8b50fe302918db0405b4634f941bc8423e29c72227d84531684c82b436c4c71a8a9244c7fd53
-  data.tar.gz: b8548a9fd9d0b004af8d18994ea550072dc5df17b66a9635c394a9cb405f3145e4e25ab06030945e8ab79758891ce9636bdf3449082a371188ea022c504eee5f
+  metadata.gz: e905a1f7fa40887d5c8bd78c428f1d377b42ead6586cf147f6334fafc6264d81ccbdb504e6ef2c8da3e473f40ad18b275f372cc70eea147435252d813ac948b8
+  data.tar.gz: 3d03fb7104356a787b85287455e74157761e92b159db33414685af565fd99e7ff596e9cd1f4ce7dd0e00f44e2c342618fc65f52ad91ed7ccedabd42db6d990c4

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 5.5.0 - 2019-10-03
+* [#859](https://github.com/stripe/stripe-ruby/pull/859) User-friendly messages and retries for `EOFError`, `Errno::ECONNRESET`, `Errno::ETIMEDOUT`, and `Errno::EHOSTUNREACH` network errors
+
 ## 5.4.1 - 2019-10-01
 * [#858](https://github.com/stripe/stripe-ruby/pull/858) Drop Timecop dependency
 

data/Gemfile

@@ -11,7 +11,6 @@ group :development do
   gem "rake"
   gem "shoulda-context"
   gem "test-unit"
-  gem "timecop"
   gem "webmock"
 
   # Rubocop changes pretty quickly: new cops get added and old cops change

data/VERSION

@@ -1 +1 @@
-5.4.1
+5.5.0

data/lib/stripe/stripe_client.rb

@@ -81,17 +81,17 @@ module Stripe
     def self.should_retry?(error, method:, num_retries:)
       return false if num_retries >= Stripe.max_network_retries
 
-      # Retry on timeout-related problems (either on open or read).
-      return true if error.is_a?(Net::OpenTimeout)
-      return true if error.is_a?(Net::ReadTimeout)
-
-      # Destination refused the connection, the connection was reset, or a
-      # variety of other connection failures. This could occur from a single
-      # saturated server, so retry in case it's intermittent.
-      return true if error.is_a?(Errno::ECONNREFUSED)
-      return true if error.is_a?(SocketError)
-
-      if error.is_a?(Stripe::StripeError)
+      case error
+      when Net::OpenTimeout, Net::ReadTimeout
+        # Retry on timeout-related problems (either on open or read).
+        true
+      when EOFError, Errno::ECONNREFUSED, Errno::ECONNRESET,
+            Errno::EHOSTUNREACH, Errno::ETIMEDOUT, SocketError
+        # Destination refused the connection, the connection was reset, or a
+        # variety of other connection failures. This could occur from a single
+        # saturated server, so retry in case it's intermittent.
+        true
+      when Stripe::StripeError
         # The API may ask us not to retry (e.g. if doing so would be a no-op),
         # or advise us to retry (e.g. in cases of lock timeouts). Defer to
         # those instructions if given.
@@ -119,10 +119,10 @@ module Stripe
         return true if error.http_status == 500 && method != :post
 
         # 503 Service Unavailable
-        return true if error.http_status == 503
+        error.http_status == 503
+      else
+        false
       end
-
-      false
     end
 
     def self.sleep_time(num_retries)
@@ -296,7 +296,11 @@ module Stripe
     # The original error message is also appended onto the final exception for
     # full transparency.
     NETWORK_ERROR_MESSAGES_MAP = {
+      EOFError => ERROR_MESSAGE_CONNECTION,
       Errno::ECONNREFUSED => ERROR_MESSAGE_CONNECTION,
+      Errno::ECONNRESET => ERROR_MESSAGE_CONNECTION,
+      Errno::EHOSTUNREACH => ERROR_MESSAGE_CONNECTION,
+      Errno::ETIMEDOUT => ERROR_MESSAGE_TIMEOUT_CONNECT,
       SocketError => ERROR_MESSAGE_CONNECTION,
 
       Net::OpenTimeout => ERROR_MESSAGE_TIMEOUT_CONNECT,

data/lib/stripe/util.rb

@@ -178,9 +178,8 @@ module Stripe
     # to calculate an elapsed duration.
     #
     # Shortcut for getting monotonic time, mostly for purposes of line length
-    # and stubbing (Timecop doesn't freeze the monotonic clock). Returns time
-    # in seconds since the event used for monotonic reference purposes by the
-    # platform (e.g. system boot time).
+    # and test stubbing. Returns time in seconds since the event used for
+    # monotonic reference purposes by the platform (e.g. system boot time).
     def self.monotonic_time
       Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end

data/lib/stripe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Stripe
-  VERSION = "5.4.1"
+  VERSION = "5.5.0"
 end

data/test/stripe/stripe_client_test.rb

@@ -172,6 +172,26 @@ module Stripe
                                           method: :post, num_retries: 0)
       end
 
+      should "retry on EOFError" do
+        assert StripeClient.should_retry?(EOFError.new,
+                                          method: :post, num_retries: 0)
+      end
+
+      should "retry on Errno::ECONNRESET" do
+        assert StripeClient.should_retry?(Errno::ECONNRESET.new,
+                                          method: :post, num_retries: 0)
+      end
+
+      should "retry on Errno::ETIMEDOUT" do
+        assert StripeClient.should_retry?(Errno::ETIMEDOUT.new,
+                                          method: :post, num_retries: 0)
+      end
+
+      should "retry on Errno::EHOSTUNREACH" do
+        assert StripeClient.should_retry?(Errno::EHOSTUNREACH.new,
+                                          method: :post, num_retries: 0)
+      end
+
       should "retry on Net::OpenTimeout" do
         assert StripeClient.should_retry?(Net::OpenTimeout.new,
                                           method: :post, num_retries: 0)
@@ -316,11 +336,11 @@ module Stripe
 
       context "logging" do
         setup do
-          # Freeze time for the purposes of the `elapsed` parameter that we emit
-          # for responses. Mocha's `anything` parameter can't match inside of a
-          # hash and is therefore not useful for this purpose, and Timecop
-          # doesn't freeze monotonic time. If we switch over to rspec-mocks at
-          # some point, we can probably remove Timecop from the project.
+          # Freeze time for the purposes of the `elapsed` parameter that we
+          # emit for responses. Mocha's `anything` parameter can't match inside
+          # of a hash and is therefore not useful for this purpose. If we
+          # switch over to rspec-mocks at some point, we can probably remove
+          # this.
           Util.stubs(:monotonic_time).returns(0.0)
         end
 

data/test/test_helper.rb

@@ -8,7 +8,6 @@ require "test/unit"
 require "mocha/setup"
 require "stringio"
 require "shoulda/context"
-require "timecop"
 require "webmock/test_unit"
 
 PROJECT_ROOT = ::File.expand_path("../", __dir__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stripe
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 5.5.0
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2019-10-03 00:00:00.000000000 Z
 dependencies: []
 description: Stripe is the easiest way to accept payments online.  See https://stripe.com
   for details.
@@ -246,7 +246,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Stripe API