aws-sdk 1.8.0 → 1.8.1

data/lib/aws/route_53/resource_record_set_collection.rb

@@ -0,0 +1,110 @@
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+require 'time'
+
+module AWS
+  class Route53
+
+    # = Create new resource record set
+    #
+    #   rrsets = AWS::Route53::HostedZone.new(hosted_zone_id).rrsets
+    #   rrset = rrsets.create('foo.example.com.', 'A', :ttl => 300, :resource_records => [{:value => '127.0.0.1'}])
+    #
+    # = Find existing resource record set
+    #
+    #   rrsets = AWS::Route53::HostedZone.new(hosted_zone_id).rrsets
+    #   rrset = rrsets['foo.example.com.', 'A']
+    #
+    class ResourceRecordSetCollection
+
+      include Core::Collection::WithLimitAndNextToken
+
+      # @private
+      def initialize hosted_zone_id, options = {}
+        @hosted_zone_id = hosted_zone_id
+        @filters = options[:filters] || {}
+        super
+      end
+
+      # @return [String]
+      attr_reader :hosted_zone_id
+
+      # Find resource record set by its name, type and identifier.
+      # @param [String] name
+      # @param [String] type
+      # @param [String] set_identifier
+      # @return [ResourceRecordSet]
+      def [] name, type, set_identifier = nil
+        ResourceRecordSet.new(name, type, :set_identifier => set_identifier, :hosted_zone_id => hosted_zone_id, :config => config)
+      end
+
+      # Create new resource record set.
+      # @param [String] name
+      # @param [String] type
+      # @param [Hash] options
+      # @return [ResourceRecordSet]
+      def create name, type, options = {}
+        batch = ChangeBatch.new(hosted_zone_id, :comment => options[:comment], :config => config)
+        batch << CreateRequest.new(name, type, options)
+
+        change_info = batch.call()
+        if change_info
+          ResourceRecordSet.new(name,
+                                type,
+                                :set_identifier => options[:set_identifier],
+                                :change_info => change_info,
+                                :hosted_zone_id => hosted_zone_id,
+                                :config => config)
+        end
+      end
+
+      private
+
+      def _each_item next_token, limit, options = {}, &block
+
+        options = @filters.merge(options)
+
+        options[:start_record_name] = next_token[:next_record_name] if next_token and next_token[:next_record_name]
+        options[:start_record_type] = next_token[:next_record_type] if next_token and next_token[:next_record_type]
+        options[:start_record_identifier] = next_token[:next_record_identifier] if next_token and next_token[:next_record_identifier]
+        options[:maxitems] = limit if limit
+
+        options[:hosted_zone_id] = hosted_zone_id
+
+        resp = client.list_resource_record_sets(options)
+        resp.data[:resource_record_sets].each do |details|
+          rrset = ResourceRecordSet.new_from(
+            :list_resource_record_sets,
+            details,
+            details[:name],
+            details[:type],
+            :set_identifier => details[:set_identifier],
+            :hosted_zone_id => hosted_zone_id, :config => config)
+
+          yield(rrset)
+
+        end
+
+        if resp.data[:is_truncated]
+          {
+            :next_record_name => resp.data[:next_record_name],
+            :next_record_type => resp.data[:next_record_type],
+            :next_record_identifier => resp.data[:next_record_identifier],
+          }
+        end
+      end
+
+    end
+  end
+end

data/lib/aws/s3.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of
@@ -98,7 +98,7 @@ module AWS
   #   end
   #
   #   # enumerate at most 20 objects with the given prefix
-  #   bucket.objects.with_prefix('photos/').each(:limit => 20).each do |photo|
+  #   bucket.objects.with_prefix('photos/').each(:limit => 20) do |photo|
   #     puts photo.key
   #   end
   #
@@ -140,6 +140,7 @@ module AWS
       autoload :Tree,                         'tree'
       autoload :UploadedPart,                 'uploaded_part'
       autoload :UploadedPartCollection,       'uploaded_part_collection'
+      autoload :WebsiteConfiguration,         'website_configuration'
     end
 
     include Core::ServiceInterface

data/lib/aws/s3/access_control_list.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/s3/acl_object.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/s3/acl_options.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/s3/bucket.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of
@@ -68,6 +68,33 @@ module AWS
     # See {ObjectCollection} and {S3Object} for more information on working
     # with objects.
     #
+    # = Website Configuration
+    #
+    # It is easy to enable website hosting for a bucket.
+    #
+    #   bucket.configure_website
+    #
+    # You can specify the index and error documents by passing a block.
+    # If your bucket is already configured as a website, the current
+    # configuration will be yielded.  If you bucket it not currently
+    # configured as a website, a new configuration will be yielded
+    # with default values.
+    #
+    #   bucket.configure_website do |cfg|
+    #     cfg.index_document_suffix = 'index.html'
+    #     cfg.error_document_key = 'error.html'
+    #   end
+    #
+    # You can disable website hosting two ways:
+    #
+    #   bucket.remove_website_configuration
+    #   bucket.website_configuration = nil
+    #
+    # You can use {#website_configuration=} to copy a website configuration
+    # from one bucket to another.
+    #
+    #   bucket.website_configuration = other_bucket.website_configuration
+    #
     # = Bucket Policies and ACLs
     #
     # You can control access to your bucket and its contents a number
@@ -231,6 +258,92 @@ module AWS
         client.get_bucket_location(:bucket_name => name).location_constraint
       end
 
+      # Configure the current bucket as a website.
+      #
+      #   bucket.configure_website
+      #
+      # If you pass a block, the website configuration object
+      # will be yielded.  You can modify it before it is saved.
+      #
+      #   bucket.configure_website do |cfg|
+      #     cfg.index_document_suffix = 'index.html'
+      #     cfg.error_document_key = 'error.html'
+      #   end
+      #
+      # If the bucket already has a website configuration, it will be loaded
+      # and yielded.  This makes it possible to modify an existing
+      # configuration.
+      #
+      #   # only rename the error document
+      #   bucket.configure_website do |cfg|
+      #     cfg.error_document_key = 'oops.html'
+      #   end
+      #
+      # @yieldparam [WebsiteConfiguration] website_config
+      # @return [WebsiteConfiguration]
+      # @see #website_configuration
+      # @see #website_configuration=
+      # @see #remove_website_configuration
+      # @see #website?
+      def configure_website &block
+        website_config = self.website_configuration
+        website_config ||= WebsiteConfiguration.new
+        yield(website_config) if block_given?
+        self.website_configuration = website_config
+      end
+
+      # Returns the bucket website configuration. Returns +nil+ if the bucket
+      # is not configured as a website.
+      # @return [WebsiteConfiguration,nil]
+      # @see #configure_website
+      # @see #website_configuration=
+      # @see #remove_website_configuration
+      # @see #website?
+      def website_configuration
+        resp = client.get_bucket_website(:bucket_name => name)
+        WebsiteConfiguration.new(resp.data)
+      rescue Errors::NoSuchWebsiteConfiguration
+        nil
+      end
+
+      # Sets the website configuration.  Deletes the configuration if
+      # +nil+ is passed.
+      # @param [WebsiteConfiguration,nil] website_configuration
+      # @see #configure_website
+      # @see #website_configuration
+      # @see #remove_website_configuration
+      # @see #website?
+      def website_configuration= website_configuration
+        if website_configuration
+          client_opts = website_configuration.to_hash
+          client_opts[:bucket_name] = name
+          client.put_bucket_website(client_opts)
+        else
+          remove_website_configuration
+        end
+      end
+
+      # @return [nil] Deletes the bucket website configuration.
+      # @see #configure_website
+      # @see #website_configuration
+      # @see #website_configuration=
+      # @see #website?
+      def remove_website_configuration
+        client.delete_bucket_website(:bucket_name => name)
+        @website_configuration = false
+        nil
+      end
+
+      # @return [Boolean] Returns +true+ if this bucket is configured as
+      #   a website.
+      # @see #configure_website
+      # @see #website_configuration
+      # @see #website_configuration=
+      # @see #remove_website_configuration
+      def website?
+        !!website_configuration
+      end
+
       # Returns the tags for this bucket.
       #
       #   tags = bucket.tags

data/lib/aws/s3/bucket_collection.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/s3/bucket_lifecycle_configuration.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/s3/bucket_tag_collection.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/s3/bucket_version_collection.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/s3/cipher_io.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

data/lib/aws/s3/client.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of
@@ -37,6 +37,7 @@ module AWS
       EMPTY_BODY_ERRORS = {
         304 => Errors::NotModified,
         403 => Errors::Forbidden,
+        400 => Errors::BadRequest,
         404 => Errors::NoSuchKey,
       }
 
@@ -152,6 +153,58 @@ module AWS
       end
       alias_method :put_bucket, :create_bucket
 
+      # @overload put_bucket_website(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,Hash] :index_document
+      #     * +:suffix+ - (*required*, String) - A suffix that is appended to
+      #       a request that is for a directory on the website endpoint
+      #       (e.g. if the suffix is index.html and you make a request to
+      #       samplebucket/images/ the data that is returned will be for
+      #       the object with the key name images/index.html).
+      #       The suffix must not be empty and must not include a
+      #       slash character.
+      #   @option options [Hash] :error_document
+      #     * +:key+ - (*required*, String) - The object key name to use
+      #       when a 4XX class error occurs.
+      #   @return [Core::Response]
+      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
+              xml.IndexDocument do
+                xml.Suffix(options[:index_document][:suffix])
+              end
+              if options[:error_document]
+                xml.ErrorDocument do
+                  xml.Key(options[:error_document][:key])
+                end
+              end
+            end
+          end.doc.root.to_xml
+          super(req, options)
+        end
+
+      end
+
+      # @overload get_bucket_website(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
+      #     * +:index_document+ - (Hash)
+      #       * +:suffix+ - (String)
+      #     * +:error_document+ - (Hash)
+      #       * +:key+ - (String)
+      bucket_method(:get_bucket_website, :get, 'website', XML::GetBucketWebsite)
+
+      # @overload delete_bucket_website(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
+      bucket_method(:delete_bucket_website, :delete, 'website')
+
       # Deletes an empty bucket.
       # @overload delete_bucket(options = {})
       #   @param [Hash] options
@@ -734,6 +787,9 @@ module AWS
       #     is made to determine the content length of strings, files,
       #     tempfiles, io objects, and any object that responds
       #     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
@@ -761,7 +817,8 @@ module AWS
       #     The base64 encoded content md5 of the +:data+.
       #   @option options [String] :content_type
       #     Specifies the content type.
-      #   @option options [String] :expires
+      #   @option options [String] :expires The date and time at which the
+      #     object is no longer cacheable.
       #   @option options [String] :acl A canned ACL (e.g. 'private',
       #     'public-read', etc).  See the S3 API documentation for
       #     a complete list of valid values.
@@ -773,6 +830,7 @@ module AWS
       #   @return [Core::Response]
       #
       object_method(:put_object, :put, :header_options => {
+        :website_redirect_location => 'x-amz-website-redirect-location',
         :acl => 'x-amz-acl',
         :grant_read => 'x-amz-grant-read',
         :grant_write => 'x-amz-grant-write',
@@ -784,7 +842,7 @@ module AWS
         :content_disposition => 'Content-Disposition',
         :content_encoding => 'Content-Encoding',
         :content_type => 'Content-Type',
-        :expires => 'Expires'
+        :expires => 'Expires',
       }) do
 
         configure_request do |request, options|
@@ -800,19 +858,8 @@ module AWS
 
         end
 
-        process_response do |response|
-
-          response.data[:version_id] =
-            response.http_response.header('x-amz-version-id')
-
-          response.data[:etag] = response.http_response.header('ETag')
-
-          if time = response.http_response.header('Last-Modified')
-            response.data[:last_modified] = Time.parse(time)
-          end
-
-          add_sse_to_response(response)
-
+        process_response do |resp|
+          extract_object_headers(resp)
         end
 
         simulate_response do |response|
@@ -884,10 +931,10 @@ module AWS
         end
 
         process_response do |resp|
+          extract_object_headers(resp)
           resp.data[:data] = resp.http_response.body
-          resp.data[:version_id] = resp.http_response.header('x-amz-version-id')
-          add_sse_to_response(resp)
         end
+
       end
 
       # @overload head_object(options = {})
@@ -906,58 +953,9 @@ module AWS
         end
 
         process_response do |resp|
-
-          # create a hash of user-supplied metadata
-          meta = {}
-          resp.http_response.headers.each_pair do |name,value|
-            if name =~ /^x-amz-meta-(.+)$/i
-              meta[$1] = [value].flatten.join
-            end
-          end
-          meta
-          resp.data[:meta] = meta
-
-          if expiry = resp.http_response.headers['x-amz-expiration']
-            expiry.first =~ /^expiry-date="(.+)", rule-id="(.+)"$/
-            exp_date = DateTime.parse($1)
-            exp_rule_id = $2
-          else
-            exp_date = nil
-            exp_rule_id = nil
-          end
-
-          if restore = resp.http_response.headers['x-amz-restore']
-            restore.first =~ /ongoing-request="(.+?)", expiry-date="(.+?)"/
-            restoring = $1 == "true"
-            restore_date = DateTime.parse($2)
-          else
-            restoring = false
-            restore_date = nil
-          end
-
-          resp.data[:expiration_date] = exp_date
-          resp.data[:expiration_rule_id] = exp_rule_id
-          resp.data[:restore_in_progress] = restoring
-          resp.data[:restore_expiration_date] = restore_date
-
-          {
-            'x-amz-version-id' => :version_id,
-            'content-type' => :content_type,
-            'etag' => :etag,
-          }.each_pair do |header,method|
-            resp.data[method] = resp.http_response.header(header)
-          end
-
-          if time = resp.http_response.header('Last-Modified')
-            resp.data[:last_modified] = Time.parse(time)
-          end
-
-          resp.data[:content_length] =
-            resp.http_response.header('content-length').to_i
-
-          add_sse_to_response(resp)
-
+          extract_object_headers(resp)
         end
+
       end
 
       # @overload delete_object(options = {})
@@ -1039,6 +1037,9 @@ module AWS
       #   @param [Hash] options
       #   @option options [required,String] :bucket_name
       #   @option options [required,String] :key
+      #   @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
       #   @option options [Symbol] :acl
       #   @option options [String] :cache_control
@@ -1052,7 +1053,8 @@ module AWS
       #   @option options [Symbol,String] :server_side_encryption (nil) The
       #     algorithm used to encrypt the object on the server side
       #     (e.g. :aes256).
-      #   @option options [String] :expires
+      #   @option options [String] :expires The date and time at which the
+      #     object is no longer cacheable.
       #   @option options [String] :acl A canned ACL (e.g. 'private',
       #     'public-read', etc).  See the S3 API documentation for
       #     a complete list of valid values.
@@ -1065,6 +1067,7 @@ module AWS
       object_method(:initiate_multipart_upload, :post, 'uploads',
                     XML::InitiateMultipartUpload,
                     :header_options => {
+                      :website_redirect_location => 'x-amz-website-redirect-location',
                       :acl => 'x-amz-acl',
                       :grant_read => 'x-amz-grant-read',
                       :grant_write => 'x-amz-grant-write',
@@ -1075,7 +1078,7 @@ module AWS
                       :content_disposition => 'Content-Disposition',
                       :content_encoding => 'Content-Encoding',
                       :content_type => 'Content-Type',
-                      :expires => 'Expires'
+                      :expires => 'Expires',
                     }) do
 
         configure_request do |req, options|
@@ -1085,8 +1088,8 @@ module AWS
           super(req, options)
         end
 
-        process_response do |response|
-          add_sse_to_response(response)
+        process_response do |resp|
+          extract_object_headers(resp)
         end
 
       end
@@ -1178,12 +1181,8 @@ module AWS
 
         end
 
-        process_response do |response|
-          response.data[:etag] = response.http_response.header('ETag')
-          if time = response.http_response.header('Last-Modified')
-            response.data[:last_modified] = Time.parse(time)
-          end
-          add_sse_to_response(response)
+        process_response do |resp|
+          extract_object_headers(resp)
         end
 
         simulate_response do |response|
@@ -1215,15 +1214,14 @@ module AWS
             "<CompleteMultipartUpload>#{parts_xml}</CompleteMultipartUpload>"
         end
 
-        process_response do |response|
-          add_sse_to_response(response)
-          response.data[:version_id] =
-            response.http_response.header('x-amz-version-id')
+        process_response do |resp|
+          extract_object_headers(resp)
         end
 
         simulate_response do |response|
           response.data[:version_id] = nil
         end
+
       end
 
       # @overload abort_multipart_upload(options = {})
@@ -1267,6 +1265,9 @@ module AWS
       #     to copy a object into.
       #   @option options [required, String] :key Where (object key) in the
       #     bucket the object should be copied to.
+      #   @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 [required, String] :copy_source The source
       #     bucket name and key, joined by a forward slash ('/').
       #     This string must be URL-encoded. Additionally, you must
@@ -1281,6 +1282,8 @@ module AWS
       #     Controls whether Reduced Redundancy Storage is enabled for
       #     the object.  Valid values are 'STANDARD' and
       #     'REDUCED_REDUNDANCY'.
+      #   @option options [String] :expires The date and time at which the
+      #     object is no longer cacheable.
       #   @option options [String] :grant_read
       #   @option options [String] :grant_write
       #   @option options [String] :grant_read_acp
@@ -1288,6 +1291,7 @@ module AWS
       #   @option options [String] :grant_full_control
       #   @return [Core::Response]
       object_method(:copy_object, :put, :header_options => {
+        :website_redirect_location => 'x-amz-website-redirect-location',
         :acl => 'x-amz-acl',
         :grant_read => 'x-amz-grant-read',
         :grant_write => 'x-amz-grant-write',
@@ -1299,6 +1303,7 @@ module AWS
         :metadata_directive => 'x-amz-metadata-directive',
         :content_type => 'Content-Type',
         :content_disposition => 'Content-Disposition',
+        :expires => 'Expires',
       }) do
 
         configure_request do |req, options|
@@ -1318,14 +1323,8 @@ module AWS
           end
         end
 
-        process_response do |response|
-          response.data[:version_id] =
-            response.http_response.header('x-amz-version-id')
-          response.data[:etag] = response.http_response.header('ETag')
-          if time = response.http_response.header('Last-Modified')
-            response.data[:last_modified] = Time.parse(time)
-          end
-          add_sse_to_response(response)
+        process_response do |resp|
+          extract_object_headers(resp)
         end
 
       end
@@ -1372,13 +1371,6 @@ module AWS
         req
       end
 
-      def add_sse_to_response response
-        if sse = response.http_response.header('x-amz-server-side-encryption')
-          sse = sse.downcase.to_sym
-        end
-        response.data[:server_side_encryption] = sse
-      end
-
       # Previously the access control policy could be specified via :acl
       # as a string or an object that responds to #to_xml.  The prefered
       # method now is to pass :access_control_policy an xml document.
@@ -1407,6 +1399,64 @@ module AWS
         Base64.encode64(Digest::MD5.digest(str)).strip
       end
 
+      def extract_object_headers resp
+        meta = {}
+        resp.http_response.headers.each_pair do |name,value|
+          if name =~ /^x-amz-meta-(.+)$/i
+            meta[$1] = [value].flatten.join
+          end
+        end
+        resp.data[:meta] = meta
+
+        if expiry = resp.http_response.headers['x-amz-expiration']
+          expiry.first =~ /^expiry-date="(.+)", rule-id="(.+)"$/
+          exp_date = DateTime.parse($1)
+          exp_rule_id = $2
+        else
+          exp_date = nil
+          exp_rule_id = nil
+        end
+        resp.data[:expiration_date] = exp_date if exp_date
+        resp.data[:expiration_rule_id] = exp_rule_id if exp_rule_id
+
+        restoring = false
+        restore_date = nil
+
+        if restore = resp.http_response.headers['x-amz-restore']
+          if restore.first =~ /ongoing-request="(.+?)", expiry-date="(.+?)"/
+            restoring = $1 == "true"
+            restore_date = DateTime.parse($2)
+          elsif restore.first =~ /ongoing-request="(.+?)"/
+            restoring = $1 == "true"
+          end
+        end
+        resp.data[:restore_in_progress] = restoring
+        resp.data[:restore_expiration_date] = restore_date if restore_date
+
+        {
+          'x-amz-version-id' => :version_id,
+          'content-type' => :content_type,
+          'etag' => :etag,
+          'x-amz-website-redirect-location' => :website_redirect_location,
+        }.each_pair do |header,method|
+          if value = resp.http_response.header(header)
+            resp.data[method] = value
+          end
+        end
+
+        if time = resp.http_response.header('Last-Modified')
+          resp.data[:last_modified] = Time.parse(time)
+        end
+
+        if length = resp.http_response.header('content-length')
+          resp.data[:content_length] = length.to_i
+        end
+
+        if sse = resp.http_response.header('x-amz-server-side-encryption')
+          resp.data[:server_side_encryption] = sse.downcase.to_sym
+        end
+      end
+
       module Validators
 
         # @return [Boolean] Returns true if the given bucket name is valid.