toy-dynamo 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 379a504380d30c3c6b1c38c47661e7f366a3a6ae
-  data.tar.gz: d7b3c58d0d7a2f4bca65d234b542e295cc4b9c56
+  metadata.gz: a5e8be83c9545d0ded8c76d26666c46cb7441edc
+  data.tar.gz: faec9a501e022c3dfc95190d6b09da1ee6725734
 SHA512:
-  metadata.gz: 27692d7df92daba4828fb3bb122ef684e50a378b307090341e9c2ac653e42c13a329b23c1f0ee2497fe351913e6a27674e09770328cd35bc767bfe4bd8c238fa
-  data.tar.gz: 4f8a7e8b64b3c16862fb83f02db97405c470bbbfe57464f926b94b13b17f3254ad63e963ed6b163979b577e7ac86b7203e7af382e4babd03564fa82edf414453
+  metadata.gz: d57c6a6e554e9cd52304c279953a1bcb09af2fb457f95c3b67e17a5485abea686abd22c90eb63dc847ce4d3e89a24cb7ad87d51b674b4cfb6dce2baf5a458038
+  data.tar.gz: d1605f9f38d4bf55c16cd9470d25208908612c0f82d2378255042e9f3c72fdf60882857c8fd2962f635f9231d3da09938afbe19db1bcc08d83d045b3bea59040

data/lib/toy/dynamo/config.rb

@@ -25,23 +25,17 @@ module Toy
       #option :access_key
       #option :secret_key
 
-      # The default logger for Dynamoid: either the Rails logger or just stdout.
-      #
-      # @since 0.2.0
+      # The default logger: either the Rails logger or just stdout.
       def default_logger
         defined?(Rails) && Rails.respond_to?(:logger) ? Rails.logger : ::Logger.new($stdout)
       end
 
       # Returns the assigned logger instance.
-      #
-      # @since 0.2.0
       def logger
         @logger ||= default_logger
       end
 
       # If you want to, set the logger manually to any output you'd like. Or pass false or nil to disable logging entirely.
-      #
-      # @since 0.2.0
       def logger=(logger)
         case logger
         when false, nil then @logger = nil

data/lib/toy/dynamo/querying.rb

@@ -76,6 +76,49 @@ module Toy
           results_map
         end
 
+        #:count=>10, :scanned_count=>10, :last_evaluated_key=>{"guid"=>{:s=>"11f82550-5c5d-11e3-9b55-d311a43114ca"}}}
+        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
+
+          response = Response.new(results)
+
+          results[:member].each do |result|
+            attrs = Response.strip_attr_types(result)
+            aggregated_results << load(attrs[dynamo_table.hash_key[:attribute_name]], attrs)
+          end
+
+          if response.more_results?
+            results_returned = response.count
+            batch_iteration = 0
+            while response.more_results? && batch_iteration < MAX_BATCH_ITERATIONS
+              if max_results_limit && (delta_results_limit = (max_results_limit-results_returned)) < batch_size
+                break if delta_results_limit == 0
+                options.merge!(:limit => delta_results_limit)
+              else
+                options.merge!(:limit => batch_size)
+              end
+
+              results = dynamo_table.scan(options.merge(:exclusive_start_key => response.last_evaluated_key))
+              response = Response.new(results)
+              results[:member].each do |result|
+                attrs = Response.strip_attr_types(result)
+                aggregated_results << load(attrs[dynamo_table.hash_key[:attribute_name]], attrs)
+              end
+              results_returned += response.count
+              batch_iteration += 1
+            end
+          end
+
+          aggregated_results
+        end
+
       end # ClassMethods
 
     end

data/lib/toy/dynamo/table.rb

@@ -399,8 +399,8 @@ module Toy
           scan_request.merge!(:scan_filter => scan_filter)
         end
 
-        scan_request.merge!({ :segment => options[:segment] }) if options[:segment]
-        scan_request.merge!({ :total_segments => options[:total_segments].to_i }) if options[:total_segments]
+        scan_request.merge!({ :segment => options[:segment].to_i }) if options[:segment].present?
+        scan_request.merge!({ :total_segments => options[:total_segments].to_i }) if options[:total_segments].present?
 
         @client.scan(scan_request)
       end

data/lib/toy/dynamo/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toy-dynamo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Cary Dunn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: ActiveModel based DynamoDB ORM - extension to toystore