shoptet 0.0.26 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf65c602c4c267d61e5fb7bd64a993d1da6b2911ea857eea8ca78022eae03a33
-  data.tar.gz: 1e9ce67fb7dd3fa9059c7a2eb5faa21f32de6ca802aff9ac99244f27687420be
+  metadata.gz: fdbf34faa0e1fa994b0c27da950e35159983d6bb31d827c4e45d7ff33c92a368
+  data.tar.gz: abfd6916c1bebc36291583fc4826877016bc720ea5405cb7ad911acf183afba7
 SHA512:
-  metadata.gz: 72637f126f47c2e7ff0eb2ac9bf797f4b9108f5be4af8a6f43e3e1eae4b11a92a6fa2bcf7db48224904eb97ee1a4c51a86b66e9c8db98d50a6cdcecf3563f251
-  data.tar.gz: d149fc9bd73a3c5e4135e1f4956a9426b5d8edacd7963698e384454858556aa313473ec87734c2ae5e6ac15f6a4c4dfbe9052290ffd1d1b98255f6dce2a8f198
+  metadata.gz: d336ee1c684eb1018cc9a9a643997240928eb649116519a0bfd6ac443e55b90dccef90073b9c5b453352db219da9747d5f82c64745e7f171ba1e130c2a661118
+  data.tar.gz: 251688ec6650ce6629a91c9d256f309eeee928c019b1cee1cd57264c9e8e8b88de3fca11ed18181889e357423fe1b61861279b35a405bacee534613ee0d942b9

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

@@ -23,7 +23,7 @@ class Shoptet
   end
 
   def self.version
-    '0.0.26'
+    '0.0.31'
   end
 
   def self.ar_on_token_error(model)

data/lib/shoptet/request.rb

@@ -1,23 +1,23 @@
 require 'net/http'
-require 'oj'
+require 'json'
 
 class Shoptet
   class Request
     def self.get url, headers
       http = Net::HTTP.new(url.host, url.port)
       http.use_ssl = true
-      http.open_timeout = 60
-      http.read_timeout = 60
-      http.write_timeout = 60
-      http.ssl_timeout = 60
+      http.open_timeout = 5
+      http.read_timeout = 5
+      http.write_timeout = 5
+      http.ssl_timeout = 5
 
       request = Net::HTTP::Get.new(url)
       headers.each do |key, value|
         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.26
+  version: 0.0.31
 platform: ruby
 authors:
 - Premysl Donat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-06 00:00:00.000000000 Z
+date: 2021-05-15 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