active_fulfillment 3.0.0.pre3 → 3.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d45dc280f777d4353c5ac75310d2d797e418430
-  data.tar.gz: ffb69cd6def6034c48906a9cc7621be44e788185
+  metadata.gz: ff356b4c8f350a78ca0475c4415257fa803f83a9
+  data.tar.gz: 971bb598f5bd8ff27cb73eb0e0c5810453586714
 SHA512:
-  metadata.gz: 9bf1e4dd980b394918d515bbe8ca11e142b544cda990e0f8c89501bb81d8a6b6a736c1dca95921da98a2eb0d86fe3be322b2d26e43ff23c67aefcf1bac8efe85
-  data.tar.gz: 81ba7cee54bd6844018dcd5ce5313bf52a572d6cbce202fcfc5f19067a95534e75c5551a8ceff1f9e1b40265f472f4cbd05c8b96a1d3bb7fae1ac5fecfe0557f
+  metadata.gz: 2d7ce7cbb4a2dd194df82e42f7677678e92ccecfa5b01b7f9990622252bfaac22cb2b8542fdb3f55c5c6a553ff35e4e460cf223087ccb1f070fc71ef136a451f
+  data.tar.gz: d1632004e3c03275a02bd0f1c2eabdef9cede7ca047fa75523d34a581d3ebc87466194d8701d2aa2c162fa092d1240b3a3c5f2e3be69aa782df284b85ebaf9c4

data/lib/active_fulfillment/services/amazon_mws.rb

@@ -150,17 +150,20 @@ module ActiveFulfillment
     end
 
     def fetch_tracking_data(order_ids, options = {})
+      index = 0
       order_ids.reduce(nil) do |previous, order_id|
-      response = commit :post, :outbound, :tracking, build_tracking_request(order_id, options)
-      return response if !response.success?
-
-      if previous
-        response.tracking_numbers.merge!(previous.tracking_numbers)
-        response.tracking_companies.merge!(previous.tracking_companies)
-        response.tracking_urls.merge!(previous.tracking_urls)
-      end
+        index += 1
+        response = commit :post, :outbound, :tracking, build_tracking_request(order_id, options)
+        return response if !response.success?
+
+        if previous
+          sleep_for_throttle_options(options[:throttle], index)
+          response.tracking_numbers.merge!(previous.tracking_numbers)
+          response.tracking_companies.merge!(previous.tracking_companies)
+          response.tracking_urls.merge!(previous.tracking_urls)
+        end
 
-      response
+        response
       end
     end
 
@@ -460,6 +463,11 @@ module ActiveFulfillment
 
     private
 
+    def sleep_for_throttle_options(throttle_options, index)
+      return unless interval = throttle_options.try(:[], :interval)
+      sleep(throttle_options[:sleep_time]) if (index % interval).zero?
+    end
+
     def secure_compare(a, b)
       return false unless a.bytesize == b.bytesize
 

data/lib/active_fulfillment/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module ActiveFulfillment
-  VERSION = "3.0.0.pre3"
+  VERSION = "3.0.0.pre4"
 end

data/test/unit/services/amazon_mws_test.rb

@@ -381,6 +381,22 @@ class AmazonMarketplaceWebServiceTest < Minitest::Test
     assert_equal %w{93ZZ00}, response.tracking_numbers['extern_id_1154539615776']
   end
 
+   def test_fetch_tracking_numbers_with_throttle
+    @service.expects(:ssl_post).times(30).returns(xml_fixture('amazon_mws/fulfillment_get_fulfillment_order'))
+    numbers = (1..30).map {|i| "extern_id_#{i}" }
+    @service.expects(:sleep).times(3)
+    response = @service.fetch_tracking_numbers(numbers, {throttle: {interval: 10, sleep_time: 1}})
+    assert response.success?
+  end
+
+  def test_fetch_tracking_numbers_with_throttle_for_not_enough_requests
+    @service.expects(:ssl_post).times(5).returns(xml_fixture('amazon_mws/fulfillment_get_fulfillment_order'))
+    numbers = (1..5).map {|i| "extern_id_#{i}" }
+    @service.expects(:sleep).never
+    response = @service.fetch_tracking_numbers(numbers, {throttle: {interval: 10, sleep_time: 1}})
+    assert response.success?
+  end
+
   def test_fetch_tracking_numbers_aborts_on_error
     response = mock('response')
     response.stubs(:code).returns(500)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_fulfillment
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre3
+  version: 3.0.0.pre4
 platform: ruby
 authors:
 - Cody Fauser
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-26 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport