Refactoring. Minor changes in Criteria::Chain module

Dynamoid · Aug 17, 2019 · 347f6bf · 347f6bf
1 parent 8de57b7
commit 347f6bf
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/lib/dynamoid/criteria/chain.rb b/lib/dynamoid/criteria/chain.rb
@@ -195,9 +195,12 @@ def pages
       #
       # @since 3.1.0
       def pages_via_query
-        Enumerator.new do |yielder|
+        Enumerator.new do |y|
           Dynamoid.adapter.query(source.table_name, range_query).each do |items, metadata|
-            yielder.yield items.map { |hash| source.from_database(hash) }, metadata.slice(:last_evaluated_key)
+            page = items.map { |h| source.from_database(h) }
+            options = metadata.slice(:last_evaluated_key)
+
+            y.yield page, options
           end
         end
       end
@@ -208,9 +211,12 @@ def pages_via_query
       #
       # @since 3.1.0
       def pages_via_scan
-        Enumerator.new do |yielder|
+        Enumerator.new do |y|
           Dynamoid.adapter.scan(source.table_name, scan_query, scan_opts).each do |items, metadata|
-            yielder.yield(items.map { |hash| source.from_database(hash) }, metadata.slice(:last_evaluated_key))
+            page = items.map { |h| source.from_database(h) }
+            options = metadata.slice(:last_evaluated_key)
+
+            y.yield page, options
           end
         end
       end