aws-sdk 1.3.2 → 1.3.3

data/lib/aws/s3/client.rb

@@ -152,6 +152,45 @@ module AWS
       # * +:bucket_name+ -- The name of the bucket.
       bucket_method(:delete_bucket, :delete)
 
+      bucket_method(:set_bucket_lifecycle_configuration, :put) do
+
+        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
+          super(req, options)
+        end
+
+      end
+
+      bucket_method(:get_bucket_lifecycle_configuration, :get) do
+
+        configure_request do |req, options|
+          req.add_param('lifecycle')
+          super(req, options)
+        end
+
+        process_response do |resp|
+          xml = resp.http_response.body
+          data = XML::GetBucketLifecycleConfiguration.parse(xml)
+          Core::MetaUtils.extend_method(resp, :data) { ResponseData.new(data) }
+        end
+
+      end
+
+      bucket_method(:delete_bucket_lifecycle_configuration, :delete) do
+        
+        configure_request do |req, options|
+          req.add_param('lifecycle')
+          super(req, options)
+        end
+
+      end
+
+      # delete_bucket_lifecycle_configuration
+
       ##
       # Lists the buckets in the account.
       add_client_request_method(:list_buckets) do
@@ -623,6 +662,17 @@ module AWS
             meta
           end
 
+          if expiry = resp.http_response.headers['x-amz-expiration']
+            expiry.first =~ /^expiry-date="(.+)", rule-id="(.+)"$/
+            date = DateTime.parse($1)
+            rule_id = $2
+          else
+            date = nil
+            rule_id = nil
+          end
+          Core::MetaUtils.extend_method(resp, :expiration_date) { date }
+          Core::MetaUtils.extend_method(resp, :expiration_rule_id) { rule_id }
+
           # create methods for standard response headers
           {
             'x-amz-version-id' => :version_id,

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

@@ -188,6 +188,16 @@ module AWS
           end
         end
 
+        GetBucketLifecycleConfiguration = Core::XmlGrammar.customize do
+          element("Rule") do
+            list
+            rename("Rules")  
+            element("Expiration") do
+              element("Days") { integer_value }
+            end
+          end
+        end
+
       end
     end
   end

data/lib/aws/s3/object_version.rb

@@ -50,6 +50,11 @@ module AWS
         object.key
       end
 
+      # (see S3Object#url_for)
+      def url_for method, options = {}
+        object.url_for(method, options.merge(:version_id => version_id))
+      end
+
       # @see S3Object#head
       # @return (see S3Object#head)
       def head

data/lib/aws/s3/object_version_collection.rb

@@ -23,7 +23,21 @@ module AWS
     #   object.write('3')
     #
     #   object.versions.collect(&:read)
-    #   #=> ['1', '2', '3']
+    #   #=> ['1', '2', '3']         
+    #                                         
+    # To see all the version id for a particular object, access the any particular version,
+    # and see the latest version:
+    #
+    #   object.versions.each do |version| puts version.version_id end
+    #   #=> T2TwAiZ3SmNr7tOfe0QBa4RZnSb3GSLq
+    #   #=> kAEHC_ysT65bT4P3zyYOP1ELA6ajar_6
+    #   #=> itHPX6m8na_sog0cAtkgP3QITEE8v5ij
+    #  
+    #   object.versions['itHPX6m8na_sog0cAtkgP3QITEE8v5ij']
+    #   #=> <AWS::S3::ObjectVersion:<<bucket>>:myobj:itHPX6m8na_sog0cAtkgP3QITEE8v5ij>
+    #
+    #   object.versions.latest
+    #   #=> <AWS::S3::ObjectVersion:<<bucket>>:myobj:T2TwAiZ3SmNr7tOfe0QBa4RZnSb3GSLq>
     #
     # If you know the id of a particular version you can get that object.
     #

data/lib/aws/s3/request.rb

@@ -184,7 +184,7 @@ module AWS
         def sub_resources
           %w(acl location logging notification partNumber policy 
              requestPayment torrent uploadId uploads versionId 
-             versioning versions delete)
+             versioning versions delete lifecycle)
         end
 
         def query_parameters

data/lib/aws/s3/s3_object.rb

@@ -126,6 +126,16 @@ module AWS
         head.content_type
       end
 
+      # @return [DateTime,nil]
+      def expiration_date
+        head.expiration_date
+      end
+
+      # @return [String,nil]
+      def expiration_rule_id
+        head.expiration_date
+      end
+
       # @return [Symbol, nil] Returns the algorithm used to encrypt
       #   the object on the server side, or +nil+ if SSE was not used
       #   when storing the object.
@@ -431,6 +441,48 @@ module AWS
         ObjectUploadCollection.new(self)
       end
 
+      # Moves an object to a new key. 
+      #
+      # This works by copying the object to a new key and then
+      # deleting the old object.  This function returns the 
+      # new object once this is done.
+      #
+      #   bucket = s3.buckets['old-bucket']
+      #   old_obj = bucket.objets['old-key']
+      #
+      #   # renaming an object returns a new object
+      #   new_obj = old_obj.move_to('new-key')
+      #
+      #   old_obj.key     #=> 'old-key'
+      #   old_obj.exists? #=> false
+      #   
+      #   new_obj.key     #=> 'new-key'
+      #   new_obj.exists? #=> true
+      #
+      # If you need to move an object to a different bucket, pass
+      # +:bucket+ or +:bucket_name+.
+      #
+      #   obj = s3.buckets['old-bucket'].objects['old-key]
+      #   obj.move_to('new-key', :bucket_name => 'new_bucket')
+      # 
+      # If the copy succedes, but the then the delete fails, an error
+      # will be raised.  
+      #
+      # @param [String] target The key to move this object to.
+      #
+      # @param [Hash] options
+      #
+      # @option (see #copy_to)
+      #
+      # @return [S3Object] Returns a new objet with the new key.
+      #
+      def move_to target, options = {}
+        copy = copy_to(target, options)
+        delete
+        copy
+      end
+      alias_method :rename_to, :move_to
+
       # Copies data from one S3 object to another.  
       #
       # S3 handles the copy so the clients does not need to fetch the data
@@ -594,7 +646,8 @@ module AWS
       #   option in the current configuration; for more information,
       #   see {AWS.config}.
       #
-      # @return (see #copy_from)
+      # @return [S3Object] Returns the copy (target) object.
+      #
       def copy_to target, options = {}
 
         unless target.is_a?(S3Object)
@@ -614,6 +667,7 @@ module AWS
         copy_opts.delete(:bucket_name)
 
         target.copy_from(self, copy_opts)
+        target
         
       end
 
@@ -785,6 +839,7 @@ module AWS
         method = http_method(method)
         expires = expiration_timestamp(options[:expires])
         req.add_param("AWSAccessKeyId", config.signer.access_key_id)
+        req.add_param("versionId", options[:version_id]) if options[:version_id]
         req.add_param("Signature", signature(method, expires, req))
         req.add_param("Expires", expires)
         req.add_param("x-amz-security-token", config.signer.session_token) if

data/lib/aws/sns.rb

@@ -47,6 +47,7 @@ module AWS
       autoload :Client,                      'client'
       autoload :Errors,                      'errors'
       autoload :Policy,                      'policy'
+      autoload :HasDeliveryPolicy,           'has_delivery_policy'
       autoload :Request,                     'request'
       autoload :Subscription,                'subscription'
       autoload :SubscriptionCollection,      'subscription_collection'

data/lib/aws/sns/has_delivery_policy.rb

@@ -0,0 +1,68 @@
+# 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 SNS
+
+    # A module shared between {Topic} and {Subscription}.  Provides methods
+    # for getting and setting the delivery policy and for getting the
+    # effective delivery policy.
+    module HasDeliveryPolicy
+
+      # @return [nil,Hash] Returns the delivery policy.
+      def delivery_policy
+        parse_delivery_policy(delivery_policy_json)
+      end
+
+      # @return [Hash] Returns the effective delivery policy.
+      def effective_delivery_policy
+        parse_delivery_policy(effective_delivery_policy_json)
+      end
+
+      # @param [nil,Hash,String<JSON>] policy A delivery policy.  You can
+      #   pass a JSON string, A policy hash or nil.
+      def delivery_policy= policy
+
+        policy_json = case policy
+        when nil then ''
+        when String then policy
+        else policy.to_json
+        end
+
+        update_delivery_policy(policy_json)
+
+      end
+
+      # @return [nil,String] Returns the delivery policy JSON string.
+      def delivery_policy_json
+        raise NotImplementedError
+      end
+
+      # @return [String] Returns the effective delivery policy JSON string.
+      def effective_delivery_policy_json
+        raise NotImplementedError
+      end
+
+      protected
+      def parse_delivery_policy policy_json
+        policy_json.nil? ? nil : JSON.parse(policy_json)
+      end
+
+      protected
+      def update_delivery_policy policy_json
+        raise NotImplementedError
+      end
+
+    end
+  end
+end

data/lib/aws/sns/subscription.rb

@@ -21,11 +21,12 @@ module AWS
     class Subscription
 
       include Core::Model
+      include HasDeliveryPolicy
 
       # @private
       def initialize(arn, opts = {})
         @arn = arn
-        @topic = opts[:topic]
+        @topic_arn = opts[:topic_arn]
         @endpoint = opts[:endpoint]
         @protocol = opts[:protocol]
         @owner_id = opts[:owner_id]
@@ -35,9 +36,6 @@ module AWS
       # @return [String] The ARN of the subscription.
       attr_reader :arn
 
-      # @return [Topic] The topic to which the endpoint is subscribed.
-      attr_reader :topic
-
       # @return [String] The endpoint.  This can be an HTTP or HTTPS
       # URL, an e-mail address, or a queue ARN.
       attr_reader :endpoint
@@ -52,7 +50,19 @@ module AWS
       attr_reader :protocol
 
       # @return [String] The AWS account ID of the subscription owner.
-      attr_reader :owner_id
+      def owner_id
+        @owner_id ||= get_attributes['Owner']
+      end
+
+      # @return [String]
+      def topic_arn
+        @topic_arn ||= get_attributes['TopicArn']
+      end
+
+      # @return [Topic]
+      def topic
+        Topic.new(topic_arn, :config => config)  
+      end
 
       # Deletes this subscription.
       # @return [nil]
@@ -61,6 +71,32 @@ module AWS
         nil
       end
 
+      # @return [Boolean] Returns true if the subscription confirmation 
+      #   request was authenticated.
+      def confirmation_authenticated?
+
+        return true if @authenticated
+
+        if authenticated = get_attributes['ConfirmationWasAuthenticated']
+          @authenticated = true
+        else
+          false
+        end
+
+      end
+
+      # You can get the parsed JSON hash from {#delivery_policy}.
+      # @return [nil,String] Returns the delivery policy JSON string.
+      def delivery_policy_json
+        get_attributes['DeliveryPolicy']
+      end
+
+      # You can get the parsed JSON hash from {#effective_delivery_policy}.
+      # @return [nil,String] Returns the effective delivery policy JSON string.
+      def effective_delivery_policy_json
+        get_attributes['EffectiveDeliveryPolicy']
+      end
+
       # @note This method requests the entire list of subscriptions
       #   for the topic (if known) or the account (if the topic is not
       #   known).  It can be expensive if the number of subscriptions
@@ -68,19 +104,17 @@ module AWS
       #
       # @return [Boolean] Returns true if the subscription exists.
       def exists?
-        collection =
-          if topic
-            TopicSubscriptionCollection.new(topic,
-                                            :config => config)
-          else
-            SubscriptionCollection.new(:config => config)
-          end
-        collection.include?(self)
+        begin
+          get_attributes
+          true
+        rescue Errors::NotFound, Errors::InvalidParameter
+          false
+        end
       end
 
       # @private
       def inspect
-        "<#{self.class}:#{arn}>"
+        "<#{self.class} arn:#{arn}>"
       end
 
       # @return [Boolean] Returns true if the subscriptions have the same
@@ -90,6 +124,20 @@ module AWS
       end
       alias_method :eql?, :==
 
+      protected
+      def update_delivery_policy policy_json
+        client_opts = {}
+        client_opts[:subscription_arn] = arn
+        client_opts[:attribute_name] = 'DeliveryPolicy'
+        client_opts[:attribute_value] = policy_json
+        client.set_subscription_attributes(client_opts)
+      end
+
+      protected
+      def get_attributes
+        client.get_subscription_attributes(:subscription_arn => arn).attributes
+      end
+
     end
 
   end

data/lib/aws/sns/subscription_collection.rb

@@ -43,7 +43,7 @@ module AWS
               :endpoint => sub.endpoint,
               :protocol => sub.protocol.tr('-','_').to_sym,
               :owner_id => sub.owner,
-              :topic => Topic.new(sub.topic_arn, :config => config),
+              :topic_arn => sub.topic_arn,
               :config => config
             )
             yield(subscription)

data/lib/aws/sns/topic.rb

@@ -19,6 +19,7 @@ module AWS
     class Topic
 
       include Core::Model
+      include HasDeliveryPolicy
 
       # @param [String] arn The topic ARN.
       def initialize arn, options = {}
@@ -140,7 +141,7 @@ module AWS
         resp = client.confirm_subscription(confirm_opts)
         Subscription.new(
           resp.subscription_arn,
-          :topic => self,
+          :topic_arn => arn,
           :config => config)
       end
 
@@ -203,6 +204,17 @@ module AWS
         nil
       end
 
+      # @return [nil,String<JSON>] The delivery policy JSON string.
+      def delivery_policy_json
+        to_h[:delivery_policy_json]
+      end
+
+      # @return [String<JSON>] The effective delivery policy JSON string.
+      #   into account system defaults.
+      def effective_delivery_policy_json
+        to_h[:effective_delivery_policy_json]
+      end
+
       # Publishes a message to this SNS topic. 
       #
       #   topic.publish('a short message')
@@ -297,17 +309,23 @@ module AWS
           :num_subscriptions_confirmed => attributes['SubscriptionsConfirmed'].to_i,
           :num_subscriptions_pending => attributes['SubscriptionsPending'].to_i,
           :num_subscriptions_deleted => attributes['SubscriptionsDeleted'].to_i,
+          :delivery_policy_json => attributes['DeliveryPolicy'],
+          :effective_delivery_policy_json => attributes['EffectiveDeliveryPolicy'],
         }
       end
 
       # @return [Boolean] Returns true if compared to another {Topic}
       #   with the same ARN.
-      def ==(other)
+      def eql? other
         other.kind_of?(Topic) and other.arn == arn
       end
-      alias_method :eql?, :==
+      alias_method :==, :eql?
+
+      protected
+      def update_delivery_policy policy_json
+        set_attribute('DeliveryPolicy', policy_json)
+      end
 
-      # @private
       protected
       def parse_policy policy_json
         if policy_json