right_aws 1.6.1 → 1.6.2

data/History.txt

@@ -71,7 +71,6 @@ Initial release.
 
 * r1983, konstantin, 2007-10-25 22:33:00 +0400
   * Fixed ActiveSupport requirement bug (thanks to Toby)
-  * Fixed HttpConnection logging to stdout bug (thanks to Toby)
 
 == 1.4.4
 
@@ -139,6 +138,21 @@ r2963 | todd | 2008-03-06 19:10:23 -0800 (Thu, 06 Mar 2008) | 3 lines
 in
 certain rare conditions
 
+== 1.6.2 2008-03-19
+------------------------------------------------------------------------
+r3128 | todd | 2008-03-19 11:54:53 -0700 (Wed, 19 Mar 2008) | 2 lines
+
+Create 1.6.2 release branch
+
+------------------------------------------------------------------------
+r3130 | todd | 2008-03-19 12:01:12 -0700 (Wed, 19 Mar 2008) | 3 lines
+
+Apply Change 3124 to release_1_6_2 : further fixes to
+incrementally_list_bucket
+
+------------------------------------------------------------------------
+r3134 | todd | 2008-03-19 14:10:25 -0700 (Wed, 19 Mar 2008) | 2 lines
 
+Merge 3133 (max-keys fix in incrementally_list_bucket) from trunk to 1.6.2
 
 

data/lib/right_aws.rb

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

data/lib/s3/right_s3_interface.rb

@@ -283,27 +283,38 @@ module RightAws
         response = request_info(req_hash, S3ImprovedListBucketParser.new(:logger => @logger))
         there_are_more_keys = response[:is_truncated]
         if(there_are_more_keys)
-          if(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 
-            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[:marker] = decide_marker(response)
           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 && internal_options[:'max-keys'] > 0
+      end while there_are_more_keys && under_max_keys(internal_options)
       true
     rescue
       on_exception
     end
     
+    
+    private
+    def decide_marker(response)
+      return response[:next_marker].dup if response[:next_marker]
+      last_key = response[:contents].last[:key]
+      last_prefix = response[:common_prefixes].last
+      if(!last_key)
+        return nil if(!last_prefix)
+        last_prefix.dup
+      elsif(!last_prefix)
+        last_key.dup
+      else
+        last_key > last_prefix ? last_key.dup : last_prefix.dup
+      end
+    end
+    
+    def under_max_keys(internal_options)
+      internal_options[:'max-keys'] ? internal_options[:'max-keys'] > 0 : true
+    end
+    
+    public
       # Saves object to Amazon. Returns +true+  or an exception.
       # Any header starting with AMAZON_METADATA_PREFIX is considered
       # user metadata. It will be stored with the object and returned

metadata

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