toy-dynamo 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5e8be83c9545d0ded8c76d26666c46cb7441edc
-  data.tar.gz: faec9a501e022c3dfc95190d6b09da1ee6725734
+  metadata.gz: b009000e9ef292d89e89f980ff8696d92990f861
+  data.tar.gz: 29e1c1455056be654a8757834493f45c906e3ce6
 SHA512:
-  metadata.gz: d57c6a6e554e9cd52304c279953a1bcb09af2fb457f95c3b67e17a5485abea686abd22c90eb63dc847ce4d3e89a24cb7ad87d51b674b4cfb6dce2baf5a458038
-  data.tar.gz: d1605f9f38d4bf55c16cd9470d25208908612c0f82d2378255042e9f3c72fdf60882857c8fd2962f635f9231d3da09938afbe19db1bcc08d83d045b3bea59040
+  metadata.gz: 5fcef06c3655d1ad8d845616ed95b1a00d813705dd268255eb3b3109e5912fa78fc57ac715db5f505e9e9a5aa4b7be7f094acf067b9f7a3c0a01e6b37f3d1a0f
+  data.tar.gz: 768bef23ff4fb4cbf4298c1c9070f47ea437ff0347ddbcad253c95938c24c53e7d4c4bfa45750a9be3c21a7bca53da1ed4fac0b3af8fe879f461edce69878698

data/lib/toy/dynamo/querying.rb

@@ -4,7 +4,7 @@ module Toy
       extend ActiveSupport::Concern
 
       # Failsafe
-      MAX_BATCH_ITERATIONS = 1000
+      MAX_BATCH_ITERATIONS = 99_999
       DEFAULT_BATCH_SIZE = 100
 
       module ClassMethods
@@ -77,16 +77,16 @@ module Toy
         end
 
         #:count=>10, :scanned_count=>10, :last_evaluated_key=>{"guid"=>{:s=>"11f82550-5c5d-11e3-9b55-d311a43114ca"}}}
+        # :manual_batching => true|false
+        #   return results with last_evaluated_key instead of automatically looping through (useful to throttle or )
         def scan(options={})
-          results = dynamo_table.scan(options)
           aggregated_results = []
 
           batch_size = options.delete(:batch) || DEFAULT_BATCH_SIZE
           max_results_limit = options[:limit]
-          if options[:limit] && options[:limit] > batch_size
-            options.merge!(:limit => batch_size)
-          end
+          options[:limit] = batch_size
 
+          results = dynamo_table.scan(options)
           response = Response.new(results)
 
           results[:member].each do |result|
@@ -94,7 +94,7 @@ module Toy
             aggregated_results << load(attrs[dynamo_table.hash_key[:attribute_name]], attrs)
           end
 
-          if response.more_results?
+          if response.more_results? && !options[:manual_batching]
             results_returned = response.count
             batch_iteration = 0
             while response.more_results? && batch_iteration < MAX_BATCH_ITERATIONS
@@ -116,7 +116,16 @@ module Toy
             end
           end
 
-          aggregated_results
+          if options[:manual_batching]
+            response_hash = {
+              :results => aggregated_results,
+              :last_evaluated_key => results[:last_evaluated_key]
+            }
+            response_hash.merge!(:consumed_capacity => results[:consumed_capacity]) if results[:consumed_capacity]
+            response_hash
+          else
+            aggregated_results
+          end
         end
 
       end # ClassMethods

data/lib/toy/dynamo/version.rb

@@ -1,5 +1,5 @@
 module Toy
   module Dynamo
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toy-dynamo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Cary Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler