aws-sdk 1.6.5 → 1.6.6

data/lib/aws/s3/bucket_lifecycle_configuration.rb

@@ -11,7 +11,7 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'builder'
+require 'nokogiri'
 require 'uuidtools'
 
 module AWS

data/lib/aws/s3/bucket_tag_collection.rb

@@ -0,0 +1,109 @@
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+module AWS
+  class S3
+
+    # Manages tags for a single S3 {Bucket}.
+    #
+    # @example Setting a tag.
+    #
+    #   bucket.tags['key'] = 'value'
+    #
+    # @exapmle Getting a tag.
+    #
+    #   bucket.tags['key']
+    #   #=> 'value'
+    #
+    # @example Getting all tags
+    #
+    #   bucket.tags.to_h
+    #   #=> { 'key' => 'value', ... }
+    #
+    # @example Removing all tags
+    #
+    #   bucket.tags.clear
+    #
+    class BucketTagCollection
+
+      include Core::Model
+
+      # @param [Bucket] bucket
+      # @param [Hash] options
+      def initialize bucket, options = {}
+        @bucket = bucket
+        super
+      end
+
+      # @return [Bucket]
+      attr_reader :bucket
+
+      # @param [String] key
+      # @return [String,nil] Returns the tag for the given key.  If there
+      #    Returns +nil+ if the key does not exist.
+      def [] key
+        self.to_h[key]
+      end
+
+      # @param [String] key
+      # @param [String] value
+      def []= key, value
+        self.set(self.to_h.merge(key => value))
+      end
+
+      # @param [Hash<String,String>] tags A hash of tag keys and values.
+      # @return [nil]
+      def set tags
+        if tags.nil? or tags.empty?
+          self.clear
+        else
+          client.put_bucket_tagging(:bucket_name => bucket.name, :tags => tags)
+        end
+        nil
+      end
+
+      # Removes all tags from the bucket.
+      #
+      #   bucket.tags.clear
+      #   bucket.tags.to_h #=> {}
+      #
+      # @return [nil]
+      def clear
+        client.delete_bucket_tagging(:bucket_name => bucket.name)
+        nil
+      end
+
+      # @return [Hash]
+      def to_h
+        client.get_bucket_tagging(:bucket_name => bucket.name).data[:tags]
+      rescue AWS::S3::Errors::NoSuchTagSet
+        {}
+      end
+      alias_method :to_hash, :to_h
+
+      # @param [Hash] other
+      # @return [Boolean] Returns +true+ if the tags for this bucket match
+      #   the passed hash.
+      def eql? other
+        self.to_h == other
+      end
+      alias_method :==, :eql?
+
+      # @private
+      def inspect
+        self.to_h.inspect
+      end
+
+    end
+  end
+end

data/lib/aws/s3/client.rb

@@ -16,6 +16,7 @@ require 'pathname'
 require 'stringio'
 require 'json'
 require 'digest/md5'
+require 'nokogiri'
 
 module AWS
   class S3
@@ -166,10 +167,9 @@ module AWS
 
         configure_request do |req, options|
           xml = options[:lifecycle_configuration]
-          md5 = Base64.encode64(Digest::MD5.digest(xml)).strip
           req.add_param('lifecycle')
           req.body = xml
-          req.headers['content-md5'] = md5
+          req.headers['content-md5'] = md5(xml)
           super(req, options)
         end
 
@@ -206,6 +206,166 @@ module AWS
 
       end
 
+      # @overload put_bucket_cors(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,Array<Hash>] :rules An array of rule hashes.
+      #     * +:id+ - (String) A unique identifier for the rule. The ID
+      #       value can be up to 255 characters long. The IDs help you find
+      #       a rule in the configuration.
+      #     * +:allowed_methods+ - (required,Array<String>) A list of HTTP
+      #       methods that you want to allow the origin to execute.
+      #       Each rule must identify at least one method.
+      #     * +:allowed_origins+ - (required,Array<String>) A list of origins
+      #       you want to allow cross-domain requests from. This can
+      #       contain at most one * wild character.
+      #     * +:allowed_headers+ - (Array<String>) A list of headers allowed
+      #       in a pre-flight OPTIONS request via the
+      #       Access-Control-Request-Headers header. Each header name
+      #       specified in the Access-Control-Request-Headers header must
+      #       have a corresponding entry in the rule.
+      #       Amazon S3 will send only the allowed headers in a response
+      #       that were requested. This can contain at most one * wild
+      #       character.
+      #     * +:max_age_seconds+ - (Integer) The time in seconds that your
+      #       browser is to cache the preflight response for the specified
+      #       resource.
+      #     * +:expose_headers+ - (Array<String>) One or more headers in
+      #       the response that you want customers to be able to access
+      #       from their applications (for example, from a JavaScript
+      #       XMLHttpRequest object).
+      #   @return [Core::Response]
+      bucket_method(:put_bucket_cors, :put) do
+        configure_request do |req, options|
+
+          req.add_param('cors')
+
+          xml = Nokogiri::XML::Builder.new do |xml|
+            xml.CORSConfiguration do
+              options[:rules].each do |rule|
+                xml.CORSRule do
+
+                  xml.ID(rule[:id]) if rule[:id]
+
+                  (rule[:allowed_methods] || []).each do |method|
+                    xml.AllowedMethod(method)
+                  end
+
+                  (rule[:allowed_origins] || []).each do |origin|
+                    xml.AllowedOrigin(origin)
+                  end
+
+                  (rule[:allowed_headers] || []).each do |header|
+                    xml.AllowedHeader(header)
+                  end
+
+                  xml.MaxAgeSeconds(rule[:max_age_seconds]) if
+                    rule[:max_age_seconds]
+
+                  (rule[:expose_headers] || []).each do |header|
+                    xml.ExposeHeader(header)
+                  end
+
+                end
+              end
+            end
+          end.doc.root.to_xml
+
+          req.body = xml
+          req.headers['content-md5'] = md5(xml)
+
+          super(req, options)
+
+        end
+      end
+
+      # @overload get_bucket_cors(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
+      bucket_method(:get_bucket_cors, :get) do
+
+        configure_request do |req, options|
+          req.add_param('cors')
+          super(req, options)
+        end
+
+        process_response do |resp|
+          resp.data = XML::GetBucketCors.parse(resp.http_response.body)
+        end
+
+      end
+
+      # @overload delete_bucket_cors(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
+      bucket_method(:delete_bucket_cors, :delete) do
+        configure_request do |req, options|
+          req.add_param('cors')
+          super(req, options)
+        end
+      end
+
+      # @overload put_bucket_tagging(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [Hash] :tags
+      #   @return [Core::Response]
+      bucket_method(:put_bucket_tagging, :put) do
+        configure_request do |req, options|
+
+          req.add_param('tagging')
+
+          xml = Nokogiri::XML::Builder.new
+          xml.Tagging do |xml|
+            xml.TagSet do
+              options[:tags].each_pair do |key,value|
+                xml.Tag do
+                  xml.Key(key)
+                  xml.Value(value)
+                end
+              end
+            end
+          end
+
+          xml = xml.doc.root.to_xml
+          req.body = xml
+          req.headers['content-md5'] = md5(xml)
+
+          super(req, options)
+
+        end
+      end
+
+      # @overload get_bucket_tagging(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
+      bucket_method(:get_bucket_tagging, :get) do
+
+        configure_request do |req, options|
+          req.add_param('tagging')
+          super(req, options)
+        end
+
+        process_response do |resp|
+          resp.data = XML::GetBucketTagging.parse(resp.http_response.body)
+        end
+
+      end
+
+      # @overload delete_bucket_tagging(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
+      bucket_method(:delete_bucket_tagging, :delete) do
+        configure_request do |req, options|
+          req.add_param('tagging')
+          super(req, options)
+        end
+      end
+
       # @overload list_buckets(options = {})
       #   @param [Hash] options
       #   @return [Core::Response]
@@ -929,10 +1089,7 @@ module AWS
           xml << "<Delete><Quiet>#{quiet}</Quiet>#{objects}</Delete>"
 
           req.body = xml
-
-          md5 = Base64.encode64(Digest::MD5.digest(xml)).strip
-
-          req.headers['content-md5'] = md5
+          req.headers['content-md5'] = md5(xml)
 
         end
       end
@@ -1192,6 +1349,10 @@ module AWS
         end
       end
 
+      def md5 str
+        Base64.encode64(Digest::MD5.digest(str)).strip
+      end
+
       module Validators
 
         # @return [Boolean] Returns true if the given bucket name is valid.

data/lib/aws/s3/client/xml.rb

@@ -164,13 +164,49 @@ module AWS
         GetBucketLifecycleConfiguration = BaseGrammar.customize do
           element("Rule") do
             list
-            rename(:rules)  
+            rename(:rules)
             element("Expiration") do
               element("Days") { integer_value }
             end
           end
         end
 
+        GetBucketCors = BaseGrammar.customize do
+          element "CORSRule" do
+            list
+            rename :rules
+            element "AllowedMethod" do
+              list
+              rename :allowed_methods
+            end
+            element "AllowedOrigin" do
+              list
+              rename :allowed_origins
+            end
+            element "AllowedHeader" do
+              list
+              rename :allowed_headers
+            end
+            element "MaxAgeSeconds" do
+              integer
+            end
+            element "ExposeHeader" do
+              list
+              rename :expose_headers
+            end
+          end
+        end
+
+        GetBucketTagging = BaseGrammar.customize do
+          element "TagSet" do
+            ignore
+            element "Tag" do
+              map_entry("Key", "Value")
+              rename :tags
+            end
+          end
+        end
+
       end
     end
   end

data/lib/aws/s3/config.rb

@@ -29,6 +29,8 @@ AWS::Core::Configuration.module_eval do
 
   add_option :s3_encryption_materials_location, :metadata
 
+  add_option :s3_encryption_matdesc, '{}'
+
   add_option :s3_storage_class, 'STANDARD'
 
 end

data/lib/aws/s3/cors_rule.rb

@@ -0,0 +1,106 @@
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+module AWS
+  class S3
+
+    # Represents a single CORS rule for an S3 {Bucket}.
+    #
+    #   rule = bucket.cors.first
+    #   rule.allowed_methods #=> ['GET', 'HEAD']
+    #   rule.allowed_origins #=> ['*']
+    #
+    # @see CORSRuleCollection
+    class CORSRule
+
+      # @param [Hash] options A hash of the rule details.
+      #
+      # @option options [String] :id A unique identifier for the rule. The ID
+      #   value can be up to 255 characters long. The IDs help you find
+      #   a rule in the configuration.
+      #
+      # @option options [required,Array<String>] :allowed_methods A list of HTTP
+      #   methods that you want to allow the origin to execute.
+      #   Each rule must identify at least one method.
+      #
+      # @option options [required,Array<String>] :allowed_origins A list of
+      #   origins you want to allow cross-domain requests from. This can
+      #   contain at most one * wild character.
+      #
+      # @option options [Array<String>] :allowed_headers A list of headers
+      #   allowed in a pre-flight OPTIONS request via the
+      #   Access-Control-Request-Headers header. Each header name
+      #   specified in the Access-Control-Request-Headers header must
+      #   have a corresponding entry in the rule.
+      #
+      #   Amazon S3 will send only the allowed headers in a response
+      #   that were requested. This can contain at most one '*' wild
+      #   character.
+      #
+      # @option options [Array<String>] :max_age_seconds The time in
+      #   seconds that your browser is to cache the pre-flight response for
+      #   the specified resource.
+      #
+      # @option options [Array<String>] :expose_headers One or more headers in
+      #    the response that you want customers to be able to access
+      #    from their applications (for example, from a JavaScript
+      #    XMLHttpRequest object).
+      #
+      def initialize options = {}
+        @id = options[:id]
+        @allowed_methods = options[:allowed_methods] || []
+        @allowed_origins = options[:allowed_origins] || []
+        @allowed_headers = options[:allowed_headers] || []
+        @max_age_seconds = options[:max_age_seconds]
+        @expose_headers = options[:expose_headers] || []
+      end
+
+      # @return [String,nil] A user supplied unique identifier for this role.
+      #   Set this when you set or add roles via {CORSRuleCollection}.
+      attr_reader :id
+
+      # @return [Array<String>] A list of HTTP methods (GET, POST, etc) this
+      #   role authorizes.
+      attr_reader :allowed_methods
+
+      # @return [Array<String>] The list of origins allowed to make
+      #   cross-domain requests to the bucket.
+      attr_reader :allowed_origins
+
+      # @return [Array<String>] A list of headers allowed in the pre-flight
+      #   OPTIONS request.
+      attr_reader :allowed_headers
+
+      # @return [Integer,nil] The time in seconds the browser may cache the
+      #   pre-flight response.
+      attr_reader :max_age_seconds
+
+      # @return [Array<String>] The headers that may be accessed cross-domain.
+      attr_reader :expose_headers
+
+      # @return [Hash]
+      def to_h
+        h = {}
+        h[:id] = id if id
+        h[:allowed_methods] = allowed_methods
+        h[:allowed_origins] = allowed_origins
+        h[:allowed_headers] = allowed_headers unless allowed_headers.empty?
+        h[:max_age_seconds] = max_age_seconds if max_age_seconds
+        h[:expose_headers] = expose_headers unless expose_headers.empty?
+        h
+      end
+
+    end
+
+  end
+end