lucid_shopify 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1fa336bfc2abcc35129665ab1679ce26a214e8cc711a9f2f02cb8d12dc910ff
-  data.tar.gz: 59d6e27a766ef0b189e4475a658986ede24c8aaba514e5e0f8a4ac9aba859bf5
+  metadata.gz: fa7a124e765e51f59294a364b97b006e5898b96cf2613745c66ac35051ec46ab
+  data.tar.gz: deb41acf5b31b21a7eee70bf644b8daff3badf6e716653076df2760940545145
 SHA512:
-  metadata.gz: c95ec5d9ba4317494ac5d761bea90ee846b096f75dad3e15399d974966ad663bb0a924262b08053fc382c3126c26de5ebbff34d7a95bd2436cde579d566c31c9
-  data.tar.gz: 0dbea237b8786e642e596999c8500f6a57efa8bf9fc92aa8ca044a5c097e38ecd7c637ee8e3a8958e978f783ff52fe4b5618d96a7b5f49779030b38eff79aec6
+  metadata.gz: d86eb37763f25cdbc7fd686a9bd0fe31e5139db86d33a87a11cf27bd8ce05c7617f3b02a978a4f4194f67f6fad44f86ee299ad69e25cea2ca2843980a5761183
+  data.tar.gz: bfd6ace749c04766bd6270350fdcce7ac4593f0881c561091ce2b70fca3caeae25a78bc41efb0b7cf12b19033ccbbcd2cf834da8e99dd9d249fa356ed857b56d

data/lib/lucid_shopify.rb

@@ -23,7 +23,7 @@ module LucidShopify
   autoload :Response, 'lucid_shopify/response'
   autoload :Result, 'lucid_shopify/result'
   autoload :SendRequest, 'lucid_shopify/send_request'
-  autoload :SendThrottledRequest, 'lucid_shopify/send_throttled_request'
+  autoload :ThrottledStrategy, 'lucid_shopify/throttled_strategy'
   autoload :VerifyCallback, 'lucid_shopify/verify_callback'
   autoload :VerifyWebhook, 'lucid_shopify/verify_webhook'
   autoload :VERSION, 'lucid_shopify/version'

data/lib/lucid_shopify/container.rb

@@ -19,7 +19,7 @@ module LucidShopify
   Container.register(:delete_webhook) { DeleteWebhook.new }
   Container.register(:http) { ::HTTP::Client.new }
   Container.register(:send_request) { SendRequest.new }
-  Container.register(:send_throttled_request) { SendThrottledRequest.new }
+  Container.register(:send_throttled_request) { SendRequest.new(strategy: ThrottledStrategy.new) }
   Container.register(:verify_callback) { VerifyCallback.new }
   Container.register(:verify_webhook) { VerifyWebhook.new }
   Container.register(:webhook_handler_list) { LucidShopify.handlers }

data/lib/lucid_shopify/send_request.rb

@@ -13,9 +13,12 @@ module LucidShopify
 
     #
     # @param http [HTTP::Client]
+    # @param strategy [#call, nil] unthrottled by default
     #
-    def initialize(http: Container[:http])
+    def initialize(http: Container[:http],
+                   strategy: ->(*, &block) { block.() })
       @http = http
+      @strategy = strategy
     end
 
     #
@@ -29,8 +32,11 @@ module LucidShopify
     # @raise [Response::ServerError] for status 5xx
     #
     def call(request, attempts: default_attempts)
-      res = send(request)
-      res = Response.new(request, res.code, res.headers.to_h, res.to_s)
+      res = @strategy.(request) do
+        res = send(request)
+
+        Response.new(request, res.code, res.headers.to_h, res.to_s)
+      end
 
       res.assert!.data_hash
     rescue HTTP::ConnectionError,

data/lib/lucid_shopify/{send_throttled_request.rb → throttled_strategy.rb}

@@ -3,16 +3,20 @@
 require 'lucid_shopify'
 
 module LucidShopify
-  class SendThrottledRequest < SendRequest
+  class ThrottledStrategy
     MINIMUM_INTERVAL = 500 # ms
 
     #
-    # @see SendRequest#call
+    # @param request [Request]
+    #
+    # @yieldreturn [Response]
+    #
+    # @return [Response]
     #
-    def call(request, attempts: default_attempts)
+    def call(request, &send_request)
       interval(build_interval_key(request))
 
-      super(request, attempts: attempts)
+      send_request.()
     end
 
     #
@@ -26,7 +30,7 @@ module LucidShopify
     private def interval(interval_key)
       if Thread.current[interval_key]
         (timestamp - Thread.current[interval_key]).tap do |n|
-          sleep(Rational(n, 1000)) if n < MINIMUM_INTERVAL
+          sleep(Rational(MINIMUM_INTERVAL - n, 1000)) if n < MINIMUM_INTERVAL
         end
       end
 

data/lib/lucid_shopify/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucidShopify
-  VERSION = '0.15.1'
+  VERSION = '0.16.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucid_shopify
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Kelsey Judson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-13 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -135,7 +135,7 @@ files:
 - lib/lucid_shopify/request.rb
 - lib/lucid_shopify/response.rb
 - lib/lucid_shopify/send_request.rb
-- lib/lucid_shopify/send_throttled_request.rb
+- lib/lucid_shopify/throttled_strategy.rb
 - lib/lucid_shopify/verify_callback.rb
 - lib/lucid_shopify/verify_webhook.rb
 - lib/lucid_shopify/version.rb