shoptet 0.0.11 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c25e08acd0126a8756438b17836f64f13268628e32a9fc9f8a1375f75096626
-  data.tar.gz: 2b998f5dd0df5d74a6c56be2b1fabfa4651d56efcbb276194f56b7aa8f62f10a
+  metadata.gz: 4c86fdea4c6992986c3db615c17a5687d5fb71eedd29af756a1e746c03718df0
+  data.tar.gz: 275c40c5fedd71fb72b4be6327951ba810763661763d7d950c1eb273d6308625
 SHA512:
-  metadata.gz: 13ba8bead9e42327929dd0bd25f64cc838ecbc52f4a26c506c379301da92d89053ec7189cd5dabee353c9220ae5a1941652690fdbcafcebe2e4c91c63a1d0cb9
-  data.tar.gz: 8f34a681340f8ad9db35c242ae808b00e8b8062c84698dc46e735037a9b9c696d203402b1e77d0e4b5a116e2bb34507b4062a697ce2b1d36608ce43917f03bba
+  metadata.gz: 5d5775690ef05f456177650b4bf11ec8571c8fd33bd9c0ba86ca4b83057f3f0ef22fb4075161a6385f0bb9945b9c673f505b541e1a002a6b41e3bfe3cd815505
+  data.tar.gz: c2a5e2b984c2fedc2cedf6b5f59f125bc2c609bb3fe359ddeae11c6a20afceaf9e361d55f6b363d4695c633e8e48b4696e1924ce01e4009883a968d17d2f3214

data/lib/shoptet.rb

@@ -8,6 +8,12 @@ class Shoptet
   class AddonSuspended < StandardError; end
   class AddonNotInstalled < StandardError; end
   class InvalidTokenNoRights < StandardError; end
+  class EmptyRequestResponse < StandardError; end
+  class MaxPageReached < StandardError; end
+
+  EXPIRED_TOKEN_CODE = 'expired-token'
+  INVALID_TOKEN_CODE = 'invalid-token'
+  ADDON_NOT_INSTALLED = 'Addon installation is not approved.'
 
   DEFAULT_ON_TOKEN_ERROR = -> (api) do
     api.api_token = api.new_api_token
@@ -66,7 +72,7 @@ class Shoptet
   end
 
   def self.version
-    '0.0.11'
+    '0.0.16'
   end
 
   def self.ar_on_token_error(model)
@@ -247,6 +253,14 @@ class Shoptet
     end
   end
 
+  def suspended?
+    data = shop_info
+
+    false if data
+  rescue Shoptet::AddonSuspended
+    true
+  end
+
   private
 
   def enumerize base_url, filters = {}, data_key = nil
@@ -256,15 +270,23 @@ class Shoptet
   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'] }
+    token_errors, non_token_errors = errors.partition do |err|
+      code = err['errorCode']
+      message = err['message']
+
+      code == EXPIRED_TOKEN_CODE ||
+        code == INVALID_TOKEN_CODE && (message.include?('Invalid access token') || message.include?('Missing access token'))
+    end
 
     if error || non_token_errors.any?
-      if error == 'addon_suspended'
+      if error == 'addon_suspended' || errors.any? { |e| e["errorCode"] == INVALID_TOKEN_CODE && e['message'] == ADDON_NOT_INSTALLED }
         raise AddonSuspended
-      elsif error == 'addon_not_installed'
+      elsif (error == 'addon_not_installed')
         raise AddonNotInstalled
       elsif errors.any? { |err| err["errorCode"] == 'invalid-token-no-rights' }
         raise InvalidTokenNoRights
+      elsif errors.any? { |err| err["errorCode"] == 'page-not-found' && err['message'].include?('max page is') }
+        raise MaxPageReached
       else
         raise Error.new result
       end

data/lib/shoptet/request.rb

@@ -32,8 +32,14 @@ class Shoptet
       end
 
       response = http.request request
+      parsed_body = JSON.parse response.body
 
-      JSON.parse response.body
+      unless parsed_body
+        message = "Status code: #{response.code}, url: #{uri}"
+        fail Shoptet::EmptyRequestResponse.new(message)
+      end
+
+      parsed_body
     rescue Net::OpenTimeout
       retry if attempt < 4
     end

metadata

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