fog 0.3.13 → 0.3.14

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

@@ -39,17 +39,9 @@ module Fog
 
         def copy(target_directory_key, target_file_key)
           requires :directory, :key
-          data = connection.copy_object(directory.key, @key, target_directory_key, target_file_key).body
+          connection.copy_object(directory.key, @key, target_directory_key, target_file_key)
           target_directory = connection.directories.new(:key => target_directory_key)
-          target_file = target_directory.files.new(attributes.merge!(:key => target_file_key))
-          copy_data = {}
-          for key, value in data
-            if ['ETag', 'LastModified'].include?(key)
-              copy_data[key] = value
-            end
-          end
-          target_file.merge_attributes(copy_data)
-          target_file
+          target_directory.files.get(target_file_key)
         end
 
         def destroy
@@ -70,8 +62,14 @@ module Fog
 
         def save(options = {})
           requires :body, :directory, :key
+          if options != {}
+            Formatador.display_line("[yellow][WARN] options param is deprecated, use acl= instead[/] [light_black](#{caller.first})[/]")
+          end
           if @acl
-            options['x-amz-acl'] = @acl
+            options['x-amz-acl'] ||= @acl
+          end
+          if content_type
+            options['Content-Type'] = content_type
           end
           data = connection.put_object(directory.key, @key, @body, options)
           @etag = data.headers['ETag']

data/lib/fog/aws/parsers/cdn/distribution.rb

@@ -0,0 +1,44 @@
+module Fog
+  module Parsers
+    module AWS
+      module CDN
+
+        class Distribution < Fog::Parsers::Base
+
+          def reset
+            @response = { 'DistributionConfig' => { 'CNAME' => [], 'Logging' => {}, 'TrustedSigners' => [] } }
+          end
+
+          def end_element(name)
+            case name
+            when 'AwsAccountNumber'
+              @response['DistributionConfig']['TrustedSigners'] << @value
+            when 'Bucket', 'Prefix'
+              @response['DistributionConfig']['Logging'][name] = @value
+            when 'CNAME'
+              @response['DistributionConfig']['CNAME'] << @value
+            when 'DomainName', 'Id', 'Status'
+              @response[name] = @value
+            when 'CallerReference', 'Comment', 'DefaultRootObject', 'Origin', 'OriginAccessIdentity'
+              @response['DistributionConfig'][name] << @value
+            when 'Enabled'
+              if @value == 'true'
+                @response['DistributionConfig'][name] = true
+              else
+                @response['DistributionConfig'][name] = false
+              end
+            when 'LastModifiedTime'
+              @response[name] = Time.parse(@value)
+            when 'Protocol'
+              @response['DistributionConfig']['RequireProtocols'] = @value
+            when 'Self'
+              @response['DistributionConfig']['TrustedSigners'] << 'Self'
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cdn/get_distribution_list.rb

@@ -0,0 +1,48 @@
+module Fog
+  module Parsers
+    module AWS
+      module CDN
+
+        class GetDistributionList < Fog::Parsers::Base
+
+          def reset
+            @distribution_summary = { 'CNAME' => [], 'TrustedSigners' => [] }
+            @response = { 'DistributionSummary' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'DistributionSummary'
+              @response['DistributionSummary'] << @distribution_summary
+              @distribution_summary = { 'CNAME' => [], 'TrustedSigners' => [] }
+            when 'Comment', 'DomainName', 'Id', 'Origin', 'Status'
+              @distribution_summary[name] = @value
+            when 'CNAME'
+              @distribution_summary[name] << @value
+            when 'Enabled'
+              if @value == 'true'
+                @distribution_summary[name] = true
+              else
+                @distribution_summary[name] = false
+              end
+            when 'LastModifiedTime'
+              @distribution_summary[name] = Time.parse(@value)
+            when 'IsTruncated'
+              if @value == 'true'
+                @response[name] = true
+              else
+                @response[name] = false
+              end
+            when 'Marker', 'NextMarker'
+              @response[name] = @value
+            when 'MaxItems'
+              @response[name] = @value.to_i
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/cdn/post_invalidation.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Parsers
+    module AWS
+      module CDN
+
+        class PostInvalidation < Fog::Parsers::Base
+
+          def reset
+            @response = { 'InvalidationBatch' => { 'Path' => [] } }
+          end
+
+          def end_element(name)
+            case name
+            when 'CallerReference'
+              @response['InvalidationBatch'][name] = @value
+            when 'CreateTime', 'Id', 'Status'
+              @response[name] = @value
+            when 'Path'
+              @response['InvalidationBatch'][name] << @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/iam/basic.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Parsers
+    module AWS
+      module IAM
+
+        class Basic < Fog::Parsers::Base
+
+          def end_element(name)
+            case name
+            when 'requestId'
+              @response[name] = @value
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/iam/create_group.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module AWS
+      module IAM
+
+        class CreateGroups < Fog::Parsers::Base
+
+          def reset
+            @response = { 'Group' => {} }
+          end
+
+          def end_element(name)
+            case name
+            when 'Arn', 'GroupId', 'GroupName', 'Path'
+              @response['Group'][name] = @value
+            when 'RequestId'
+              response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/iam/list_groups.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Parsers
+    module AWS
+      module IAM
+
+        class ListGroups < Fog::Parsers::Base
+
+          def reset
+            @group = {}
+            @response = { 'Groups' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'Arn', 'GroupId', 'GroupName', 'Path'
+              @group[name] = @value
+            when 'member'
+              @response['Groups'] << @group
+              @group = {}
+            when 'IsTruncated'
+              response[name] = (@value == 'true')
+            when 'RequestId'
+              response[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/cdn/delete_distribution.rb

@@ -0,0 +1,36 @@
+module Fog
+  module AWS
+    class CDN
+      class Real
+
+        # Delete a distribution from CloudFront
+        #
+        # ==== Parameters
+        # * distribution_id<~String> - Id of distribution to delete
+        # * etag<~String> - etag of that distribution from earlier get or put
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/DeleteDistribution.html
+
+        def delete_distribution(distribution_id, etag)
+          request({
+            :expects    => 204,
+            :headers    => { 'If-Match' => etag },
+            :idempotent => true,
+            :method     => 'DELETE',
+            :path       => "/distribution/#{distribution_id}"
+          })
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def delete_distribution(distribution_id, etag)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/cdn/get_distribution.rb

@@ -0,0 +1,55 @@
+module Fog
+  module AWS
+    class CDN
+      class Real
+
+        require 'fog/aws/parsers/cdn/distribution'
+
+        # Get information about a distribution from CloudFront
+        #
+        # ==== Parameters
+        # * distribution_id<~String> - id of distribution
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'DomainName'<~String>: Domain name of distribution
+        #     * 'Id'<~String> - Id of distribution
+        #     * 'LastModifiedTime'<~String> - Timestamp of last modification of distribution
+        #     * 'Status'<~String> - Status of distribution
+        #     * 'DistributionConfig'<~Array>:
+        #       * 'CallerReference'<~String> - Used to prevent replay, defaults to Time.now.to_i.to_s
+        #       * 'CNAME'<~Array> - array of associated cnames
+        #       * 'Comment'<~String> - comment associated with distribution
+        #       * 'Enabled'<~Boolean> - whether or not distribution is enabled
+        #       * 'Logging'<~Hash>:
+        #         * 'Bucket'<~String> - bucket logs are stored in
+        #         * 'Prefix'<~String> - prefix logs are stored with
+        #       * 'Origin'<~String> - s3 origin bucket
+        #       * 'TrustedSigners'<~Array> - trusted signers
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/GetDistribution.html
+
+        def get_distribution(distribution_id)
+          request({
+            :expects    => 200,
+            :idempotent => true,
+            :method     => 'GET',
+            :parser     => Fog::Parsers::AWS::CDN::Distribution.new,
+            :path       => "/distribution/#{distribution_id}"
+          })
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def get_distribution(distribution_id)
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/cdn/get_distribution_list.rb

@@ -0,0 +1,59 @@
+module Fog
+  module AWS
+    class CDN
+      class Real
+
+        require 'fog/aws/parsers/cdn/get_distribution_list'
+
+        # List information about distributions in CloudFront
+        #
+        # ==== Parameters
+        # * options<~Hash> - config arguments for list.  Defaults to {}.
+        #   * 'Marker'<~String> - limits object keys to only those that appear
+        #     lexicographically after its value.
+        #   * 'MaxItems'<~Integer> - limits number of object keys returned
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'IsTruncated'<~Boolean> - Whether or not the listing is truncated
+        #     * 'Marker'<~String> - Marker specified for query
+        #     * 'MaxItems'<~Integer> - Maximum number of keys specified for query
+        #     * 'NextMarker'<~String> - Marker to specify for next page (id of last result of current page)
+        #     * 'DistributionSummary'<~Array>:
+        #       * 'Comment'<~String> - comment associated with distribution
+        #       * 'CNAME'<~Array> - array of associated cnames
+        #       * 'DomainName'<~String> - Domain name of distribution
+        #       * 'Enabled'<~Boolean> - whether or not distribution is enabled
+        #       * 'Id'<~String> - Id of distribution
+        #       * 'LastModifiedTime'<~String> - Timestamp of last modification of distribution
+        #       * 'Origin'<~String> - s3 origin bucket
+        #       * 'Status'<~String> - Status of distribution
+        #       * 'TrustedSigners'<~Array> - trusted signers
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/ListDistributions.html
+
+        def get_distribution_list(options = {})
+          request({
+            :expects    => 200,
+            :idempotent => true,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::AWS::CDN::GetDistributionList.new,
+            :path       => "/distribution",
+            :query      => options
+          })
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def get_distribution_list(options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/cdn/post_distribution.rb

@@ -0,0 +1,88 @@
+module Fog
+  module AWS
+    class CDN
+      class Real
+
+        require 'fog/aws/parsers/cdn/distribution'
+
+        # create a new distribution in CloudFront
+        #
+        # ==== Parameters
+        # * origin<~String> - s3 bucket, ie 'mybucket.s3.amazonaws.com'
+        # * config<~Hash> - config for distribution.  Defaults to {}.
+        #   * 'CallerReference'<~String> - Used to prevent replay, defaults to Time.now.to_i.to_s
+        #   * 'Comment'<~String> - Optional comment about distribution
+        #   * 'CNAME'<~Array> - Optional array of strings to set as CNAMEs
+        #   * 'DefaultRootObject'<~String> - Optional default object to return for '/'
+        #   * 'Enabled'<~Boolean> - Whether or not distribution should accept requests, defaults to true
+        #   * 'Logging'<~Hash>: Optional logging config
+        #     * 'Bucket'<~String> - Bucket to store logs in, ie 'mylogs.s3.amazonaws.com'
+        #     * 'Prefix'<~String> - Optional prefix for log filenames, ie 'myprefix/'
+        #   * 'OriginAccessIdentity'<~String> - Used for serving private content, in format 'origin-access-identity/cloudfront/ID'
+        #   * 'RequiredProtocols'<~String> - Optional, set to 'https' to force https connections
+        #   * 'TrustedSigners'<~Array> - Optional grant of rights to up to 5 aws accounts to generate signed URLs for private content, elements are either 'Self' for your own account or an AWS Account Number
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'DomainName'<~String>: Domain name of distribution
+        #     * 'Id'<~String> - Id of distribution
+        #     * 'LastModifiedTime'<~String> - Timestamp of last modification of distribution
+        #     * 'Status'<~String> - Status of distribution
+        #     * 'DistributionConfig'<~Array>:
+        #       * 'CallerReference'<~String> - Used to prevent replay, defaults to Time.now.to_i.to_s
+        #       * 'CNAME'<~Array> - array of associated cnames
+        #       * 'Comment'<~String> - comment associated with distribution
+        #       * 'Enabled'<~Boolean> - whether or not distribution is enabled
+        #       * 'Logging'<~Hash>:
+        #         * 'Bucket'<~String> - bucket logs are stored in
+        #         * 'Prefix'<~String> - prefix logs are stored with
+        #       * 'Origin'<~String> - s3 origin bucket
+        #       * 'TrustedSigners'<~Array> - trusted signers
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonCloudFront/latest/APIReference/CreateDistribution.html
+
+        def post_distribution(origin, options = {})
+          data = '<?xml version="1.0" encoding="UTF-8"?>'
+          data << "<DistributionConfig xmlns=\"http://cloudfront.amazonaws.com/doc/#{@version}/\">"
+          for key, value in options
+            case value
+            when Array
+              for item in array
+                data << "<#{key}>#{item}</#{key}>"
+              end
+            when Hash
+              data << "<#{key}>"
+              for inner_key, inner_value in value
+                data << "<#{inner_key}>#{inner_value}</#{inner_key}>"
+              end
+              data << "</#{key}>"
+            else
+              data << "<#{key}>#{value}</#{key}>"
+            end
+          end
+          data << "</DistributionConfig>"
+          request({
+            :body       => data,
+            :expects    => 201,
+            :headers    => { 'Content-Type' => 'text/xml' },
+            :idempotent => true,
+            :method     => 'POST',
+            :parser     => Fog::Parsers::AWS::CDN::Distribution.new,
+            :path       => "/distribution"
+          })
+        end
+
+      end
+
+      class Mock # :nodoc:all
+
+        def post_distribution(origin, options = {})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end