shopify_api_extensions 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7566570d57f4f468edcdc70d4f775b378966f62a
-  data.tar.gz: f00c3ffbe99977f67e78ee8e4b65cd493050307d
+  metadata.gz: c941b2d40cd938d27a81562e21d5e1cc24254939
+  data.tar.gz: ebb922c0292452b14f44f997b49df06b24a1ae36
 SHA512:
-  metadata.gz: f28fe3ae813e604ec37bf50279d3d00846ec0ef9a54550425e439628d07d43ff400f5ac6a7d557d0cb116ee756f86581e074df2f64a2430bfa92f07d6a54e83d
-  data.tar.gz: 4da2d68bb217749870b4ae6c58a833f20c1bb5e823863b668f89496249b50e45e6bcec74b6faa028611c0e045ac627dd2a4dcacb1f03c35ceaa9da34dfa053fa
+  metadata.gz: 44917662ae3ff68b7b25d3aa478099220a0125d784a13d239ddcebf9e36acead1915a1e507b4406a6e6b25a3d1378bb1d062f11c86e2b8b2201713ecfebec5f7
+  data.tar.gz: 69f0effd50de8174f283dc08ee0d16f991fb4ac3fae03ebe0dfaee1e6a992ea1574f71c713cc0992084d0c5cde4ffaab5299cb640a50b4892557ed6588e325e7

data/README.md

@@ -25,6 +25,8 @@ gem 'shopify_api_extensions'
 ShopifyAPI::Product.auto_paging_each do |product|
   puts "#{product.id}"
 end
+
+ShopifyAPI::Order.list(limit: 100).map(&:number)
 ```
 
 ## Development

data/lib/shopify_api_extensions/backoff.rb

@@ -2,11 +2,13 @@ ShopifyAPI::Connection.class_eval do
   alias_method :shopify_request, :request
 
   def request(*args)
-    count = 0
-    limit = 10
+    network_retry = 0
+    network_limit = 10
+
+    rate_limit_retry = 0
+    rate_limit_limit = 30
 
     begin
-      count += 1
       shopify_request(*args)
     rescue Exception => e
       exceptions_to_retry = [
@@ -16,18 +18,37 @@ ShopifyAPI::Connection.class_eval do
         Errno::EHOSTUNREACH,
         EOFError,
         Zlib::BufError,
-        SocketError
+        SocketError,
+        ActiveResource::SSLError,
+        # NOTE represents only 500x errors
+        ActiveResource::ServerError
       ]
 
       if !exceptions_to_retry.include?(e.class)
         raise
       end
 
-      # TODO look at code instead of static string? This is brittle
-      if count >= limit || (e.class == ActiveResource::ClientError && e.message != "Failed.  Response code = 429.  Response message = Too Many Requests.")
+      if e.class == ActiveResource::ClientError && e.message =~ /429/ && e.message =~ /Too Many Requests/
+        if rate_limit_retry > 0 && rate_limit_retry % 10 == 0
+          puts "Shopify Rate Limit Error Encountered"
+        end
+
+        if rate_limit_retry >= rate_limit_limit
+          raise
+        else
+          rate_limit_retry += 1
+          sleep(rate_limit_retry)
+          retry
+        end
+      elsif e.class == ActiveResource::ClientError
+        raise
+      end
+
+      if network_retry >= network_limit
         raise
       else
-        sleep(count)
+        network_retry += 1
+        sleep(network_retry)
         retry
       end
     end

data/lib/shopify_api_extensions/version.rb

@@ -1,3 +1,3 @@
 module ShopifyAPIExtensions
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_api_extensions
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Michael Bianco
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shopify_api