aws-sdk 1.6.3 → 1.6.4

data/lib/aws/record/hash_model/attributes.rb

@@ -17,7 +17,7 @@ module AWS
   module Record
     class HashModel
       class << self
-  
+
         # Adds a string attribute to this class.
         #
         # @example A standard string attribute
@@ -36,7 +36,7 @@ module AWS
         #   end
         #
         #   recipe = Recipe.new(:tags => %w(popular dessert))
-        #   recipe.tags #=> #<Set: {"popular", "desert"}> 
+        #   recipe.tags #=> #<Set: {"popular", "desert"}>
         #
         # @param [Symbol] name The name of the attribute.
         # @param [Hash] options
@@ -45,7 +45,7 @@ module AWS
         def string_attr name, options = {}
           add_attribute(Attributes::StringAttr.new(name, options))
         end
-  
+
         # Adds an integer attribute to this class.
         #
         #   class Recipe < AWS::Record::HashModel
@@ -62,7 +62,7 @@ module AWS
         def integer_attr name, options = {}
           add_attribute(Attributes::IntegerAttr.new(name, options))
         end
-  
+
         # Adds a float attribute to this class.
         #
         #   class Listing < AWS::Record::HashModel
@@ -79,7 +79,7 @@ module AWS
         def float_attr name, options = {}
           add_attribute(Attributes::FloatAttr.new(name, options))
         end
-  
+
         # Adds a boolean attribute to this class.
         #
         # @example
@@ -98,16 +98,16 @@ module AWS
         #
         # @param [Symbol] name The name of the attribute.
         def boolean_attr name, options = {}
-  
+
           attr = add_attribute(Attributes::BooleanAttr.new(name, options))
-  
+
           # add the boolean question mark method
           define_method("#{attr.name}?") do
             !!__send__(attr.name)
           end
-  
+
         end
-  
+
         # Adds a datetime attribute to this class.
         #
         # @example A standard datetime attribute
@@ -132,7 +132,7 @@ module AWS
         def datetime_attr name, options = {}
           add_attribute(Attributes::DateTimeAttr.new(name, options))
         end
-  
+
         # Adds a date attribute to this class.
         #
         # @example A standard date attribute
@@ -155,7 +155,22 @@ module AWS
         def date_attr name, options = {}
           add_attribute(Attributes::DateAttr.new(name, options))
         end
-  
+
+        # Adds a DynamoDB binary attribute to this class.  A binary
+        # attribute acts the same as a string attribute, except
+        #
+        # @param [Symbol] name The name of the attribute.
+        #
+        # @param [Hash] options
+        #
+        # @option options [Boolean] :set (false) When true this attribute
+        #   can have multiple values.
+        #
+        # @note This should not be used for large objects.
+        #
+        def binary_attr name, options = {}
+        end
+
         # A convenience method for adding the standard two datetime attributes
         # +:created_at+ and +:updated_at+.
         #
@@ -169,13 +184,13 @@ module AWS
         #   recipe.save
         #   recipe.created_at #=> <DateTime ...>
         #   recipe.updated_at #=> <DateTime ...>
-        # 
+        #
         def timestamps
           c = datetime_attr :created_at
           u = datetime_attr :updated_at
           [c, u]
         end
-    
+
       end
     end
   end

data/lib/aws/route_53/client.rb

@@ -13,11 +13,9 @@
 
 module AWS
   class Route53
-    class Client < Core::Client
+    class Client < Core::RESTClient
 
-      API_VERSION = '2012-02-29'
-
-      extend Core::RESTClient
+      define_client_methods('2012-02-29')
 
       # @private
       CACHEABLE_REQUESTS = Set[]
@@ -49,10 +47,10 @@ module AWS
       #         resource record set.
       #       * +:type+ - *required* - (String) The type of the current
       #         resource record set.
-      #       * +:set_identifier+ - (String) Weighted resource record sets or
-      #         Regional resource record sets only: An identifier that
-      #         differentiates among multiple resource record sets that have
-      #         the same combination of DNS name and type.
+      #       * +:set_identifier+ - (String) Weighted resource record sets
+      #         only: An identifier that differentiates among multiple resource
+      #         record sets that have the same combination of DNS name and
+      #         type.
       #       * +:weight+ - (Integer) Weighted resource record sets only: Among
       #         resource record sets that have the same combination of DNS name
       #         and type, a value that determines what portion of traffic for
@@ -96,7 +94,6 @@ module AWS
       #     * +:status+ - (String)
       #     * +:submitted_at+ - (Time)
       #     * +:comment+ - (String)
-      define_client_method :change_resource_record_sets, 'ChangeResourceRecordSets'
 
       # Calls the POST CreateHostedZone API operation.
       # @method create_hosted_zone(options = {})
@@ -141,7 +138,6 @@ module AWS
       #     * +:comment+ - (String)
       #   * +:delegation_set+ - (Hash)
       #     * +:name_servers+ - (Array<String>)
-      define_client_method :create_hosted_zone, 'CreateHostedZone'
 
       # Calls the DELETE DeleteHostedZone API operation.
       # @method delete_hosted_zone(options = {})
@@ -157,7 +153,6 @@ module AWS
       #     * +:status+ - (String)
       #     * +:submitted_at+ - (Time)
       #     * +:comment+ - (String)
-      define_client_method :delete_hosted_zone, 'DeleteHostedZone'
 
       # Calls the GET GetChange API operation.
       # @method get_change(options = {})
@@ -174,7 +169,6 @@ module AWS
       #     * +:status+ - (String)
       #     * +:submitted_at+ - (Time)
       #     * +:comment+ - (String)
-      define_client_method :get_change, 'GetChange'
 
       # Calls the GET GetHostedZone API operation.
       # @method get_hosted_zone(options = {})
@@ -193,7 +187,6 @@ module AWS
       #     * +:resource_record_set_count+ - (Integer)
       #   * +:delegation_set+ - (Hash)
       #     * +:name_servers+ - (Array<String>)
-      define_client_method :get_hosted_zone, 'GetHostedZone'
 
       # Calls the GET ListHostedZones API operation.
       # @method list_hosted_zones(options = {})
@@ -218,7 +211,6 @@ module AWS
       #   * +:is_truncated+ - (Boolean)
       #   * +:next_marker+ - (String)
       #   * +:max_items+ - (Integer)
-      define_client_method :list_hosted_zones, 'ListHostedZones'
 
       # Calls the GET ListResourceRecordSets API operation.
       # @method list_resource_record_sets(options = {})
@@ -231,7 +223,6 @@ module AWS
       # * +:start_record_type+ - (String) The DNS type at which to begin the
       #   listing of resource record sets. Valid values: A | AAAA | CNAME | MX
       #   | NS | PTR | SOA | SPF | SRV | TXT Values for Weighted Resource
-      #   Record Sets: A | AAAA | CNAME | TXT Values for Regional Resource
       #   Record Sets: A | AAAA | CNAME | TXT Values for Alias Resource Record
       #   Sets: A | AAAA Constraint: Specifying type without specifying name
       #   returns an InvalidInput error.
@@ -263,7 +254,6 @@ module AWS
       #   * +:next_record_type+ - (String)
       #   * +:next_record_identifier+ - (String)
       #   * +:max_items+ - (Integer)
-      define_client_method :list_resource_record_sets, 'ListResourceRecordSets'
 
       ## end client methods ##
 

data/lib/aws/s3/client.rb

@@ -920,7 +920,7 @@ module AWS
           keys = options[:objects] || options[:keys]
 
           objects = keys.inject('') do |xml,o|
-            xml << "<Object><Key>#{o[:key]}</Key>"
+            xml << "<Object><Key>#{REXML::Text.normalize(o[:key])}</Key>"
             xml << "<VersionId>#{o[:version_id]}</VersionId>" if o[:version_id]
             xml << "</Object>"
           end
@@ -1087,6 +1087,7 @@ module AWS
         :cache_control => 'Cache-Control',
         :metadata_directive => 'x-amz-metadata-directive',
         :content_type => 'Content-Type',
+        :content_disposition => 'Content-Disposition',
       }) do
 
         configure_request do |req, options|

data/lib/aws/s3/encryption_utils.rb

@@ -66,11 +66,6 @@ module AWS
 
       # Checks for any formatting problems for keys and initialization vectors
       #   supported with EncryptionUtils.
-      #
-      # @param [OpenSSL::PKey::RSA, String] key Key used to encrypt.
-      #
-      # @param [String] data Data to be encrypted.
-      #
       def check_encryption_materials mode, key
         rsa = OpenSSL::PKey::RSA
         case key
@@ -116,8 +111,8 @@ module AWS
         cipher
       end
 
-      # @param  [Fixnum] Size of data given.
-      # @return [Fixnum] Returns the AES encrypted size based on a given size.
+      # @param  [Integer] size Size of data given.
+      # @return [Integer] Returns the AES encrypted size based on a given size.
       def get_encrypted_size size
         # The next multiple of 16
         ((size / 16) + 1) * 16

data/lib/aws/s3/s3_object.rb

@@ -809,6 +809,11 @@ module AWS
           end
         end
 
+        if options[:content_disposition]
+          copy_opts[:content_disposition] = options[:content_disposition]
+          copy_opts[:metadata_directive] = "REPLACE"
+        end
+
         if options[:content_type]
           copy_opts[:content_type] = options[:content_type]
           copy_opts[:metadata_directive] = "REPLACE"

data/lib/aws/simple_db/client.rb

@@ -15,11 +15,9 @@ module AWS
   class SimpleDB
 
     # Client class for Amazon SimpleDB.
-    class Client < Core::Client
+    class Client < Core::QueryClient
 
-      API_VERSION = '2009-04-15'
-
-      extend Core::QueryClient
+      define_client_methods('2009-04-15')
 
       # @private
       REGION_US_E1 = 'sdb.amazonaws.com'
@@ -75,7 +73,6 @@ module AWS
       #   * +:response_metadata+ - (Hash)
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
-      define_client_method :batch_delete_attributes, 'BatchDeleteAttributes'
 
       # Calls the BatchPutAttributes API operation.
       # @method batch_put_attributes(options = {})
@@ -100,7 +97,6 @@ module AWS
       #   * +:response_metadata+ - (Hash)
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
-      define_client_method :batch_put_attributes, 'BatchPutAttributes'
 
       # Calls the CreateDomain API operation.
       # @method create_domain(options = {})
@@ -114,7 +110,6 @@ module AWS
       #   * +:response_metadata+ - (Hash)
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
-      define_client_method :create_domain, 'CreateDomain'
 
       # Calls the DeleteAttributes API operation.
       # @method delete_attributes(options = {})
@@ -149,7 +144,6 @@ module AWS
       #   * +:response_metadata+ - (Hash)
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
-      define_client_method :delete_attributes, 'DeleteAttributes'
 
       # Calls the DeleteDomain API operation.
       # @method delete_domain(options = {})
@@ -162,7 +156,6 @@ module AWS
       #   * +:response_metadata+ - (Hash)
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
-      define_client_method :delete_domain, 'DeleteDomain'
 
       # Calls the DomainMetadata API operation.
       # @method domain_metadata(options = {})
@@ -182,7 +175,6 @@ module AWS
       #   * +:response_metadata+ - (Hash)
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
-      define_client_method :domain_metadata, 'DomainMetadata'
 
       # Calls the GetAttributes API operation.
       # @method get_attributes(options = {})
@@ -207,7 +199,6 @@ module AWS
       #   * +:response_metadata+ - (Hash)
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
-      define_client_method :get_attributes, 'GetAttributes'
 
       # Calls the ListDomains API operation.
       # @method list_domains(options = {})
@@ -225,7 +216,6 @@ module AWS
       #   * +:response_metadata+ - (Hash)
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
-      define_client_method :list_domains, 'ListDomains'
 
       # Calls the PutAttributes API operation.
       # @method put_attributes(options = {})
@@ -261,7 +251,6 @@ module AWS
       #   * +:response_metadata+ - (Hash)
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
-      define_client_method :put_attributes, 'PutAttributes'
 
       # Calls the Select API operation.
       # @method select(options = {})
@@ -290,7 +279,6 @@ module AWS
       #   * +:response_metadata+ - (Hash)
       #     * +:box_usage+ - (Numeric)
       #     * +:response_id+ - (String)
-      define_client_method :select, 'Select'
 
       ## end client methods ##
 

data/lib/aws/simple_email_service/client.rb

@@ -15,11 +15,9 @@ module AWS
   class SimpleEmailService
 
     # Client class for Amazon Simple E-mail Service (SES).
-    class Client < Core::Client
+    class Client < Core::QueryClient
 
-      API_VERSION = '2010-12-01'
-
-      extend Core::QueryClient
+      define_client_methods('2010-12-01')
 
       REGION_US_E1 = 'email.us-east-1.amazonaws.com'
 
@@ -34,7 +32,6 @@ module AWS
       #   * +:identity+ - *required* - (String) The identity to be removed from
       #     the list of identities for the AWS Account.
       # @return [Core::Response]
-      define_client_method :delete_identity, 'DeleteIdentity'
 
       # Calls the DeleteVerifiedEmailAddress API operation.
       # @method delete_verified_email_address(options = {})
@@ -42,7 +39,19 @@ module AWS
       #   * +:email_address+ - *required* - (String) An email address to be
       #     removed from the list of verified addresses.
       # @return [Core::Response]
-      define_client_method :delete_verified_email_address, 'DeleteVerifiedEmailAddress'
+
+      # Calls the GetIdentityDkimAttributes API operation.
+      # @method get_identity_dkim_attributes(options = {})
+      # @param [Hash] options
+      #   * +:identities+ - *required* - (Array<String>) A list of one or more
+      #     verified identities - email addresses, domains, or both.
+      # @return [Core::Response]
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:dkim_attributes+ - (Hash<String,Hash>)
+      #     * +:dkim_enabled+ - (Boolean)
+      #     * +:dkim_verification_status+ - (String)
+      #     * +:dkim_tokens+ - (Array<String>)
 
       # Calls the GetIdentityNotificationAttributes API operation.
       # @method get_identity_notification_attributes(options = {})
@@ -56,7 +65,6 @@ module AWS
       #     * +:bounce_topic+ - (String)
       #     * +:complaint_topic+ - (String)
       #     * +:forwarding_enabled+ - (Boolean)
-      define_client_method :get_identity_notification_attributes, 'GetIdentityNotificationAttributes'
 
       # Calls the GetIdentityVerificationAttributes API operation.
       # @method get_identity_verification_attributes(options = {})
@@ -68,7 +76,6 @@ module AWS
       #   * +:verification_attributes+ - (Hash<String,Hash>)
       #     * +:verification_status+ - (String)
       #     * +:verification_token+ - (String)
-      define_client_method :get_identity_verification_attributes, 'GetIdentityVerificationAttributes'
 
       # Calls the GetSendQuota API operation.
       # @method get_send_quota(options = {})
@@ -79,7 +86,6 @@ module AWS
       #   * +:max_24_hour_send+ - (Numeric)
       #   * +:max_send_rate+ - (Numeric)
       #   * +:sent_last_24_hours+ - (Numeric)
-      define_client_method :get_send_quota, 'GetSendQuota'
 
       # Calls the GetSendStatistics API operation.
       # @method get_send_statistics(options = {})
@@ -93,7 +99,6 @@ module AWS
       #     * +:bounces+ - (Integer)
       #     * +:complaints+ - (Integer)
       #     * +:rejects+ - (Integer)
-      define_client_method :get_send_statistics, 'GetSendStatistics'
 
       # Calls the ListIdentities API operation.
       # @method list_identities(options = {})
@@ -109,7 +114,6 @@ module AWS
       #   a hash with the following structure:
       #   * +:identities+ - (Array<String>)
       #   * +:next_token+ - (String)
-      define_client_method :list_identities, 'ListIdentities'
 
       # Calls the ListVerifiedEmailAddresses API operation.
       # @method list_verified_email_addresses(options = {})
@@ -118,7 +122,6 @@ module AWS
       #   The #data method of the response object returns
       #   a hash with the following structure:
       #   * +:verified_email_addresses+ - (Array<String>)
-      define_client_method :list_verified_email_addresses, 'ListVerifiedEmailAddresses'
 
       # Calls the SendEmail API operation.
       # @method send_email(options = {})
@@ -165,7 +168,6 @@ module AWS
       #   The #data method of the response object returns
       #   a hash with the following structure:
       #   * +:message_id+ - (String)
-      define_client_method :send_email, 'SendEmail'
 
       # Calls the SendRawEmail API operation.
       # @method send_raw_email(options = {})
@@ -194,7 +196,16 @@ module AWS
       #   The #data method of the response object returns
       #   a hash with the following structure:
       #   * +:message_id+ - (String)
-      define_client_method :send_raw_email, 'SendRawEmail'
+
+      # Calls the SetIdentityDkimEnabled API operation.
+      # @method set_identity_dkim_enabled(options = {})
+      # @param [Hash] options
+      #   * +:identity+ - *required* - (String) The identity for which DKIM
+      #     signing should be enabled or disabled.
+      #   * +:dkim_enabled+ - *required* - (Boolean) Sets whether DKIM signing
+      #     is enabled for an identity. Set to +true+ to enable DKIM signing
+      #     for this identity; +false+ to disable it.
+      # @return [Core::Response]
 
       # Calls the SetIdentityFeedbackForwardingEnabled API operation.
       # @method set_identity_feedback_forwarding_enabled(options = {})
@@ -211,7 +222,6 @@ module AWS
       #     to +false+ when topics are specified for both Bounce and Complaint
       #     topic types.
       # @return [Core::Response]
-      define_client_method :set_identity_feedback_forwarding_enabled, 'SetIdentityFeedbackForwardingEnabled'
 
       # Calls the SetIdentityNotificationTopic API operation.
       # @method set_identity_notification_topic(options = {})
@@ -225,7 +235,16 @@ module AWS
       #     parameter is ommited from the request or a null value is passed,
       #     the topic is cleared and publishing is disabled.
       # @return [Core::Response]
-      define_client_method :set_identity_notification_topic, 'SetIdentityNotificationTopic'
+
+      # Calls the VerifyDomainDkim API operation.
+      # @method verify_domain_dkim(options = {})
+      # @param [Hash] options
+      #   * +:domain+ - *required* - (String) The name of the domain to be
+      #     verified for Easy DKIM signing.
+      # @return [Core::Response]
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:dkim_tokens+ - (Array<String>)
 
       # Calls the VerifyDomainIdentity API operation.
       # @method verify_domain_identity(options = {})
@@ -235,7 +254,6 @@ module AWS
       #   The #data method of the response object returns
       #   a hash with the following structure:
       #   * +:verification_token+ - (String)
-      define_client_method :verify_domain_identity, 'VerifyDomainIdentity'
 
       # Calls the VerifyEmailAddress API operation.
       # @method verify_email_address(options = {})
@@ -243,7 +261,6 @@ module AWS
       #   * +:email_address+ - *required* - (String) The email address to be
       #     verified.
       # @return [Core::Response]
-      define_client_method :verify_email_address, 'VerifyEmailAddress'
 
       # Calls the VerifyEmailIdentity API operation.
       # @method verify_email_identity(options = {})
@@ -251,7 +268,6 @@ module AWS
       #   * +:email_address+ - *required* - (String) The email address to be
       #     verified.
       # @return [Core::Response]
-      define_client_method :verify_email_identity, 'VerifyEmailIdentity'
 
       ## end client methods ##