fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/aws/requests/dns/change_resource_record_sets.rb

@@ -198,6 +198,7 @@ module Fog
         @elb_hosted_zone_mapping ||= {
           "ap-northeast-1" => "Z2YN17T5R711GT",
           "ap-southeast-1" => "Z1WI8VXHPB1R38",
+          "ap-southeast-2" => "Z2999QAZ9SRTIC",
           "eu-west-1"      => "Z3NF1Z3NOM5OY2",
           "sa-east-1"      => "Z2ES78Y61JGQKS",
           "us-east-1"      => "Z3DZXE0Q79N41H",

data/lib/fog/aws/requests/storage/abort_multipart_upload.rb

@@ -2,16 +2,14 @@ module Fog
   module Storage
     class AWS
       class Real
-
+        # 
         # Abort a multipart upload
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket to abort multipart upload on
-        # * object_name<~String> - Name of object to abort multipart upload on
-        # * upload_id<~String> - Id of upload to add part to
+        # @param [String] bucket_name Name of bucket to abort multipart upload on
+        # @param [String] object_name Name of object to abort multipart upload on
+        # @param [String] upload_id Id of upload to add part to
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadAbort.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadAbort.html
         #
         def abort_multipart_upload(bucket_name, object_name, upload_id)
           request({

data/lib/fog/aws/requests/storage/complete_multipart_upload.rb

@@ -7,23 +7,19 @@ module Fog
 
         # Complete a multipart upload
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket to complete multipart upload for
-        # * object_name<~String> - Name of object to complete multipart upload for
-        # * upload_id<~String> - Id of upload to add part to
-        # * parts<~Array>: Array of etags for parts
-        #   * :etag<~String> - Etag for this part
+        # @param [String] bucket_name Name of bucket to complete multipart upload for
+        # @param [String] object_name Name of object to complete multipart upload for
+        # @param [String] upload_id Id of upload to add part to
+        # @param [Array<String>] parts Array of etags as Strings for parts
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * headers<~Hash>:
-        #     * 'Bucket'<~String> - bucket of new object
-        #     * 'ETag'<~String> - etag of new object (will be needed to complete upload)
-        #     * 'Key'<~String> - key of new object
-        #     * 'Location'<~String> - location of new object
+        # @return [Excon::Response]
+        #   * headers [Hash]:
+        #     * Bucket [String] - bucket of new object
+        #     * ETag [String] - etag of new object (will be needed to complete upload)
+        #     * Key [String] - key of new object
+        #     * Location [String] - location of new object
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadComplete.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadComplete.html
         #
         def complete_multipart_upload(bucket_name, object_name, upload_id, parts)
           data = "<CompleteMultipartUpload>"
@@ -49,4 +45,4 @@ module Fog
       end # Real
     end # Storage
   end # AWS
-end # Fog
+end # Fog

data/lib/fog/aws/requests/storage/copy_object.rb

@@ -7,28 +7,27 @@ module Fog
 
         # Copy an object from one S3 bucket to another
         #
-        # ==== Parameters
-        # * source_bucket_name<~String> - Name of source bucket
-        # * source_object_name<~String> - Name of source object
-        # * target_bucket_name<~String> - Name of bucket to create copy in
-        # * target_object_name<~String> - Name for new copy of object
-        # * options<~Hash>:
-        #   * 'x-amz-metadata-directive'<~String> - Specifies whether to copy metadata from source or replace with data in request.  Must be in ['COPY', 'REPLACE']
-        #   * 'x-amz-copy_source-if-match'<~String> - Copies object if its etag matches this value
-        #   * 'x-amz-copy_source-if-modified_since'<~Time> - Copies object it it has been modified since this time
-        #   * 'x-amz-copy_source-if-none-match'<~String> - Copies object if its etag does not match this value
-        #   * 'x-amz-copy_source-if-unmodified-since'<~Time> - Copies object it it has not been modified since this time
-        #   * 'x-amz-storage-class'<~String> - Default is 'STANDARD', set to 'REDUCED_REDUNDANCY' for non-critical, reproducable data
+        # @param source_bucket_name [String] Name of source bucket
+        # @param source_object_name [String] Name of source object
+        # @param target_bucket_name [String] Name of bucket to create copy in
+        # @param target_object_name [String] Name for new copy of object
+        # 
+        # @param options [Hash]:
+        # @option options [String] x-amz-metadata-directive Specifies whether to copy metadata from source or replace with data in request.  Must be in ['COPY', 'REPLACE']
+        # @option options [String] x-amz-copy_source-if-match Copies object if its etag matches this value
+        # @option options [Time] x-amz-copy_source-if-modified_since Copies object it it has been modified since this time
+        # @option options [String] x-amz-copy_source-if-none-match Copies object if its etag does not match this value
+        # @option options [Time] x-amz-copy_source-if-unmodified-since Copies object it it has not been modified since this time
+        # @option options [String] x-amz-storage-class Default is 'STANDARD', set to 'REDUCED_REDUNDANCY' for non-critical, reproducable data
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'ETag'<~String> - etag of new object
-        #     * 'LastModified'<~Time> - date object was last modified
+        # 
+        # @return [Excon::Response]
+        #   * body [Hash]:
+        #     * ETag [String] - etag of new object
+        #     * LastModified [Time] - date object was last modified
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectCOPY.html
-
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectCOPY.html
+        # 
         def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {})
           headers = { 'x-amz-copy-source' => "/#{source_bucket_name}/#{CGI.escape(source_object_name)}" }.merge!(options)
           request({

data/lib/fog/aws/requests/storage/cors_utils.rb

@@ -0,0 +1,41 @@
+module Fog
+  module Storage
+    class AWS
+
+      require 'fog/aws/parsers/storage/cors_configuration'
+
+      private
+
+        def self.hash_to_cors(cors)
+          data =  "<CORSConfiguration>\n"
+
+          [cors['CORSConfiguration']].flatten.compact.each do |rule|
+            data << "  <CORSRule>\n"
+
+            ['ID', 'MaxAgeSeconds'].each do |key|
+              data << "    <#{key}>#{rule[key]}</#{key}>\n" if rule[key]
+            end
+
+            ['AllowedOrigin', 'AllowedMethod', 'AllowedHeader', 'ExposeHeader'].each do |key|
+              [rule[key]].flatten.compact.each do |value|
+                data << "    <#{key}>#{value}</#{key}>\n"
+              end
+            end
+
+            data << "  </CORSRule>\n"
+          end
+
+          data << "</CORSConfiguration>"
+
+          data
+        end
+
+        def self.cors_to_hash(cors_xml)
+          parser = Fog::Parsers::Storage::AWS::CorsConfiguration.new
+          Nokogiri::XML::SAX::Parser.new(parser).parse(cors_xml)
+          parser.response
+        end
+
+    end
+  end
+end

data/lib/fog/aws/requests/storage/delete_bucket.rb

@@ -5,15 +5,12 @@ module Fog
 
         # Delete an S3 bucket
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket to delete
+        # @param bucket_name [String] name of bucket to delete
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * status<~Integer> - 204
+        # @return [Excon::Response] response:
+        #   * status [Integer] - 204
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETE.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETE.html
 
         def delete_bucket(bucket_name)
           request({

data/lib/fog/aws/requests/storage/delete_bucket_cors.rb

@@ -0,0 +1,29 @@
+module Fog
+  module Storage
+    class AWS
+      class Real
+
+        # Deletes the cors configuration information set for the bucket.
+        #
+        # @param bucket_name [String] name of bucket to delete cors rules from
+        #
+        # @return [Excon::Response] response:
+        #   * status [Integer] - 204
+        #
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEcors.html
+
+        def delete_bucket_cors(bucket_name)
+          request({
+            :expects  => 204,
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'DELETE',
+            :query    => {'cors' => nil}
+          })
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/requests/storage/delete_bucket_lifecycle.rb

@@ -5,15 +5,12 @@ module Fog
 
         # Delete lifecycle configuration for a bucket
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket to delete lifecycle configuration from
+        # @param bucket_name [String] name of bucket to delete lifecycle configuration from
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * status<~Integer> - 204
+        # @return [Excon::Response] response:
+        #   * status [Integer] - 204
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETElifecycle.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETElifecycle.html
 
         def delete_bucket_lifecycle(bucket_name)
           request({

data/lib/fog/aws/requests/storage/delete_bucket_policy.rb

@@ -5,15 +5,12 @@ module Fog
 
         # Delete policy for a bucket
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket to delete policy from
+        # @param bucket_name [String] name of bucket to delete policy from
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * status<~Integer> - 204
-        #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEpolicy.html
+        # @return [Excon::Response] response:
+        #   * status [Integer] - 204
+        # 
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEpolicy.html
 
         def delete_bucket_policy(bucket_name)
           request({

data/lib/fog/aws/requests/storage/delete_bucket_website.rb

@@ -5,15 +5,12 @@ module Fog
 
         # Delete website configuration for a bucket
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket to delete website configuration from
+        # @param bucket_name [String] name of bucket to delete website configuration from
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * status<~Integer> - 204
+        # @return [Excon::Response] response:
+        #   * status [Integer] - 204
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEwebsite.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEwebsite.html
 
         def delete_bucket_website(bucket_name)
           request({

data/lib/fog/aws/requests/storage/delete_multiple_objects.rb

@@ -0,0 +1,167 @@
+module Fog
+  module Storage
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/storage/delete_multiple_objects'
+
+        # Delete multiple objects from S3
+        # @note For versioned deletes, options should include a version_ids hash, which
+        #     maps from filename to an array of versions.
+        #     The semantics are that for each (object_name, version) tuple, the
+        #     caller must insert the object_name and an associated version (if
+        #     desired), so for n versions, the object must be inserted n times.
+        #
+        # @param bucket_name [String] Name of bucket containing object to delete
+        # @param object_names [Array]  Array of object names to delete
+        #
+        # @return [Excon::Response] response:
+        #   * body [Hash]:
+        #     * DeleteResult [Array]:
+        #       * Deleted [Hash]:
+        #         * Key [String] - Name of the object that was deleted
+        #         * VersionId [String] - ID for the versioned onject in case of a versioned delete
+        #         * DeleteMarker [Boolean] - Indicates if the request accessed a delete marker
+        #         * DeleteMarkerVersionId [String] - Version ID of the delete marker accessed
+        #       * Error [Hash]:
+        #         * Key [String] - Name of the object that failed to be deleted
+        #         * VersionId [String] - ID of the versioned object that was attempted to be deleted
+        #         * Code [String] - Status code for the result of the failed delete
+        #         * Message [String] - Error description
+        #
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/multiobjectdeleteapi.html
+        
+        def delete_multiple_objects(bucket_name, object_names, options = {})
+          data = "<Delete>"
+          data << "<Quiet>true</Quiet>" if options.delete(:quiet)
+          version_ids = options.delete('versionId')
+          object_names.each do |object_name|
+            data << "<Object>"
+            data << "<Key>#{CGI.escapeHTML(object_name)}</Key>"
+            object_version = version_ids.nil? ? nil : version_ids[object_name]
+            if object_version
+              data << "<VersionId>#{CGI.escapeHTML(object_version)}</VersionId>"
+            end
+            data << "</Object>"
+          end
+          data << "</Delete>"
+
+          headers = options
+          headers['Content-Length'] = data.length
+          headers['Content-MD5'] = Base64.encode64(Digest::MD5.digest(data)).
+                                   gsub("\n", '')
+
+          request({
+            :body       => data,
+            :expects    => 200,
+            :headers    => headers,
+            :host       => "#{bucket_name}.#{@host}",
+            :method     => 'POST',
+            :parser     => Fog::Parsers::Storage::AWS::DeleteMultipleObjects.new,
+            :query      => {'delete' => nil}
+          })
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def delete_multiple_objects(bucket_name, object_names, options = {})
+          response = Excon::Response.new
+          if bucket = self.data[:buckets][bucket_name]
+            response.status = 200
+            response.body = { 'DeleteResult' => [] }
+            version_ids = options.delete('versionId')
+            object_names.each do |object_name|
+              object_version = version_ids.nil? ? nil : version_ids[object_name]
+              response.body['DeleteResult'] << delete_object_helper(bucket,
+                                                                object_name,
+                                                                object_version)
+            end
+          else
+            response.status = 404
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+          response
+        end
+
+        private
+
+        def delete_object_helper(bucket, object_name, version_id)
+          response = { 'Deleted' => {} }
+          if bucket[:versioning]
+            bucket[:objects][object_name] ||= []
+
+            if version_id
+              version = bucket[:objects][object_name].find { |object| object['VersionId'] == version_id}
+
+              # S3 special cases the 'null' value to not error out if no such version exists.
+              if version || (version_id == 'null')
+                bucket[:objects][object_name].delete(version)
+                bucket[:objects].delete(object_name) if bucket[:objects][object_name].empty?
+
+                response['Deleted'] = { 'Key' => object_name,
+                                        'VersionId' => version_id,
+                                        'DeleteMarker' => 'true',
+                                        'DeleteMarkerVersionId' => version_id
+                                      }
+              else
+                response = delete_error_body(object_name,
+                                             version_id,
+                                             'InvalidVersion',
+                                             'Invalid version ID specified')
+              end
+            else
+              delete_marker = {
+                :delete_marker    => true,
+                'Key'             => object_name,
+                'VersionId'       => bucket[:versioning] == 'Enabled' ? Fog::Mock.random_base64(32) : 'null',
+                'Last-Modified'   => Fog::Time.now.to_date_header
+              }
+
+              # When versioning is suspended, a delete marker is placed if the last object ID is not the value 'null',
+              # otherwise the last object is replaced.
+              if bucket[:versioning] == 'Suspended' && bucket[:objects][object_name].first['VersionId'] == 'null'
+                bucket[:objects][object_name].shift
+              end
+
+              bucket[:objects][object_name].unshift(delete_marker)
+
+              response['Deleted'] = { 'Key' => object_name,
+                                      'VersionId' => delete_marker['VersionId'],
+                                      'DeleteMarkerVersionId' =>
+                                          delete_marker['VersionId'],
+                                      'DeleteMarker' => 'true',
+                                    }
+            end
+          else
+            if version_id && version_id != 'null'
+              response = delete_error_body(object_name,
+                                           version_id,
+                                           'InvalidVersion',
+                                           'Invalid version ID specified')
+              response = invalid_version_id_payload(version_id)
+            else
+              bucket[:objects].delete(object_name)
+              response['Deleted'] = { 'Key' => object_name }
+            end
+          end
+          response
+        end
+
+        def delete_error_body(key, version_id, message, code)
+          {
+            'Error' => {
+              'Code'      => code,
+              'Message'   => message,
+              'VersionId' => version_id,
+              'Key'       => key,
+            }
+          }
+        end
+
+      end
+    end
+  end
+end
+