active_fulfillment 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 804e3e5791d47c2869a62f774dcc13c0ca086fd8
-  data.tar.gz: acc14cb632a432229594ed0de859026a71a778ea
+  metadata.gz: d288b33870248b76342ef2226467f4c782fc37cc
+  data.tar.gz: 545b5ad66e986c085c24accd94ce68e6a41c40d2
 SHA512:
-  metadata.gz: ab2f0781d5aee8b146f740b754b8a7219f89509dd0219e0ebf490b1293b3d4009c67c3602039f1bbc897180f8f7ca0942efbdba3f8c74392c07eefc406ecc4b3
-  data.tar.gz: 86a092f5142799e14d2d440319daa2381812bf53ed97f43300796c45eb1b69581dcf9d036406bff93f5c5fd92248af18c4e61a41ff6b7b77ae68c4e71b98fdd3
+  metadata.gz: 79a0204832b57d4609ff932eef6310e13c39e362469c1bd82e62a0e829eff49498641ccd736e19e1b961f718e70c40baa2216726850ad705f609409cc3c5a75b
+  data.tar.gz: 8217c752ca10dd4384c16c0cd81eb621b3ddc8f8442f43fd6b3db13b3f9376150171f1bfe5960f7a02f49619434ff42f6a754ed2f1952762206f5da62afccd50

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # ActiveFulfillment changelog
 
+### Version 3.2.2
+- Add an option to retry Amazon requests upon getting a 503.
+
 ### Version 3.2.1
 
 - Allow truncating the Amazon response log.

data/lib/active_fulfillment/services/amazon_mws.rb

@@ -110,12 +110,14 @@ module ActiveFulfillment
 
     def fetch_stock_levels(options = {})
       options[:skus] = [options.delete(:sku)] if options.include?(:sku)
-      response = with_error_handling do
+      max_retries = options[:max_retries] || 0
+
+      response = with_error_handling(max_retries) do
         data = commit :post, 'FulfillmentInventory', build_inventory_list_request(options)
         parse_inventory_response(parse_document(data))
       end
       while token = response.params['next_token'] do
-        next_page = with_error_handling do
+        next_page = with_error_handling(max_retries) do
           data = commit :post, 'FulfillmentInventory', build_next_inventory_list_request(token)
           parse_inventory_response(parse_document(data))
         end
@@ -429,10 +431,18 @@ module ActiveFulfillment
 
     private
 
-    def with_error_handling
-      yield
-    rescue ActiveUtils::ResponseError => e
-      handle_error(e)
+    def with_error_handling(max_retries = 0)
+      retries = 0
+      begin
+        yield
+      rescue ActiveUtils::ResponseError => e
+        if e.response.code == 503 && retries < max_retries
+          retries += 1
+          retry
+        else
+          handle_error(e)
+        end
+      end
     end
 
     def sleep_for_throttle_options(throttle_options, index)

data/lib/active_fulfillment/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module ActiveFulfillment
-  VERSION = "3.2.1"
+  VERSION = "3.2.2"
 end

data/test/unit/services/amazon_mws_test.rb

@@ -337,6 +337,17 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
     assert_equal 5259, response.stock_levels['GN-01-02A']
   end
 
+  def test_get_inventory_for_specific_skus_requests_correct_skus
+    requested_skus = ['GN-00-01A', 'GN-00-02A', 'GN-01-01A', 'GN-01-02A']
+    @service.expects(:commit).with(any_parameters) do |_method, _amazon_action, xml|
+      assert_equal xml['SellerSkus.member.1'], requested_skus[0]
+      assert_equal xml['SellerSkus.member.2'], requested_skus[1]
+      assert_equal xml['SellerSkus.member.3'], requested_skus[2]
+      assert_equal xml['SellerSkus.member.4'], requested_skus[3]
+    end
+    @service.fetch_stock_levels(skus: requested_skus)
+  end
+
   def test_get_inventory_multipage_missing_stock
 
     @service.expects(:ssl_post).with { |uri, query, headers|
@@ -488,6 +499,15 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
     assert !constructed_address[nil]
   end
 
+  def test_retry_on_error
+    retries = 5
+    http_response = build_mock_response(response_from_503, "", 503)
+    @service.expects(:ssl_post).raises(ActiveUtils::ResponseError.new(http_response)).times(retries + 1)
+
+    response = @service.fetch_stock_levels(max_retries: retries)
+    refute_predicate response, :success?
+  end
+
   private
   def build_mock_response(response, message, code = "200")
     http_response = stub(:code => code, :message => message)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_fulfillment
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Cody Fauser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport