productive 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77f29b8aec3d5246bfa8c47324367f71a8d89fe1
-  data.tar.gz: 164de5a9592b69346d43d62afd5810722f7e2275
+  metadata.gz: 135076a9825c5ba98a32ae6adcf847bee2613d14
+  data.tar.gz: 2926f11187cd278ca1d6b6c481e8df905ca44988
 SHA512:
-  metadata.gz: 1cfbcdea8b7ed820c83c954b23b482fc9c9fbfc4909fc4818c8c505af790c826b34c9f1f13d6f9ae56b903dba771163bae7c8592ff821dcfadd44bda626b5b10
-  data.tar.gz: 7cff7c8493628f0d22f9919e9448328a33d0d9c9e25ac4125352e534e2acd048da64d6e7e9a7750090785522551a80392dcb48ef8abcfa25d1ae89f6f6e3cde1
+  metadata.gz: 69c10baf363ebb19915aaac3b81bce0f3404bb7e30092c552ed1f61587205e3e35098d887c09f64fc64145a1486c43ab8de9ce27a2493c94e32a7678adcd46ed
+  data.tar.gz: 1281601acbc2c4648ca60a7330435855561dccdf9da4092adcc9e728ecf0408aa5d0e3d6d340712f43a96f9f7957dd752e46e001a8a066e3a5cfc4e0e1bb5d44

data/lib/productive/resources/base.rb

@@ -21,30 +21,44 @@ module Productive
     end
 
     def self.all(args = {})
-      arr = []
-      page = 1
+      depaginate(BaseItems.new([]), args).items
+    end
+
+    def self.lazy_all(args = {})
+      Enumerator.new do |yielder|
+        depaginate(LazyItems.new(yielder), args)
+      end.lazy
+    end
+
+    def self.depaginate(items, args)
+      page = paginate(per_page: PER_PAGE).find(args)
+      items.append(page)
 
       loop do
-        results = paginate(per_page: PER_PAGE, page: page).find(args)
-        raise StopIteration if results.empty?
-        arr += results
-        page += 1
+        page = page.pages.next
+        raise StopIteration if page.nil?
+        items.append(page)
       end
 
-      arr
+      items
     end
 
-    def self.lazy_all
-      Enumerator.new do |yielder|
-        page = 1
-
-        loop do
-          results = paginate(per_page: PER_PAGE, page: page).find(args)
-          raise StopIteration if results.empty?
-          results.each { |item| yielder << item }
-          page += 1
-        end
-      end.lazy
+    class BaseItems
+      attr_reader :items
+
+      def initialize(items)
+        @items = items
+      end
+
+      def append(results)
+        @items += results
+      end
+    end
+
+    class LazyItems < BaseItems
+      def append(results)
+        results.each { |item| @items << item }
+      end
     end
   end
 end

data/lib/productive/version.rb

@@ -1,3 +1,3 @@
 module Productive
-  VERSION = '0.5.3'.freeze
+  VERSION = '0.5.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: productive
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Josip Bišćan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack