shoptet 0.0.31 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdbf34faa0e1fa994b0c27da950e35159983d6bb31d827c4e45d7ff33c92a368
-  data.tar.gz: abfd6916c1bebc36291583fc4826877016bc720ea5405cb7ad911acf183afba7
+  metadata.gz: 834618535e5ec061b17899047e826cb4258cbcd1f162efba35dbd73201947eb8
+  data.tar.gz: 5b5cf393befc33bee8bf68f6352bb4a4e63d26b33c9d1d0fa5b3d01a02614340
 SHA512:
-  metadata.gz: d336ee1c684eb1018cc9a9a643997240928eb649116519a0bfd6ac443e55b90dccef90073b9c5b453352db219da9747d5f82c64745e7f171ba1e130c2a661118
-  data.tar.gz: 251688ec6650ce6629a91c9d256f309eeee928c019b1cee1cd57264c9e8e8b88de3fca11ed18181889e357423fe1b61861279b35a405bacee534613ee0d942b9
+  metadata.gz: a4478297d6958d02c4c647ed1b568b2da7748e774764625477179a029d04feacbd9ce80d3f6cc36d094b3ec2d2e511ce2281aec7658b15e5a0f4e21060a061b4
+  data.tar.gz: 52393d9a48043fac3485b4f99ca8b1c807987df18a50bf6abc9686b6ed850f1b24613e29c8beb5a2b20184bc3268c37ac9110f3102c95d161c356f4a5440c2ce

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.31'
+    '0.0.35'
   end
 
   def self.ar_on_token_error(model)
@@ -111,12 +113,12 @@ class Shoptet
   end
 
   def shop_info api_params = {}
-    result = request('https://api.myshoptet.com/api/eshop', api_params)
+    result = get('https://api.myshoptet.com/api/eshop', api_params)
     result['data']
   end
 
   def design_info api_params = {}
-    result = request('https://api.myshoptet.com/api/eshop/design', api_params)
+    result = get('https://api.myshoptet.com/api/eshop/design', api_params)
 
     result['data']
   end
@@ -163,17 +165,32 @@ class Shoptet
   end
 
   def order code, api_params = {}
-    result = request("https://api.myshoptet.com/api/orders/#{code}", api_params)
+    result = get("https://api.myshoptet.com/api/orders/#{code}", api_params)
     result.dig('data', 'order')
   end
 
   def product guid, api_params = {}
-    result = request("https://api.myshoptet.com/api/products/#{guid}", api_params)
+    result = get("https://api.myshoptet.com/api/products/#{guid}", api_params)
     result['data']
   end
 
   def product_by_code code, api_params = {}
-    result = request("https://api.myshoptet.com/api/products/code/#{code}", api_params)
+    result = get("https://api.myshoptet.com/api/products/code/#{code}", api_params)
+    result['data']
+  end
+
+  def template_includes
+    result = get('https://api.myshoptet.com/api/template-include')
+    result['data']
+  end
+
+  def set_templates(data)
+    result = post_binary('https://api.myshoptet.com/api/template-include', data)
+    result['data']
+  end
+
+  def delete_template(location)
+    result = delete("https://api.myshoptet.com/api/template-include/#{location}")
     result['data']
   end
 
@@ -186,7 +203,7 @@ class Shoptet
     result.fetch('access_token')
   end
 
-  def request url, api_params = {}, retry_on_token_error = true
+  def get url, api_params = {}, retry_on_token_error = true
     url = URI(url)
     url.query = URI.encode_www_form(api_params) if api_params.any?
 
@@ -199,7 +216,45 @@ class Shoptet
     if token_errors.any?
       if retry_on_token_error
         @on_token_error.call(self)
-        request(url, api_params, false)
+        get(url, api_params, false)
+      else
+        raise Error.new(result)
+      end
+    else
+      result
+    end
+  end
+
+  def post_binary(url, data, retry_on_token_error = true)
+    url = URI(url)
+    headers = { 'Shoptet-Access-Token' => @api_token,
+                'Content-Type' => 'application/vnd.shoptet.v1.0' }
+    result = Shoptet::Request.post_binary(url, data, headers)
+    token_errors = handle_errors(result)
+
+    if token_errors.any?
+      if retry_on_token_error
+        @on_token_error.call(self)
+        post_binary(url, data, false)
+      else
+        raise Error.new(result)
+      end
+    else
+      result
+    end
+  end
+
+  def delete(url, retry_on_token_error = true)
+    url = URI(url)
+    headers = { 'Shoptet-Access-Token' => @api_token,
+                'Content-Type' => 'application/vnd.shoptet.v1.0' }
+    result = Shoptet::Request.delete(url, headers)
+    token_errors = handle_errors(result)
+
+    if token_errors.any?
+      if retry_on_token_error
+        @on_token_error.call(self)
+        delete(url, false)
       else
         raise Error.new(result)
       end

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

@@ -6,10 +6,10 @@ class Shoptet
     def self.get url, headers
       http = Net::HTTP.new(url.host, url.port)
       http.use_ssl = true
-      http.open_timeout = 5
-      http.read_timeout = 5
-      http.write_timeout = 5
-      http.ssl_timeout = 5
+      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|
@@ -38,19 +38,41 @@ class Shoptet
       JSON.parse(response.body)
     end
 
+    def self.post_binary(url, body, headers)
+      request = Net::HTTP::Post.new(url)
+      request.body = body
+      request.content_type = 'appliaction/octet-stream'
+      headers.each do |key, value|
+        request[key] = value
+      end
+
+      response = Net::HTTP.start(url.host, url.port, use_ssl: true) do |http|
+        handle_net_timeouts { http.request(request) }
+      end
+
+      JSON.parse(response.body)
+    end
+
+    def self.delete(url, headers)
+      request = Net::HTTP::Delete.new(url)
+      headers.each do |key, value|
+        request[key] = value
+      end
+
+      response = Net::HTTP.start(url.host, url.port, use_ssl: true) do |http|
+        handle_net_timeouts { http.request(request) }
+      end
+
+      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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoptet
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.35
 platform: ruby
 authors:
 - Premysl Donat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-15 00:00:00.000000000 Z
+date: 2021-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb