shoptet 0.0.12 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44764e9a3baef43fabb596f7702f030f9ee3b2d2ef3cd4cd7ec5e9de26622a69
-  data.tar.gz: cbf1cf85542a688455bb984d30db96986b9bc941ebffdb587e7b6bfbb423493e
+  metadata.gz: c6e34af9913575eccf62bb7733798b354a81e3fc00046ba5585461c8bb65a52f
+  data.tar.gz: c531d53f42166c618b7d66bb7418d1c9d4d715037f482523718d5c717d25afb9
 SHA512:
-  metadata.gz: d07510d07f5a1fd3bd6f91fac8f3cd1f932013c43c836ab9c5c34525ca926d6b251e88f41831abaaa0e46d726a206fbfd9c4ca473e8cdca1218050c1d2b7ecd0
-  data.tar.gz: fffebdf455902541dbf7aa8acd9c26ab66e454e391f622390b92364bcc787ef0ba25f362e137cc199b787a8b145da834b920e92a961f02c4ed0daec03eb7a470
+  metadata.gz: aff6a24d95315896100ee17100d53dad6293e51c860361dc78b2094466e3f0d260b0407f6701af426458a247c75aefa770233d8df24df2c3c1cde41cbed6bc40
+  data.tar.gz: 1f57093bca36597126821cdc033980ca35cad71d440d2deae93eee4092a35e410b27ad76077f2b194b111c319cdc8918119026f7c4d32a91f33b43a79612e326

data/lib/shoptet.rb

@@ -9,6 +9,12 @@ class Shoptet
   class AddonNotInstalled < StandardError; end
   class InvalidTokenNoRights < StandardError; end
   class EmptyRequestResponse < StandardError; end
+  class MaxPageReached < StandardError; end
+  class UnsuccessfulApiResponse < 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
@@ -67,7 +73,7 @@ class Shoptet
   end
 
   def self.version
-    '0.0.12'
+    '0.0.17'
   end
 
   def self.ar_on_token_error(model)
@@ -248,6 +254,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
@@ -257,15 +271,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

@@ -39,6 +39,11 @@ class Shoptet
         fail Shoptet::EmptyRequestResponse.new(message)
       end
 
+      unless response.code == '200'
+        message = "Status code: #{response.code}, url: #{uri}"
+        fail Shoptet::UnsuccessfulApiResponse.new(message)
+      end
+
       parsed_body
     rescue Net::OpenTimeout
       retry if attempt < 4

metadata

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