shoptet 0.0.13 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b54d6391037e97c1da81d008e8bb53f2947cbe9420f5066d193e3ac37de9f2ce
-  data.tar.gz: 1a3a5b996e229250d145018f1fc4ec9e6befaa542bc7aa7e647059a717cbf216
+  metadata.gz: 5e027e9838f1031078700fefa9208685301227a87998272534abab291b6592cc
+  data.tar.gz: b54940690e5ac0eeccce25a6d5cc44e8537eb934468e08334ae07393449bc28f
 SHA512:
-  metadata.gz: 14807f333d2eb001674f09cd59264060607084d7ccc132bb9a84554ef98b5d2aaba1261240fd0f8e70d4e20c3a02992fe7631706c848df3078dc46e6865c8a6b
-  data.tar.gz: 5ad641c3f8a09cf75b3beab292bba91572fa1a4fd35864109826eb9d21fd0d9f3db6dc16b31838413980f931859721c095bde8bd38971274f8f5a99da15626bd
+  metadata.gz: 5b432895ea1a1d8214531bb0097fcf036cd8f12016069410ae1cb04e4707420f117f59006245eeec87fe194cf8254b4f05dc0d96add6eddcf872a58d788f5f4c
+  data.tar.gz: e4a97e102621cc21658d07152d1a75c94b68807457edaf9eafb9da39323f924fef2f748236cba221cc0f0ed5307ec166f9a928ffb169e67043f8b0bf5e7188d9

data/lib/shoptet.rb

@@ -10,6 +10,11 @@ class Shoptet
   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
@@ -68,7 +73,7 @@ class Shoptet
   end
 
   def self.version
-    '0.0.13'
+    '0.0.18'
   end
 
   def self.ar_on_token_error(model)
@@ -249,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
@@ -258,12 +271,18 @@ 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

data/lib/shoptet/request.rb

@@ -14,9 +14,6 @@ class Shoptet
 
   class Request
     def self.get uri, headers
-      attempt ||= 0
-      attempt += 1
-
       parsed_uri = URI(uri)
 
       http = Net::HTTP.new parsed_uri.host, parsed_uri.port
@@ -39,9 +36,12 @@ 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
     end
 
     def self.post uri, body

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoptet
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.18
 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