fog 1.8.0 → 1.9.0

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

@@ -5,33 +5,62 @@ module Fog
 
         # Change lifecycle configuration for an S3 bucket
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket to set lifecycle configuration for
-        # * lifecycle<~Hash>:
-        #   * 'Rules'<~Array> - object expire rules
-        #      * 'ID'<~String>       - Unique identifier for the rule
-        #      * 'Prefix'<~String>   - Prefix identifying one or more objects to which the rule applies
-        #      * 'Enabled'<~Boolean> - if rule is currently being applied
-        #      * 'Days'<~Integer>    - lifetime, in days, of the objects that are subject to the rule
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTlifecycle.html
-
+        # @param bucket_name [String] name of bucket to set lifecycle configuration for
+        # * lifecycle [Hash]:
+        #   * Rules [Array] object expire rules
+        #     * ID [String] Unique identifier for the rule
+        #     * Prefix [String] Prefix identifying one or more objects to which the rule applies
+        #     * Enabled [Boolean] if rule is currently being applied
+        #     * Expiration [Hash] Container for the object expiration rule. 
+        #       * Days [Integer] lifetime, in days, of the objects that are subject to the rule
+        #       * Date [Date] Indicates when the specific rule take effect.
+        #         The date value must conform to the ISO 8601 format. The time is always midnight UTC. 
+        #     * Transition [Hash] Container for the transition rule that describes when objects transition 
+        #       to the Glacier storage class
+        #       * Days [Integer] lifetime, in days, of the objects that are subject to the rule
+        #       * Date [Date] Indicates when the specific rule take effect.
+        #         The date value must conform to the ISO 8601 format. The time is always midnight UTC. 
+        #       * StorageClass [String] Indicates the Amazon S3 storage class to which you want the object
+        #         to transition to. 
+        #
+        # 
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTlifecycle.html
+        # 
         def put_bucket_lifecycle(bucket_name, lifecycle)
           builder = Nokogiri::XML::Builder.new do
             LifecycleConfiguration {
               lifecycle['Rules'].each do |rule|
                 Rule {
                   ID rule['ID']
-                  Prefix rule['Prefix']
+                  Prefix rule['Prefix'] 
                   Status rule['Enabled'] ? 'Enabled' : 'Disabled'
-                  Expiration { Days rule['Days'] }
+                  unless (rule['Expiration'] or rule['Transition'])
+                    Expiration { Days rule['Days'] }
+                  else
+                    if rule['Expiration']
+                      if rule['Expiration']['Days']
+                        Expiration { Days rule['Expiration']['Days'] }
+                      elsif rule['Expiration']['Date']
+                        Expiration { Date rule['Expiration']['Date'].is_a?(Time) ? rule['Expiration']['Date'].utc.iso8601 : Time.parse(rule['Expiration']['Date']).utc.iso8601 }
+                      end
+                    end
+                    if rule['Transition']
+                      Transition {
+                        if rule['Transition']['Days']
+                          Days rule['Transition']['Days']
+                        elsif rule['Transition']['Date']
+                          Date rule['Transition']['Date'].is_a?(Time) ? time.utc.iso8601 : Time.parse(time).utc.iso8601
+                        end
+                        StorageClass rule['Transition']['StorageClass'].nil? ? 'GLACIER' : rule['Transition']['StorageClass']
+                      }
+                    end
+                  end
                 }
               end
             }
           end
-
           body = builder.to_xml
-
+          body.gsub! /<([^<>]+)\/>/, '<\1></\1>'
           request({
                     :body     => body,
                     :expects  => 200,

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

@@ -5,24 +5,22 @@ module Fog
 
         # Change logging status for an S3 bucket
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket to modify
-        # * logging_status<~Hash>:
-        #   * Owner<~Hash>:
-        #     * ID<~String>: id of owner
-        #     * DisplayName<~String>: display name of owner
-        #   * AccessControlList<~Array>:
-        #     * Grantee<~Hash>:
-        #         * 'DisplayName'<~String> - Display name of grantee
-        #         * 'ID'<~String> - Id of grantee
+        # @param bucket_name [String] name of bucket to modify
+        # @param logging_status [Hash]:
+        #   * Owner [Hash]:
+        #     * ID [String]: id of owner
+        #     * DisplayName [String]: display name of owner
+        #   * AccessControlList [Array]:
+        #     * Grantee [Hash]:
+        #       * DisplayName [String] Display name of grantee
+        #       * ID [String] Id of grantee
         #       or
-        #         * 'EmailAddress'<~String> - Email address of grantee
+        #       * EmailAddress [String] Email address 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/RESTBucketPUTlogging.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTlogging.html
 
         def put_bucket_logging(bucket_name, logging_status)
           if logging_status['LoggingEnabled'].empty?

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

@@ -5,12 +5,10 @@ module Fog
 
         # Change bucket policy for an S3 bucket
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket to modify
-        # * policy<~Hash> - policy document 
+        # @param bucket_name [String] name of bucket to modify
+        # @param policy [Hash] policy document 
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTpolicy.html 
+        # @ee http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTpolicy.html 
 
         def put_bucket_policy(bucket_name, policy)
           request({

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

@@ -5,12 +5,10 @@ module Fog
 
         # Change versioning status for an S3 bucket
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket to modify
-        # * status<~String> - Status to change to in ['Enabled', 'Suspended']
+        # @param bucket_name [String] name of bucket to modify
+        # @param status [String] Status to change to in ['Enabled', 'Suspended']
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTVersioningStatus.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTVersioningStatus.html
 
         def put_bucket_versioning(bucket_name, status)
           data =

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

@@ -5,14 +5,12 @@ module Fog
 
         # Change website configuration for an S3 bucket
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket to modify
-        # * suffix<~String> - suffix to append to requests for the bucket
-        # * options<~Hash>
-        #   * key<~String> - key to use for 4XX class errors
+        # @param bucket_name [String] name of bucket to modify
+        # @param suffix [String] suffix to append to requests for the bucket
+        # @param options [Hash]
+        # @option options key [String] key to use for 4XX class errors
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTwebsite.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketPUTwebsite.html
 
         def put_bucket_website(bucket_name, suffix, options = {})
           data =

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

@@ -5,30 +5,27 @@ module Fog
 
         # Create an object in an S3 bucket
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket to create object in
-        # * object_name<~String> - Name of object to create
-        # * data<~File||String> - File or String to create object from
-        # * options<~Hash>:
-        #   * 'Cache-Control'<~String> - Caching behaviour
-        #   * 'Content-Disposition'<~String> - Presentational information for the object
-        #   * 'Content-Encoding'<~String> - Encoding of object data
-        #   * 'Content-Length'<~String> - Size of object in bytes (defaults to object.read.length)
-        #   * 'Content-MD5'<~String> - Base64 encoded 128-bit MD5 digest of message
-        #   * 'Content-Type'<~String> - Standard MIME type describing contents (defaults to MIME::Types.of.first)
-        #   * 'Expires'<~String> - Cache expiry
-        #   * 'x-amz-acl'<~String> - Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
-        #   * 'x-amz-storage-class'<~String> - Default is 'STANDARD', set to 'REDUCED_REDUNDANCY' for non-critical, reproducable data
-        #   * "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 data [File||String] File or String to create object from
+        # @param options [Hash]
+        # @option options Cache-Control [String] Caching behaviour
+        # @option options Content-Disposition [String] Presentational information for the object
+        # @option options Content-Encoding [String] Encoding of object data
+        # @option options Content-Length [String] Size of object in bytes (defaults to object.read.length)
+        # @option options Content-MD5 [String] Base64 encoded 128-bit MD5 digest of message
+        # @option options Content-Type [String] Standard MIME type describing contents (defaults to MIME::Types.of.first)
+        # @option options Expires [String] Cache expiry
+        # @option options x-amz-acl [String] Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
+        # @option options x-amz-storage-class [String] Default is 'STANDARD', set to 'REDUCED_REDUNDANCY' for non-critical, reproducable data
+        # @option options 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>:
-        #   * headers<~Hash>:
-        #     * 'ETag'<~String> - etag of new object
-        #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUT.html
+        # @return [Excon::Response] response:
+        #   * headers [Hash]:
+        #     * ETag [String] etag of new object
         #
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUT.html
+        
         def put_object(bucket_name, object_name, data, options = {})
           data = Fog::Storage.parse_data(data)
           headers = data[:headers].merge!(options)

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

@@ -7,28 +7,26 @@ module Fog
 
         # Change access control list for an S3 object
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket to modify
-        # * object_name<~String> - name of object to get access control list for
-        # * acl<~Hash>:
-        #   * Owner<~Hash>:
-        #     * ID<~String>: id of owner
-        #     * DisplayName<~String>: display name of owner
-        #   * AccessControlList<~Array>:
-        #     * Grantee<~Hash>:
-        #         * 'DisplayName'<~String> - Display name of grantee
-        #         * 'ID'<~String> - Id of grantee
+        # @param bucket_name [String] name of bucket to modify
+        # @param object_name [String] name of object to get access control list for
+        # @param acl [Hash]:
+        #   * Owner [Hash]
+        #     * ID [String] id of owner
+        #     * DisplayName [String] display name of owner
+        #   * AccessControlList [Array]
+        #     * Grantee [Hash]
+        #       * DisplayName [String] Display name of grantee
+        #       * ID [String] Id of grantee
         #       or
-        #         * 'EmailAddress'<~String> - Email address of grantee
+        #       * EmailAddress [String] Email address of grantee
         #       or
-        #         * 'URI'<~String> - URI of group to grant access for
-        #     * Permission<~String> - Permission, in [FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP]
-        # * acl<~String> - Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
-        # * options<~Hash>:
-        #   * 'versionId'<~String> - specify a particular version to retrieve
+        #       * URI [String] URI of group to grant access for
+        #     * Permission [String] Permission, in [FULL_CONTROL, WRITE, WRITE_ACP, READ, READ_ACP]
+        # @param acl [String] Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
+        # @param options [Hash]
+        # @option options versionId [String] specify a particular version to retrieve
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUTacl.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectPUTacl.html
 
         def put_object_acl(bucket_name, object_name, acl, options = {})
           query = {'acl' => nil}

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

@@ -25,17 +25,14 @@ module Fog
 
         # Get an expiring object url from S3 for putting an object
         #
-        # ==== 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 PutObjectUrl
 

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

@@ -5,12 +5,10 @@ module Fog
 
         # Change who pays for requests to an S3 bucket
         #
-        # ==== Parameters
-        # * bucket_name<~String> - name of bucket to modify
-        # * payer<~String> - valid values are BucketOwner or Requester
+        # @param bucket_name [String] name of bucket to modify
+        # @param payer [String] valid values are BucketOwner or Requester
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTrequestPaymentPUT.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTrequestPaymentPUT.html
 
         def put_request_payment(bucket_name, payer)
           data =

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

@@ -5,22 +5,19 @@ module Fog
 
         # Upload a part for a multipart upload
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket to add part to
-        # * object_name<~String> - Name of object to add part to
-        # * upload_id<~String> - Id of upload to add part to
-        # * part_number<~String> - Index of part in upload
-        # * data<~File||String> - Content for part
-        # * options<~Hash>:
-        #   * 'Content-MD5'<~String> - Base64 encoded 128-bit MD5 digest of message
+        # @param bucket_name [String] Name of bucket to add part to
+        # @param object_name [String] Name of object to add part to
+        # @param upload_id [String] Id of upload to add part to
+        # @param part_number [String] Index of part in upload
+        # @param data [File||String] Content for part
+        # @param options [Hash]
+        # @option options Content-MD5 [String] Base64 encoded 128-bit MD5 digest of message
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * headers<~Hash>:
-        #     * 'ETag'<~String> - etag of new object (will be needed to complete upload)
+        # @return [Excon::Response] response
+        #   * headers [Hash]:
+        #     * ETag [String] etag of new object (will be needed to complete upload)
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadUploadPart.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/mpUploadUploadPart.html
         #
         def upload_part(bucket_name, object_name, upload_id, part_number, data, options = {})
           data = Fog::Storage.parse_data(data)
@@ -41,4 +38,4 @@ module Fog
       end # Real
     end # Storage
   end # AWS
-end # Fog
+end # Fog

data/lib/fog/aws/storage.rb

@@ -22,6 +22,7 @@ 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
@@ -29,6 +30,7 @@ module Fog
       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
@@ -51,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
@@ -190,7 +193,10 @@ module Fog
                   :bucket => {},
                   :object => {}
                 },
-                :buckets => {}
+                :buckets => {},
+                :cors => {
+                  :bucket => {}
+                }
               }
             end
           end
@@ -338,6 +344,7 @@ DATA
           for key in (params[:query] || {}).keys.sort
             if %w{
               acl
+              cors
               delete
               lifecycle
               location

data/lib/fog/bin/rackspace.rb

@@ -45,6 +45,13 @@ class Rackspace < Fog::Bin
         when :storage
           Fog::Logger.warning("Rackspace[:storage] is not recommended, use Storage[:rackspace] for portability")
           Fog::Storage.new(:provider => 'Rackspace')
+        when :identity
+          Fog::Logger.warning("Rackspace[:identity] is not recommended, use Identity[:rackspace] for portability")
+          Fog::Identity.new(:provider => 'Rackspace')
+        when :databases
+          Fog::Rackspace::Databases.new
+        when :block_storage
+          Fog::Rackspace::BlockStorage.new
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end

data/lib/fog/bluebox/models/compute/flavors.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Bluebox::Flavor
 
         def all
-          data = connection.get_products.body
+          data = service.get_products.body
           load(data)
         end
 
         def get(product_id)
-          response = connection.get_product(product_id)
+          response = service.get_product(product_id)
           new(response.body)
         rescue Fog::Compute::Bluebox::NotFound
           nil

data/lib/fog/bluebox/models/compute/image.rb

@@ -7,26 +7,26 @@ module Fog
       class Image < Fog::Model
 
         identity :id
-        
+
         attribute :block_id
         attribute :description
         attribute :public
         attribute :created_at, :aliases => 'created'
-        
+
         def save
           requires :block_id
-          
-          data = connection.create_template(block_id, attributes)
+
+          data = service.create_template(block_id, attributes)
           true
         end
-        
+
         def destroy
           requires :id
-          
-          data = connection.destroy_template(id)
+
+          data = service.destroy_template(id)
           true
         end
-        
+
       end
 
     end