aws-sdk 1.5.4 → 1.5.5

data/lib/aws/s3/request.rb

@@ -37,14 +37,6 @@ module AWS
         end
       end
 
-      def canned_acl= acl
-        if acl.kind_of?(Symbol)
-          headers["x-amz-acl"] = acl.to_s.gsub("_", "-")
-        elsif acl
-          headers["x-amz-acl"] = acl
-        end
-      end
-
       def storage_class= storage_class
         if storage_class.kind_of?(Symbol)
           headers["x-amz-storage-class"] = storage_class.to_s.upcase

data/lib/aws/s3/s3_object.rb

@@ -39,6 +39,7 @@ module AWS
 
       include Core::Model
       include DataOptions
+      include ACLOptions
 
       # @param [Bucket] bucket The bucket this object belongs to.
       # @param [String] key The object's key.
@@ -247,7 +248,7 @@ module AWS
       #   headers prefixed with +x-amz-meta+.  Each name, value pair
       #   must conform to US-ASCII.
       #
-      # @option options [Symbol] :acl (private) A canned access
+      # @option options [Symbol,String] :acl (:private) A canned access
       #   control policy.  Valid values are:
       #
       #   * +:private+
@@ -257,6 +258,12 @@ module AWS
       #   * +:bucket_owner_read+
       #   * +:bucket_owner_full_control+
       #
+      # @option options [String] :grant_read
+      # @option options [String] :grant_write
+      # @option options [String] :grant_read_acp
+      # @option options [String] :grant_write_acp
+      # @option options [String] :grant_full_control
+      #
       # @option options [Symbol] :storage_class Controls whether
       #   Reduced Redundancy Storage is enabled for the object.
       #   Valid values are +:standard+ (the default) or
@@ -293,11 +300,16 @@ module AWS
       #   enabled, returns the {ObjectVersion} representing the
       #   version that was uploaded.  If versioning is disabled,
       #   returns self.
+      #
       def write(options_or_data = nil, options = nil)
 
         (data_options, put_options) =
           compute_put_options(options_or_data, options)
 
+        if acl = put_options[:acl]
+          put_options[:acl] = acl.to_s.tr('_', '-')
+        end
+
         add_configured_write_options(put_options)
 
         if use_multipart?(data_options, put_options)
@@ -747,21 +759,19 @@ module AWS
 
       end
 
-      # Sets the object's access control list.  +acl+ can be:
-      # * An XML policy as a  string (which is passed to S3 uninterpreted)
-      # * An AccessControlList object
-      # * Any object that responds to +to_xml+
-      # * Any Hash that is acceptable as an argument to
-      #   AccessControlList#initialize.
-      #
-      # @param (see Bucket#acl=)
+      # Sets the objects's ACL (access control list).  You can provide an ACL
+      # in a number of different formats.
+      # @param (see ACLOptions#acl_options)
       # @return [nil]
       def acl=(acl)
-        client.set_object_acl(
-          :bucket_name => bucket.name,
-          :key => key,
-          :acl => acl)
+
+        client_opts = {}
+        client_opts[:bucket_name] = bucket.name
+        client_opts[:key] = key
+
+        client.put_object_acl(acl_options(acl).merge(client_opts))
         nil
+
       end
 
       # @private

data/lib/aws/simple_email_service/client.rb

@@ -33,8 +33,8 @@ module AWS
       #
       # === Options:
       #
-      # * +:identity+ - *required* - (String) The name of the identity to be
-      #   removed from the list of verified identities.
+      # * +:identity+ - *required* - (String) The identity to be removed from
+      #   the list of identities for the AWS Account.
       #
       # === Response Structure:
       #
@@ -50,7 +50,7 @@ module AWS
       # === Options:
       #
       # * +:email_address+ - *required* - (String) An email address to be
-      #   removed from the list of verified addreses.
+      #   removed from the list of verified addresses.
       #
       # === Response Structure:
       #
@@ -60,12 +60,31 @@ module AWS
       #
       define_client_method :delete_verified_email_address, 'DeleteVerifiedEmailAddress'
 
+      # Calls the GetIdentityNotificationAttributes API operation.
+      # @method get_identity_notification_attributes(options = {})
+      #
+      # === Options:
+      #
+      # * +:identities+ - *required* - (Array<String>) A list of one or more
+      #   identities.
+      #
+      # === Response Structure:
+      #
+      # * +:notification_attributes+ - (Hash<String,Hash>)
+      #   * +:bounce_topic+ - (String)
+      #   * +:complaint_topic+ - (String)
+      #   * +:forwarding_enabled+ - (Boolean)
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :get_identity_notification_attributes, 'GetIdentityNotificationAttributes'
+
       # Calls the GetIdentityVerificationAttributes API operation.
       # @method get_identity_verification_attributes(options = {})
       #
       # === Options:
       #
-      # * +:identities+ - *required* - (Array<String>)
+      # * +:identities+ - *required* - (Array<String>) A list of identities.
       #
       # === Response Structure:
       #
@@ -119,11 +138,12 @@ module AWS
       #
       # === Options:
       #
-      # * +:identity_type+ - (String) The type of the identities listed.
-      #   Possible values are: "EmailAddress", "Domain" or null.
-      # * +:next_token+ - (String) The token used for retrieving the next set
-      #   of items.
-      # * +:max_items+ - (Integer) The maximum number of items returned.
+      # * +:identity_type+ - (String) The type of the identities to list.
+      #   Possible values are "EmailAddress" and "Domain". If this parameter is
+      #   omitted, then all identities will be listed.
+      # * +:next_token+ - (String) The token to use for pagination.
+      # * +:max_items+ - (Integer) The maximum number of identities per page.
+      #   Possible values are 1-100 inclusive.
       #
       # === Response Structure:
       #
@@ -231,13 +251,58 @@ module AWS
       #
       define_client_method :send_raw_email, 'SendRawEmail'
 
+      # Calls the SetIdentityFeedbackForwardingEnabled API operation.
+      # @method set_identity_feedback_forwarding_enabled(options = {})
+      #
+      # === Options:
+      #
+      # * +:identity+ - *required* - (String) The identity for which to set
+      #   feedback notification forwarding. Examples: user@example.com,
+      #   example.com.
+      # * +:forwarding_enabled+ - *required* - (Boolean) Sets whether Amazon
+      #   SES will forward feedback notifications as email. +true+ specifies
+      #   that Amazon SES will forward feedback notifications as email, in
+      #   addition to any Amazon SNS topic publishing otherwise specified.
+      #   +false+ specifies that Amazon SES will publish feedback notifications
+      #   only through Amazon SNS. This value can only be set to +false+ when
+      #   topics are specified for both Bounce and Complaint topic types.
+      #
+      # === Response Structure:
+      #
+      # This method returns no response data.
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :set_identity_feedback_forwarding_enabled, 'SetIdentityFeedbackForwardingEnabled'
+
+      # Calls the SetIdentityNotificationTopic API operation.
+      # @method set_identity_notification_topic(options = {})
+      #
+      # === Options:
+      #
+      # * +:identity+ - *required* - (String) The identity for which the topic
+      #   will be set. Examples: user@example.com, example.com.
+      # * +:notification_type+ - *required* - (String) The type of feedback
+      #   notifications that will be published to the specified topic.
+      # * +:sns_topic+ - (String) The Amazon Resource Name (ARN) of the Amazon
+      #   Simple Notification Service (Amazon SNS) topic. If the parameter is
+      #   ommited from the request or a null value is passed, the topic is
+      #   cleared and publishing is disabled.
+      #
+      # === Response Structure:
+      #
+      # This method returns no response data.
+      #
+      # @return [Core::Response]
+      #
+      define_client_method :set_identity_notification_topic, 'SetIdentityNotificationTopic'
+
       # Calls the VerifyDomainIdentity API operation.
       # @method verify_domain_identity(options = {})
       #
       # === Options:
       #
-      # * +:domain+ - *required* - (String) The name of the domain to be
-      #   verified.
+      # * +:domain+ - *required* - (String) The domain to be verified.
       #
       # === Response Structure:
       #

data/lib/aws/simple_email_service/identity.rb

@@ -18,6 +18,14 @@ module AWS
     #
     # @attr_reader [String,nil] verification_token
     #
+    # @attr [String] bounce_topic_arn
+    #
+    # @attr [String] complaint_topic_arn
+    #
+    # @attr [Boolean] forwarding_enabled When +false+, complaint and bounce
+    #   notifications will not be forwarded via email.  Can only be set to 
+    #   +false+ when there is both a +bounce_topic+ and +complaint_topic+.
+    #
     class Identity < Core::Resource
 
       # @private
@@ -34,8 +42,53 @@ module AWS
 
       attribute :verification_token, :static => true
 
-      populates_from(:get_identity_verification_attributes) do |resp|
-        resp.data[:verification_attributes][identity]
+      mutable_attribute :bounce_topic_arn, :as => :bounce_topic
+
+      mutable_attribute :complaint_topic_arn, :as => :complaint_topic
+
+      mutable_attribute :forwarding_enabled
+
+      alias_method :forwarding_enabled?, :forwarding_enabled
+
+      provider(:get_identity_verification_attributes) do |provider|
+        provider.provides :verification_token
+        provider.provides :verification_status
+        provider.find{|resp| resp.data[:verification_attributes][identity] }
+      end
+
+      provider(:get_identity_notification_attributes) do |provider|
+        provider.provides :bounce_topic_arn
+        provider.provides :complaint_topic_arn
+        provider.provides :forwarding_enabled
+        provider.find{|resp| resp.data[:notification_attributes][identity] }
+      end
+
+      # @param [String,SNS::Topic] topic The topic (ARN string or topic
+      #   object) that bounce notifications should be published to.
+      def bounce_topic= topic
+        arn = topic.respond_to?(:arn) ? topic.arn : topic
+        self.bounce_topic_arn = arn
+      end
+
+      # @return [SNS::Topic,nil]
+      def bounce_topic
+        if arn = bounce_topic_arn
+          SNS::Topic.new(arn, :config => config)
+        end
+      end
+
+      # @param [String,SNS::Topic] topic The topic (ARN string or topic
+      #   object) that complaint notifications should be published to.
+      def complaint_topic= topic
+        arn = topic.respond_to?(:arn) ? topic.arn : topic
+        self.complaint_topic_arn = arn
+      end
+
+      # @return [SNS::Topic,nil]
+      def complaint_topic
+        if arn = complaint_topic_arn
+          SNS::Topic.new(arn, :config => config)
+        end
       end
 
       # @return [Boolean] Returns +true+ if this {Identity} represents an
@@ -80,10 +133,34 @@ module AWS
         [[:identity, identity]]
       end
 
-      def get_resource attr = nil
+      def get_resource attr
         client_opts = {}
         client_opts[:identities] = [identity]
-        client.get_identity_verification_attributes(client_opts)
+        if attr.name.to_s.match(/verification/)
+          client.get_identity_verification_attributes(client_opts)
+        else
+          client.get_identity_notification_attributes(client_opts)
+        end
+      end
+
+      def update_resource attr, value
+        client_opts = {}
+        client_opts[:identity] = identity
+        case attr.name
+        when :bounce_topic_arn
+          method = :set_identity_notification_topic
+          client_opts[:notification_type] = 'Bounce'
+          client_opts[:sns_topic] = value if value
+        when :complaint_topic_arn
+          method = :set_identity_notification_topic
+          client_opts[:notification_type] = 'Complaint'
+          client_opts[:sns_topic] = value if value
+        when :forwarding_enabled
+          method = :set_identity_feedback_forwarding_enabled
+          client_opts[:forwarding_enabled] = value
+        else raise "unhandled attribute: #{attr.name}" 
+        end
+        client.send(method, client_opts)
       end
 
     end

data/lib/net/http/connection_pool.rb

@@ -14,6 +14,7 @@
 require 'net/http/connection_pool/session'
 require 'net/http/connection_pool/connection'
 require 'thread'
+require 'logger'
 
 # @private
 class Net::HTTP::ConnectionPool
@@ -29,18 +30,26 @@ class Net::HTTP::ConnectionPool
 
   # @param [Hash] options
   #
-  # @option options [Numeric] :idle_timeout (60) The number of seconds a 
+  # @option options [Numeric] :http_idle_timeout (60) The number of seconds a
   #   connection is allowed to sit idle before it is closed and removed
   #   from the pool.
   #
-  # @option options [Numeric] :open_timeout (15) The number of seconds to 
+  # @option options [Numeric] :http_open_timeout (15) The number of seconds to
   #   wait when opening a http session before raising a timeout exception.
+  #
+  # @option options [Boolean] :http_wire_trace (false) When +true+, HTTP
+  #   debug output will be sent to the +:logger+.
+  #
+  # @option options [Logger] :logger (Logger.new($stdout)) Where debug out
+  #   is sent (wire traces).
   # 
   def initialize options = {}
     @pool = []
     @pool_mutex = Mutex.new
-    @open_timeout = options[:open_timeout] || 15
-    @idle_timeout = options[:idle_timeout] || 60
+    @open_timeout = options[:http_open_timeout] || 15
+    @idle_timeout = options[:http_idle_timeout] || 60
+    @log_wire_trace = !!options[:http_wire_trace]
+    @logger = options[:logger] || Logger.new($stdout)
   end
 
   # @return [Integer] 
@@ -49,20 +58,32 @@ class Net::HTTP::ConnectionPool
   # @return [Integer]
   attr_accessor :open_timeout
 
-  # Requests a http session from the connection pool.  
+  # @return [Boolean] Returns +true+ when HTTP debug output (wire traces)
+  #   will be logged.
+  attr_reader :log_wire_trace
+
+  alias_method :log_wire_trace?, :log_wire_trace
+
+  # @return [Logger] Where debug output is sent.
+  attr_reader :logger
+
+  # Requests a connection object from the connection pool.
   #
-  #   pool.connection_for('domain.com') do |connection|
+  #   connection = pool.connection_for('domain.com')
+  #   connection.request(Net::HTTP::Get.new('/index.html'))
+  #   connection.request(Net::HTTP::Get.new('/about.html'))
   #
-  #     # make 
+  #   # same thing in block form
+  #   pool.connection_for('domain.com') do |connection|
   #     connection.request(Net::HTTP::Get.new('/index.html'))
   #     connection.request(Net::HTTP::Get.new('/about.html'))
-  #
   #   end
   #
-  # The yielded connection object is a thin wrapper around the persistent 
-  # http session object.  You generally want to call {Connection#request}
-  # on the yielded object.  When the block is complete the connection
-  # will be returned to the pool.
+  # Because the pool manages HTTP sessions you do not have to
+  # worry about closing a connection or returning a connection
+  # to the pool.  Every time you call request on a connection
+  # object, a HTTP session received from the pool and returned after
+  # the request is complete.
   #
   # @param [String] host
   #
@@ -76,7 +97,7 @@ class Net::HTTP::ConnectionPool
   #   to +true+.
   #
   # @option options [Boolean] :ssl_verify_peer (true) If true, ssl 
-  #   connections will verify peer certificates.  This should only ever be
+  #   connections should verify peer certificates.  This should only ever be
   #   set false false for debugging purposes.
   #
   # @option options [String] :ssl_ca_file Full path to the SSL certificate
@@ -90,8 +111,8 @@ class Net::HTTP::ConnectionPool
   #   the the system default will be used if available.
   #
   # @option options [URI::HTTP,String] :proxy_uri (nil) A URI string or
-  #   URI::HTTP for a proxy reqeusts should be made through.  You should
-  #   not pass both +:proxy_uri+ with any of the other proxy options.
+  #   URI::HTTP object to use as a proxy.  You should not provide 
+  #   +:proxy_uri+ with any other proxy options.
   #
   #     :proxy_uri => 'http://user:pass@host.com:80'
   #
@@ -103,19 +124,19 @@ class Net::HTTP::ConnectionPool
   #
   # @option options [String] :proxy_password
   #
-  # @yieldparam [Connection] connection
+  # @yield [connection]
+  #
+  # @yieldparam [optional,Connection] connection
   #
-  # @return [nil]
+  # @return [Connection]
   #
   def connection_for host, options = {}, &block
     connection = Connection.new(self, host, options)
-    if block_given?
-      yield(connection)
-    else
-      connection
-    end
+    yield(connection) if block_given?
+    connection
   end
 
+  # @private
   def request connection, *request_args, &block
 
     session = nil
@@ -187,7 +208,8 @@ class Net::HTTP::ConnectionPool
     end
 
     if session.nil?
-      session = Session.for(connection, open_timeout)
+      logger = log_wire_trace? ? self.logger : nil 
+      session = Session.for(connection, open_timeout, logger)
     end
 
     session