fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

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

@@ -5,28 +5,25 @@ module Fog
 
         # Get an object from S3
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket to read from
-        # * object_name<~String> - Name of object to read
-        # * options<~Hash>:
-        #   * 'If-Match'<~String> - Returns object only if its etag matches this value, otherwise returns 412 (Precondition Failed).
-        #   * 'If-Modified-Since'<~Time> - Returns object only if it has been modified since this time, otherwise returns 304 (Not Modified).
-        #   * 'If-None-Match'<~String> - Returns object only if its etag differs from this value, otherwise returns 304 (Not Modified)
-        #   * 'If-Unmodified-Since'<~Time> - Returns object only if it has not been modified since this time, otherwise returns 412 (Precodition Failed).
-        #   * 'Range'<~String> - Range of object to download
-        #   * 'versionId'<~String> - specify a particular version to retrieve
+        # @param bucket_name [String] Name of bucket to read from
+        # @param object_name [String] Name of object to read
+        # @param options [Hash]
+        # @option options If-Match [String] Returns object only if its etag matches this value, otherwise returns 412 (Precondition Failed).
+        # @option options If-Modified-Since [Time] Returns object only if it has been modified since this time, otherwise returns 304 (Not Modified).
+        # @option options If-None-Match [String] Returns object only if its etag differs from this value, otherwise returns 304 (Not Modified)
+        # @option options If-Unmodified-Since [Time] Returns object only if it has not been modified since this time, otherwise returns 412 (Precodition Failed).
+        # @option options Range [String] Range of object to download
+        # @option options versionId [String] specify a particular version to retrieve
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~String> - Contents of object
-        #   * headers<~Hash>:
-        #     * 'Content-Length'<~String> - Size of object contents
-        #     * 'Content-Type'<~String> - MIME type of object
-        #     * 'ETag'<~String> - Etag of object
-        #     * 'Last-Modified'<~String> - Last modified timestamp for object
+        # @return [Excon::Response] response:
+        #   * body [String]- Contents of object
+        #   * headers [Hash]:
+        #     * Content-Length [String] - Size of object contents
+        #     * Content-Type [String] - MIME type of object
+        #     * ETag [String] - Etag of object
+        #     * Last-Modified [String] - Last modified timestamp for object
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectGET.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectGET.html
 
         def get_object(bucket_name, object_name, options = {}, &block)
           unless bucket_name

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

@@ -7,30 +7,27 @@ module Fog
 
         # Get access control list for an S3 object
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket containing object
-        # * object_name<~String> - name of object to get access control list for
-        # * options<~Hash>:
-        #   * 'versionId'<~String> - specify a particular version to retrieve
+        # @param bucket_name [String] name of bucket containing object
+        # @param object_name [String] name of object to get access control list for
+        # @param options [Hash]
+        # @option options versionId [String] specify a particular version to retrieve
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'AccessControlPolicy'<~Hash>
-        #       * 'Owner'<~Hash>:
-        #         * 'DisplayName'<~String> - Display name of object owner
-        #         * 'ID'<~String> - Id of object owner
-        #       * 'AccessControlList'<~Array>:
-        #         * 'Grant'<~Hash>:
-        #           * 'Grantee'<~Hash>:
-        #              * 'DisplayName'<~String> - Display name of grantee
-        #              * 'ID'<~String> - Id of grantee
+        # @return [Excon::Response] response:
+        #   * body [Hash]:
+        #     * [AccessControlPolicy [Hash]:
+        #       * Owner [Hash]:
+        #         * DisplayName [String] - Display name of object owner
+        #         * ID [String] - Id of object owner
+        #       * AccessControlList [Array]:
+        #         * Grant [Hash]:
+        #           * Grantee [Hash]:
+        #             * DisplayName [String] - Display name of grantee
+        #             * ID [String] - Id of grantee
         #             or
-        #              * 'URI'<~String> - URI of group to grant access for
-        #           * 'Permission'<~String> - Permission, in [FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP]
+        #             * URI [String] - URI of group to grant access for
+        #           * Permission [String] - Permission, in [FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP]
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectGETacl.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectGETacl.html
 
         def get_object_acl(bucket_name, object_name, options = {})
           unless bucket_name

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

@@ -32,17 +32,14 @@ module Fog
 
         # Get an expiring object http url from S3
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket containing object
-        # * object_name<~String> - Name of object to get expiring url for
-        # * expires<~Time> - An expiry time for this url
+        # @param bucket_name [String] Name of bucket containing object
+        # @param object_name [String] Name of object to get expiring url for
+        # @param expires [Time] An expiry time for this url
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~String> - url for object
+        # @return [Excon::Response] response:
+        #   * body [String] - url for object
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
         include GetObjectHttpUrl
 

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

@@ -14,17 +14,14 @@ module Fog
 
         # Get an expiring object https url from S3
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket containing object
-        # * object_name<~String> - Name of object to get expiring url for
-        # * expires<~Time> - An expiry time for this url
+        # @param bucket_name [String] Name of bucket containing object
+        # @param object_name [String] Name of object to get expiring url for
+        # @param expires [Time] An expiry time for this url
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~String> - url for object
+        # @return [Excon::Response] response:
+        #   * body [String] - url for object
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
         include GetObjectHttpsUrl
 

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

@@ -5,26 +5,23 @@ module Fog
 
         # Get torrent for an S3 object
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket containing object
-        # * object_name<~String> - name of object to get torrent for
+        # @param bucket_name [String] name of bucket containing object
+        # @param object_name [String] name of object to get torrent for
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'AccessControlPolicy'<~Hash>
-        #       * 'Owner'<~Hash>:
-        #         * 'DisplayName'<~String> - Display name of object owner
-        #         * 'ID'<~String> - Id of object owner
-        #       * 'AccessControlList'<~Array>:
-        #         * 'Grant'<~Hash>:
-        #           * 'Grantee'<~Hash>:
-        #             * 'DisplayName'<~String> - Display name of grantee
-        #             * 'ID'<~String> - Id of grantee
-        #           * 'Permission'<~String> - Permission, in [FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP]
+        # @return [Excon::Response] response:
+        #   * body [Hash]:
+        #     * AccessControlPolicy [Hash:
+        #       * Owner [Hash]:
+        #         * DisplayName [String] - Display name of object owner
+        #         * ID [String] - Id of object owner
+        #       * AccessControlList [Array]:
+        #         * Grant [Hash]:
+        #           * Grantee [Hash]:
+        #             * DisplayName [String] - Display name of grantee
+        #             * ID [String] - Id of grantee
+        #           * Permission [String] - Permission, in [FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP]
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectGETtorrent.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectGETtorrent.html
 
         def get_object_torrent(bucket_name, object_name)
           unless bucket_name

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

@@ -11,7 +11,7 @@ module Fog
           unless object_name
             raise ArgumentError.new('object_name is required')
           end
-          host, path = if bucket_name =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\-(?![\.])){1,61}[a-z0-9]$/
+          host, path = if bucket_name =~ Fog::AWS::COMPLIANT_BUCKET_NAMES
             ["#{bucket_name}.#{@host}", object_name]
           else
             [@host, "#{bucket_name}/#{object_name}"]
@@ -32,17 +32,14 @@ module Fog
 
         # Get an expiring object url from S3
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket containing object
-        # * object_name<~String> - Name of object to get expiring url for
-        # * expires<~Time> - An expiry time for this url
+        # @param bucket_name [String] Name of bucket containing object
+        # @param object_name [String] Name of object to get expiring url for
+        # @param expires [Time] An expiry time for this url
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~String> - url for object
+        # @return [Excon::Response] response:
+        #   * body [String] - url for object
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
         include GetObjectUrl
 

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

@@ -7,16 +7,13 @@ module Fog
 
         # Get configured payer for an S3 bucket
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket to get payer for
+        # @param bucket_name [String] name of bucket to get payer for
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'Payer'<~String> - Specifies who pays for download and requests
+        # @return [Excon::Response] response:
+        #   * body [Hash]:
+        #     * Payer [String] - Specifies who pays for download and requests
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTrequestPaymentGET.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTrequestPaymentGET.html
 
         def get_request_payment(bucket_name)
           request({

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

@@ -7,18 +7,16 @@ module Fog
 
         # List information about S3 buckets for authorized user
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'Buckets'<~Hash>:
-        #       * 'Name'<~String> - Name of bucket
-        #       * 'CreationTime'<~Time> - Timestamp of bucket creation
-        #     * 'Owner'<~Hash>:
-        #       * 'DisplayName'<~String> - Display name of bucket owner
-        #       * 'ID'<~String> - Id of bucket owner
+        # @return [Excon::Response] response:
+        #   * body [Hash]:
+        #     * Buckets [Hash]:
+        #       * Name [String] - Name of bucket
+        #       * CreationTime [Time] - Timestamp of bucket creation
+        #     * Owner [Hash]:
+        #       * DisplayName [String] - Display name of bucket owner
+        #       * ID [String] - Id of bucket owner
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTServiceGET.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTServiceGET.html
         #
         def get_service
           request({

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

@@ -3,30 +3,30 @@ module Fog
     class AWS
       class Real
 
-        # Get headers for an object from S3
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket to read from
-        # * object_name<~String> - Name of object to read
-        # * options<~Hash>:
-        #   * 'If-Match'<~String> - Returns object only if its etag matches this value, otherwise returns 412 (Precondition Failed).
-        #   * 'If-Modified-Since'<~Time> - Returns object only if it has been modified since this time, otherwise returns 304 (Not Modified).
-        #   * 'If-None-Match'<~String> - Returns object only if its etag differs from this value, otherwise returns 304 (Not Modified)
-        #   * 'If-Unmodified-Since'<~Time> - Returns object only if it has not been modified since this time, otherwise returns 412 (Precodition Failed).
-        #   * 'Range'<~String> - Range of object to download
-        #   * 'versionId'<~String> - specify a particular version to retrieve
+        # Get headers for an object from S3
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~String> - Contents of object
-        #   * headers<~Hash>:
-        #     * 'Content-Length'<~String> - Size of object contents
-        #     * 'Content-Type'<~String> - MIME type of object
-        #     * 'ETag'<~String> - Etag of object
-        #     * 'Last-Modified'<~String> - Last modified timestamp for object
+        # @param bucket_name [String] Name of bucket to read from
+        # @param object_name [String] Name of object to read
+        # @param options [Hash]: 
+        # @option options [String] If-Match Returns object only if its etag matches this value, otherwise returns 412 (Precondition Failed).
+        # @option options [Time]   If-Modified-Since Returns object only if it has been modified since this time, otherwise returns 304 (Not Modified).
+        # @option options [String] If-None-Match Returns object only if its etag differs from this value, otherwise returns 304 (Not Modified)
+        # @option options [Time]   If-Unmodified-Since Returns object only if it has not been modified since this time, otherwise returns 412 (Precodition Failed).
+        # @option options [String] Range Range of object to download
+        # @option options [String] versionId specify a particular version to retrieve
+        # 
+        # @return [Excon::Response] response: 
+        #   * body [String] Contents of object
+        #   * headers [Hash]: 
+        #     * Content-Length [String] - Size of object contents
+        #     * Content-Type [String] - MIME type of object
+        #     * ETag [String] - Etag of object
+        #     * Last-Modified - [String] Last modified timestamp for object
+        # 
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectHEAD.html
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectHEAD.html
+
 
         def head_object(bucket_name, object_name, options={})
           unless bucket_name

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

@@ -5,30 +5,29 @@ module Fog
 
         require 'fog/aws/parsers/storage/initiate_multipart_upload'
 
+        #
         # Initiate a multipart upload to an S3 bucket
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket to create object in
-        # * object_name<~String> - Name of object to create
-        # * options<~Hash>:
-        #   * 'Cache-Control'<~String> - Caching behaviour
-        #   * 'Content-Disposition'<~String> - Presentational information for the object
-        #   * 'Content-Encoding'<~String> - Encoding of object data
-        #   * 'Content-MD5'<~String> - Base64 encoded 128-bit MD5 digest of message (defaults to Base64 encoded MD5 of object.read)
-        #   * 'Content-Type'<~String> - Standard MIME type describing contents (defaults to MIME::Types.of.first)
-        #   * 'x-amz-acl'<~String> - Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
-        #   * "x-amz-meta-#{name}" - Headers to be returned with object, note total size of request without body must be less than 8 KB.
+        # @param bucket_name [String] Name of bucket to create object in
+        # @param object_name [String] Name of object to create
+        # @param options [Hash]: 
+        # @option options [String] Cache-Control Caching behaviour
+        # @option options [String] Content-Disposition Presentational information for the object
+        # @option options [String] Content-Encoding Encoding of object data
+        # @option options [String] Content-MD5 Base64 encoded 128-bit MD5 digest of message (defaults to Base64 encoded MD5 of object.read)
+        # @option options [String] Content-Type Standard MIME type describing contents (defaults to MIME::Types.of.first)
+        # @option options [String] x-amz-acl Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
+        # @option options [String] x-amz-meta-#{name} Headers to be returned with object, note total size of request without body must be less than 8 KB.
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~Hash>:
-        #     * 'Bucket'<~String> - Bucket where upload was initiated
-        #     * 'Key'<~String> - Object key where the upload was initiated
-        #     * 'UploadId'<~String> - Id for initiated multipart upload
+        # @return [Excon::Response] response: 
+        #   * body [Hash]: 
+        #     * Bucket [String] - Bucket where upload was initiated
+        #     * Key [String] - Object key where the upload was initiated
+        #     * UploadId [String] - Id for initiated multipart upload
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadInitiate.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadInitiate.html
         #
+        
         def initiate_multipart_upload(bucket_name, object_name, options = {})
           request({
             :expects    => 200,

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

@@ -0,0 +1,51 @@
+module Fog
+  module Storage
+    class AWS
+      class Real
+
+        require 'fog/aws/requests/storage/cors_utils'
+
+        # Sets the cors configuration for your bucket. If the configuration exists, Amazon S3 replaces it.
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - name of bucket to modify
+        # * cors<~Hash>:
+        #   * CORSConfiguration<~Array>:
+        #     * ID<~String>: A unique identifier for the rule.
+        #     * AllowedMethod<~String>: An HTTP method that you want to allow the origin to execute.
+        #     * AllowedOrigin<~String>: An origin that you want to allow cross-domain requests from.
+        #     * AllowedHeader<~String>: Specifies which headers are allowed in a pre-flight OPTIONS request via the Access-Control-Request-Headers header.
+        #     * MaxAgeSeconds<~String>: The time in seconds that your browser is to cache the preflight response for the specified resource.
+        #     * ExposeHeader<~String>: One or more headers in the response that you want customers to be able to access from their applications.
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTcors.html
+
+        def put_bucket_cors(bucket_name, cors)
+          data = Fog::Storage::AWS.hash_to_cors(cors)
+
+          headers = {}
+          headers['Content-MD5'] = Base64.encode64(Digest::MD5.digest(data)).strip
+          headers['Content-Type'] = 'application/json'
+          headers['Date'] = Fog::Time.now.to_date_header
+
+          request({
+            :body     => data,
+            :expects  => 200,
+            :headers  => headers,
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'PUT',
+            :query    => {'cors' => nil}
+          })
+        end
+      end
+
+      class Mock
+        def put_bucket_cors(bucket_name, cors)
+          self.data[:cors][:bucket][bucket_name] = Fog::Storage::AWS.hash_to_cors(cors)
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/aws/signaturev4.rb

@@ -70,4 +70,4 @@ DATA
 
     end
   end
-end
+end

data/lib/fog/aws/sqs.rb

@@ -40,7 +40,7 @@ module Fog
           setup_credentials(options)
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end

data/lib/fog/aws/storage.rb

@@ -22,12 +22,15 @@ module Fog
       request :complete_multipart_upload
       request :copy_object
       request :delete_bucket
+      request :delete_bucket_cors
       request :delete_bucket_lifecycle
       request :delete_bucket_policy
       request :delete_bucket_website
       request :delete_object
+      request :delete_multiple_objects
       request :get_bucket
       request :get_bucket_acl
+      request :get_bucket_cors
       request :get_bucket_lifecycle
       request :get_bucket_location
       request :get_bucket_logging
@@ -50,6 +53,7 @@ module Fog
       request :post_object_hidden_fields
       request :put_bucket
       request :put_bucket_acl
+      request :put_bucket_cors
       request :put_bucket_lifecycle
       request :put_bucket_logging
       request :put_bucket_policy
@@ -189,7 +193,10 @@ module Fog
                   :bucket => {},
                   :object => {}
                 },
-                :buckets => {}
+                :buckets => {},
+                :cors => {
+                  :bucket => {}
+                }
               }
             end
           end
@@ -337,6 +344,8 @@ DATA
           for key in (params[:query] || {}).keys.sort
             if %w{
               acl
+              cors
+              delete
               lifecycle
               location
               logging