shoptet 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f2a8ff1331b90ddcd3421d6408b667643d3fe8b95643ea7833f192a8152103d
-  data.tar.gz: 8a87de0252b757023dd35c20f67885454d4cc85f72651b4b91c32a9430531805
+  metadata.gz: 682cc8f11ec548207514c501fb63e2c18ea8f9cb3a7ff4eb6db35b458b75b022
+  data.tar.gz: ec70519cd497dd8a49e9c72ee1940ec084fa0a2203889de3292febb658885c1a
 SHA512:
-  metadata.gz: 7b1cfa1f1fe0b8d57bb8df48793224a94dd970adad6af9438ada8bdbeb0ba62caa91578058c50582fdcf2f890970995ff6bb73c56358699b9fa2726dd5801520
-  data.tar.gz: 5d45e753e5a64158e0d1d21b2f1dbc6daea2c894a70c6a2b43e0eccdd3645fe2ae569f452865c7752fde2b3ea623e90c17dd83c8d005f95f1eb5175901ffa7bd
+  metadata.gz: 2ce582d9fdbac257cffd92e2b9cb60ac718141af95a2a744ad27605c35c883bbd82f9838deb9b1fde57802a37740f49309ac034b541b19ad2557e41b09ca0bbc
+  data.tar.gz: 0bc005b177781df29dd9c7b0471d317ed108529b717455bd70a88bbb3ccbdc8b303bbd1ff21e9c2e7cb834a969876de547eecd86d17cddf32a80cfa473fe297a

data/lib/shoptet.rb

@@ -11,13 +11,14 @@ class Shoptet
     end
   end
   class AddonSuspended < StandardError; end
+  class AddonNotInstalled < StandardError; end
 
   DEFAULT_ON_TOKEN_ERROR = -> (api) do
     api.api_token = api.new_api_token
   end
 
   def self.version
-    '0.0.2'
+    '0.0.3'
   end
 
   def self.ar_on_token_error(model)
@@ -106,7 +107,7 @@ class Shoptet
     headers = { 'Authorization' => "Bearer #{@oauth_token}" }
 
     result = Shoptet::Request.get @oauth_url, headers
-    handle_errors result, @oauth_url
+    handle_errors result, @oauth_url, headers
 
     result.fetch 'access_token'
   end
@@ -140,22 +141,26 @@ class Shoptet
     end
   end
 
-  def request uri
+  def request uri, retry_on_token_error = true
     headers = { 'Shoptet-Access-Token' => @api_token,
                 'Content-Type' => 'application/vnd.shoptet.v1.0' }
 
     result = Shoptet::Request.get uri, headers
-    token_errors = handle_errors result, uri
+    token_errors = handle_errors result, uri, headers
 
     if token_errors.any?
-      @on_token_error.call self
-      request uri
+      if retry_on_token_error
+        @on_token_error.call self
+        request uri, false
+      else
+        raise Error.new result
+      end
     else
       result
     end
   end
 
-  def handle_errors result, uri
+  def handle_errors result, uri, headers
     error = result['error']
     errors = result['errors'] || []
     token_errors, non_token_errors = errors.partition { |err| ['invalid-token', 'expired-token'].include? err['errorCode'] }
@@ -163,6 +168,8 @@ class Shoptet
     if error || non_token_errors.any?
       if error == 'addon_suspended'
         raise AddonSuspended
+      elsif error == 'addon_not_installed'
+        raise AddonNotInstalled
       else
         additional_data = {
           uri: uri,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoptet
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Premysl Donat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-07 00:00:00.000000000 Z
+date: 2020-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb