fog-maestrodev 1.8.0.20130114204828 → 1.14.0.20130806165225

data/lib/fog/rackspace/models/monitoring/metric.rb

@@ -0,0 +1,25 @@
+require 'fog/core/model'
+require 'fog/rackspace/models/monitoring/base'
+
+module Fog
+  module Rackspace
+    class Monitoring
+      class Metric < Fog::Rackspace::Monitoring::Base
+
+        identity  :name
+        attribute :check
+
+        def datapoints(options={})
+          @datapoints ||= begin
+            Fog::Rackspace::Monitoring::DataPoints.new(
+              :metric        => self,
+              :service       => service
+            )
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/rackspace/models/monitoring/metrics.rb

@@ -0,0 +1,27 @@
+require 'fog/core/collection'
+require 'fog/rackspace/models/monitoring/metric'
+
+module Fog
+  module Rackspace
+    class Monitoring
+      class Metrics < Fog::Collection
+
+        attribute :check
+
+        model Fog::Rackspace::Monitoring::Metric
+
+        def all
+          requires :check
+          data = service.list_metrics(check.entity.id, check.id).body['values']
+          load(data)
+        end
+
+        def new(attributes = {})
+          requires :check
+          super({ :check => check }.merge!(attributes))
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/rackspace/models/storage/account.rb

@@ -0,0 +1,50 @@
+require 'fog/core/model'
+
+module Fog
+  module Storage
+    class Rackspace
+      class Account < Fog::Model
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/View_Account_Info-d1e11995.html
+
+        # @!attribute [rw] meta_temp_url_key
+        # @return [String] The temporary URL key used to generate temporary access to files
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
+        attribute :meta_temp_url_key, :aliases => 'X-Account-Meta-Temp-Url-Key'
+
+        # @!attribute [r] container_count
+        # @return [Integer] The number of containers in account
+        attribute :container_count, :aliases => 'X-Account-Container-Count', :type => :integer
+
+        # @!attribute [r] bytes_used
+        # @return [Integer] The total number of bytes used by the account
+        attribute :bytes_used, :aliases => 'X-Account-Bytes-Used', :type => :integer
+
+        # @!attribute [r] object_count
+        # @return [Integer] The total number of objects in the account
+        attribute :object_count, :aliases => 'X-Account-Object-Count', :type => :integer        
+        
+        # Saves account settings (meta_temp_url_key)
+        # @return [Boolean] returns true if successfully updated
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        def save
+          service.post_set_meta_temp_url_key meta_temp_url_key
+          true
+        end
+        
+        # Reload account with latest data from Cloud Files
+        # @return [Fog::Storage::Rackspace::Account] returns itself
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        def reload
+          response = service.head_containers
+          merge_attributes response.headers
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/models/storage/directories.rb

@@ -9,15 +9,35 @@ module Fog
 
         model Fog::Storage::Rackspace::Directory
 
+        # Returns list of directories
+        # @return [Fog::Storage::Rackspace::Directories] Retrieves a list directories.
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @note Fog's current implementation only returns 10,000 directories
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/View_List_of_Containers-d1e1100.html
         def all
           data = service.get_containers.body
           load(data)
         end
 
-        # Supply the :cdn_cname option to use the Rackspace CDN CNAME functionality on the public_url.
+        # Retrieves directory
+        # @param [String] key  of directory
+        # @param options [Hash]:
+        # @option options [String] cdn_cname CDN CNAME used when calling Directory#public_url
+        # @return [Fog::Storage::Rackspace::Directory]
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @example
+        #   directory = fog.directories.get('video', :cdn_cname => 'http://cdn.lunenburg.org')
+        #   files = directory.files
+        #   files.first.public_url
         #
-        # > fog.directories.get('video', :cdn_cname => 'http://cdn.lunenburg.org').files.first.public_url
-        # => 'http://cdn.lunenburg.org/hayley-dancing.mov'
+        # @see Directory#public_url
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/View-Container_Info-d1e1285.html
         def get(key, options = {})
           data = service.get_container(key, options)
           directory = new(:key => key, :cdn_cname => options[:cdn_cname])
@@ -26,8 +46,11 @@ module Fog
               directory.merge_attributes(key => value)
             end
           end
+          
+          directory.metadata = Metadata.from_headers(directory, data.headers)
           directory.files.merge_attributes(options)
           directory.files.instance_variable_set(:@loaded, true)
+          
           data.body.each do |file|
             directory.files << directory.files.new(file)
           end

data/lib/fog/rackspace/models/storage/directory.rb

@@ -1,5 +1,6 @@
 require 'fog/core/model'
 require 'fog/rackspace/models/storage/files'
+require 'fog/rackspace/models/storage/metadata'
 
 module Fog
   module Storage
@@ -7,21 +8,77 @@ module Fog
 
       class Directory < Fog::Model
 
+        # @!attribute [r] key
+        # @return [String] The name of the directory
         identity  :key, :aliases => 'name'
 
-        attribute :bytes, :aliases => 'X-Container-Bytes-Used'
-        attribute :count, :aliases => 'X-Container-Object-Count'
+        # @!attribute [r] bytes
+        # @return [Integer] The number of bytes used by the directory
+        attribute :bytes, :aliases => 'X-Container-Bytes-Used', :type => :integer
+
+        # @!attribute [r] count
+        # @return [Integer] The number of objects in the directory
+        attribute :count, :aliases => 'X-Container-Object-Count', :type => :integer
+
+        # @!attribute [rw] cdn_name
+        # @return [String] The CDN CNAME to be used instead of the default CDN directory URI. The CDN CNAME will need to be setup setup in DNS and
+        #    point to the default CDN directory URI.
+        # @note This value does not persist and will need to be specified each time a directory is created or retrieved
+        # @see Directories#get
         attribute :cdn_cname
+        
+        # @!attribute [w] public
+        # Required for compatibility with other Fog providers. Not Used.
+        attr_writer :public
+
+        # @!attribute [w] public_url
+        # Required for compatibility with other Fog providers. Not Used.
+        attr_writer :public_url
 
+        # Set directory metadata
+        # @param [Hash,Fog::Storage::Rackspace::Metadata] hash contains key value pairs
+        def metadata=(hash)
+          if hash.is_a? Fog::Storage::Rackspace::Metadata
+            attributes[:metadata] = hash
+          else
+            attributes[:metadata] = Fog::Storage::Rackspace::Metadata.new(self, hash)
+          end
+          attributes[:metadata]
+        end
+        
+        # Retrieve directory metadata
+        # @return [Fog::Storage::Rackspace::Metadata] metadata key value pairs.
+        def metadata
+          unless attributes[:metadata]
+             response = service.head_container(key)
+             attributes[:metadata] = Fog::Storage::Rackspace::Metadata.from_headers(self, response.headers)
+          end
+          attributes[:metadata]
+        end
+
+        # Destroy the directory and remove it from CDN
+        # @return [Boolean] returns true if directory was deleted
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @note Directory must be empty before it is destroyed.
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Delete_Container-d1e1765.html
         def destroy
           requires :key
           service.delete_container(key)
-          service.cdn.post_container(key, 'X-CDN-Enabled' => 'False')
+          service.cdn.publish_container(self, false) if cdn_enabled?
           true
         rescue Excon::Errors::NotFound
           false
         end
 
+        # Returns collection of files in directory
+        # @return [Fog::Storage::Rackspace::Files] collection of files in directory
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
         def files
           @files ||= begin
             Fog::Storage::Rackspace::Files.new(
@@ -31,50 +88,106 @@ module Fog
           end
         end
 
-        def public=(new_public)
-          @public = new_public
+        # Is directory published to CDN
+        # @return [Boolean] return true if published to CDN
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        def public?
+          if @public.nil?
+            @public ||= (key && public_url) ? true : false
+          end
+          @public
         end
-
+        
+        # Reload directory with latest data from Cloud Files
+        # @return [Fog::Storage::Rackspace::Directory] returns itself
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        def reload
+          @public = nil
+          @urls = nil
+          @files = nil
+          super
+        end
+        
+        # Returns the public url for the directory.
+        # If the directory has not been published to the CDN, this method will return nil as it is not publically accessible. This method will return the approprate
+        # url in the following order:
+        #
+        # 1. If the service used to access this directory was created with the option :rackspace_cdn_ssl => true, this method will return the SSL-secured URL.
+        # 2. If the cdn_cname attribute is populated this method will return the cname.
+        # 3. return the default CDN url.
+        #
+        # @return [String] public url for directory
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
         def public_url
-          requires :key
-          @public_url ||= begin
-            begin response = service.cdn.head_container(key)
-              if response.headers['X-Cdn-Enabled'] == 'True'
-                if service.rackspace_cdn_ssl == true
-                  response.headers['X-Cdn-Ssl-Uri']
-                else
-                  cdn_cname || response.headers['X-Cdn-Uri']
-                end
-              end
-            rescue Fog::Service::NotFound
-              nil
-            end
-          end
+          return nil if urls.empty?
+          return urls[:ssl_uri] if service.ssl?
+          cdn_cname || urls[:uri]
+        end
+        
+        # URL used to stream video to iOS devices. Cloud Files will auto convert to the approprate format.
+        # @return [String] iOS URL
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/iOS-Streaming-d1f3725.html
+        def ios_url
+          urls[:ios_uri]
+        end
+        
+        # URL used to stream resources
+        # @return [String] streaming url
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Streaming-CDN-Enabled_Containers-d1f3721.html
+        def streaming_url
+          urls[:streaming_uri]
         end
 
+        # Create or update directory and associated metadata
+        # @return [Boolean] returns true if directory was saved
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @note If public attribute is true, directory will be CDN enabled
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_Container-d1e1694.html
         def save
           requires :key
-          service.put_container(key)
-
-          if service.cdn && @public
-            # if public and CDN connection then update cdn to public
-            uri_header = 'X-CDN-URI'
-            if service.rackspace_cdn_ssl == true
-              uri_header = 'X-CDN-SSL-URI'
-            end
-            @public_url = service.cdn.put_container(key, 'X-CDN-Enabled' => 'True').headers[uri_header]
-          elsif service.cdn && !@public
-            service.cdn.put_container(key, 'X-CDN-Enabled' => 'False')
-            @public_url = nil
-          elsif !service.cdn && @public
-            # if public but no CDN connection then error
-            raise(Fog::Storage::Rackspace::Error.new("Directory can not be set as :public without a CDN provided"))
-          end
+          create_or_update_container
+          raise Fog::Storage::Rackspace::Error.new("Directory can not be set as :public without a CDN provided") if public? && !cdn_enabled?
+          @urls = service.cdn.publish_container(self, public?)
           true
         end
-
+        
+        private
+        
+        def cdn_enabled?
+          service.cdn && service.cdn.enabled?
+        end
+        
+        def urls
+          requires :key          
+          return {} unless cdn_enabled?
+          @urls ||= service.cdn.urls(self)
+        end
+           
+        def create_or_update_container
+          headers = attributes[:metadata].nil? ? {} : metadata.to_headers           
+          service.put_container(key, headers)        
+        end
       end
-
     end
   end
 end

data/lib/fog/rackspace/models/storage/file.rb

@@ -6,15 +6,59 @@ module Fog
 
       class File < Fog::Model
 
+        # @!attribute [r] key
+        # @return [String] The name of the file
         identity  :key,             :aliases => 'name'
 
+        # @!attribute [r] content_length
+        # @return [Integer] The content length of the file
         attribute :content_length,  :aliases => ['bytes', 'Content-Length'], :type => :integer
+
+        # @!attribute [rw] content_type
+        # @return [String] The MIME Media Type of the file
+        # @see http://www.iana.org/assignments/media-types
         attribute :content_type,    :aliases => ['content_type', 'Content-Type']
+
+        attribute :content_disposition, :aliases => 'Content-Disposition'
+
+        # @!attribute [rw] etag
+        # The MD5 checksum of file. If included file creation request, will ensure integrity of the file.
+        # @return [String] MD5 checksum of file.
         attribute :etag,            :aliases => ['hash', 'Etag']
+
+        # @!attribute [r] last_modified
+        # The last time the file was modified
+        # @return [Time] The last time the file was modified
         attribute :last_modified,   :aliases => ['last_modified', 'Last-Modified'], :type => :time
+
+        # @!attribute [rw] access_control_allow_origin
+        # A space delimited list of URLs allowed to  make Cross Origin Requests. Format is http://www.example.com. An asterisk (*) allows all.
+        # @return [String] string containing a list of space delimited URLs
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/CORS_Container_Header-d1e1300.html
         attribute :access_control_allow_origin, :aliases => ['Access-Control-Allow-Origin']
+        
+        # @!attribute [rw] origin
+        # @return [String] The origin is the URI of the object's host.
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/CORS_Container_Header-d1e1300.html
         attribute :origin,          :aliases => ['Origin']
 
+        # @!attribute [r] directory
+        # @return [Fog::Storage::Rackspace::Directory] directory containing file
+        attr_accessor :directory
+
+        # @!attribute [w] public
+        # @note Required for compatibility with other Fog providers. Not Used.
+        attr_writer :public
+
+        # Returns the body/contents of file
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @example Retrieve and download contents of Cloud Files object to file system
+        #   file_object = directory.files.get('germany.jpg')
+        #   File.open('germany.jpg', 'w') {|f| f.write(file_object.body) }
+        # @see Fog::Storage::Rackspace::Files#get
         def body
           attributes[:body] ||= if last_modified
             collection.get(identity).body
@@ -23,14 +67,21 @@ module Fog
           end
         end
 
+        # Sets the body/contents of file
+        # @param [String,File] new_body contents of file
         def body=(new_body)
           attributes[:body] = new_body
         end
 
-        def directory
-          @directory
-        end
-
+        # Copy file to another directory or directory
+        # @param [String] target_directory_key
+        # @param [String] target_file_key
+        # @param options [Hash] used to pass in file attributes
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Copy_Object-d1e2241.html
         def copy(target_directory_key, target_file_key, options={})
           requires :directory, :key
           options['Content-Type'] ||= content_type if content_type
@@ -41,16 +92,37 @@ module Fog
           target_directory.files.get(target_file_key)
         end
 
+        # Destroy the file
+        # @return [Boolean] returns true if file is destroyed
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Delete_Object-d1e2264.html
         def destroy
           requires :directory, :key
           service.delete_object(directory.key, key)
           true
         end
 
+        # Set file metadata
+        # @param [Hash,Fog::Storage::Rackspace::Metadata] hash contains key value pairs
+        def metadata=(hash)
+          if hash.is_a? Fog::Storage::Rackspace::Metadata
+            attributes[:metadata] = hash
+          else
+            attributes[:metadata] = Fog::Storage::Rackspace::Metadata.new(self, hash)
+          end
+          attributes[:metadata]
+        end
+        
+        # File metadata
+        # @return [Fog::Storage::Rackspace::Metadata] metadata key value pairs.
         def metadata
-          @metadata ||= headers_to_metadata
+          attributes[:metadata] ||= Fog::Storage::Rackspace::Metadata.new(self)
         end
-
+        
+        # Required for compatibility with other Fog providers. Not Used.
         def owner=(new_owner)
           if new_owner
             attributes[:owner] = {
@@ -60,26 +132,107 @@ module Fog
           end
         end
 
-        def public=(new_public)
-          new_public
+        # Set last modified
+        # @param [String, Fog::Time] timestamp
+        def last_modified=(obj)
+          if obj.nil? || obj == "" || obj.is_a?(Time)
+            attributes[:last_modified] = obj
+            return obj
+          end
+
+          # This is a work around for swift bug that has existed for 4+ years. The is that fixing the swift bug would cause more problems than its worth.
+          # For more information refer to https://github.com/fog/fog/pull/1811
+          d = Date._strptime(obj,"%Y-%m-%dT%H:%M:%S")
+          if d
+            attributes[:last_modified] = Time.utc(d[:year], d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:leftover], d[:zone])
+          else
+            attributes[:last_modified] = Time.parse(obj)
+          end
         end
 
+        # Is file published to CDN
+        # @return [Boolean] return true if published to CDN
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        def public?
+          directory.public?
+        end
+        
+        # Returns the public url for the file.
+        # If the file has not been published to the CDN, this method will return nil as it is not publically accessible. This method will return the approprate
+        # url in the following order:
+        #
+        # 1. If the service used to access this file was created with the option :rackspace_cdn_ssl => true, this method will return the SSL-secured URL.
+        # 2. If the directory's cdn_cname attribute is populated this method will return the cname.
+        # 3. return the default CDN url.
+        #
+        # @return [String] public url for file
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
         def public_url
-          requires :key
-          self.collection.get_url(self.key)
+          Files::file_url directory.public_url, key
+        end
+        
+        # URL used to stream video to iOS devices without needing to convert your video
+        # @return [String] iOS URL
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/iOS-Streaming-d1f3725.html
+        def ios_url
+          Files::file_url directory.ios_url, key
+        end
+        
+        # URL used to stream resources
+        # @return [String] streaming url
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Streaming-CDN-Enabled_Containers-d1f3721.html
+        def streaming_url
+          Files::file_url directory.streaming_url, key
+        end      
+        
+        # Immediately purge file from the CDN network
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @note You may only PURGE up to 25 objects per day. Any attempt to purge more than this will result in a 498 status code error (Rate Limited).
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Purge_CDN-Enabled_Objects-d1e3858.html
+        def purge_from_cdn
+          if public?
+            service.cdn.purge(self)
+          else
+            false
+          end
         end
 
+        # Create or updates file and associated metadata
+        # @param options [Hash] additional parameters to pass to Cloud Files
+        # @raise [Fog::Storage::Rackspace::NotFound] - HTTP 404
+        # @raise [Fog::Storage::Rackspace::BadRequest] - HTTP 400
+        # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
+        # @raise [Fog::Storage::Rackspace::ServiceError]
+        # @see http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_Update_Object-d1e1965.html
         def save(options = {})
           requires :body, :directory, :key
           options['Content-Type'] = content_type if content_type
           options['Access-Control-Allow-Origin'] = access_control_allow_origin if access_control_allow_origin
           options['Origin'] = origin if origin
-          options.merge!(metadata_to_headers)
+          options['Content-Disposition'] = content_disposition if content_disposition
+          options['Etag'] = etag if etag
+          options.merge!(metadata.to_headers)
 
           data = service.put_object(directory.key, key, body, options)
           update_attributes_from(data)
-          refresh_metadata
-
+          
           self.content_length = Fog::Storage.get_body_size(body)
           self.content_type ||= Fog::Storage.get_content_type(body)
           true
@@ -87,59 +240,6 @@ module Fog
 
         private
 
-        def directory=(new_directory)
-          @directory = new_directory
-        end
-
-        def refresh_metadata
-          metadata.reject! {|k, v| v.nil? }
-        end
-
-        def headers_to_metadata
-          key_map = key_mapping
-          Hash[metadata_attributes.map {|k, v| [key_map[k], v] }]
-        end
-
-        def key_mapping
-          key_map = metadata_attributes
-          key_map.each_pair {|k, v| key_map[k] = header_to_key(k)}
-        end
-
-        def header_to_key(opt)
-          opt.gsub(metadata_prefix, '').split('-').map {|k| k[0, 1].downcase + k[1..-1]}.join('_').to_sym
-        end
-
-        def metadata_to_headers
-          header_map = header_mapping
-          Hash[metadata.map {|k, v| [header_map[k], v] }]
-        end
-
-        def header_mapping
-          header_map = metadata.dup
-          header_map.each_pair {|k, v| header_map[k] = key_to_header(k)}
-        end
-
-        def key_to_header(key)
-          metadata_prefix + key.to_s.split(/[-_]/).map(&:capitalize).join('-')
-        end
-
-        def metadata_attributes
-          if last_modified
-            headers = service.head_object(directory.key, self.key).headers
-            headers.reject! {|k, v| !metadata_attribute?(k)}
-          else
-            {}
-          end
-        end
-
-        def metadata_attribute?(key)
-          key.to_s =~ /^#{metadata_prefix}/
-        end
-
-        def metadata_prefix
-          "X-Object-Meta-"
-        end
-
         def update_attributes_from(data)
           merge_attributes(data.headers.reject {|key, value| ['Content-Length', 'Content-Type'].include?(key)})
         end