shoptet 0.0.10 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 419d01d58f819a79e524940a21eb8cca44fca53cc77257acd87f6a0e0f699bb6
-  data.tar.gz: 0366bbceb70df4b75ccef62ed9ac853b5fd1e5d56b81833ee5c1a87ee99f6208
+  metadata.gz: 9de0b397fa3b5dd0812bc64e68c9a2ed317955bc0f8a9e646dea9f7ed47c30c1
+  data.tar.gz: e0ede103c20d5d0807bc6cec27f6e256fba7764ecf31a2e35a89c50c10094e42
 SHA512:
-  metadata.gz: 4ced7cedf10bf236c1fe434ef729707cfb152fb747f02391d037ec2adff66f5aed43c41081e1b59b43e6b8d47fe52924d1323b0c554c340e49fad2cceebd5030
-  data.tar.gz: 887f3afe91e7b8bcbefe3bdac69bf6ce4c81a3525f27967969893aad172d5d4248e77585ec59a3c4f5ca6b8a79e7a1a16a45e605561f94a3e0b2e8e1aef8a41b
+  metadata.gz: 97efaa5b7940915ef996ef5c3e37abb83a4fc19c1a2efabeb6dab20fbb3dc3b14f9dd25675dbc114418ba583672e92bebc0017e741107731c657e1668d24892c
+  data.tar.gz: edb39d61b980ef258a6f0f5f95d8090f83ebe8a98f1be5d14676f5f33a8d50d965ea2f7978dcd0f3a754696e0932e086bf41f5e86ba20a58e35f72c554a6e428

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.10'
+    '0.0.15'
   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")
+    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

@@ -21,10 +21,10 @@ class Shoptet
 
       http = Net::HTTP.new parsed_uri.host, parsed_uri.port
       http.use_ssl = true
-      http.open_timeout = 10
-      http.read_timeout = 10
-      http.write_timeout = 10
-      http.ssl_timeout = 10
+      http.open_timeout = 60
+      http.read_timeout = 60
+      http.write_timeout = 60
+      http.ssl_timeout = 60
 
       request = Net::HTTP::Get.new parsed_uri
       headers.each do |key, value|
@@ -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.10
+  version: 0.0.15
 platform: ruby
 authors:
 - Premysl Donat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb