shoptet 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8facc56cfe2afc649cbad1f5094830d94d83f1f8d3d564e8886f17efe1b5bc87
-  data.tar.gz: 82c8517d218cc6182c54620e1161428d992a43e70364c23438fb0970bf303a6f
+  metadata.gz: 020dcc94bd92d287243ac40e3bf854a9f0e5f4c32670fe221aa7af1a6b785e39
+  data.tar.gz: 5d3701df86ba602c16e626b7f703b01c733ef6878a3cfa862217c17cad19890e
 SHA512:
-  metadata.gz: 3ff366765e02c7fe423368d0afa62bda693811c96f4f681b490161274228d39e0713cca821d4d49768c17e5f7de51e80a291bad2473e5087ff3bf4f22ccf872b
-  data.tar.gz: c74cda5f867dd363950b031cd4995fdf9585b843e8f66b11bdd7ec4f5e8e3f728e8340d7cebf796756133b05b3b3678716994692a46b169454e680b8a357f516
+  metadata.gz: b060e7a30c1cd96da7f7978231f40648b6a738154a33b0c6b5d8be538edd7e0f2dbfaa29490a16e979337244e9bd432b69e2a0cb3cc604a36d4354ba6c20e3a1
+  data.tar.gz: '0599e14ba6550168b2b02b31a8b25cb1452d244e27acb358d7a858473033c6992e0dec4a4cf28cf04d46d6c83c82ee4e06d54a0d00e7a2dc1e4afdda06827cb1'

data/lib/shoptet.rb

@@ -1,6 +1,9 @@
+require 'delegate'
 require_relative 'shoptet/request'
 
 class Shoptet
+  include Shoptet::UrlHelpers
+
   class Error < StandardError; end
   class AddonSuspended < StandardError; end
   class AddonNotInstalled < StandardError; end
@@ -10,8 +13,60 @@ class Shoptet
     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.8'
   end
 
   def self.ar_on_token_error(model)
@@ -161,35 +216,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 +235,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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoptet
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Premysl Donat