shoptet 0.0.25 → 0.0.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df7f60fd4783c4575ed4d5655d64c8dc6059bedbbfd617799b75bc39179c42a2
-  data.tar.gz: 45f65ff7f49e34929f2517776b98168d46ada03b9c51537299740a1342a6ac18
+  metadata.gz: 671a3a74eccf368f260d0cf4706cb1ba166012164bb44460f66713e9dde87998
+  data.tar.gz: 37a1695eb6a8a84479169399d02663792c17dc15ffe0fb735ecf5a413a38e82e
 SHA512:
-  metadata.gz: 638f26a2866195b498176e89ec3c975f39218bb3e7c5720db75b1c8f6193a8e6390556dfdc090670e6148e6c532eb12f682a790b4c0bab81720fbe5cbe69ad91
-  data.tar.gz: 56a94a9e122ff6385b8bebcdb15abe279754d7b8253023ef1ab7a8ce235dfc8af6bb00dd44017e22f311b1dae5b54f26be8e527ffa0ff6095650cfbdeb2e395b
+  metadata.gz: 7572c405b6db590e09e16a2232f5925c883964ec7d06ca009e1e7056494eb44fcb8e35513d460cc0d0c17066b7997c823f6960c2f2b59bfa77b65ced9dba4694
+  data.tar.gz: 80f326ab967e6641513d30791c1b140ab952a1df4552c446809ce469857181e657b322640fd60d3eaefe4c65097f60d83af3d333ec46df291340e16b532f8fff

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shoptet (0.0.19)
+    shoptet (0.0.29)
 
 GEM
   remote: https://rubygems.org/

data/lib/shoptet.rb

@@ -10,6 +10,9 @@ class Shoptet
   class EmptyResponse < StandardError; end
   class MaxPageReached < StandardError; end
   class StockNotFound < StandardError; end
+  class ProductNotFound < StandardError; end
+  class SystemMaintenance < StandardError; end
+  class UnknownError < StandardError; end
 
   EXPIRED_TOKEN_CODE = 'expired-token'
   INVALID_TOKEN_CODE = 'invalid-token'
@@ -20,7 +23,7 @@ class Shoptet
   end
 
   def self.version
-    '0.0.25'
+    '0.0.30'
   end
 
   def self.ar_on_token_error(model)
@@ -237,6 +240,12 @@ class Shoptet
         raise InvalidTokenNoRights
       elsif errors.any? { |err| err["errorCode"] == 'stock-not-found' }
         raise StockNotFound
+      elsif errors.any? { |err| err["errorCode"] == 'product-not-found' }
+        raise ProductNotFound
+      elsif errors.any? { |err| err["errorCode"] == 'system-maintenance' }
+        raise SystemMaintenance
+      elsif errors.any? { |err| err["errorCode"] == 'unknown-error' }
+        raise UnknownError
       elsif errors.any? { |err| err["errorCode"] == 'page-not-found' && err['message'].include?('max page is') }
         raise MaxPageReached
       else

data/lib/shoptet/request.rb

@@ -1,5 +1,5 @@
 require 'net/http'
-require 'oj'
+require 'json'
 
 class Shoptet
   class Request
@@ -16,8 +16,8 @@ class Shoptet
         request[key] = value
       end
 
-      response = http.request(request)
-      parsed_body = Oj.load(response.body, mode: :compat)
+      response = handle_net_timeouts { http.request(request) }
+      parsed_body = JSON.parse(response.body)
 
       unless parsed_body
         message = "Status code: #{response.code}, url: #{url}"
@@ -32,10 +32,26 @@ class Shoptet
       request.set_form_data(body)
 
       response = Net::HTTP.start(url.host, url.port, use_ssl: true) do |http|
-        http.request(request)
+        handle_net_timeouts { http.request(request) }
       end
 
-      Oj.load(response.body, mode: :compat)
+      JSON.parse(response.body)
+    end
+
+    private
+
+    def self.handle_net_timeouts
+      attempts = 0
+
+      begin
+        yield
+      rescue Net::OpenTimeout
+        raise if attempts > 3
+
+        attempts += 1
+
+        retry
+      end
     end
   end
 end

data/shoptet.gemspec

@@ -22,7 +22,5 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'oj'
-
   spec.add_development_dependency 'irb'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: shoptet
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.30
 platform: ruby
 authors:
 - Premysl Donat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-05-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: oj
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: irb
   requirement: !ruby/object:Gem::Requirement