aws-sdk 1.8.0 → 1.8.1

data/lib/aws/s3/client/xml.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
@@ -213,6 +213,15 @@ module AWS
           end
         end
 
+        GetBucketWebsite = BaseGrammar.customize do
+          element "IndexDocument" do
+            element "Suffix"
+          end
+          element "ErrorDocument" do
+            element "Key"
+          end
+        end
+
       end
     end
   end

data/lib/aws/s3/config.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/cors_rule.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/cors_rule_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/data_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/encryption_utils.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/errors.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/multipart_upload.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/multipart_upload_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/object_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/object_metadata.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/object_upload_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/object_version.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/object_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/paginated_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/policy.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/prefix_and_delimiter_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/prefixed_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/presigned_post.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/request.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
@@ -180,7 +180,9 @@ module AWS
         def sub_resources
           %w(acl location logging notification partNumber policy
              requestPayment torrent uploadId uploads versionId
-             versioning versions restore delete lifecycle tagging cors)
+             versioning versions restore delete lifecycle tagging cors
+             website
+            )
         end
 
         def query_parameters

data/lib/aws/s3/s3_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
@@ -303,19 +303,19 @@ module AWS
       #
       # @return [String] Returns the object's ETag
       def etag
-        head.etag
+        head[:etag]
       end
 
       # Returns the object's last modified time.
       #
       # @return [Time] Returns the object's last modified time.
       def last_modified
-        head.last_modified
+        head[:last_modified]
       end
 
       # @return [Integer] Size of the object in bytes.
       def content_length
-        head.content_length
+        head[:content_length]
       end
 
       # @note S3 does not compute content-type.  It reports the content-type
@@ -323,24 +323,24 @@ module AWS
       # @return [String] Returns the content type as reported by S3,
       #   defaults to an empty string when not provided during upload.
       def content_type
-        head.content_type
+        head[:content_type]
       end
 
       # @return [DateTime,nil]
       def expiration_date
-        head.expiration_date
+        head[:expiration_date]
       end
 
       # @return [String,nil]
       def expiration_rule_id
-        head.expiration_rule_id
+        head[:expiration_rule_id]
       end
 
       # @return [Symbol, nil] Returns the algorithm used to encrypt
       #   the object on the server side, or +nil+ if SSE was not used
       #   when storing the object.
       def server_side_encryption
-        head.server_side_encryption
+        head[:server_side_encryption]
       end
 
       # @return [true, false] Returns true if the object was stored
@@ -354,7 +354,7 @@ module AWS
       # @see #restore_expiration_date
       # @since 1.7.2
       def restore_in_progress?
-        head.restore_in_progress
+        head[:restore_in_progress]
       end
 
       # @return [DateTime] the time when the temporarily restored object
@@ -364,14 +364,14 @@ module AWS
       #   copy
       # @since 1.7.2
       def restore_expiration_date
-        head.restore_expiration_date
+        head[:restore_expiration_date]
       end
 
       # @return [Boolean] whether the object is a temporary copy of an
       #   archived object in the Glacier storage class.
       # @since 1.7.2
       def restored_object?
-        !!head.restore_expiration_date
+        !!head[:restore_expiration_date]
       end
 
       # Deletes the object from its S3 bucket.
@@ -830,64 +830,54 @@ module AWS
       #   caching behavior.  See
       #   http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9
       #
+      # @option options [String] :expires The date and time at which the
+      #   object is no longer cacheable.
+      #
       # @return [nil]
       def copy_from source, options = {}
 
-        copy_opts = { :bucket_name => bucket.name, :key => key }
-
-        copy_opts[:copy_source] = case source
-        when S3Object
-          "#{source.bucket.name}/#{source.key}"
-        when ObjectVersion
-          copy_opts[:version_id] = source.version_id
-          "#{source.object.bucket.name}/#{source.object.key}"
-        else
-          case
-          when options[:bucket]      then "#{options[:bucket].name}/#{source}"
-          when options[:bucket_name] then "#{options[:bucket_name]}/#{source}"
-          else "#{self.bucket.name}/#{source}"
-          end
-        end
-
-        copy_opts[:metadata_directive] = 'COPY'
+        options = options.dup
 
-        # Saves client-side encryption headers and copies the instruction file
-        copy_cse_materials(source, options) do |cse_materials|
-          if options[:metadata]
-            copy_opts[:metadata] = options[:metadata].merge(cse_materials)
-            copy_opts[:metadata_directive] = 'REPLACE'
+        options[:copy_source] =
+          case source
+          when S3Object
+            "#{source.bucket.name}/#{source.key}"
+          when ObjectVersion
+            options[:version_id] = source.version_id
+            "#{source.object.bucket.name}/#{source.object.key}"
+          else
+            if options[:bucket]
+              "#{options.delete(:bucket).name}/#{source}"
+            elsif options[:bucket_name]
+              "#{options.delete(:bucket_name)}/#{source}"
+            else
+              "#{self.bucket.name}/#{source}"
+            end
           end
-        end
 
-        if options[:content_disposition]
-          copy_opts[:content_disposition] = options[:content_disposition]
-          copy_opts[:metadata_directive] = "REPLACE"
+        if [:metadata, :content_disposition, :content_type, :cache_control,
+          ].any? {|opt| options.key?(opt) }
+        then
+          options[:metadata_directive] = 'REPLACE'
+        else
+          options[:metadata_directive] ||= 'COPY'
         end
 
-        if options[:content_type]
-          copy_opts[:content_type] = options[:content_type]
-          copy_opts[:metadata_directive] = "REPLACE"
+        # copies client-side encryption materials (from the metadata or
+        # instruction file)
+        if options.delete(:client_side_encrypted)
+          copy_cse_materials(source, options)
         end
 
-        if options[:cache_control]
-          copy_opts[:cache_control] = options[:cache_control]
-          copy_opts[:metadata_directive] = "REPLACE"
-        end
+        add_sse_options(options)
 
-        copy_opts[:acl] = options[:acl] if options[:acl]
-        copy_opts[:version_id] = options[:version_id] if options[:version_id]
-        copy_opts[:server_side_encryption] =
-          options[:server_side_encryption] if
-          options.key?(:server_side_encryption)
-        add_sse_options(copy_opts)
+        options[:storage_class] = options.delete(:reduced_redundancy) ?
+          'REDUCED_REDUNDANCY' : 'STANDARD'
 
-        if options[:reduced_redundancy]
-          copy_opts[:storage_class] = 'REDUCED_REDUNDANCY'
-        else
-          copy_opts[:storage_class] = 'STANDARD'
-        end
+        options[:bucket_name] = bucket.name
+        options[:key] = key
 
-        client.copy_object(copy_opts)
+        client.copy_object(options)
 
         nil
 
@@ -949,6 +939,9 @@ module AWS
       #   option, the key and iv are not guaranteed to be transferred to
       #   the new object.
       #
+      # @option options [String] :expires The date and time at which the
+      #   object is no longer cacheable.
+      #
       # @return [S3Object] Returns the copy (target) object.
       #
       def copy_to target, options = {}
@@ -1260,7 +1253,7 @@ module AWS
         value
       end
 
-      protected
+      private
 
       # @return [Boolean]
       def should_decrypt? options
@@ -1399,11 +1392,11 @@ module AWS
       end
 
       def add_sse_options(options)
-        options[:server_side_encryption] =
-          config.s3_server_side_encryption unless
-          options.key?(:server_side_encryption)
+        unless options.key?(:server_side_encryption)
+          options[:server_side_encryption] = config.s3_server_side_encryption
+        end
         options.delete(:server_side_encryption) if
-          options[:server_side_encryption] == nil
+          options[:server_side_encryption].nil?
       end
 
       # Adds client-side encryption metadata headers and encrypts key
@@ -1583,30 +1576,31 @@ module AWS
       # @yield [Hash] Yields the metadata to be saved for client-side encryption
       def copy_cse_materials source, options
         cse_materials = {}
-        if options[:client_side_encrypted]
-          meta = source.metadata.to_h
-          cse_materials['x-amz-key'] = meta['x-amz-key'] if meta['x-amz-key']
-          cse_materials['x-amz-iv'] = meta['x-amz-iv']   if meta['x-amz-iv']
-          cse_materials['x-amz-matdesc'] = meta['x-amz-matdesc'] if
-                                             meta['x-amz-matdesc']
-          cse_materials['x-amz-unencrypted-content-length'] =
-            meta['x-amz-unencrypted-content-length'] if
-              meta['x-amz-unencrypted-content-length']
-          cse_materials['x-amz-unencrypted-content-md5'] =
-            meta['x-amz-unencrypted-content-md5'] if
-              meta['x-amz-unencrypted-content-md5']
-
+        meta = source.metadata.to_h
+        cse_materials['x-amz-key'] = meta['x-amz-key'] if meta['x-amz-key']
+        cse_materials['x-amz-iv'] = meta['x-amz-iv']   if meta['x-amz-iv']
+        cse_materials['x-amz-matdesc'] = meta['x-amz-matdesc'] if
+                                           meta['x-amz-matdesc']
+        cse_materials['x-amz-unencrypted-content-length'] =
+          meta['x-amz-unencrypted-content-length'] if
+            meta['x-amz-unencrypted-content-length']
+        cse_materials['x-amz-unencrypted-content-md5'] =
+          meta['x-amz-unencrypted-content-md5'] if
+            meta['x-amz-unencrypted-content-md5']
+
+        if
+          cse_materials['x-amz-key'] and
+          cse_materials['x-amz-iv']  and
+          cse_materials['x-amz-matdesc']
+        then
+          options[:metadata] = (options[:metadata] || {}).merge(cse_materials)
+        else
           # Handling instruction file
-          unless cse_materials['x-amz-key'] and
-                 cse_materials['x-amz-iv']  and
-                 cse_materials['x-amz-matdesc']
-            source_inst = "#{source.key}.instruction"
-            dest_inst   = "#{key}.instruction"
-            self.bucket.objects[dest_inst].copy_from(
-              source.bucket.objects[source_inst])
-          end
+          source_inst = "#{source.key}.instruction"
+          dest_inst   = "#{key}.instruction"
+          self.bucket.objects[dest_inst].copy_from(
+            source.bucket.objects[source_inst])
         end
-        yield(cse_materials)
       end
 
       # Removes unwanted options that should not be passed to the client.

data/lib/aws/s3/tree.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/tree/branch_node.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/tree/child_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