aws-sdk 1.8.5 → 1.9.0

data/lib/aws/s3/bucket_collection.rb

@@ -14,22 +14,22 @@
 module AWS
   class S3
 
-    # Represents a collection of buckets.  
+    # Represents a collection of buckets.
     #
     # You can use this to create a bucket:
     #
-    #   s3.buckets.create(:name => "mybucket")
+    #     s3.buckets.create(:name => "mybucket")
     #
     # You can get a handle for a specific bucket with indifferent
     # access:
     #
-    #   bucket = s3.buckets[:mybucket]
-    #   bucket = s3.buckets['mybucket']
+    #     bucket = s3.buckets[:mybucket]
+    #     bucket = s3.buckets['mybucket']
     #
     # You can also use it to find out which buckets are in your account:
     #
-    #   s3.buckets.collect(&:name)
-    #   #=> ['bucket1', 'bucket2', ...]
+    #     s3.buckets.collect(&:name)
+    #     #=> ['bucket1', 'bucket2', ...]
     #
     class BucketCollection
 
@@ -43,8 +43,8 @@ module AWS
       #   against the bucket using the S3 endpoint specific to the
       #   region in which your bucket resides. For example:
       #
-      #     s3 = AWS::S3.new(:s3_endpoint => "s3-eu-west-1.amazonaws.com")
-      #     bucket = s3.buckets.create("my.eu.bucket")
+      #       s3 = AWS::S3.new(:region => "eu-west-1")
+      #       bucket = s3.buckets.create("my.eu.bucket")
       #
       #   For a full list of endpoints and regions, see
       #   {http://docs.amazonwebservices.com/general/latest/gr/index.html?rande.html
@@ -68,17 +68,17 @@ module AWS
       #   appropriate location constraint for the endpoint.  For
       #   example:
       #
-      #     s3 = AWS::S3.new(:s3_endpoint => "s3-us-west-1.amazonaws.com")
-      #     bucket = s3.buckets.create("my-us-west-bucket")
-      #     bucket.location_constraint # => "us-west-1"
+      #       s3 = AWS::S3.new(:region => "us-west-1")
+      #       bucket = s3.buckets.create("my-us-west-bucket")
+      #       bucket.location_constraint # => "us-west-1"
       #
-      # @option options [Symbol,String] :acl (:private) Sets the ACL of the 
+      # @option options [Symbol,String] :acl (:private) Sets the ACL of the
       #   bucket you are creating.  Valid Values include:
-      #   * +:private+
-      #   * +:public_read+
-      #   * +:public_read_write+
-      #   * +:authenticated_read+
-      #   * +:log_delivery_write+
+      #   * `:private`
+      #   * `:public_read`
+      #   * `:public_read_write`
+      #   * `:authenticated_read`
+      #   * `:log_delivery_write`
       #
       # @option options [String] :grant_read
       # @option options [String] :grant_write
@@ -95,10 +95,10 @@ module AWS
           options[:acl] = acl.to_s.tr('_', '-')
         end
 
-        # auto set the location constraint for the user if it is not 
-        # passed in and the endpoint is not the us-standard region.  don't 
-        # override the location constraint though, even it is wrong, 
-        unless 
+        # auto set the location constraint for the user if it is not
+        # passed in and the endpoint is not the us-standard region.  don't
+        # override the location constraint though, even it is wrong,
+        unless
           config.s3_endpoint == 's3.amazonaws.com' or
           options[:location_constraint]
         then

data/lib/aws/s3/bucket_lifecycle_configuration.rb

@@ -21,7 +21,7 @@ module AWS
     # Amazon S3 stores objects. The rules apply to objects whose keys match
     # the rule's prefix.
     #
-    # == Rules
+    # ## Rules
     #
     # A rule is comprised primarily of an id, prefix and set of
     # configuration options. Configuration options on the rules can specify:
@@ -33,84 +33,84 @@ module AWS
     # See {Rule} for more information on all of the attributes and methods
     # available for rules.
     #
-    # == Expiring Objects
+    # ## Expiring Objects
     #
     # You can add a rule to a bucket lifecycle configuration using {#add_rule}
     # inside of an {#update} block that will expire an object after a given
     # number of days:
     #
-    #   # delete backups after they are 1 year old
-    #   bucket.lifecycle_configuration.update do
-    #     add_rule('backups/', :expiration_time => 365)
-    #   end
+    #     # delete backups after they are 1 year old
+    #     bucket.lifecycle_configuration.update do
+    #       add_rule('backups/', :expiration_time => 365)
+    #     end
     #
     # You can also define the rule to expire objects at a specific date:
     #
-    #   # delete backups on January 1st of next year
-    #   bucket.lifecycle_configuration.update do
-    #     date = Date.new(Time.now.year + 1, 01, 01)
-    #     add_rule('backups/', :expiration_time => date)
-    #   end
+    #     # delete backups on January 1st of next year
+    #     bucket.lifecycle_configuration.update do
+    #       date = Date.new(Time.now.year + 1, 01, 01)
+    #       add_rule('backups/', :expiration_time => date)
+    #     end
     #
-    # == Transitioning Objects to Glacier
+    # ## Transitioning Objects to Glacier
     #
     # You can add a rule to a bucket lifecycle configuration using {#add_rule}
     # inside of an {#update} block that will transition objects to Glacier
     # after a given number of days:
     #
-    #   # move backups to Glacier after 3 days
-    #   bucket.lifecycle_configuration.update do
-    #     add_rule('backups/', :glacier_transition_time => 3)
-    #   end
+    #     # move backups to Glacier after 3 days
+    #     bucket.lifecycle_configuration.update do
+    #       add_rule('backups/', :glacier_transition_time => 3)
+    #     end
     #
     # You can also define the rule to transition objects at a specific date:
     #
-    #   # transition all backups on January 1st of next year
-    #   bucket.lifecycle_configuration.update do
-    #     date = Date.new(Time.now.year + 1, 01, 01)
-    #     add_rule('backups/', :glacier_transition_time => date)
-    #   end
+    #     # transition all backups on January 1st of next year
+    #     bucket.lifecycle_configuration.update do
+    #       date = Date.new(Time.now.year + 1, 01, 01)
+    #       add_rule('backups/', :glacier_transition_time => date)
+    #     end
     #
-    # == Replacing Rules
+    # ## Replacing Rules
     #
     # If you prefer to completely replace a lifecycle configuration, call
-    # {#add_rule} inside a {#replace} block instead of an +#update+ block:
+    # {#add_rule} inside a {#replace} block instead of an `#update` block:
     #
-    #   # replace all existing rules with the following
-    #   bucket.lifecycle_configuration.replace do
-    #     add_rule('backups/', :glacier_transition_time => 10)
-    #     add_rule('temp/', :expiration_time => 30)
-    #   end
+    #     # replace all existing rules with the following
+    #     bucket.lifecycle_configuration.replace do
+    #       add_rule('backups/', :glacier_transition_time => 10)
+    #       add_rule('temp/', :expiration_time => 30)
+    #     end
     #
-    # == Removing Rules
+    # ## Removing Rules
     #
     # You can delete specific rules with {#remove_rule}.
     #
-    #   # delete all disabled rules
-    #   bucket.lifecycle_configuration.update do
-    #     rules.each do |rule|
-    #       remove_rule(rule) if rule.disabled?
+    #     # delete all disabled rules
+    #     bucket.lifecycle_configuration.update do
+    #       rules.each do |rule|
+    #         remove_rule(rule) if rule.disabled?
+    #       end
     #     end
-    #   end
     #
     # You can also remove all rules in a single call with {#clear}:
     #
-    #   # remove all rules from this lifecycle configuration
-    #   bucket.lifecycle_configuration.clear
+    #     # remove all rules from this lifecycle configuration
+    #     bucket.lifecycle_configuration.clear
     #
-    # == Editing Existing Rules
+    # ## Editing Existing Rules
     #
     # You can also make changes to existing rules.
     #
-    #   # change the expiration days to 10 for EVERY rule
-    #   bucket.lifecycle_configuration.update do
-    #     rules.each do |rule|
-    #       rule.expiration_time = 10
+    #     # change the expiration days to 10 for EVERY rule
+    #     bucket.lifecycle_configuration.update do
+    #       rules.each do |rule|
+    #         rule.expiration_time = 10
+    #       end
     #     end
-    #   end
     #
     # Please be aware, if you add, remove or edit rules outside of an
-    # {#update} or {#replace} block, then you must call +#update+ yourself
+    # {#update} or {#replace} block, then you must call `#update` yourself
     # or the changes will not be persisted.
     #
     class BucketLifecycleConfiguration
@@ -148,7 +148,7 @@ module AWS
       #
       #   @option options [Boolean] :disabled (false) By default, all rules
       #     will have the status of enabled.  You can override this default
-      #     by passing +:disabled+ => true.
+      #     by passing `:disabled` => true.
       #
       #   @option options [Date, Integer] :expiration_time (nil) Indicates
       #     the lifetime for objects matching the given prefix.
@@ -179,17 +179,17 @@ module AWS
       # Removes a single rule.  You can pass a rule id or a {Rule}
       # object.
       #
-      #   # remove a single rule by its ID
-      #   bucket.lifecycle_configuration.update do
-      #     remove_rule('rule-id')
-      #   end
+      #     # remove a single rule by its ID
+      #     bucket.lifecycle_configuration.update do
+      #       remove_rule('rule-id')
+      #     end
       #
-      #   # remove all disabled rules
-      #   bucket.lifecycle_configuration.update do
-      #     rules.each do |rule|
-      #       remove_rule(rule) if rule.disabled?
+      #     # remove all disabled rules
+      #     bucket.lifecycle_configuration.update do
+      #       rules.each do |rule|
+      #         remove_rule(rule) if rule.disabled?
+      #       end
       #     end
-      #   end
       #
       # If you call #remove_rule outside an update block
       # you need to call #update to save the changes.
@@ -210,34 +210,34 @@ module AWS
 
       # Saves changes made to this lifecycle configuration.
       #
-      #   # set the number of days before expiration for all rules to 10
-      #   config = bucket.lifecycle_configuration
-      #   config.rules.each do |rule|
-      #     rule.expiration_time = 10
-      #   end
-      #   config.update
+      #     # set the number of days before expiration for all rules to 10
+      #     config = bucket.lifecycle_configuration
+      #     config.rules.each do |rule|
+      #       rule.expiration_time = 10
+      #     end
+      #     config.update
       #
       # You can call #update with a block.  Changes are persisted at the
       # end of the block.
       #
-      #   # shorter version of the example above
-      #   bucket.lifecycle_configuration.update do
-      #     rules.each {|rule| rule.expiration_time = 10 }
-      #   end
+      #     # shorter version of the example above
+      #     bucket.lifecycle_configuration.update do
+      #       rules.each {|rule| rule.expiration_time = 10 }
+      #     end
       #
       # A block method for updating a BucketLifecycleConfiguration.
       # All modifications made inside the block are persisted at the end of
       # the block.
       #
-      #  # 1 request
-      #  bucket.lifecycle_configuration.update do
-      #    add_rule 'prefix/a', 10
-      #    add_rule 'prefix/b', 5
-      #  end
+      #     # 1 request
+      #     bucket.lifecycle_configuration.update do
+      #       add_rule 'prefix/a', 10
+      #       add_rule 'prefix/b', 5
+      #     end
       #
-      #  # 2 requests
-      #  bucket.lifecycle_configuration.add_rule 'prefix/a', 10
-      #  bucket.lifecycle_configuration.add_rule 'prefix/b', 5
+      #     # 2 requests
+      #     bucket.lifecycle_configuration.add_rule 'prefix/a', 10
+      #     bucket.lifecycle_configuration.add_rule 'prefix/b', 5
       #
       # @return [nil]
       #
@@ -259,15 +259,14 @@ module AWS
       # When the block is complete, a single call will be made to save
       # the new rules.
       #
-      #   bucket.lifecycle_configuration.rules.size #=> 3
+      #     bucket.lifecycle_configuration.rules.size #=> 3
       #
-      #   # replace the existing 3 rules with a single rule
-      #   bucket.lifecycle_configuration.replace
-      #     add_rule 'temp/', 10
-      #   end
-      #
-      #   bucket.lifecycle_configuration.rules.size #=> 1
+      #     # replace the existing 3 rules with a single rule
+      #     bucket.lifecycle_configuration.replace
+      #       add_rule 'temp/', 10
+      #     end
       #
+      #     bucket.lifecycle_configuration.rules.size #=> 1
       def replace &block
         @rules = []
         update(&block)
@@ -326,11 +325,11 @@ module AWS
       # Represents a single rule from an Amazon S3 bucket lifecycle
       # configuration.
       #
-      #   # delete all objects with the prefix 'temporary/' after 10 days
-      #   bucket.lifecycle_configuration.add_rule 'temporary/', 10
+      #     # delete all objects with the prefix 'temporary/' after 10 days
+      #     bucket.lifecycle_configuration.add_rule 'temporary/', 10
       #
-      #   # remove the rule created above
-      #   bucket.lifecycle_configuration.remove_rule 'temporary/'
+      #     # remove the rule created above
+      #     bucket.lifecycle_configuration.remove_rule 'temporary/'
       #
       #
       class Rule

data/lib/aws/s3/bucket_tag_collection.rb

@@ -50,7 +50,7 @@ module AWS
 
       # @param [String] key
       # @return [String,nil] Returns the tag for the given key.  If there
-      #    Returns +nil+ if the key does not exist.
+      #    Returns `nil` if the key does not exist.
       def [] key
         self.to_h[key]
       end
@@ -74,6 +74,8 @@ module AWS
 
       # Removes all tags from the bucket.
       #
+      # @example
+      #
       #   bucket.tags.clear
       #   bucket.tags.to_h #=> {}
       #
@@ -92,7 +94,7 @@ module AWS
       alias_method :to_hash, :to_h
 
       # @param [Hash] other
-      # @return [Boolean] Returns +true+ if the tags for this bucket match
+      # @return [Boolean] Returns `true` if the tags for this bucket match
       #   the passed hash.
       def eql? other
         self.to_h == other

data/lib/aws/s3/cipher_io.rb

@@ -44,15 +44,16 @@ module AWS
 
       # @return [String] Returns the requested number of bytes.  If no byte
       #   amount is given, it will return the entire body of encrypted data
-      def read bytes = nil
-        if bytes
+      def read bytes = nil, output_buffer = nil
+        data = if bytes
           (@eof) ? nil : read_chunk(bytes)
         else
-          (@eof) ? ""  : read_all()
+          (@eof) ? ""  : read_all
         end
+        output_buffer ? output_buffer.replace(data || '') : data
       end
 
-      # @return [Boolean] Returns +true+ when the entire stream has been read.
+      # @return [Boolean] Returns `true` when the entire stream has been read.
       def eof?
         @eof
       end

data/lib/aws/s3/client.rb

@@ -29,9 +29,7 @@ module AWS
 
       XMLNS = "http://s3.amazonaws.com/doc/#{API_VERSION}/"
 
-      AWS.register_autoloads(self) do
-        autoload :XML, 'xml'
-      end
+      autoload :XML, 'aws/s3/client/xml'
 
       # @private
       EMPTY_BODY_ERRORS = {
@@ -161,7 +159,6 @@ module AWS
       bucket_method(:put_bucket_website, :put, 'website') do
 
         configure_request do |req, options|
-          validate_bucket_name!(options[:bucket_name])
           req.body = Nokogiri::XML::Builder.new do |xml|
             xml.WebsiteConfiguration(:xmlns => XMLNS) do
 
@@ -221,10 +218,10 @@ module AWS
       #   @param [Hash] options
       #   @option options [required,String] :bucket_name
       #   @return [Core::Response]
-      #     * +:index_document+ - (Hash)
-      #       * +:suffix+ - (String)
-      #     * +:error_document+ - (Hash)
-      #       * +:key+ - (String)
+      #     * `:index_document` - (Hash)
+      #       * `:suffix` - (String)
+      #     * `:error_document` - (Hash)
+      #       * `:key` - (String)
       bucket_method(:get_bucket_website, :get, 'website', XML::GetBucketWebsite)
 
       # @overload delete_bucket_website(options = {})
@@ -292,16 +289,16 @@ module AWS
       #   @param [Hash] options
       #   @option options [required,String] :bucket_name
       #   @option options [required,Array<Hash>] :rules An array of rule hashes.
-      #     * +:id+ - (String) A unique identifier for the rule. The ID
+      #     * `:id` - (String) A unique identifier for the rule. The ID
       #       value can be up to 255 characters long. The IDs help you find
       #       a rule in the configuration.
-      #     * +:allowed_methods+ - (required,Array<String>) A list of HTTP
+      #     * `:allowed_methods` - (required,Array<String>) A list of HTTP
       #       methods that you want to allow the origin to execute.
       #       Each rule must identify at least one method.
-      #     * +:allowed_origins+ - (required,Array<String>) A list of origins
+      #     * `:allowed_origins` - (required,Array<String>) A list of origins
       #       you want to allow cross-domain requests from. This can
       #       contain at most one * wild character.
-      #     * +:allowed_headers+ - (Array<String>) A list of headers allowed
+      #     * `:allowed_headers` - (Array<String>) A list of headers allowed
       #       in a pre-flight OPTIONS request via the
       #       Access-Control-Request-Headers header. Each header name
       #       specified in the Access-Control-Request-Headers header must
@@ -309,10 +306,10 @@ module AWS
       #       Amazon S3 will send only the allowed headers in a response
       #       that were requested. This can contain at most one * wild
       #       character.
-      #     * +:max_age_seconds+ - (Integer) The time in seconds that your
+      #     * `:max_age_seconds` - (Integer) The time in seconds that your
       #       browser is to cache the preflight response for the specified
       #       resource.
-      #     * +:expose_headers+ - (Array<String>) One or more headers in
+      #     * `:expose_headers` - (Array<String>) One or more headers in
       #       the response that you want customers to be able to access
       #       from their applications (for example, from a JavaScript
       #       XMLHttpRequest object).
@@ -472,7 +469,7 @@ module AWS
       #   @param [Hash] options
       #   @option options [required,String] :bucket_name
       #   @option options [required,String] :policy This can be a String
-      #     or any object that responds to +#to_json+.
+      #     or any object that responds to `#to_json`.
       #   @return [Core::Response]
       bucket_method(:set_bucket_policy, :put, 'policy') do
 
@@ -586,9 +583,9 @@ module AWS
       # Sets the access control list for a bucket.  You must specify an ACL
       # via one of the following methods:
       #
-      # * as a canned ACL (via +:acl+)
-      # * as a list of grants (via the +:grant_*+ options)
-      # * as an access control policy document (via +:access_control_policy+)
+      # * as a canned ACL (via `:acl`)
+      # * as a list of grants (via the `:grant_*` options)
+      # * as an access control policy document (via `:access_control_policy`)
       #
       # @example Using a canned acl
       #   s3_client.put_bucket_acl(
@@ -675,9 +672,9 @@ module AWS
       # Sets the access control list for an object.  You must specify an ACL
       # via one of the following methods:
       #
-      # * as a canned ACL (via +:acl+)
-      # * as a list of grants (via the +:grant_*+ options)
-      # * as an access control policy document (via +:access_control_policy+)
+      # * as a canned ACL (via `:acl`)
+      # * as a list of grants (via the `:grant_*` options)
+      # * as an access control policy document (via `:access_control_policy`)
       #
       # @example Using a canned acl
       #   s3_client.put_object_acl(
@@ -774,7 +771,7 @@ module AWS
       #     :data => 'This is the readme for ...',
       #   })
       #
-      # == Block Form
+      # ## Block Form
       #
       # In block form, this method yields a stream to the block that
       # accepts data chunks.  For example:
@@ -808,24 +805,24 @@ module AWS
       #   @option options [required,String,Pathname,File,IO] :data
       #     The data to upload.  This can be provided as a string,
       #     a Pathname object, or any object that responds to
-      #     +#read+ and +#eof?+ (e.g. IO, File, Tempfile, StringIO, etc).
+      #     `#read` and `#eof?` (e.g. IO, File, Tempfile, StringIO, etc).
       #   @option options [Integer] :content_length
       #     Required if you are using block form to write data or if it is
-      #     not possible to determine the size of +:data+.  A best effort
+      #     not possible to determine the size of `:data`.  A best effort
       #     is made to determine the content length of strings, files,
       #     tempfiles, io objects, and any object that responds
-      #     to +#length+ or +#size+.
+      #     to `#length` or `#size`.
       #   @option options [String] :website_redirect_location If the bucket is
       #     configured as a website, redirects requests for this object to
       #     another object in the same bucket or to an external URL.
       #   @option options [Hash] :metadata
       #     A hash of metadata to be included with the
       #     object.  These will be sent to S3 as headers prefixed with
-      #     +x-amz-meta+.
+      #     `x-amz-meta`.
       #   @option options [Symbol] :acl (:private) A canned access
       #     control policy.  Accepted values include:
-      #     * +:private+
-      #     * +:public_read+
+      #     * `:private`
+      #     * `:public_read`
       #     * ...
       #   @option options [String] :storage_class+ ('STANDARD')
       #     Controls whether Reduced Redundancy Storage is enabled for
@@ -834,7 +831,7 @@ module AWS
       #   @option options [Symbol,String] :server_side_encryption (nil) The
       #     algorithm used to encrypt the object on the server side
       #     (e.g. :aes256).
-      #   object on the server side, e.g. +:aes256+)
+      #   object on the server side, e.g. `:aes256`)
       #   @option options [String] :cache_control
       #     Can be used to specify caching behavior.
       #   @option options [String] :content_disposition
@@ -842,7 +839,7 @@ module AWS
       #   @option options [String] :content_encoding
       #     Specifies the content encoding.
       #   @option options [String] :content_md5
-      #     The base64 encoded content md5 of the +:data+.
+      #     The base64 encoded content md5 of the `:data`.
       #   @option options [String] :content_type
       #     Specifies the content type.
       #   @option options [String] :expires The date and time at which the
@@ -903,25 +900,25 @@ module AWS
       #   @option options [required,String] :bucket_name
       #   @option options [required,String] :key
       #   @option options [Time] :if_modified_since If specified, the
-      #     response will contain an additional +:modified+ value that
+      #     response will contain an additional `:modified` value that
       #     returns true if the object was modified after the given
-      #     time.  If +:modified+ is false, then the response
-      #     +:data+ value will be +nil+.
+      #     time.  If `:modified` is false, then the response
+      #     `:data` value will be `nil`.
       #   @option options [Time] :if_unmodified_since If specified, the
-      #     response will contain an additional +:unmodified+ value
+      #     response will contain an additional `:unmodified` value
       #     that is true if the object was not modified after the
-      #     given time.  If +:unmodified+ returns false, the +:data+
-      #     value will be +nil+.
+      #     given time.  If `:unmodified` returns false, the `:data`
+      #     value will be `nil`.
       #   @option options [String] :if_match If specified, the response
-      #     will contain an additional +:matches+ value that is true
+      #     will contain an additional `:matches` value that is true
       #     if the object ETag matches the value for this option.  If
-      #     +:matches+ is false, the +:data+ value of the
-      #     response will be +nil+.
+      #     `:matches` is false, the `:data` value of the
+      #     response will be `nil`.
       #   @option options [String] :if_none_match If specified, the
-      #     response will contain an additional +:matches+ value that
+      #     response will contain an additional `:matches` value that
       #     is true if and only if the object ETag matches the value for
-      #     this option.  If +:matches+ is true, the +:data+ value
-      #     of the response will be +nil+.
+      #     this option.  If `:matches` is true, the `:data` value
+      #     of the response will be `nil`.
       #   @option options [Range<Integer>] :range A byte range of data to request.
       #   @return [Core::Response]
       #
@@ -1150,31 +1147,34 @@ module AWS
       # @overload delete_objects(options = {})
       #   @param [Hash] options
       #   @option options [required,String] :bucket_name
-      #   @option options [required,Array<String>] :keys
+      #   @option options [required,Array<Hash>] :objects Each entry should be
+      #     a hash with the following keys:
+      #     * `:key` - *required*
+      #     * `:version_id`
       #   @option options [Boolean] :quiet (true)
       #   @option options [String] :mfa
       #   @return [Core::Response]
-      bucket_method(:delete_objects, :post, 'delete', XML::DeleteObjects, :header_options => { :mfa => "x-amz-mfa" }) do
+      bucket_method(:delete_objects, :post, 'delete', XML::DeleteObjects,
+        :header_options => { :mfa => "x-amz-mfa" }
+      ) do
+
         configure_request do |req, options|
 
           super(req, options)
 
-          quiet = options.key?(:quiet) ? options[:quiet] : true
-
-          # previously named this option :objects, since renamed
-          keys = options[:objects] || options[:keys]
-
-          objects = keys.inject('') do |xml,o|
-            xml << "<Object><Key>#{REXML::Text.normalize(o[:key])}</Key>"
-            xml << "<VersionId>#{o[:version_id]}</VersionId>" if o[:version_id]
-            xml << "</Object>"
-          end
+          req.body = Nokogiri::XML::Builder.new do |xml|
+            xml.Delete do
+              xml.Quiet(options.key?(:quiet) ? options[:quiet] : true)
+              (options[:objects] || options[:keys]).each do |obj|
+                xml.Object do
+                  xml.Key(obj[:key])
+                  xml.VersionId(obj[:version_id]) if obj[:version_id]
+                end
+              end
+            end
+          end.doc.root.to_xml
 
-          xml = '<?xml version="1.0" encoding="UTF-8"?>'
-          xml << "<Delete><Quiet>#{quiet}</Quiet>#{objects}</Delete>"
-
-          req.body = xml
-          req.headers['content-md5'] = md5(xml)
+          req.headers['content-md5'] = md5(req.body)
 
         end
       end
@@ -1188,7 +1188,7 @@ module AWS
       #   @option options [required,String,Pathname,File,IO] :data
       #     The data to upload.  This can be provided as a string,
       #     a Pathname object, or any object that responds to
-      #     +#read+ and +#eof?+ (e.g. IO, File, Tempfile, StringIO, etc).
+      #     `#read` and `#eof?` (e.g. IO, File, Tempfile, StringIO, etc).
       #   @return [Core::Response]
       object_method(:upload_part, :put,
                     :header_options => {
@@ -1223,7 +1223,10 @@ module AWS
       #   @option options [required,String] :bucket_name
       #   @option options [required,String] :key
       #   @option options [required,String] :upload_id
-      #   @option options [required,Array<String>] :parts
+      #   @option options [required,Array<Hash>] :parts An array of hashes
+      #     with the following keys:
+      #     * `:part_number` [Integer] - *required*
+      #     * `:etag` [String] - *required*
       #   @return [Core::Response]
       object_method(:complete_multipart_upload, :post,
                     XML::CompleteMultipartUpload) do
@@ -1232,14 +1235,18 @@ module AWS
           validate_parts!(options[:parts])
           super(req, options)
           req.add_param('uploadId', options[:upload_id])
-          parts_xml = options[:parts].map do |part|
-            "<Part>"+
-              "<PartNumber>#{part[:part_number].to_i}</PartNumber>"+
-              "<ETag>#{REXML::Text.normalize(part[:etag].to_s)}</ETag>"+
-              "</Part>"
-          end.join
-          req.body =
-            "<CompleteMultipartUpload>#{parts_xml}</CompleteMultipartUpload>"
+
+          req.body = Nokogiri::XML::Builder.new do |xml|
+            xml.CompleteMultipartUpload do
+              options[:parts].each do |part|
+                xml.Part do
+                  xml.PartNumber(part[:part_number])
+                  xml.ETag(part[:etag])
+                end
+              end
+            end
+          end.doc.root.to_xml
+
         end
 
         process_response do |resp|
@@ -1413,7 +1420,7 @@ module AWS
       end
 
       # @param [String] possible_xml
-      # @return [Boolean] Returns +true+ if the given string is a valid xml
+      # @return [Boolean] Returns `true` if the given string is a valid xml
       #   document.
       def is_xml? possible_xml
         begin
@@ -1466,6 +1473,7 @@ module AWS
           'content-type' => :content_type,
           'content-encoding' => :content_encoding,
           'cache-control' => :cache_control,
+          'expires' => :expires,
           'etag' => :etag,
           'x-amz-website-redirect-location' => :website_redirect_location,
           'accept-ranges' => :accept_ranges,
@@ -1496,16 +1504,16 @@ module AWS
           validate_bucket_name!(bucket_name) rescue false
         end
 
-        # Returns true if the given +bucket_name+ is DNS compatible.
+        # Returns true if the given `bucket_name` is DNS compatible.
         #
         # DNS compatible bucket names may be accessed like:
         #
-        #   http://dns.compat.bucket.name.s3.amazonaws.com/
+        #     http://dns.compat.bucket.name.s3.amazonaws.com/
         #
         # Whereas non-dns compatible bucket names must place the bucket
         # name in the url path, like:
         #
-        #   http://s3.amazonaws.com/dns_incompat_bucket_name/
+        #     http://s3.amazonaws.com/dns_incompat_bucket_name/
         #
         # @return [Boolean] Returns true if the given bucket name may be
         #   is dns compatible.
@@ -1515,14 +1523,15 @@ module AWS
           return false if
             !valid_bucket_name?(bucket_name) or
 
-            # Bucket names should not contain underscores (_)
-            bucket_name["_"] or
-
             # Bucket names should be between 3 and 63 characters long
             bucket_name.size > 63 or
 
-            # Bucket names should not end with a dash
-            bucket_name[-1,1] == '-' or
+            # Bucket names must only contain lowercase letters, numbers, dots, and dashes
+            # and must start and end with a lowercase letter or a number
+            bucket_name !~ /^[a-z0-9][a-z0-9.-]+[a-z0-9]$/ or
+
+            # Bucket names should not be formatted like an IP address (e.g., 192.168.5.4)
+            bucket_name =~ /(\d+\.){3}\d+/ or
 
             # Bucket names cannot contain two, adjacent periods
             bucket_name['..'] or
@@ -1585,15 +1594,11 @@ module AWS
             case
             when bucket_name.nil? || bucket_name == ''
               'may not be blank'
-            when bucket_name !~ /^[a-z0-9._\-]+$/
-              'may only contain lowercase letters, numbers, periods (.), ' +
+            when bucket_name !~ /^[A-Za-z0-9._\-]+$/
+              'may only contain uppercase letters, lowercase letters, numbers, periods (.), ' +
               'underscores (_), and dashes (-)'
-            when bucket_name !~ /^[a-z0-9]/
-              'must start with a letter or a number'
             when !(3..255).include?(bucket_name.size)
               'must be between 3 and 255 characters long'
-            when bucket_name =~ /(\d+\.){3}\d+/
-              'must not be formatted like an IP address (e.g., 192.168.5.4)'
             when bucket_name =~ /\n/
               'must not contain a newline character'
             end