shoptet 0.0.29 → 0.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 866b74c908239757de5a5dde121f939888c1b3308a7bcf83496af4882bda642a
-  data.tar.gz: bdbea0cb42f72f45d0b3021e292820c536ca4fd7ac228a756836ae4820e84626
+  metadata.gz: 94aaeb044be3d937c013893b263fd6fcf48eec3267737e57a72a0a972e8193b8
+  data.tar.gz: 5a86aea9a7a8caf2e3eb93146cc92cf6d14e54adbc910079b11243ae892b7f6b
 SHA512:
-  metadata.gz: 4e17a88fa2c52bae48d3b933ff99c35a6ceffbebb690b1798c7c8da02989f1e9fb1c8ddbdea65dc2b69f56133b87da3180b9efa764fea0078272aa7c329ddd66
-  data.tar.gz: 9cdfcc94049272e0a5a4ca81e283166b4579a35e5f47b2d8586b3ce0138916142f5f02c6ca3ff9515cba34232f1074d9d1a51d706815ed180e331fc3319b51d4
+  metadata.gz: 06def3df961091c2000bc13eb685a9507096c53256f57bd2faf7e9991eab09dbec9b3d43131310d303403cec8315688bd9a9dc559f45e03e90f4476f27780528
+  data.tar.gz: 763669ff9ee09302d24d379dd0c3901084425511b6878d902e28e30c0e572bedf25f9b698f5bc89163c59811cbf31ee4af6b2e1f65b3fa25db5dd917ea9abd2b

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'delegate'
 require_relative 'shoptet/request'
 require_relative 'shoptet/api_enumerator'
@@ -23,7 +25,7 @@ class Shoptet
   end
 
   def self.version
-    '0.0.29'
+    '0.0.34'
   end
 
   def self.ar_on_token_error(model)

data/lib/shoptet/api_enumerator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Shoptet
   class ApiEnumerator < SimpleDelegator
     def initialize base_url, filters, data_key, api
@@ -10,10 +12,10 @@ class Shoptet
         first_page.dig('data', @data_key).each { y.yield _1 }
 
         if total_pages > 1
-          other_pages = 2..(total_pages - 1)
-          other_pages.each do |page|
-            result = @api.request(base_url, filters.merge(page: page))
-            result.dig('data', @data_key).each { y.yield _1 }
+          (2..(total_pages - 1)).each do |page|
+            @api.request(base_url, filters.merge(page: page))
+              .dig('data', @data_key)
+              .each { y.yield _1 }
           end
 
           last_page.dig('data', @data_key).each { y.yield _1 }

data/lib/shoptet/request.rb

@@ -1,15 +1,15 @@
 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 = 30
+      http.read_timeout = 30
+      http.write_timeout = 30
+      http.ssl_timeout = 30
 
       request = Net::HTTP::Get.new(url)
       headers.each do |key, value|
@@ -17,7 +17,7 @@ class Shoptet
       end
 
       response = handle_net_timeouts { http.request(request) }
-      parsed_body = Oj.load(response.body, mode: :compat)
+      parsed_body = JSON.parse(response.body)
 
       unless parsed_body
         message = "Status code: #{response.code}, url: #{url}"
@@ -35,22 +35,16 @@ class Shoptet
         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
+        yield
       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.29
+  version: 0.0.34
 platform: ruby
 authors:
 - Premysl Donat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-06-28 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
@@ -78,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.13
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: API wrapper for interacting with Shoptet api