aws-sdk 1.1.0 → 1.1.1

data/lib/aws/base_client.rb

@@ -16,7 +16,6 @@ require 'aws/inflection'
 require 'aws/naming'
 require 'aws/response'
 require 'aws/async_handle'
-require 'aws/configurable'
 require 'aws/http/handler'
 require 'aws/http/request'
 require 'aws/http/response'
@@ -32,7 +31,6 @@ module AWS
   # @private
   class BaseClient
 
-    include Configurable
     include ClientLogging
 
     extend Naming
@@ -281,6 +279,7 @@ module AWS
       code = nil
       code = xml_error_grammar.parse(response.http_response.body).code if
         xml_error_response?(response)
+      
 
       case
       when response.timeout?
@@ -306,7 +305,6 @@ module AWS
       response.http_response.status >= 300 and
         response.http_response.body and
         xml_error_grammar.parse(response.http_response.body).respond_to?(:code)
-
     end
 
     protected
@@ -433,15 +431,17 @@ module AWS
 
     end
 
-    # defined using MetaUtils so it can be extended by
-    # modules such as ConfiguredClientMethods
-    MetaUtils.extend_method(self, :configure_client) do
+    protected
+    def self.configure_client
 
       module_eval('module Options; end')
       module_eval('module XML; end')
 
-      make_configurable :"#{service_ruby_name}_client",
-        :needs => [:signer, :http_handler]
+      name = :"#{service_ruby_name}_client"
+      needs = [:signer, :http_handler]
+      create_block = lambda {|config| new(:config => config) }
+
+      Configuration.add_option_with_needs(name, needs, &create_block)
 
     end
 

data/lib/aws/common.rb

@@ -19,7 +19,7 @@ require 'aws/response_cache'
 module AWS
 
   # Current version of the AWS SDK for Ruby
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 
   class << self
 
@@ -51,72 +51,102 @@ module AWS
     #
     # @note Changing the global configuration does not affect objects
     #   that have already been constructed.
+    #
     # @param [Hash] options
-    # @option options [String] :access_key_id Your account access key 
-    #   id credential.
-    # @option options [String] :secret_access_key Your account secret
-    #   access key credential.
+    # @option options [String] :access_key_id (nil) AWS access key id 
+    #   credential.
+    # @option options [String] :ec2_endpoint ('ec2.amazonaws.com') The 
+    #   service endpoint for Amazon EC2.
+    # @option options [Object] :http_handler (AWS::HTTPartyHandler) The 
+    #   http handler that sends requests to AWS.
+    # @option options [String] :iam_endpoint ('iam.amazonaws.com') The 
+    #   service endpoint for AWS Idenity Access Management (IAM).
+    # @option options [Object,nil] :logger (nil) A logger instance that 
+    #   should receive log messages generated by service requets.  
+    #   A logger needs to respond to #log and must accept a 
+    #   severity (e.g. :info, :error, etc) and a string message.
     # @option options [Integer] :max_retries (3) The maximum number of times
     #   service errors (500) should be retried.  There is an exponential 
     #   backoff in between service request retries, so the more retries the
     #   longer it can take to fail.
-    # @option options [String] :ec2_endpoint ('ec2.amazonaws.com') The
-    #   service endpoint to use when communicating with Amazon EC2.
-    # @option options :http_handler The request/response handler
-    #   for all service requests.  The default handler uses HTTParty to
-    #   send requests.
-    # @option options :logger (nil) A logger instance that should receive log
-    #   messages generated by service requets.  A logger needs to respond to
-    #   #log and must accept a severity (e.g. :info, :error, etc) and
-    #   a string message.
     # @option options [String, URI, nil] :proxy_uri (nil) The URI of the proxy 
     #    to send service requests through.  You can pass a URI object or a 
     #    URI string:
     #
     #       AWS.config(:proxy_uri => 'https://user:password@my.proxy:443/path?query')
-    # 
-    # @option options [String] :s3_endpoint ('s3.amazonaws.com') The
-    #   service endpoint to use when communicating with Amazon S3.
-    # @option [Integer] :s3_multipart_threshold (16777216) When uploading
-    #   data to S3, if the number of bytes to send exceedes 
+    #
+    # @option options [String] :s3_endpoint ('s3.amazonaws.com') The 
+    #   service endpoint for Amazon S3.
+    #
+    # @option options [Integer] :s3_multipart_max_parts (1000) The maximum 
+    #   number of parts to split a file into when uploading in parts to S3.
+    #
+    # @option options [Integer] :s3_multipart_threshold (16777216) When 
+    #   uploading data to S3, if the number of bytes to send exceedes 
     #   +:s3_multipart_threshold+ then a multi part session is automatically
     #   started and the data is sent up in chunks.  The size of each part
-    #   is specified by +:s3_multipart_min_part_size+.
-    # @option [Integer] :s3_multipart_min_part_size (5242880) 
-    # @option [Integer] :s3_multipart_max_parts (1000)
-    # @option options [Boolean] :simple_db_consistent_reads (false) When true
-    #   all read operations against SimpleDB will be consistent reads (slower).
+    #   is specified by +:s3_multipart_min_part_size+. Defaults to 
+    #   16777216 (16MB).
+    #
+    # @option options [Integer] :s3_multipart_min_part_size (5242880) The 
+    #   absolute minimum size (in bytes) each S3 multipart segment should be.
+    #   Defaults to 5242880 (5MB).
+    #
+    # @option options [String] :secret_access_key (nil) AWS secret access 
+    #   key credential.
+    #
+    # @option options [String,nil] :session_token (nil) AWS secret token 
+    #   credential.
+    #
     # @option options [String] :simple_db_endpoint ('sdb.amazonaws.com') The
-    #   service endpoint to use when communicating with Amazon SimpleDB.
-    # @option options [String] :simple_email_service_endpoint ('email.us-east-1.amazonaws.com')
-    #   The service endpoint to use when communicating with Amazon 
-    #   SimpleEmailService.
-    # @option options :signer The request signer.  Defaults to a
-    #   {DefaultSigner}.
-    # @option options [String] :sns_endpoint ('sns.us-east-1.amazonaws.com') 
-    #   The service endpoint to use when communicating with Amazon SNS.
-    # @option options [String] :sqs_endpoint ('sqs.us-east-1.amazonaws.com') 
-    #   The service endpoint to use when communicating with Amazon SQS.
-    # @option options :stub_requests (false) When true no requests will be
-    #   made against the live service.  Responses returned will have empty
-    #   values. This is primarily used for writing tests.
-    # @option options [Boolean] :use_ssl (true) When true, all requests are
-    #   sent over SSL.
-    # @option options [Boolean] :ssl_verify_peer (true) True if the HTTPS
-    #   client should validate the server certificate.  *Note:* This
-    #   option should only be used for diagnostic purposes; leaving
-    #   this option set to +false+ exposes your application to
+    #   service endpoint for Amazon SimpleDB.
+    #
+    # @option options [Boolean] :simple_db_consistent_reads (false) Determines
+    #   if all SimpleDB read requests should be done consistently.
+    #   Consistent reads are slower, but reflect all changes to SDB.
+    #
+    # @option options [String] :simple_email_service_endpoint ('email.us-east-1.amazonaws.com') 
+    #   The service endpoint for Amazon Simple Email Service.
+    #
+    # @option options [Object] :signer (AWS::DefaultSigner) The request signer.  Defaults to
+    #   a default request signer implementation.
+    #
+    # @option options [String] :ssl_ca_file The path to a CA cert bundle in 
+    #   PEM format.
+    #
+    #   If +:ssl_verify_peer+ is +true+ (the default) this bundle will be
+    #   used to validate the server certificate in each HTTPS request.
+    #   The AWS SDK for Ruby ships with a CA cert bundle, which is the
+    #   default value for this option.
+    #
+    # @option options [Boolean] :ssl_verify_peer (true) When +true+ 
+    #   the HTTP handler validate server certificates for HTTPS requests.
+    #
+    #   This option should only be disabled for diagnostic purposes;
+    #   leaving this option set to +false+ exposes your application to
     #   man-in-the-middle attacks and can pose a serious security
     #   risk.
-    # @option options [String] :ssl_ca_file The path to a CA cert
-    #   bundle in PEM format.  If +:ssl_verify_peer+ is true (the
-    #   default) this bundle will be used to validate the server
-    #   certificate in each HTTPS request.  The AWS SDK for Ruby ships
-    #   with a CA cert bundle, which is the default value for this
-    #   option.
+    #
+    # @option options[Boolean] :stub_requests (false) When +true+ requests 
+    #   are not sent to AWS, instead empty reponses are generated and 
+    #   returned to each service request.
+    #
+    # @option options [String] :sns_endpoint ('sns.us-east-1.amazonaws.com') The
+    #   service endpoint for Amazon SNS.
+    #
+    # @option options [String] :sqs_endpoint ('sqs.us-east-1.amazonaws.com') The
+    #   service endpoint for Amazon SQS.
+    #
+    # @option options [String] :sts_endpoint ('sts.amazonaws.com') The 
+    #   service endpoint for AWS Security Token Service.
+    #
+    # @option options [Boolean] :use_ssl (true) When +true+, all requests
+    #   to AWS are sent using HTTPS instead vanilla HTTP.
+    #
     # @option options [String] :user_agent_prefix (nil) A string prefix to 
     #   append to all requets against AWS services.  This should be set
     #   for clients and applications built ontop of the aws-sdk gem.
+    # 
     # @return [Configuration] Returns the new configuration.
     def config options = {}
       @@config ||= Configuration.new

data/lib/aws/configuration.rb

@@ -56,6 +56,114 @@ module AWS
   #
   # The global default configuration can be found at {AWS.config}
   #
+  # @attr_reader [String,nil] access_key_id AWS access key id credential.
+  #   Defaults to +nil+.
+  #
+  # @attr_reader [String] ec2_endpoint The service endpoint for Amazon EC2.
+  #   Defaults to 'ec2.amazonaws.com'.
+  #
+  # @attr_reader [Object] http_handler The http handler that sends requests
+  #   to AWS.  Defaults to an {AWS::HTTPartyHandler}.
+  #
+  # @attr_reader [String] iam_endpoint The service endpoint for AWS Idenity
+  #   Access Management (IAM).  Defaults to 'iam.amazonaws.com'.
+  #
+  # @attr_reader [Object,nil] logger A logger instance that 
+  #   should receive log messages generated by service requets.  
+  #   A logger needs to respond to #log and must accept a 
+  #   severity (e.g. :info, :error, etc) and a string message.
+  #   Defaults to +nil+.
+  #
+  # @attr_reader [Integer] max_retries The maximum number of times
+  #   service errors (500) should be retried.  There is an exponential 
+  #   backoff in between service request retries, so the more retries the
+  #   longer it can take to fail.  Defautls to 3.
+  #
+  # @attr_reader [String, URI, nil] proxy_uri The URI of the proxy 
+  #    to send service requests through.  You can pass a URI object or a 
+  #    URI string.  Defautls to +nil+.
+  #
+  #       AWS.config(:proxy_uri => 'https://user:password@my.proxy:443/path?query')
+  #
+  #
+  # @attr_reader [String] s3_endpoint The service endpoint for Amazon S3.
+  #   Defaults to 's3.amazonaws.com'.
+  #
+  # @attr_reader [Integer] s3_multipart_max_parts The maximum number of 
+  #   parts to split a file into when uploading in parts to S3.  
+  #   Defaults to 1000.
+  #
+  # @attr_reader [Integer] s3_multipart_threshold (16777216) When uploading
+  #   data to S3, if the number of bytes to send exceedes 
+  #   +:s3_multipart_threshold+ then a multi part session is automatically
+  #   started and the data is sent up in chunks.  The size of each part
+  #   is specified by +:s3_multipart_min_part_size+. Defaults to 
+  #   16777216 (16MB).
+  #
+  # @attr_reader [Integer] s3_multipart_min_part_size The absolute minimum
+  #   size (in bytes) each S3 multipart segment should be.
+  #   Defaults to 5242880 (5MB).
+  #
+  # @attr_reader [String,nil] secret_access_key AWS secret access key 
+  #   credential.  Defaults to +nil+.
+  #
+  # @attr_reader [String,nil] session_token AWS secret token credential.
+  #   Defaults to +nil+.
+  #
+  # @attr_reader [String] simple_db_endpoint The service endpoint for Amazon
+  #   SimpleDB.  Defaults to 'sdb.amazonaws.com'.
+  #
+  # @attr_reader [Boolean] simple_db_consistent_reads Determines
+  #   if all SimpleDB read requests should be done consistently.
+  #   Consistent reads are slower, but reflect all changes to SDB.
+  #   Defaults to +false+.
+  #
+  # @attr_reader [String] simple_email_service_endpoint The service endpoint
+  #   for Amazon Simple Email Service.  Defaults to 
+  #   'email.us-east-1.amazonaws.com'.
+  #
+  # @attr_reader [Object] signer The request signer.  Defaults to
+  #   a default request signer implementation.
+  #
+  # @attr_reader [String] ssl_ca_file The path to a CA cert bundle in 
+  #   PEM format.
+  #
+  #   If +ssl_verify_peer+ is true (the default) this bundle will be
+  #   used to validate the server certificate in each HTTPS request.
+  #   The AWS SDK for Ruby ships with a CA cert bundle, which is the
+  #   default value for this option.
+  #
+  # @attr_reader [Boolean] ssl_verify_peer When +true+ 
+  #   the HTTP handler validate server certificates for HTTPS requests.
+  #   Defaults to +true+.
+  #
+  #   This option should only be disabled for diagnostic purposes;
+  #   leaving this option set to +false+ exposes your application to
+  #   man-in-the-middle attacks and can pose a serious security
+  #   risk.
+  #
+  # @attr_reader [Boolean] stub_requests When +true+ requests are not
+  #   sent to AWS, instead empty reponses are generated and returned to
+  #   each service request.
+  #
+  # @attr_reader [String] sns_endpoint The service endpoint for Amazon SNS.
+  #   Defaults to 'sns.us-east-1.amazonaws.com'.
+  #
+  # @attr_reader [String] sqs_endpoint The service endpoint for Amazon SQS.
+  #   Defaults to 'sqs.us-east-1.amazonaws.com'.
+  #
+  # @attr_reader [String] sts_endpoint The service endpoint for AWS
+  #   Security Token Service.  Defaults to 'sts.amazonaws.com'.
+  #
+  # @attr_reader [Boolean] use_ssl When +true+, all requests
+  #   to AWS are sent using HTTPS instead vanilla HTTP.
+  #   Defaults to +true+.
+  #
+  # @attr_reader [String] user_agent_prefix A string prefix to 
+  #   append to all requets against AWS services.  This should be set
+  #   for clients and applications built ontop of the aws-sdk gem.
+  #   Defaults to +nil+.
+  #
   class Configuration
 
     # Creates a new Configuration object.
@@ -63,75 +171,17 @@ module AWS
     # @option options (see AWS.config)
     def initialize options = {}
 
-      @create_options = options.delete(:__create_options__) || {}
-
-      @overridden = options.delete(:__overridden__) ||
-        Set.new(options.keys.map { |k| k.to_sym })
-
-      @options = {
-        :ec2_endpoint => 'ec2.amazonaws.com',
-        :http_handler => Http::HTTPartyHandler.new,
-        :max_retries => 3,
-        :iam_endpoint => 'iam.amazonaws.com',
-        :s3_endpoint => 's3.amazonaws.com',
-        :s3_multipart_threshold => 16 * 1024 * 1024,
-        :s3_multipart_min_part_size => 5 * 1024 * 1024,
-        :s3_multipart_max_parts => 10000,
-        :simple_db_endpoint => 'sdb.amazonaws.com',
-        :simple_db_consistent_reads => false,
-        :simple_email_service_endpoint => 'email.us-east-1.amazonaws.com',
-        :sns_endpoint => 'sns.us-east-1.amazonaws.com',
-        :sqs_endpoint => 'sqs.us-east-1.amazonaws.com',
-        :sts_endpoint => 'sts.amazonaws.com',
-        :stub_requests => false,
-        :proxy_uri => nil,
-        :use_ssl => true,
-        :user_agent_prefix => nil,
-        :ssl_verify_peer => true,
-        :ssl_ca_file => File.expand_path(File.dirname(__FILE__)+
-                                         "/../../ca-bundle.crt")
-      }
-
-      {
-        'AWS_ACCESS_KEY_ID'        => :access_key_id,
-        'AWS_SECRET_ACCESS_KEY'    => :secret_access_key,
-        'AMAZON_ACCESS_KEY_ID'     => :access_key_id,
-        'AMAZON_SECRET_ACCESS_KEY' => :secret_access_key,
-      }.each_pair do |env_key, opt_key|
-        if ENV[env_key]
-          @options[opt_key] = ENV[env_key]
-        end
-      end
+      @created = options.delete(:__created__) || {}
 
-      options.each do |(k,v)|
-        @options[k.to_sym] = v
+      options.each_pair do |opt_name, value|
+        opt_name = opt_name.to_sym
+        if self.class.accepted_options.include?(opt_name)
+          supplied[opt_name] = value
+        end
       end
 
     end
 
-    # @return [Boolean] Returns true if web service requets should be 
-    #   made with HTTPS.
-    def use_ssl?
-      @options[:use_ssl]
-    end
-    alias_method :use_ssl, :use_ssl?
-
-    # @return [String] Your AWS account access key id credential.
-    def access_key_id
-      @options[:access_key_id]
-    end
-
-    # @return [String] Your AWS secret access key credential.
-    def secret_access_key
-      @options[:secret_access_key]
-    end
-
-    # @return [String] Your AWS session token credential.
-    # @see STS
-    def session_token
-      @options[:session_token]
-    end
-
     # Used to create a new Configuration object with the given modifications.
     # The current configuration object is not modified.
     #
@@ -153,172 +203,155 @@ module AWS
     # @return [Configuration] Copies the current configuration and returns
     #   a new one with modifications as provided in +:options+.
     def with options = {}
-      overridden = @overridden + options.keys.map { |k| k.to_sym }
-      self.class.new(@options.merge(options).
-                     merge(:__create_options__ => @create_options,
-                           :__overridden__ => overridden))
-    end
 
-    # @return [Integer] Maximum number of times to retry server errors.
-    def max_retries
-      @options[:max_retries]
-    end
+      # symbolize option keys
+      options = options.inject({}) {|h,kv| h[kv.first.to_sym] = kv.last; h }
 
-    # @return [String] The service endpoint for AWS Idenity Access 
-    #   Management (IAM).
-    def iam_endpoint
-      @options[:iam_endpoint]
-    end
+      values = supplied.merge(options)
 
-    # @return [String] The service endpoint for Amazon S3.
-    def s3_endpoint
-      @options[:s3_endpoint]
-    end
+      if supplied == values
+        self # nothing changed
+      else
+        self.class.new(values.merge(:__created__ => @created))
+      end
 
-    # @return [String] The default service endpoint for Amazon EC2.
-    def ec2_endpoint
-      @options[:ec2_endpoint]
     end
 
-    # @return [String] The service endpoint for Amazon SimpleDB.
-    def simple_db_endpoint
-      @options[:simple_db_endpoint]
+    # @return [Hash] Returns a hash of all configuration values.
+    def to_h
+      self.class.accepted_options.inject({}) do |h,k|
+        h[k] = send(k)
+        h
+      end
     end
 
-    # @return [String] The service endpoint for Amazon SimpleEmailService.
-    def simple_email_service_endpoint
-      @options[:simple_email_service_endpoint]
+    # @return [Boolean] Returns true if the two configuration objects have
+    #   the same values.
+    def == other
+      other.is_a?(self.class) and self.supplied == other.supplied
     end
 
-    # @return [String] The service endpoint for Amazon SNS.
-    def sns_endpoint
-      @options[:sns_endpoint]
-    end
+    alias_method :eql, :==
 
-    # @return [String] The service endpoint for Amazon SQS.
-    def sqs_endpoint
-      @options[:sqs_endpoint]
+    # @private
+    def inspect
+      "<#{self.class.name}>"
     end
 
-    # @return [String] The service endpoint for AWS Security Token Service.
-    def sts_endpoint
-      @options[:sts_endpoint]
+    protected
+    def supplied
+      @supplied ||= {}
     end
 
-    # @return [Boolean] Returns true if all reads to SimpleDB default to
-    #   consistent reads.
-    def simple_db_consistent_reads?
-      @options[:simple_db_consistent_reads]
-    end
+    class << self
 
-    # @return [String,nil] Returns the prefix that is appended to the 
-    #   user agent string that is sent with all requests to AWS.
-    def user_agent_prefix
-      @options[:user_agent_prefix]
-    end
+      # @private
+      def accepted_options
+        @options ||= Set.new
+      end
 
-    # @return [Object] Returns the current http handler.
-    def http_handler
-      @options[:http_handler]
-    end
+      # @private
+      def add_option name, default_value = nil, options = {}, &transform
 
-    # @return [Object] Returns the current request signer.
-    def signer
-      return @options[:signer] if @options[:signer]
-      raise "Missing credentials" unless access_key_id and secret_access_key
-      @options[:signer] ||=
-        DefaultSigner.new(access_key_id, secret_access_key, session_token)
-    end
+        accepted_options << name
 
-    # @return [Object,nil] Returns the current logger.
-    def logger
-      @options[:logger]
-    end
+        define_method(name) do
+          value = supplied.has_key?(name) ? supplied[name] : default_value
+          transform ? transform.call(value) : value
+        end
 
-    # @return [Boolean] Returns true if this configuration causes
-    #   all AWS requests to return stubbed (empty) responses without making a
-    #   request to the actual service.
-    def stub_requests?
-      @options[:stub_requests]
-    end
+        alias_method("#{name}?", name) if options[:boolean]
 
-    # @return [Integer] Returns the number of bytes where files larger 
-    #   are uploaded to S3 in multiple parts.
-    def s3_multipart_threshold
-      @options[:s3_multipart_threshold]
-    end
+      end
 
-    # @return [Integer] The absolute minimum size (in bytes) each S3 multipart
-    #   segment should be.
-    def s3_multipart_min_part_size
-      @options[:s3_multipart_min_part_size]
-    end
+      # Configuration options that have dependencies are re-recreated
+      # anytime one of their dependendent configuration values are
+      # changed.
+      # @private
+      def add_option_with_needs name, needs, &create_block
+        
+        accepted_options << name
 
-    # @return [Integer] The maximum number of parts to split a file into
-    #   when uploading to S3.
-    def s3_multipart_max_parts
-      @options[:s3_multipart_max_parts]
-    end
+        define_method(name) do
 
-    # @return [Boolean] True if the HTTPS client should validate the
-    #   server certificate.
-    #
-    # @note This option should only be used for diagnostic purposes;
-    #   leaving this option set to +false+ exposes your application to
-    #   man-in-the-middle attacks and can pose a serious security
-    #   risk.
-    def ssl_verify_peer?
-      @options[:ssl_verify_peer]
-    end
+          return supplied[name] if supplied.has_key?(name)
 
-    # @return [String] The path to a CA cert bundle in PEM format.
-    #
-    # If {#ssl_verify_peer?} is true (the default) this bundle will be
-    # used to validate the server certificate in each HTTPS request.
-    # The AWS SDK for Ruby ships with a CA cert bundle, which is the
-    # default value for this option.
-    def ssl_ca_file
-      @options[:ssl_ca_file]
-    end
+          needed = needs.collect{|need| send(need) }
 
-    # @return [URI::HTTP, URI::HTTPS, nil] Returns the URI for the configured
-    #   proxy if there is one.  Defaults to nil.
-    def proxy_uri
-      @options[:proxy_uri] ? URI.parse(@options[:proxy_uri].to_s) : nil
-    end
+          unless @created.key?(name) and @created[name][:needed] == needed
+            @created[name] ||= {}
+            @created[name][:object] = create_block.call(self)
+            @created[name][:needed] = needed
+          end
+
+          @created[name][:object]
+          
+        end
+
+      end
 
-    # @private
-    def inspect
-      "<#{self.class}>"
     end
 
-    class << self
+    add_option :access_key_id, 
+      ENV['AWS_ACCESS_KEY_ID'] || ENV['AMAZON_ACCESS_KEY_ID']
 
-      # @private
-      def add_parameter_type(klass, name, options = {})
-        if options[:needs]
-          define_method(name) do
-            unless @overridden.include?(name)
-              create_options = { :config => self }
-              options[:needs].each do |need|
-                create_options[need] = send(need)
-              end
-            end
-
-            return @options[name] if @options[name] and
-              (@overridden.include?(name) or
-               @create_options[name] == create_options)
-
-            @create_options[name] = create_options
-            @options[name] = klass.new(create_options)
-          end
-        else
-          define_method(name) do
-            @options[name] ||= klass.new(:config => self)
-          end
-        end
-      end
+    add_option :ec2_endpoint, 'ec2.amazonaws.com'
+
+    add_option :s3_endpoint, 's3.amazonaws.com'
+
+    add_option :http_handler, Http::HTTPartyHandler.new
+
+    add_option :iam_endpoint, 'iam.amazonaws.com'
+
+    add_option :logger
+
+    add_option :max_retries, 3
+
+    add_option :proxy_uri do |uri| uri ? URI.parse(uri.to_s) : nil end
+
+    add_option :s3_multipart_threshold, 16 * 1024 * 1024
+
+    add_option :s3_multipart_min_part_size, 5 * 1024 * 1024
+
+    add_option :s3_multipart_max_parts, 10000
+
+    add_option :secret_access_key, 
+      ENV['AWS_SECRET_ACCESS_KEY'] || ENV['AMAZON_SECRET_ACCESS_KEY']
+
+    add_option :session_token
+
+    add_option_with_needs :signer, 
+      [:access_key_id, :secret_access_key, :session_token] do |config|
+
+      DefaultSigner.new(
+        config.access_key_id, 
+        config.secret_access_key, 
+        config.session_token)
 
     end
+
+    add_option :simple_db_endpoint, 'sdb.amazonaws.com'
+
+    add_option :simple_db_consistent_reads, false, :boolean => true
+
+    add_option :simple_email_service_endpoint, 'email.us-east-1.amazonaws.com'
+
+    add_option :sns_endpoint, 'sns.us-east-1.amazonaws.com'
+
+    add_option :sqs_endpoint, 'sqs.us-east-1.amazonaws.com'
+
+    add_option :ssl_verify_peer, true, :boolean => true
+
+    add_option :ssl_ca_file, 
+      File.expand_path(File.dirname(__FILE__) + "/../../ca-bundle.crt")
+
+    add_option :sts_endpoint, 'sts.amazonaws.com'
+
+    add_option :stub_requests, false, :boolean => true
+
+    add_option :use_ssl, true, :boolean => true
+
+    add_option :user_agent_prefix
+
   end
 end

data/lib/aws/default_signer.rb

@@ -37,12 +37,14 @@ module AWS
     # @param [String] session_token The Session Token used to sign
     #   requests.  You can get credentials that include a session
     #   token using the {STS} class.
-    def initialize(access_key_id,
-                   secret_access_key,
-                   session_token = nil)
+    def initialize(access_key_id, secret_access_key, session_token = nil)
+
       @access_key_id = access_key_id
       @secret_access_key = secret_access_key
       @session_token = session_token
+
+      raise "Missing credentials" unless access_key_id and secret_access_key
+
     end
 
     # Signs a string using the credentials stored in memory.

data/lib/aws/iam.rb

@@ -108,7 +108,7 @@ module AWS
   # See {AccessKeyCollection} and {AccessKey} for more information about
   # working with access keys.
   #
-  # = Users & Gropus
+  # = Users & Groups
   #
   # Each AWS account can have multiple users.  Users can be used to easily
   # manage permissions.  Users can also be organized into groups.  

data/lib/aws/s3/presigned_post.rb

@@ -357,7 +357,8 @@ module AWS
                          :key => key,
                          :metadata => metadata,
                          :secure => secure?,
-                         :content_length => content_length
+                         :content_length => content_length,
+                         :expires => expires
                        }.merge(@fields).
                        merge(opts))
       end

data/lib/aws/uri_escape.rb

@@ -33,7 +33,11 @@ module AWS
     # @private
     protected
     def escape_path value
-      value.split("/").map { |part| escape(part) }.join("/")
+      escaped = ""
+      value.scan(%r{(/?)([^/]+)(/?)}) do |(leading, part, trailing)|
+        escaped << leading + escape(part) + trailing
+      end
+      escaped
     end
 
   end

metadata

@@ -1,93 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: aws-sdk
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.1.1
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-16 00:00:00 -07:00
+date: 2011-08-18 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: uuidtools
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2163583560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
-        version: "2.1"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  name: httparty
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2163583560
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: &2163582960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2163582960
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2163582380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.4
   type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2163582380
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2163581800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
-  requirement: *id004
+  prerelease: false
+  version_requirements: *2163581800
 description: AWS SDK for Ruby
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - ca-bundle.crt
 - rails/init.rb
 - lib/aws/api_config.rb
@@ -101,7 +75,6 @@ files:
 - lib/aws/client_logging.rb
 - lib/aws/collections.rb
 - lib/aws/common.rb
-- lib/aws/configurable.rb
 - lib/aws/configuration.rb
 - lib/aws/configured_client_methods.rb
 - lib/aws/configured_grammars.rb
@@ -339,37 +312,31 @@ files:
 - LICENSE.txt
 has_rdoc: true
 homepage: http://aws.amazon.com/sdkforruby
-licenses: 
+licenses:
 - Apache 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2676721713860142099
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: AWS SDK for Ruby
 test_files: []
-

data/lib/aws/configurable.rb

@@ -1,36 +0,0 @@
-# Copyright 2011 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.
-
-require 'aws/configuration'
-
-module AWS
-
-  # @private
-  module Configurable
-
-    module ClassMethods
-
-      def make_configurable(name, opts = {})
-        Configuration.add_parameter_type(self, name, opts)
-      end
-
-    end
-
-    def self.included(m)
-      m.extend ClassMethods
-      super
-    end
-
-  end
-
-end