shoptet 0.0.9 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b98a4b88e59f4cd33fcddb5448caae903e5cbeb81b8bda9fcf9c52a7db337aa
-  data.tar.gz: d138e3406b01db0f8b4833aeb3ac2b16a1b590341922d9d50e370774ef2de8bf
+  metadata.gz: 289440d376a54ad0d925741b1964a1db28beb3f27ea7bfc667eccbc427458f2d
+  data.tar.gz: '09d1742a1b57c06acb939aa547aefdea76513905fd89679475438e3c2e515e65'
 SHA512:
-  metadata.gz: 91e5a23fb8973e97536947176590811e58c216a3b3a7e43cec2b57eadd9bbaafbc7a93e00bd761530853a351dc7fb6328ea8aac47f174cb876d7161de27136d6
-  data.tar.gz: a74007a4120bbd10f7be9e9ad1f95cfa474290bf2900eac5fcd0702f01588c2d369775b270848d2b285b03f17f3531e64747539a44841aaba9ee51d7a9b1d105
+  metadata.gz: 366aa1983278c08fac3864f79e9b3322e5ac72e99a5beca1a3aea72926eb0facafb2cfc8018f46c7fe40459c197823c05c2c6e291231d8e48a41bcac254be199
+  data.tar.gz: 745cc481bb6fcc8711bc69b81242097da6a52c9afe0e31a499e5405fc5e8b08c3659e4a5154c151032f0050d18ee99ee8887c14c8316701045d0193289ea6d41

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.9'
+    '0.0.14'
   end
 
   def self.ar_on_token_error(model)
@@ -150,12 +156,14 @@ class Shoptet
   end
 
   def shop_info api_params = {}
-    result = request 'https://api.myshoptet.com/api/eshop'
+    url = assemble_uri 'https://api.myshoptet.com/api/eshop', api_params
+    result = request url
     result['data']
   end
 
   def design_info api_params = {}
-    result = request 'https://api.myshoptet.com/api/eshop/design'
+    url = assemble_uri 'https://api.myshoptet.com/api/eshop/design', api_params
+    result = request url
 
     result['data']
   end
@@ -245,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
@@ -254,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 == "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.9
+  version: 0.0.14
 platform: ruby
 authors:
 - Premysl Donat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb