shoptet 0.0.17 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6e34af9913575eccf62bb7733798b354a81e3fc00046ba5585461c8bb65a52f
-  data.tar.gz: c531d53f42166c618b7d66bb7418d1c9d4d715037f482523718d5c717d25afb9
+  metadata.gz: 2009bb64f74a45fdc160d4cbe7040366ec918ad6ad392288cad5f00f3e4e2406
+  data.tar.gz: 72dfe3b46b578a2131e7c8b96ca1d951dddfa15eea60a8ce77d4666ae9186d91
 SHA512:
-  metadata.gz: aff6a24d95315896100ee17100d53dad6293e51c860361dc78b2094466e3f0d260b0407f6701af426458a247c75aefa770233d8df24df2c3c1cde41cbed6bc40
-  data.tar.gz: 1f57093bca36597126821cdc033980ca35cad71d440d2deae93eee4092a35e410b27ad76077f2b194b111c319cdc8918119026f7c4d32a91f33b43a79612e326
+  metadata.gz: 3aee7e5ad2e7c1006202513f8ca57faaeb07b96508097b6457b98b174e497530545553923106f61ec184a194d2af3caf3e14abffe81f4c1912c212c8846f7723
+  data.tar.gz: 89ae29433db50dede06c6eef59a311cef45aa9b0d59ae740ca5130cd47d207bf06cd172498862e7c2b6c4b6df96d25eb01f9b8485892d36750048e0f62bc3208

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shoptet (0.0.1)
+    shoptet (0.0.19)
 
 GEM
   remote: https://rubygems.org/

data/lib/shoptet.rb

@@ -1,79 +1,25 @@
 require 'delegate'
 require_relative 'shoptet/request'
+require_relative 'shoptet/api_enumerator'
 
 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
+  class EmptyResponse < StandardError; end
   class MaxPageReached < StandardError; end
-  class UnsuccessfulApiResponse < StandardError; end
 
   EXPIRED_TOKEN_CODE = 'expired-token'
   INVALID_TOKEN_CODE = 'invalid-token'
   ADDON_NOT_INSTALLED = 'Addon installation is not approved.'
 
-  DEFAULT_ON_TOKEN_ERROR = -> (api) do
+  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.17'
+    '0.0.22'
   end
 
   def self.ar_on_token_error(model)
@@ -103,7 +49,7 @@ class Shoptet
       'scope' => 'api'
     }
 
-    Shoptet::Request.post url, data
+    Shoptet::Request.post(url, data)
   end
 
   def self.login_token url, code, client_id, client_secret, redirect_url
@@ -116,11 +62,11 @@ class Shoptet
       scope: 'basic_eshop'
     }
 
-    Shoptet::Request.post url, data
+    Shoptet::Request.post(url, data)
   end
 
   def self.basic_eshop url, access_token
-    Shoptet::Request.get url, { 'Authorization' => "Bearer #{access_token}" }
+    Shoptet::Request.get(url, { 'Authorization' => "Bearer #{access_token}" })
   end
 
   attr_accessor :api_token
@@ -131,11 +77,11 @@ class Shoptet
     @shop_url = shop_url
     @client_id = client_id
     @api_token = api_token
-    @on_token_error = on_token_error || DEFAULT_ON_TOKEN_ERROR
+    @on_token_error = on_token_error || ON_TOKEN_ERROR
   end
 
   def endpoints api_params = {}
-    enumerize 'https://api.myshoptet.com/api/system/endpoints', api_params
+    enumerize('https://api.myshoptet.com/api/system/endpoints', api_params)
   end
 
   def endpoint_approved? endpoint
@@ -144,6 +90,10 @@ class Shoptet
     @approved_endpoints.any? { _1['endpoint'] == endpoint }
   end
 
+  def endpoints_approved? *endpoints_to_check
+    endpoints_to_check.all? { endpoint_approved? _1 }
+  end
+
   def authorize_url redirect_url, state
     query = {
       client_id: @client_id,
@@ -153,101 +103,95 @@ class Shoptet
       redirect_uri: redirect_url
     }.to_query
 
-    URI("#{@shop_url}action/OAuthServer/authorize?#{query}").to_s
+    URI("#{@shop_url}action/OAuthServer/authorize?#{query}")
   end
 
   def shop_info api_params = {}
-    url = assemble_uri 'https://api.myshoptet.com/api/eshop', api_params
-    result = request url
+    result = request('https://api.myshoptet.com/api/eshop', api_params)
     result['data']
   end
 
   def design_info api_params = {}
-    url = assemble_uri 'https://api.myshoptet.com/api/eshop/design', api_params
-    result = request url
+    result = request('https://api.myshoptet.com/api/eshop/design', api_params)
 
     result['data']
   end
 
   def stocks api_params = {}
-    enumerize 'https://api.myshoptet.com/api/stocks', api_params
+    enumerize('https://api.myshoptet.com/api/stocks', api_params)
   end
 
   def products api_params = {}
-    enumerize "https://api.myshoptet.com/api/products", api_params
+    enumerize("https://api.myshoptet.com/api/products", api_params)
   end
 
   def supplies warehouse_id, api_params = {}
-    uri = "https://api.myshoptet.com/api/stocks/#{warehouse_id}/supplies"
-    enumerize uri, api_params
+    enumerize("https://api.myshoptet.com/api/stocks/#{warehouse_id}/supplies", api_params)
   end
 
   def stocks_movements warehouse_id, api_params = {}
-    uri = "https://api.myshoptet.com/api/stocks/#{warehouse_id}/movements"
-    enumerize uri, api_params
+    enumerize("https://api.myshoptet.com/api/stocks/#{warehouse_id}/movements", api_params)
   end
 
   def product_categories api_params = {}
-    enumerize 'https://api.myshoptet.com/api/categories', api_params
+    enumerize('https://api.myshoptet.com/api/categories', api_params)
   end
 
   def products_changes api_params = {}
-    uri = 'https://api.myshoptet.com/api/products/changes'
-    enumerize uri, api_params
+    enumerize('https://api.myshoptet.com/api/products/changes', api_params)
   end
 
   def price_lists api_params = {}
-    enumerize 'https://api.myshoptet.com/api/pricelists', api_params
+    enumerize('https://api.myshoptet.com/api/pricelists', api_params)
   end
 
   def prices price_list_id, api_params = {}
-    uri = "https://api.myshoptet.com/api/pricelists/#{price_list_id}"
-    enumerize uri, api_params, 'pricelist'
+    enumerize("https://api.myshoptet.com/api/pricelists/#{price_list_id}", api_params, 'pricelist')
   end
 
   def orders api_params = {}
-    enumerize 'https://api.myshoptet.com/api/orders', api_params
+    enumerize('https://api.myshoptet.com/api/orders', api_params)
   end
 
   def orders_changes api_params = {}
-    uri = 'https://api.myshoptet.com/api/orders/changes'
-    enumerize uri, api_params
+    enumerize('https://api.myshoptet.com/api/orders/changes', api_params)
   end
 
   def order code, api_params = {}
-    uri = "https://api.myshoptet.com/api/orders/#{code}"
-    result = request assemble_uri(uri, api_params)
-    result.dig 'data', 'order'
+    result = request("https://api.myshoptet.com/api/orders/#{code}", api_params)
+    result.dig('data', 'order')
   end
 
   def product guid, api_params = {}
-    uri = "https://api.myshoptet.com/api/products/#{guid}"
-    result = request assemble_uri(uri, api_params)
+    result = request("https://api.myshoptet.com/api/products/#{guid}", api_params)
     result['data']
   end
 
   def new_api_token
     headers = { 'Authorization' => "Bearer #{@oauth_token}" }
 
-    result = Shoptet::Request.get @oauth_url, headers
-    handle_errors result, @oauth_url, headers
+    result = Shoptet::Request.get(URI(@oauth_url), headers)
+    handle_errors(result)
 
-    result.fetch 'access_token'
+    result.fetch('access_token')
   end
 
-  def request uri, retry_on_token_error = true
+  def request url, api_params = {}, retry_on_token_error = true
+    url = URI(url)
+    url.query = URI.encode_www_form(api_params) if api_params.any?
+
     headers = { 'Shoptet-Access-Token' => @api_token,
                 'Content-Type' => 'application/vnd.shoptet.v1.0' }
 
-    result = Shoptet::Request.get uri, headers
-    token_errors = handle_errors result, uri, headers
+    result = Shoptet::Request.get(url, headers)
+    token_errors = handle_errors(result)
 
     if token_errors.any?
       if retry_on_token_error
-        @on_token_error.call self
-        request uri, false
+        @on_token_error.call(self)
+        request(url, api_params, false)
       else
-        raise Error.new result
+        raise Error.new(result)
       end
     else
       result
@@ -255,9 +199,7 @@ class Shoptet
   end
 
   def suspended?
-    data = shop_info
-
-    false if data
+    false if shop_info
   rescue Shoptet::AddonSuspended
     true
   end
@@ -265,10 +207,10 @@ class Shoptet
   private
 
   def enumerize base_url, filters = {}, data_key = nil
-    ApiEnumerator.new base_url, filters, data_key, self
+    ApiEnumerator.new(base_url, filters, data_key, self)
   end
 
-  def handle_errors result, uri, headers
+  def handle_errors result
     error = result['error']
     errors = result['errors'] || []
     token_errors, non_token_errors = errors.partition do |err|

data/lib/shoptet/api_enumerator.rb

@@ -0,0 +1,44 @@
+class Shoptet
+  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|
+            result = @api.request(base_url, filters.merge(page: page))
+            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 ||= @api.request(@base_url, @filters)
+    end
+
+    def last_page
+      return first_page if total_pages < 2
+
+      @last_page ||= @api.request(@base_url, @filters.merge(page: total_pages))
+    end
+
+    def total_pages
+      first_page.dig('data', 'paginator', 'pageCount') || 0
+    end
+
+    def size
+      first_page.dig('data', 'paginator', 'totalCount')
+    end
+  end
+end

data/lib/shoptet/request.rb

@@ -1,63 +1,41 @@
 require 'net/http'
-
-#TODO: keep_alive_timeout ?
+require 'oj'
 
 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
-      attempt += 1
-
-      parsed_uri = URI(uri)
-
-      http = Net::HTTP.new parsed_uri.host, parsed_uri.port
+    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
 
-      request = Net::HTTP::Get.new parsed_uri
+      request = Net::HTTP::Get.new(url)
       headers.each do |key, value|
         request[key] = value
       end
 
-      response = http.request request
-      parsed_body = JSON.parse response.body
+      response = http.request(request)
+      parsed_body = Oj.load(response.body, mode: :compat)
 
       unless parsed_body
-        message = "Status code: #{response.code}, url: #{uri}"
-        fail Shoptet::EmptyRequestResponse.new(message)
-      end
-
-      unless response.code == '200'
-        message = "Status code: #{response.code}, url: #{uri}"
-        fail Shoptet::UnsuccessfulApiResponse.new(message)
+        message = "Status code: #{response.code}, url: #{url}"
+        fail Shoptet::EmptyResponse.new(message)
       end
 
       parsed_body
-    rescue Net::OpenTimeout
-      retry if attempt < 4
     end
 
-    def self.post uri, body
-      req = Net::HTTP::Post.new uri
-      req.set_form_data body
+    def self.post url, body
+      request = Net::HTTP::Post.new(url)
+      request.set_form_data(body)
 
-      res = Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
-        http.request req
+      response = Net::HTTP.start(url.host, url.port, use_ssl: true) do |http|
+        http.request(request)
       end
 
-      JSON.parse res.body
+      Oj.load(response.body, mode: :compat)
     end
   end
 end

data/shoptet.gemspec

@@ -22,5 +22,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
+  spec.add_dependency 'oj'
+
   spec.add_development_dependency 'irb'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: shoptet
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.22
 platform: ruby
 authors:
 - Premysl Donat
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-26 00:00:00.000000000 Z
+date: 2020-12-22 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
@@ -40,6 +54,7 @@ files:
 - bin/console
 - bin/setup
 - lib/shoptet.rb
+- lib/shoptet/api_enumerator.rb
 - lib/shoptet/request.rb
 - shoptet.gemspec
 homepage: https://github.com/Masa331/shoptet