Merge pull request #6 from btalbot/master

Avoid infinite loop during session garbage collection.

Author: awood45

lib/aws/session_store/dynamo_db/garbage_collection.rb

@@ -59,7 +59,7 @@ def eliminate_unwanted_sessions(config, last_key = nil)
     # @api private
     def scan(config, last_item = nil)
       options = scan_opts(config)
-      options.merge(start_key(last_item)) if last_item
+      options = options.merge(start_key(last_item)) if last_item
       config.dynamo_db_client.scan(options)
     end
 

spec/aws/session_store/dynamo_db/garbage_collection_spec.rb

@@ -111,7 +111,10 @@ def collect_garbage
 
     it "gets scan results then returns last evaluated key and resumes scanning" do
       dynamo_db_client.should_receive(:scan).
-        exactly(2).times.and_return(scan_resp2, scan_resp3)
+        exactly(1).times.and_return(scan_resp2)
+      dynamo_db_client.should_receive(:scan).
+        exactly(1).times.with(hash_including({:exclusive_start_key => scan_resp2.last_evaluated_key})).
+        and_return(scan_resp3)
       dynamo_db_client.should_receive(:batch_write_item).
         exactly(3).times.and_return(write_resp1)
         collect_garbage