right_aws 1.6.0 → 1.6.1

data/History.txt

@@ -131,4 +131,14 @@ updates.
 r2922 | todd | 2008-03-03 15:26:42 -0800 (Mon, 03 Mar 2008) | 2 lines
 couple of documentation tweaks in prep for 1.6.0
 
+== 1.6.1 2008-03-14
+------------------------------------------------------------------------
+r2963 | todd | 2008-03-06 19:10:23 -0800 (Thu, 06 Mar 2008) | 3 lines
+
+(#950) Many minor fixes in incrementally_list_bucket to prevent a death loop
+in
+certain rare conditions
+
+
+
 

data/lib/right_aws.rb

@@ -52,7 +52,7 @@ module RightAws #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 6
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/s3/right_s3_interface.rb

@@ -284,14 +284,21 @@ module RightAws
         there_are_more_keys = response[:is_truncated]
         if(there_are_more_keys)
           if(response[:next_marker])
-            internal_options[:marker] = response[:next_marker]
+            # Dup from response so that no one can mess with these values in the
+            # yield block
+            internal_options[:marker] = response[:next_marker].dup
           else 
-            internal_options[:marker] = response[:contents].last[:key]
+            if( response[:contents].last[:key] > response[:common_prefixes].last )
+              internal_options[:marker] = response[:contents].last[:key].dup
+            else
+              internal_options[:marker] = response[:common_prefixes].last.dup
+            end
           end
-          internal_options[:'max-keys'] ? (internal_options[:'max-keys'] -= response[:contents].length) : nil 
+          total_results = response[:contents].length + response[:common_prefixes].length
+          internal_options[:'max-keys'] ? (internal_options[:'max-keys'] -= total_results) : nil 
         end
         yield response
-      end while there_are_more_keys 
+      end while there_are_more_keys && internal_options[:'max-keys'] > 0
       true
     rescue
       on_exception

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: right_aws
 version: !ruby/object:Gem::Version 
-  version: 1.6.0
-date: 2008-03-03 00:00:00 -08:00
+  version: 1.6.1
+date: 2008-03-14 00:00:00 -07:00
 summary: Interface classes for the Amazon EC2, SQS, and S3 Web Services
 require_paths: 
 - lib