Merge remote-tracking branch 'upstream/master'

Author: gersanco

CHANGELOG.md

@@ -1,3 +1,11 @@
+### v0.9.0.pre
+
+* bug-fixes
+  * Fix typo
+
+* features
+  * Add optional `paginated: false` parameter to `session.products.all(paginated: false)`
+
 ### v0.8.1.pre
 
 * bug-fixes

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    beyond_api (0.8.1.pre)
+    beyond_api (0.9.0.pre)
       faraday (~> 0.15)
 
 GEM

lib/beyond_api/resources/product_attribute_definitions.rb

@@ -14,9 +14,9 @@ class ProductAttributeDefinitions < Base
     #
     # @beyond_api.scopes +prad:r+
     #
-    # @option param [Boolean] :paginated
-    # @option param [Integer] :size the page size
-    # @option param [Integer] :page the page number
+    # @option params [Boolean] :paginated
+    # @option params [Integer] :size the page size
+    # @option params [Integer] :page the page number
     #
     # @return [OpenStruct]
     #
@@ -32,6 +32,7 @@ def all(params = {})
         end
 
         result.is_a?(Hash) ? result.delete(:page) : result.delete_field(:page)
+
         result
       else
         all_paginated(params)

lib/beyond_api/resources/products.rb

@@ -32,6 +32,7 @@ class Products < Base
     #
     # @beyond_api.scopes +prod:r+
     #
+    # @option params [Boolean] :paginated
     # @option params [Integer] :size the page size
     # @option params [Integer] :page the page number
     #
@@ -41,9 +42,19 @@ class Products < Base
     #   @products = session.products.all(size: 100, page: 0)
     #
     def all(params = {})
-      response, status = BeyondApi::Request.get(@session, "/products", params)
+      if params[:paginated] == false
+        result = all_paginated(page: 0, size: 1000)
 
-      handle_response(response, status)
+        (1..result[:page][:total_pages] - 1).each do |page|
+          result[:embedded][:products].concat(all_paginated(page: page, size: 1000)[:embedded][:products])
+        end
+
+        result.is_a?(Hash) ? result.delete(:page) : result.delete_field(:page)
+
+        result
+      else
+        all_paginated(params)
+      end
     end
 
     #
@@ -282,5 +293,13 @@ def assign_variation_images_differentiator(product_id, differentiator)
     alias_method :create_variation, :create
     alias_method :find_variation,   :find
     alias_method :update_variation, :update
+
+    private
+
+      def all_paginated(params = {})
+        response, status = BeyondApi::Request.get(@session, "/products", params)
+
+        handle_response(response, status)
+      end
   end
 end

lib/beyond_api/version.rb

@@ -1,3 +1,3 @@
 module BeyondApi
-  VERSION = "0.8.1.pre".freeze
+  VERSION = "0.9.0.pre".freeze
 end