shoptet 0.0.7 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8facc56cfe2afc649cbad1f5094830d94d83f1f8d3d564e8886f17efe1b5bc87
-  data.tar.gz: 82c8517d218cc6182c54620e1161428d992a43e70364c23438fb0970bf303a6f
+  metadata.gz: 44764e9a3baef43fabb596f7702f030f9ee3b2d2ef3cd4cd7ec5e9de26622a69
+  data.tar.gz: cbf1cf85542a688455bb984d30db96986b9bc941ebffdb587e7b6bfbb423493e
 SHA512:
-  metadata.gz: 3ff366765e02c7fe423368d0afa62bda693811c96f4f681b490161274228d39e0713cca821d4d49768c17e5f7de51e80a291bad2473e5087ff3bf4f22ccf872b
-  data.tar.gz: c74cda5f867dd363950b031cd4995fdf9585b843e8f66b11bdd7ec4f5e8e3f728e8340d7cebf796756133b05b3b3678716994692a46b169454e680b8a357f516
+  metadata.gz: d07510d07f5a1fd3bd6f91fac8f3cd1f932013c43c836ab9c5c34525ca926d6b251e88f41831abaaa0e46d726a206fbfd9c4ca473e8cdca1218050c1d2b7ecd0
+  data.tar.gz: fffebdf455902541dbf7aa8acd9c26ab66e454e391f622390b92364bcc787ef0ba25f362e137cc199b787a8b145da834b920e92a961f02c4ed0daec03eb7a470

data/lib/shoptet.rb

@@ -1,17 +1,73 @@
+require 'delegate'
 require_relative 'shoptet/request'
 
 class Shoptet
+  include Shoptet::UrlHelpers
+
   class Error < StandardError; end
   class AddonSuspended < StandardError; end
   class AddonNotInstalled < StandardError; end
   class InvalidTokenNoRights < StandardError; end
+  class EmptyRequestResponse < StandardError; end
 
   DEFAULT_ON_TOKEN_ERROR = -> (api) do
     api.api_token = api.new_api_token
   end
 
+  class ApiEnumerator < SimpleDelegator
+    def initialize base_url, filters, data_key, api
+      @base_url = base_url
+      @filters = filters
+      @data_key = data_key ||  URI(base_url).path.split('/').last
+      @api = api
+
+      @enum = Enumerator.new do |y|
+        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|
+            uri = @api.assemble_uri base_url, filters.merge(page: page)
+            result = @api.request uri
+            result.dig('data', @data_key).each { y.yield _1 }
+          end
+
+          last_page.dig('data', @data_key).each { y.yield _1 }
+        end
+      end
+
+      super @enum
+    end
+
+    def first_page
+      @first_page ||=
+        begin
+          uri = @api.assemble_uri @base_url, @filters
+          @api.request uri
+        end
+    end
+
+    def total_pages
+      first_page.dig('data', 'paginator', 'pageCount') || 0
+    end
+
+    def last_page
+      return first_page if total_pages < 2
+
+      @last_page ||=
+        begin
+          uri = @api.assemble_uri @base_url, @filters.merge(page: total_pages)
+          @api.request uri
+        end
+    end
+
+    def size
+      first_page['data']['paginator']['totalCount']
+    end
+  end
+
   def self.version
-    '0.0.7'
+    '0.0.12'
   end
 
   def self.ar_on_token_error(model)
@@ -72,6 +128,16 @@ class Shoptet
     @on_token_error = on_token_error || DEFAULT_ON_TOKEN_ERROR
   end
 
+  def endpoints api_params = {}
+    enumerize 'https://api.myshoptet.com/api/system/endpoints', api_params
+  end
+
+  def endpoint_approved? endpoint
+    @approved_endpoints ||= endpoints
+
+    @approved_endpoints.any? { _1['endpoint'] == endpoint }
+  end
+
   def authorize_url redirect_url, state
     query = {
       client_id: @client_id,
@@ -85,12 +151,14 @@ class Shoptet
   end
 
   def shop_info api_params = {}
-    result = request 'https://api.myshoptet.com/api/eshop'
+    url = assemble_uri 'https://api.myshoptet.com/api/eshop', api_params
+    result = request url
     result['data']
   end
 
   def design_info api_params = {}
-    result = request 'https://api.myshoptet.com/api/eshop/design'
+    url = assemble_uri 'https://api.myshoptet.com/api/eshop/design', api_params
+    result = request url
 
     result['data']
   end
@@ -161,35 +229,6 @@ class Shoptet
     result.fetch 'access_token'
   end
 
-  private
-
-  def assemble_uri base, params = {}
-    u = URI(base)
-    u.query = URI.encode_www_form(params) if params.any?
-
-    u.to_s
-  end
-
-  def enumerize base_uri, filters = {}, data_key = nil
-    data_key ||= URI(base_uri).path.split('/').last
-    uri = assemble_uri base_uri, filters
-    size_proc = -> () { request(uri)['data']['paginator']['totalCount'] }
-
-    Enumerator.new(size_proc) do |y|
-      first_page = request uri
-      total_pages = first_page.dig('data', 'paginator', 'pageCount') || 0
-      other_pages = 2..total_pages
-
-      first_page.dig('data', data_key).each { y.yield _1 }
-
-      other_pages.each do |page|
-        uri = assemble_uri base_uri, filters.merge(page: page)
-        result = request uri
-        result.dig('data', data_key).each { y.yield _1 }
-      end
-    end
-  end
-
   def request uri, retry_on_token_error = true
     headers = { 'Shoptet-Access-Token' => @api_token,
                 'Content-Type' => 'application/vnd.shoptet.v1.0' }
@@ -209,6 +248,12 @@ class Shoptet
     end
   end
 
+  private
+
+  def enumerize base_url, filters = {}, data_key = nil
+    ApiEnumerator.new base_url, filters, data_key, self
+  end
+
   def handle_errors result, uri, headers
     error = result['error']
     errors = result['errors'] || []

data/lib/shoptet/request.rb

@@ -3,6 +3,15 @@ require 'net/http'
 #TODO: keep_alive_timeout ?
 
 class Shoptet
+  module UrlHelpers
+    def assemble_uri base, params = {}
+      u = URI(base)
+      u.query = URI.encode_www_form(params) if params.any?
+
+      u.to_s
+    end
+  end
+
   class Request
     def self.get uri, headers
       attempt ||= 0
@@ -12,10 +21,10 @@ class Shoptet
 
       http = Net::HTTP.new parsed_uri.host, parsed_uri.port
       http.use_ssl = true
-      http.open_timeout = 10
-      http.read_timeout = 10
-      http.write_timeout = 10
-      http.ssl_timeout = 10
+      http.open_timeout = 60
+      http.read_timeout = 60
+      http.write_timeout = 60
+      http.ssl_timeout = 60
 
       request = Net::HTTP::Get.new parsed_uri
       headers.each do |key, value|
@@ -23,8 +32,14 @@ class Shoptet
       end
 
       response = http.request request
+      parsed_body = JSON.parse response.body
+
+      unless parsed_body
+        message = "Status code: #{response.code}, url: #{uri}"
+        fail Shoptet::EmptyRequestResponse.new(message)
+      end
 
-      JSON.parse response.body
+      parsed_body
     rescue Net::OpenTimeout
       retry if attempt < 4
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoptet
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.12
 platform: ruby
 authors:
 - Premysl Donat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: irb