shoptet 0.0.27 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdf758bbae88c6e735ac1bd54968ce0ec7491b5608918767b86b892adf75b0d3
-  data.tar.gz: bf8207c9c58a30251a8926aec33fb312af16792edbdf010a56dde488d9aa5e5e
+  metadata.gz: d8ebaa8244bc4a4cba5afd3a9bb1347cb0cc96b9b74d91831b683a130278a417
+  data.tar.gz: 17327086963c82f18cb128ed71bd8e00ea5c1d965c7d018357a21efa8c6acb91
 SHA512:
-  metadata.gz: b786cd47263dbc954c8b813134def4625c829ec4f6f23d5193d8bb07017b3efd4524d51d3a53ccb0f9d6ca97ed3b67aed4dd09608aa1261f0ea5f356c7c1adcd
-  data.tar.gz: 80786ee8885ce65e971279e300dbd4f11de589d682467fbf55b41e6e43084958226c63bd52c8f0ff33ddd7718f124b402b64499d949f9783668cb8fbab485ae7
+  metadata.gz: c56de1c106ae2a1d2d78379d05bdd4abd812a814cc1257613541563929dcad4b5385bed7713b07568692007ee4569549d5cd2667f15e12c90615ff87a454c650
+  data.tar.gz: 520e8120f0b7837d088cbd0ac96061879d5fb794fe2aa4f4d4ee9bbb427fd7d60111374daed8c71faa90e97490e9a7e648eae55ac65a5c3d40d70254d1582f70

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.27'
+    '0.0.32'
   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}"
@@ -25,8 +25,6 @@ class Shoptet
       end
 
       parsed_body
-    rescue Net::OpenTimeout => e
-      raise(e.class, "#{e.message} - on url #{url}")
     end
 
     def self.post url, body
@@ -34,10 +32,20 @@ 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
+      begin
+        yield
+      rescue Net::OpenTimeout
+        yield
+      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.27
+  version: 0.0.32
 platform: ruby
 authors:
 - Premysl Donat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-05-29 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