right_aws 1.7.1 → 1.7.2

data/lib/right_aws.rb

@@ -36,6 +36,7 @@ require 'right_http_connection'
 
 $:.unshift(File.dirname(__FILE__))
 require 'awsbase/benchmark_fix'
+require 'awsbase/file_fix'
 require 'awsbase/support'
 require 'awsbase/right_awsbase'
 require 'ec2/right_ec2'
@@ -52,7 +53,7 @@ module RightAws #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 7
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/s3/right_s3.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007 RightScale Inc
+# Copyright (c) 2007-2008 RightScale Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -249,6 +249,40 @@ module RightAws
         key = Key.create(self, key.to_s) unless key.is_a?(Key)
         key.get(headers)
       end
+
+        # Rename object. Returns RightAws::S3::Key instance.
+        # 
+        #  new_key = bucket.rename_key('logs/today/1.log','logs/today/2.log')   #=> #<RightAws::S3::Key:0xb7b1e240 ... >
+        #  puts key.name   #=> 'logs/today/2.log'
+        #  key.exists?     #=> true
+        #
+      def rename_key(old_key_or_name, new_name)
+        old_key_or_name = Key.create(self, old_key_or_name.to_s) unless old_key_or_name.is_a?(Key)
+        old_key_or_name.rename(new_name)
+        old_key_or_name
+      end
+
+        # Create an object copy. Returns a destination RightAws::S3::Key instance.
+        # 
+        #  new_key = bucket.copy_key('logs/today/1.log','logs/today/2.log')   #=> #<RightAws::S3::Key:0xb7b1e240 ... >
+        #  puts key.name   #=> 'logs/today/2.log'
+        #  key.exists?     #=> true
+        #
+      def copy_key(old_key_or_name, new_key_or_name)
+        old_key_or_name = Key.create(self, old_key_or_name.to_s) unless old_key_or_name.is_a?(Key)
+        old_key_or_name.copy(new_key_or_name)
+      end
+      
+        # Move an object to other location. Returns a destination RightAws::S3::Key instance.
+        # 
+        #  new_key = bucket.copy_key('logs/today/1.log','logs/today/2.log')   #=> #<RightAws::S3::Key:0xb7b1e240 ... >
+        #  puts key.name   #=> 'logs/today/2.log'
+        #  key.exists?     #=> true
+        #
+      def move_key(old_key_or_name, new_key_or_name)
+        old_key_or_name = Key.create(self, old_key_or_name.to_s) unless old_key_or_name.is_a?(Key)
+        old_key_or_name.move(new_key_or_name)
+      end
       
         # Remove all keys from a bucket. 
         # Returns +true+. 
@@ -260,7 +294,7 @@ module RightAws
       end
 
         # Delete all keys where the 'folder_key' can be interpreted
-	# as a 'folder' name. 
+        # as a 'folder' name. 
         # Returns an array of string keys that have been deleted.
         #
         #  bucket.keys.map{|key| key.name}.join(', ') #=> 'test, test/2/34, test/3, test1, test1/logs'
@@ -334,7 +368,7 @@ module RightAws
       end
       
         # Create a new Key instance, but do not create the actual key.
-	# In normal use this method should not be called directly.
+        # In normal use this method should not be called directly.
         # Use RightAws::S3::Key.create or bucket.key() instead. 
         #
       def initialize(bucket, name, data=nil, headers={}, meta_headers={}, 
@@ -417,6 +451,66 @@ module RightAws
         @bucket.s3.interface.put(@bucket.name, @name, @data, meta.merge(headers))
       end
       
+        # Rename an object. Returns new object name.
+        # 
+        #  key = RightAws::S3::Key.create(bucket, 'logs/today/1.log') #=> #<RightAws::S3::Key:0xb7b1e240 ... >
+        #  key.rename('logs/today/2.log')   #=> 'logs/today/2.log'
+        #  puts key.name                    #=> 'logs/today/2.log'
+        #  key.exists?                      #=> true
+        #
+      def rename(new_name)
+        @bucket.s3.interface.rename(@bucket.name, @name, new_name)
+        @name = new_name
+      end
+      
+        # Create an object copy. Returns a destination RightAws::S3::Key instance.
+        #
+        #  # Key instance as destination
+        #  key1 = RightAws::S3::Key.create(bucket, 'logs/today/1.log') #=> #<RightAws::S3::Key:0xb7b1e240 ... >
+        #  key2 = RightAws::S3::Key.create(bucket, 'logs/today/2.log') #=> #<RightAws::S3::Key:0xb7b5e240 ... >
+        #  key1.put('Olala!')   #=> true
+        #  key1.copy(key2)      #=> #<RightAws::S3::Key:0xb7b5e240 ... >
+        #  key1.exists?         #=> true
+        #  key2.exists?         #=> true
+        #  puts key2.data       #=> 'Olala!'
+        #
+        #  # String as destination
+        #  key = RightAws::S3::Key.create(bucket, 'logs/today/777.log') #=> #<RightAws::S3::Key:0xb7b1e240 ... >
+        #  key.put('Olala!')                          #=> true
+        #  new_key = key.copy('logs/today/888.log')   #=> #<RightAws::S3::Key:0xb7b5e240 ... >
+        #  key.exists?                                #=> true
+        #  new_key.exists?                            #=> true
+        #
+      def copy(new_key_or_name)
+        new_key_or_name = Key.create(@bucket, new_key_or_name.to_s) unless new_key_or_name.is_a?(Key)
+        @bucket.s3.interface.copy(@bucket.name, @name, new_key_or_name.bucket.name, new_key_or_name.name)
+        new_key_or_name
+      end
+
+        # Move an object to other location. Returns a destination RightAws::S3::Key instance.
+        #
+        #  # Key instance as destination
+        #  key1 = RightAws::S3::Key.create(bucket, 'logs/today/1.log') #=> #<RightAws::S3::Key:0xb7b1e240 ... >
+        #  key2 = RightAws::S3::Key.create(bucket, 'logs/today/2.log') #=> #<RightAws::S3::Key:0xb7b5e240 ... >
+        #  key1.put('Olala!')   #=> true
+        #  key1.move(key2)      #=> #<RightAws::S3::Key:0xb7b5e240 ... >
+        #  key1.exists?         #=> false
+        #  key2.exists?         #=> true
+        #  puts key2.data       #=> 'Olala!'
+        #  
+        #  # String as destination
+        #  key = RightAws::S3::Key.create(bucket, 'logs/today/777.log') #=> #<RightAws::S3::Key:0xb7b1e240 ... >
+        #  key.put('Olala!')                          #=> true
+        #  new_key = key.move('logs/today/888.log')   #=> #<RightAws::S3::Key:0xb7b5e240 ... >
+        #  key.exists?                                #=> false
+        #  new_key.exists?                            #=> true
+        #
+      def move(new_key_or_name)
+        new_key_or_name = Key.create(@bucket, new_key_or_name.to_s) unless new_key_or_name.is_a?(Key)
+        @bucket.s3.interface.move(@bucket.name, @name, new_key_or_name.bucket.name, new_key_or_name.name)
+        new_key_or_name
+      end
+      
         # Retrieve key info from bucket and update attributes.
         # Refresh meta-headers (by calling +head+ method) if +head+ is set. 
         # Returns +true+ if the key exists in bucket and +false+ otherwise. 
@@ -444,7 +538,7 @@ module RightAws
         end
       end
 
-        # Retrieve meta-headers from S3.
+        # Updates headers and meta-headers from S3.
         # Returns +true+. 
         #
         #  key.meta_headers #=> {"family"=>"qwerty"}
@@ -455,7 +549,27 @@ module RightAws
         @headers, @meta_headers = self.class.split_meta(@bucket.s3.interface.head(@bucket, @name))
         true
       end
-
+      
+        # Reload meta-headers only. Returns meta-headers hash.
+        #
+        #  key.reload_meta   #=> {"family"=>"qwerty", "name"=>"asdfg"}
+        #
+      def reload_meta
+        @meta_headers = self.class.split_meta(@bucket.s3.interface.head(@bucket, @name)).last
+      end
+      
+        # Replace meta-headers by new hash at S3. Returns new meta-headers hash.
+        #
+        #  key.reload_meta   #=> {"family"=>"qwerty", "name"=>"asdfg"}
+        #  key.save_meta     #=> {"family"=>"oops", "race" => "troll"}
+        #  key.reload_meta   #=> {"family"=>"oops", "race" => "troll"}
+        #
+      def save_meta(meta_headers)
+        meta = self.class.add_meta_prefix(meta_headers)
+        @bucket.s3.interface.copy(@bucket.name, @name, @bucket.name, @name, :replace, meta)
+        @meta_headers = self.class.split_meta(meta)[1]
+      end
+ 
         # Check for existence of the key in the given bucket. 
         # Returns +true+ or +false+. 
         #
@@ -703,7 +817,7 @@ module RightAws
 
         # Apply current grantee @perms to +thing+. This method is called internally by the +grant+
         # and +revoke+ methods. In normal use this method should not
-	# be called directly.
+        # be called directly.
         # 
         #  grantee.perms = ['FULL_CONTROL']
         #  grantee.apply #=> true

data/lib/s3/right_s3_interface.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007 RightScale Inc
+# Copyright (c) 2007-2008 RightScale Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -33,7 +33,8 @@ module RightAws
     DEFAULT_PORT           = 443
     DEFAULT_PROTOCOL       = 'https'
     REQUEST_TTL            = 30
-    DEFAULT_EXPIRES_AFTER  = 1 * 24 * 60 * 60 # One day's worth of seconds
+    DEFAULT_EXPIRES_AFTER  =   1 * 24 * 60 * 60 # One day's worth of seconds
+    ONE_YEAR_IN_SECONDS    = 365 * 24 * 60 * 60
     AMAZON_HEADER_PREFIX   = 'x-amz-'
     AMAZON_METADATA_PREFIX = 'x-amz-meta-'
 
@@ -372,12 +373,12 @@ module RightAws
       #       :headers => {"last-modified"     => "Wed, 23 May 2007 09:08:04 GMT", 
       #                    "content-type"      => "", 
       #                    "etag"              => "\"000000000096f4ee74bc4596443ef2a4\"", 
-      #                     "date"              => "Wed, 23 May 2007 09:08:03 GMT", 
-      #                     "x-amz-id-2"        => "ZZZZZZZZZZZZZZZZZZZZ1HJXZoehfrS4QxcxTdNGldR7w/FVqblP50fU8cuIMLiu", 
-      #                     "x-amz-meta-family" => "Woho556!",
-      #                     "x-amz-request-id"  => "0000000C246D770C", 
-      #                     "server"            => "AmazonS3", 
-      #                     "content-length"    => "7"}}
+      #                    "date"              => "Wed, 23 May 2007 09:08:03 GMT", 
+      #                    "x-amz-id-2"        => "ZZZZZZZZZZZZZZZZZZZZ1HJXZoehfrS4QxcxTdNGldR7w/FVqblP50fU8cuIMLiu", 
+      #                    "x-amz-meta-family" => "Woho556!",
+      #                    "x-amz-request-id"  => "0000000C246D770C", 
+      #                    "server"            => "AmazonS3", 
+      #                    "content-length"    => "7"}}
       #
       # If a block is provided, yields incrementally to the block as
       # the response is read.  For large responses, this function is ideal as
@@ -429,6 +430,54 @@ module RightAws
       on_exception
     end
 
+      # Copy an object. 
+      #  directive: :copy    - copy meta-headers from source (default value)
+      #             :replace - replace meta-headers by passed ones
+      #
+      #  # copy a key with meta-headers
+      #  s3.copy('b1', 'key1', 'b1', 'key1_copy') #=> {:e_tag=>"\"e8b...8d\"", :last_modified=>"2008-05-11T10:25:22.000Z"}
+      #  
+      #  # copy a key, overwrite meta-headers
+      #  s3.copy('b1', 'key2', 'b1', 'key2_copy', :replace, 'x-amz-meta-family'=>'Woho555!') #=> {:e_tag=>"\"e8b...8d\"", :last_modified=>"2008-05-11T10:26:22.000Z"}
+      #
+      # see: http://docs.amazonwebservices.com/AmazonS3/2006-03-01/UsingCopyingObjects.html
+      #      http://docs.amazonwebservices.com/AmazonS3/2006-03-01/RESTObjectCOPY.html
+      #
+    def copy(src_bucket, src_key, dest_bucket, dest_key=nil, directive=:copy, headers={})
+      dest_key ||= src_key
+      headers['x-amz-metadata-directive'] = directive.to_s.upcase
+      headers['x-amz-copy-source']        = "#{src_bucket}/#{src_key}"
+      req_hash = generate_rest_request('PUT', headers.merge(:url=>"#{dest_bucket}/#{CGI::escape dest_key}"))
+      request_info(req_hash, S3CopyParser.new)
+    rescue
+      on_exception
+    end
+    
+      # Move an object. 
+      #  directive: :copy    - copy meta-headers from source (default value)
+      #             :replace - replace meta-headers by passed ones
+      #
+      #  # move bucket1/key1 to bucket1/key2
+      #  s3.move('bucket1', 'key1', 'bucket1', 'key2') #=> {:e_tag=>"\"e8b...8d\"", :last_modified=>"2008-05-11T10:27:22.000Z"}
+      #  
+      #  # move bucket1/key1 to bucket2/key2 with new meta-headers assignment
+      #  s3.copy('bucket1', 'key1', 'bucket2', 'key2', :replace, 'x-amz-meta-family'=>'Woho555!') #=> {:e_tag=>"\"e8b...8d\"", :last_modified=>"2008-05-11T10:28:22.000Z"}
+      #  
+    def move(src_bucket, src_key, dest_bucket, dest_key=nil, directive=:copy, headers={})
+      copy_result = copy(src_bucket, src_key, dest_bucket, dest_key, directive, headers)
+      # delete an original key if it differs from a destination one
+      delete(src_bucket, src_key) unless src_bucket == dest_bucket && src_key == dest_key
+      copy_result
+    end
+
+      # Rename an object. 
+      # 
+      #  # rename bucket1/key1 to bucket1/key2
+      #  s3.rename('bucket1', 'key1', 'key2') #=> {:e_tag=>"\"e8b...8d\"", :last_modified=>"2008-05-11T10:29:22.000Z"}
+      #  
+    def rename(src_bucket, src_key, dest_key, headers={})
+      move(src_bucket, src_key, src_bucket, dest_key, :copy, headers)
+    end
       
       # Retieves the ACL (access control policy) for a bucket or object. Returns a hash of headers and xml doc with ACL data. See: http://docs.amazonwebservices.com/AmazonS3/2006-03-01/RESTAccessPolicy.html.
       #
@@ -601,7 +650,7 @@ module RightAws
       end
        # expiration time
       expires ||= DEFAULT_EXPIRES_AFTER
-      expires   = Time.now.utc.since(expires) if expires.is_a?(Fixnum) && (expires<1.year)
+      expires   = Time.now.utc + expires if expires.is_a?(Fixnum) && (expires < ONE_YEAR_IN_SECONDS)
       expires   = expires.to_i
         # remove unset(==optional) and symbolyc keys
       headers.each{ |key, value| headers.delete(key) if (value.nil? || key.is_a?(Symbol)) }
@@ -669,8 +718,16 @@ module RightAws
     
       # Generates link for 'GetObject'.
       #
-      #  s3.get_link('my_awesome_bucket',key) #=> url string
+      # if a bucket comply with virtual hosting naming then retuns a link with the 
+      # bucket as a part of host name:
+      # 
+      #  s3.get_link('my-awesome-bucket',key) #=> https://my-awesome-bucket.s3.amazonaws.com:443/asia%2Fcustomers?Signature=nh7...
+      #  
+      # otherwise returns an old style link (the bucket is a part of path):
+      # 
+      #  s3.get_link('my_awesome_bucket',key) #=> https://s3.amazonaws.com:443/my_awesome_bucket/asia%2Fcustomers?Signature=QAO...
       #
+      # see http://docs.amazonwebservices.com/AmazonS3/2006-03-01/VirtualHosting.html
     def get_link(bucket, key, expires=nil, headers={})
       generate_link('GET', headers.merge(:url=>"#{bucket}/#{CGI::escape key}"), expires)
     rescue
@@ -875,6 +932,18 @@ module RightAws
         end
       end
     end
+
+    class S3CopyParser < RightAWSParser  # :nodoc:
+      def reset
+        @result = {}
+      end
+      def tagend(name)
+        case name
+        when 'LastModified' : @result[:last_modified] = @text
+        when 'ETag'         : @result[:e_tag]         = @text
+        end
+      end
+    end
     
     #-----------------------------------------------------------------
     #      PARSERS: Non XML

data/lib/sdb/right_sdb_interface.rb

@@ -29,7 +29,6 @@ module RightAws
     
     include RightAwsBaseInterface
 
-    SIGNATURE_VERSION = '1'
     DEFAULT_HOST      = 'sdb.amazonaws.com'
     DEFAULT_PORT      = 443
     DEFAULT_PROTOCOL  = 'https'
@@ -45,6 +44,7 @@ module RightAws
     #    { :server       => 'sdb.amazonaws.com'  # Amazon service host: 'sdb.amazonaws.com'(default)
     #      :port         => 443                  # Amazon service port: 80 or 443(default)
     #      :protocol     => 'https'              # Amazon service protocol: 'http' or 'https'(default)
+    #      :signature_version => '0'             # The signature version : '0' or '1'(default)
     #      :multi_thread => true|false           # Multi-threaded (connection per each thread): true or false(default)
     #      :logger       => Logger Object}       # Logger instance: logs to STDOUT if omitted }
     #      
@@ -76,9 +76,13 @@ module RightAws
                       "AWSAccessKeyId"    => @aws_access_key_id,
                       "Version"           => API_VERSION,
                       "Timestamp"         => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%S.000Z"),
-                      "SignatureVersion"  => SIGNATURE_VERSION }
+                      "SignatureVersion"  => signature_version }
+      service_hash.update(params)
       # prepare string to sight
-      string_to_sign = service_hash.merge(params).sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
+      string_to_sign = case signature_version
+                       when '0' : service_hash["Action"] + service_hash["Timestamp"]
+                       when '1' : service_hash.sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
+                       end
       service_hash.update('Signature' =>  AwsUtils::sign(@aws_secret_access_key, string_to_sign))
       service_string = service_hash.to_a.collect{|key,val| key + "=#{CGI::escape(val.to_s)}" }.join("&")
       #

data/lib/sqs/right_sqs.rb

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007 RightScale Inc
+# Copyright (c) 2007-2008 RightScale Inc
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/sqs/right_sqs_gen2_interface.rb

@@ -73,6 +73,7 @@ module RightAws
     #    {:server       => 'queue.amazonaws.com' # Amazon service host: 'queue.amazonaws.com' (default)
     #     :port         => 443                   # Amazon service port: 80 or 443 (default)
     #     :multi_thread => true|false            # Multi-threaded (connection per each thread): true or false (default)
+    #     :signature_version => '0'              # The signature version : '0' or '1'(default)
     #     :logger       => Logger Object}        # Logger instance: logs to STDOUT if omitted }
     #
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})

data/lib/sqs/right_sqs_interface.rb

@@ -26,7 +26,6 @@ module RightAws
   class SqsInterface < RightAwsBase
     include RightAwsBaseInterface
     
-    SIGNATURE_VERSION = "1"
     API_VERSION       = "2007-05-01"
     DEFAULT_HOST      = "queue.amazonaws.com"
     DEFAULT_PORT      = 443
@@ -57,6 +56,7 @@ module RightAws
       #    {:server       => 'queue.amazonaws.com' # Amazon service host: 'queue.amazonaws.com'(default)
       #     :port         => 443                   # Amazon service port: 80 or 443(default)
       #     :multi_thread => true|false            # Multi-threaded (connection per each thread): true or false(default)
+      #     :signature_version => '0'              # The signature version : '0' or '1'(default)
       #     :logger       => Logger Object}        # Logger instance: logs to STDOUT if omitted }
       #
     def initialize(aws_access_key_id=nil, aws_secret_access_key=nil, params={})
@@ -75,23 +75,26 @@ module RightAws
   #-----------------------------------------------------------------
 
       # Generates a request hash for the query API
-    def generate_request(action, param={})  # :nodoc:
+    def generate_request(action, params={})  # :nodoc:
         # Sometimes we need to use queue uri (delete queue etc)
         # In that case we will use Symbol key: 'param[:queue_url]'
-      queue_uri = param[:queue_url] ? URI(param[:queue_url]).path : '/'
+      queue_uri = params[:queue_url] ? URI(params[:queue_url]).path : '/'
         # remove unset(=optional) and symbolyc keys
-      param.each{ |key, value| param.delete(key) if (value.nil? || key.is_a?(Symbol)) }
+      params.each{ |key, value| params.delete(key) if (value.nil? || key.is_a?(Symbol)) }
         # prepare output hash
-      request_hash = { "Action"           => action,
-                       # "Expires"          => Time.now.utc.since(REQUEST_TTL).strftime("%Y-%m-%dT%H:%M:%SZ"),
+      service_hash = { "Action"           => action,
                        "Expires"          => (Time.now + REQUEST_TTL).utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
                        "AWSAccessKeyId"   => @aws_access_key_id,
                        "Version"          => API_VERSION,
-                       "SignatureVersion" => SIGNATURE_VERSION }
-      request_hash.update(param)
-      request_data   = request_hash.sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
-      request_hash['Signature'] = AwsUtils::sign(@aws_secret_access_key, request_data)
-      request_params = request_hash.to_a.collect{|key,val| key.to_s + "=" + CGI::escape(val.to_s) }.join("&")
+                       "SignatureVersion" => signature_version }
+      service_hash.update(params)
+      # prepare string to sight
+      string_to_sign = case signature_version
+                       when '0' : service_hash["Action"] + service_hash["Expires"]
+                       when '1' : service_hash.sort{|a,b| (a[0].to_s.downcase)<=>(b[0].to_s.downcase)}.to_s
+                       end
+      service_hash['Signature'] = AwsUtils::sign(@aws_secret_access_key, string_to_sign)
+      request_params = service_hash.to_a.collect{|key,val| key.to_s + "=" + CGI::escape(val.to_s) }.join("&")
       request        = Net::HTTP::Get.new("#{queue_uri}?#{request_params}")
         # prepare output hash
       { :request  => request, 

data/test/ec2/test_right_ec2.rb

@@ -65,4 +65,12 @@ class TestEc2 < Test::Unit::TestCase
 ##    assert_raise(Rightscale::AwsError) { @ec2.delete_key_pair(@key) }
   end
 
+  def test_10_signature_version_0
+    ec2 = Rightscale::Ec2.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key, :signature_version => '0')
+    images = ec2.describe_images
+    assert images.size>0, 'Amazon must have at least some public images'
+    # check that the request has correct signature version
+    assert ec2.last_request.path.include?('SignatureVersion=0')
+  end
+  
 end

data/test/s3/test_right_s3.rb

@@ -6,10 +6,13 @@ class TestS3 < Test::Unit::TestCase
   
   def setup
     @s3     = Rightscale::S3Interface.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
-    @bucket = 'right_s3_awesome_test_bucket'
+    @bucket = 'right_s3_awesome_test_bucket_00001'
     @key1   = 'test/woohoo1/'
     @key2   = 'test1/key/woohoo2'
     @key3   = 'test2/A%B@C_D&E?F+G=H"I'
+    @key1_copy =     'test/woohoo1_2'
+    @key1_new_name = 'test/woohoo1_3'
+    @key2_new_name = 'test1/key/woohoo2_new'
     @s      = Rightscale::S3.new(TestCredentials.aws_access_key_id, TestCredentials.aws_secret_access_key)
   end
 
@@ -74,12 +77,55 @@ class TestS3 < Test::Unit::TestCase
     assert(keys.include? @key3)
   end
   
-  def test_09_delete_folder
-    assert_equal 1, @s3.delete_folder(@bucket, 'test').size, "Only one key(#{@key1}) must be deleted!"
+  def test_09_copy_key
+    #--- test COPY
+    # copy a key
+    assert @s3.copy(@bucket, @key1, @bucket, @key1_copy)
+    # check it was copied well
+    assert_equal RIGHT_OBJECT_TEXT, @s3.get_object(@bucket, @key1_copy), "copied object must have the same data"
+    # check meta-headers were copied
+    headers = @s3.head(@bucket, @key1_copy)
+    assert_equal 'Woohoo1!', headers['x-amz-meta-family'], "x-amz-meta-family header must be equal to 'Woohoo1!'"
+    #--- test REPLACE
+    assert @s3.copy(@bucket, @key1, @bucket, @key1_copy, :replace, 'x-amz-meta-family' => 'oooops!')
+    # check it was copied well
+    assert_equal RIGHT_OBJECT_TEXT, @s3.get_object(@bucket, @key1_copy), "copied object must have the same data"
+    # check meta-headers were overwrittenn
+    headers = @s3.head(@bucket, @key1_copy)
+    assert_equal 'oooops!', headers['x-amz-meta-family'], "x-amz-meta-family header must be equal to 'oooops!'"
   end
 
+  def test_10_move_key
+    # move a key
+    assert @s3.move(@bucket, @key1, @bucket, @key1_new_name)
+    # check it's data was moved correctly
+    assert_equal RIGHT_OBJECT_TEXT, @s3.get_object(@bucket, @key1_new_name), "moved object must have the same data"
+    # check meta-headers were moved
+    headers = @s3.head(@bucket, @key1_new_name)
+    assert_equal 'Woohoo1!', headers['x-amz-meta-family'], "x-amz-meta-family header must be equal to 'Woohoo1!'"
+    # check the original key is not exists any more
+    keys = @s3.list_bucket(@bucket).map{|b| b[:key]}
+    assert(!keys.include?(@key1))
+  end
 
-  def test_10_delete_bucket
+  def test_11_rename_key
+    # rename a key
+    assert @s3.rename(@bucket, @key2, @key2_new_name)
+    # check the new key data
+    assert_equal RIGHT_OBJECT_TEXT, @s3.get_object(@bucket, @key2_new_name), "moved object must have the same data"
+    # check meta-headers
+    headers = @s3.head(@bucket, @key2_new_name)
+    assert_equal 'Woohoo2!', headers['x-amz-meta-family'], "x-amz-meta-family header must be equal to 'Woohoo2!'"
+    # check the original key is not exists any more
+    keys = @s3.list_bucket(@bucket).map{|b| b[:key]}
+    assert(!keys.include?(@key2))
+  end
+  
+  def test_12_delete_folder
+    assert_equal 1, @s3.delete_folder(@bucket, 'test').size, "Only one key(#{@key1}) must be deleted!"
+  end
+
+  def test_13_delete_bucket
     assert_raise(Rightscale::AwsError) { @s3.delete_bucket(@bucket) }
     assert @s3.clear_bucket(@bucket), 'Clear_bucket fail'
     assert_equal 0, @s3.list_bucket(@bucket).size, 'Bucket must be empty'
@@ -87,7 +133,6 @@ class TestS3 < Test::Unit::TestCase
     assert !@s3.list_all_my_buckets.map{|bucket| bucket[:name]}.include?(@bucket), "#{@bucket} must not exist"
   end
 
-
   #---------------------------
   # Rightscale::S3 classes
   #---------------------------
@@ -145,7 +190,80 @@ class TestS3 < Test::Unit::TestCase
     assert !key2.exists?
   end
   
-  def test_23_clear_delete
+  def test_23_rename_key
+    bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
+    # -- 1 -- (key based rename)
+    # create a key
+    key = bucket.key('test/copy/1')
+    key.put(RIGHT_OBJECT_TEXT)
+    original_key = key.clone
+    assert key.exists?, "'test/copy/1' should exist"
+    # rename it
+    key.rename('test/copy/2')
+    assert_equal 'test/copy/2', key.name
+    assert key.exists?, "'test/copy/2' should exist"
+    # the original key should not exist
+    assert !original_key.exists?, "'test/copy/1' should not exist"
+    # -- 2 -- (bucket based rename)
+    bucket.rename_key('test/copy/2', 'test/copy/3')
+    assert  bucket.key('test/copy/3').exists?, "'test/copy/3' should exist"
+    assert !bucket.key('test/copy/2').exists?, "'test/copy/2' should not exist"
+  end
+  
+  def test_24_copy_key
+    bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
+    # -- 1 -- (key based copy)
+    # create a key
+    key = bucket.key('test/copy/10')
+    key.put(RIGHT_OBJECT_TEXT)
+    # make copy
+    new_key = key.copy('test/copy/11')
+    # make sure both the keys exist and have a correct data
+    assert key.exists?,     "'test/copy/10' should exist"
+    assert new_key.exists?, "'test/copy/11' should exist"
+    assert_equal RIGHT_OBJECT_TEXT, key.get
+    assert_equal RIGHT_OBJECT_TEXT, new_key.get
+    # -- 2 -- (bucket based copy)
+    bucket.copy_key('test/copy/11', 'test/copy/12')
+    assert bucket.key('test/copy/11').exists?, "'test/copy/11' should exist"
+    assert bucket.key('test/copy/12').exists?, "'test/copy/12' should exist"
+    assert_equal RIGHT_OBJECT_TEXT, bucket.key('test/copy/11').get
+    assert_equal RIGHT_OBJECT_TEXT, bucket.key('test/copy/12').get
+  end
+  
+  def test_25_move_key
+    bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
+    # -- 1 -- (key based copy)
+    # create a key
+    key = bucket.key('test/copy/20')
+    key.put(RIGHT_OBJECT_TEXT)
+    # move
+    new_key = key.move('test/copy/21')
+    # make sure both the keys exist and have a correct data
+    assert !key.exists?,    "'test/copy/20' should not exist"
+    assert new_key.exists?, "'test/copy/21' should exist"
+    assert_equal RIGHT_OBJECT_TEXT, new_key.get
+    # -- 2 -- (bucket based copy)
+    bucket.copy_key('test/copy/21', 'test/copy/22')
+    assert bucket.key('test/copy/21').exists?, "'test/copy/21' should not exist"
+    assert bucket.key('test/copy/22').exists?, "'test/copy/22' should exist"
+    assert_equal RIGHT_OBJECT_TEXT, bucket.key('test/copy/22').get
+  end
+  
+  def test_26_save_meta
+    bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
+    # create a key
+    key = bucket.key('test/copy/30')
+    key.put(RIGHT_OBJECT_TEXT)
+    assert key.meta_headers.blank?
+    # store some meta keys
+    meta = {'family' => 'oops','race' => 'troll'}
+    assert_equal meta, key.save_meta(meta)
+    # reload meta
+    assert_equal meta, key.reload_meta
+  end
+    
+  def test_27_clear_delete
     bucket = Rightscale::S3::Bucket.create(@s, @bucket, false)
       # add another key
     bucket.put(@key2, RIGHT_OBJECT_TEXT)