aws-sdk 1.4.1 → 1.5.0

data/lib/aws/iam/collection.rb

@@ -70,9 +70,10 @@ module AWS
         options[:max_items] = max_items if max_items
 
         response = client.send(request_method, options)
+
         each_item(response, &block)
 
-        response.marker if response.respond_to?(:marker)
+        response.data[:marker]
 
       end
 

data/lib/aws/iam/errors.rb

@@ -13,15 +13,10 @@
 
 module AWS
   class IAM
-
-    # @private
     module Errors
 
-      BASE_ERROR_GRAMMAR = Client::XML::BaseError
-
-      include Core::LazyErrorClasses
+      extend Core::LazyErrorClasses
 
     end
-
   end
 end

data/lib/aws/iam/group.rb

@@ -20,6 +20,12 @@ module AWS
     # their jobs. For example, you could have a group called Admins
     # and give that group the types of permissions admins typically
     # need.
+    # @attr [String] name The group's name.
+    # @attr_reader [String] id The group's unique ID.
+    # @attr_reader [Time] create_date When the group was created.
+    # @attr_reader [String] arn The group's ARN (Amazon Resource Name).
+    # @attr [String] path The group's path.  Paths are used to identify
+    #   which division or part of an organization the group belongs to.
     class Group < Resource
 
       prefix_update_attributes
@@ -30,21 +36,14 @@ module AWS
         super
       end
 
-      # @attr [String] The group's name.
       mutable_attribute :name, :static => true, :as => :group_name
 
-      # @attr_reader [String] The group's unique ID.
       attribute :id, :static => true, :as => :group_id
 
-      # @attr_reader [Time] When the group was created.
       attribute :create_date, :static => true
 
-      # @attr_reader [String] The group's ARN (Amazon Resource Name).
       attribute :arn
 
-      # @attr [String] The group's path.  Paths are used to identify
-      #   which division or part of an organization the group belongs
-      #   to.
       mutable_attribute :path do
         translates_input do |path|
           path = "/#{path}" unless path[0] == ?/
@@ -54,11 +53,11 @@ module AWS
       end
 
       populates_from(:get_group, :create_group) do |resp|
-        resp.group if resp.group.group_name == name
+        resp[:group] if resp[:group][:group_name] == name
       end
 
       populates_from(:list_groups, :list_groups_for_user) do |resp|
-        resp.groups.find { |g| g.group_name == name }
+        resp[:groups].find {|g| g[:group_name] == name }
       end
 
       # (see Resource#exists?)

data/lib/aws/iam/request.rb

@@ -17,7 +17,7 @@ module AWS
     # @private
     class Request < Core::Http::Request
 
-      include Core::AuthorizeV4
+      include Core::Signature::Version4
 
       def service
         'iam'

data/lib/aws/iam/server_certificate_collection.rb

@@ -87,7 +87,8 @@ module AWS
       #
       # @return [ServerCertificate] The newly created server
       #   certificate.
-      def upload(options = {})
+      def create options = {}
+
         client_opts = options.dup
         client_opts[:server_certificate_name] = client_opts.delete(:name)
 
@@ -98,11 +99,13 @@ module AWS
         end
 
         resp = client.upload_server_certificate(client_opts)
-        ServerCertificate.new(resp.server_certificate_metadata.
-                              server_certificate_name,
-                              :config => config)
+
+        ServerCertificate.new(
+          resp[:server_certificate_metadata][:server_certificate_name], 
+          :config => config)
+
       end
-      alias_method :create, :upload
+      alias_method :upload, :create
 
       # Returns a reference to the server certificate with the given
       # name:

data/lib/aws/iam/signing_certificate.rb

@@ -55,7 +55,7 @@ module AWS
 
       # @param [String] certificate_id The id of the signing certificate.
       # @param [Hash] options
-      # @param [User] :user The user this signing certificate belongs to.
+      # @option options [User] :user
       def initialize certificate_id, options = {}
         @id = certificate_id
         @user = options[:user]

data/lib/aws/iam/user.rb

@@ -97,11 +97,11 @@ module AWS
       mutable_attribute :path
 
       populates_from(:create_user, :get_user) do |resp|
-        resp.user if resp.user.user_name == name
+        resp[:user] if resp[:user][:user_name] == name
       end
 
       populates_from(:list_users, :get_group) do |resp|
-        resp.users.find{|u| u.user_name == name }
+        resp[:users].find{|u| u[:user_name] == name }
       end
 
       # Deletes this user.

data/lib/aws/iam/user_policy.rb

@@ -18,8 +18,9 @@ module AWS
 
     class UserPolicy < Resource
 
-      # @param [User] The user this user policy belongs to.
-      # @param [String] The name of this user policy.
+      # @param [User] user The user this user policy belongs to.
+      # @param [String] name The name of this user policy.
+      # @param [Hash] options
       def initialize user, name, options = {}
         @user = user
         @name = name

data/lib/aws/rails.rb

@@ -136,8 +136,6 @@ module AWS
     #
     #   AWS.add_action_mailer_delivery_method(:ses, custom_options)
     #
-    # @param [Hash] options
-    #
     # @param [Symbol] name (:amazon_ses) The name of the delivery
     #   method.  The name used here should be the same as you set in
     #   your environment config.  If you name the delivery method
@@ -150,6 +148,7 @@ module AWS
     #   {AWS::SimpleEmailService#new} before delivering email.
     #
     # @return [nil]
+    #
     def self.add_action_mailer_delivery_method name = :amazon_ses, options = {}
 
       if ::Rails.version.to_f >= 3

data/lib/aws/record.rb

@@ -40,8 +40,8 @@ module AWS
     #   p.shard #=> 'products'
     #   p.save # the product is persisted to the 'production-products' domain
     #
-    # @param [String] A prefix to append to all domains.  This is useful for
-    #   grouping domains used by one application with a single prefix.
+    # @param [String] prefix A prefix to append to all domains.  This is useful 
+    #   for grouping domains used by one application with a single prefix.
     #
     def self.domain_prefix= prefix
       @domain_prefix = prefix
@@ -66,7 +66,7 @@ module AWS
     #   p.shard #=> 'products'
     #   p.save # the product is persisted to the 'production-products' table
     #
-    # @param [String] A prefix to append to all tables.  This is
+    # @param [String] prefix A prefix to append to all tables.  This is
     #   useful for grouping tables used by one application with a
     #   single prefix.
     #

data/lib/aws/record/abstract_base.rb

@@ -44,9 +44,6 @@ module AWS
 
         # Constructs a new record.
         #
-        # @param [Hash] attributes A set of attribute values to seed this record
-        #   with.  The attributes are bulk assigned.
-        #
         # @param [Hash] attributes Attributes that should be bulk assigned
         #   to this record.  You can also specify the shard (i.e. domain 
         #   or table) this record should persist to via +:shard+).

data/lib/aws/record/attributes.rb

@@ -20,7 +20,7 @@ module AWS
       # Base class for all of the AWS::Record attributes.
       class BaseAttr
   
-        # @param [Symbol] Name of this attribute.  It should be a name that
+        # @param [Symbol] name Name of this attribute.  It should be a name that
         #   is safe to use as a method.
         # @param [Hash] options
         # @option options [String] :persist_as Defaults to the name of the 
@@ -59,20 +59,20 @@ module AWS
           (options[:persist_as] || @name).to_s
         end
   
-        # @param [Mixed] A single value to type cast.
+        # @param [Mixed] raw_value A single value to type cast.
         # @return [Mixed] Returns the type casted value.
         def type_cast raw_value
           self.class.type_cast(raw_value, options)
         end
   
-        # @param [String] The serialized string value.
+        # @param [String] serialized_value The serialized string value.
         # @return [Mixed] Returns a deserialized type-casted value.
         def deserialize serialized_value
           self.class.deserialize(serialized_value, options)
         end
   
         # Takes the type casted value and serializes it
-        # @param [Mixed] A single value to serialize.
+        # @param [Mixed] type_casted_value A single value to serialize.
         # @return [Mixed] Returns the serialized value.
         def serialize type_casted_value
           self.class.serialize(type_casted_value, options)
@@ -116,7 +116,7 @@ module AWS
         #   string_attr.type_cast('', :preserve_empty_strings => true)
         #   # => ''
         #
-        # @param [Mixed] value
+        # @param [Mixed] raw_value
         # @param [Hash] options
         # @option options [Boolean] :preserve_empty_strings (false) When true,
         #   empty strings are preserved and not cast to nil.  
@@ -189,7 +189,7 @@ module AWS
         #   int_attribute.type_cast('')
         #   #=> nil
         #
-        # @param [Mixed] value The value to type cast to an integer.
+        # @param [Mixed] raw_value The value to type cast to an integer.
         # @return [Integer,nil] Returns the type casted integer or nil
         def self.type_cast raw_value, options = {}
           case raw_value
@@ -294,7 +294,7 @@ module AWS
         #   attribute.serialize(DateTime.parse('2001-01-01'))
         #   #=> '2001-01-01'
         #
-        # @param [Date] datetime The date to serialize.
+        # @param [Date] date The date to serialize.
         #
         # @param [Hash] options
         #

data/lib/aws/record/model.rb

@@ -280,33 +280,33 @@ module AWS
         #   class Product < AWS::Record::Model
         #   end
         #
-        #   Product.create_table #=> creates the SimpleDB domain 'Product'
-        #
-        # If you shard you data across multiple domains, you can specify the
-        # shard name:
-        #
-        #   # create two domains, with the given names
-        #   Product.create_domain :shard_name => 'products-1'
-        #   Product.create_domain :shard_name => 'products-2'
+        #   Product.create_table #=> 'Product'
         #
         # If you share a single AWS account with multiple applications, you
-        # can provide a domain prefix to group domains and to avoid name
-        # collisions:
+        # can provide a domain prefix for your model classes.
         #
         #   AWS::Record.domain_prefix = 'myapp-'
         #
-        #   # creates the domain 'myapp-Product'
-        #   Product.create_domain
+        #   Product.create_table #=> 'myapp-Product'
         #
-        #   # creates the domain 'myapp-products-1'
-        #   Product.create_domain :shard_name => 'products-1'
+        # If you have set a model shard name, this is used in place of the
+        # class name.
         #
-        # @param [Hash] options Hash of options passed to 
-        #   {SimpleDB::DomainCollection#create}.  
+        #   AWS::Record.domain_prefix = 'prod-'
+        #   class Product < AWS::Record::Model
+        #     set_shard_name 'products'
+        #   end
+        #
+        #   Product.create_table #=> 'prod-products'
+        #
+        # If you shard you data across multiple domains, you can specify the
+        # shard name:
+        #
+        #   # create two domains, with the given names
+        #   Product.create_domain 'products-1'
+        #   Product.create_domain 'products-2'
         #
-        # @option options [String] :shard_name Defaults to the class name.  The
-        #   shard name will be prefixed with {AWS::Record.domain_prefix},
-        #   and that becomes the domain name.
+        # @param [optional,String] shard_name Defaults to the class name.
         #
         # @return [SimpleDB::Domain]
         #

data/lib/aws/record/model/finder_methods.rb

@@ -93,7 +93,7 @@ module AWS
         #    # ...
         #  end
         #
-        # @param [String] domain
+        # @param [String] shard_name
         # @return [Scope] Returns a scope for restricting the domain of subsequent
         def shard shard_name
           new_scope.shard(shard_name)
@@ -186,11 +186,12 @@ module AWS
         #   Car.where(:color => 'red').order(:price, :desc).limit(10)
         #   
         # @overload where(conditions_hash)
+        #   @param [Hash] conditions_hash A hash of attributes to values.  Each 
+        #     key/value pair from the hash becomes a find condition.  All
+        #     conditions are joined by AND.
+        #
         # @overload where(sql_fragment[, quote_params, ...])
         #
-        # @param [Hash] conditions_hash A hash of attributes to values.  Each 
-        #   key/value pair from the hash becomes a find condition.  All conditions
-        #   are joined by AND.
         def where *args
           new_scope.where(*args)
         end
@@ -206,9 +207,8 @@ module AWS
         #   Pepole.order(:age, :desc).limit(10).each {|person| ... }
         #
         # @overload order(attribute, direction = :asc)
-        # @param [String,Symbol] attribute The attribute in SimpleDB to sort by.
-        # @param [:asc,:desc] direction (:asc) The direction to sort, ascending
-        #   or descending order.
+        #   @param [String,Symbol] attribute The attribute to sort by.
+        #   @param [:asc,:desc] direction (:asc) The direction to sort.
         def order *args
           new_scope.order(*args)
         end

data/lib/aws/s3/bucket.rb

@@ -202,10 +202,14 @@ module AWS
       #
       # @return [AccessControlList]
       def acl
-        acl = client.get_bucket_acl(:bucket_name => name).acl
+
+        resp = client.get_bucket_acl(:bucket_name => name)
+
+        acl = AccessControlList.new(resp.data)
         acl.extend ACLProxy
         acl.bucket = self
         acl
+
       end
 
       # Sets the bucket's access control list.  +acl+ can be:
@@ -263,7 +267,8 @@ module AWS
       # @return [Policy,nil] Returns the bucket policy (if it has one),
       #   or it returns +nil+ otherwise.
       def policy
-        policy = client.get_bucket_policy(:bucket_name => name).policy
+        resp = client.get_bucket_policy(:bucket_name => name)
+        policy = Policy.from_json(resp.data[:policy])
         policy.extend(PolicyProxy)
         policy.bucket = self
         policy

data/lib/aws/s3/client.rb

@@ -20,79 +20,39 @@ require 'digest/md5'
 module AWS
   class S3
 
-    ##
-    # Provides a low-level client to Amazon S3:
-    #
-    # * Each method makes exactly one request to S3, and no two
-    #   methods make the same type of request.
-    #
-    # * These methods hide the details of how request parameters are
-    #   sent to S3; for example:
-    #
-    #     client.set_bucket_acl(# controls which host to connect to
-    #                           :bucket_name => "mybucket",
-    #                           # the request payload
-    #                           :acl => [{ :grantee => "..." }])
-    #
-    # * These methods return subclasses of Response, so that you can
-    #   always get access to the request that was made and the raw
-    #   HTTP response.  You can also access S3-specific response
-    #   metadata.  For example:
-    #
-    #     response = client.list_buckets
-    #     response.http_request.http_method # => "GET"
-    #     response.http_response.body  # => "<ListAllMyBucketsResult xmlns..."
-    #     response.request_id          # => "32FE2CEB32F5EE25"
-    #                                  # (S3-specific metadata)
-    #
-    # * This client attempts to raise ArgumentError for any invalid
-    #   requests it can detect before sending a request to the
-    #   service.  For example:
-    #
-    #     begin
-    #       client.create_bucket
-    #     rescue ArgumentError => e
-    #       puts e                     # prints "The bucket_name parameter is
-    #                                  # required"
-    #     end
-    #
-    # * Each method can take an +:async+ to turn it into an
-    #   asynchronous operation.  Instead of blocking on the response
-    #   to the service call, the method will return a handle on the
-    #   response.  For example:
-    #
-    #     response = client.list_buckets(:async => true)
-    #     response.on_success { p response.buckets.map(&:name) }
-    #
-    # @private
+    # Client class for Amazon Simple Storage Service (S3).
     class Client < Core::Client
 
-      AWS.register_autoloads(self) do
-        autoload :XML, 'xml'
-      end
-
       API_VERSION = '2006-03-01'
 
       XMLNS = "http://s3.amazonaws.com/doc/#{API_VERSION}/"
 
+      AWS.register_autoloads(self) do
+        autoload :XML, 'xml'
+      end
+
+      # @private
       EMPTY_BODY_ERRORS = {
         304 => Errors::NotModified,
         404 => Errors::NoSuchKey
       }
 
+      # @private
+      CACHEABLE_REQUESTS = Set[]
+
       include DataOptions
       include Core::UriEscape
 
-      configure_client
-
       protected
+
       def self.bucket_method(method_name, verb, *args, &block)
+
         method_options = (args.pop if args.last.kind_of?(Hash)) || {}
-        xml_grammar = (args.pop if args.last.respond_to?(:parse))
+        xml_grammar = (args.pop if args.last.respond_to?(:rules))
         verb = verb.to_s.upcase
         subresource = args.first
 
-        add_client_request_method(method_name, :xml_grammar => xml_grammar) do
+        add_client_request_method(method_name) do
 
           configure_request do |req, options|
               require_bucket_name!(options[:bucket_name])
@@ -110,10 +70,26 @@ module AWS
           end
 
           instance_eval(&block) if block
+
+          if xml_grammar
+
+            parser = Core::XML::Parser.new(xml_grammar.rules)
+    
+            process_response do |resp|
+              resp.data = parser.parse(resp.http_response.body)
+              super(resp)
+            end
+    
+            simulate_response do |resp|
+              resp.data = parser.simulate
+              super(resp)
+            end
+    
+          end
+
         end
       end
 
-      protected
       def self.object_method(method_name, verb, *args, &block)
         bucket_method(method_name, verb, *args) do
           configure_request do |req, options|
@@ -128,6 +104,11 @@ module AWS
 
       public
 
+      # Creates a bucket.
+      # @overload create_bucket(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
       bucket_method(:create_bucket, :put) do
         configure_request do |req, options|
           validate_bucket_name!(options[:bucket_name])
@@ -144,14 +125,18 @@ module AWS
         end
       end
 
-      ##
-      # Deletes a bucket.
-      #
-      # == Required Options
-      #
-      # * +:bucket_name+ -- The name of the bucket.
+      # Deletes an empty bucket.
+      # @overload delete_bucket(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
       bucket_method(:delete_bucket, :delete)
 
+      # @overload set_bucket_lifecycle_configuration(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :lifecycle_configuration
+      #   @return [Core::Response]
       bucket_method(:set_bucket_lifecycle_configuration, :put) do
 
         configure_request do |req, options|
@@ -165,6 +150,10 @@ module AWS
 
       end
 
+      # @overload get_bucket_lifecycle_configuration(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
       bucket_method(:get_bucket_lifecycle_configuration, :get) do
 
         configure_request do |req, options|
@@ -174,12 +163,15 @@ module AWS
 
         process_response do |resp|
           xml = resp.http_response.body
-          data = XML::GetBucketLifecycleConfiguration.parse(xml)
-          Core::MetaUtils.extend_method(resp, :data) { ResponseData.new(data) }
+          resp.data = XML::GetBucketLifecycleConfiguration.parse(xml)
         end
 
       end
 
+      # @overload delete_bucket_lifecycle_configuration(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
       bucket_method(:delete_bucket_lifecycle_configuration, :delete) do
         
         configure_request do |req, options|
@@ -189,38 +181,36 @@ module AWS
 
       end
 
-      # delete_bucket_lifecycle_configuration
-
-      ##
-      # Lists the buckets in the account.
+      # @overload list_buckets(options = {})
+      #   @param [Hash] options
+      #   @return [Core::Response]
       add_client_request_method(:list_buckets) do
+
         configure_request do |req, options|
           req.http_method = "GET"
         end
 
         process_response do |resp|
-          XML::ListBuckets.parse(resp.http_response.body, :context => resp)
+          resp.data = XML::ListBuckets.parse(resp.http_response.body)
         end
+
+        simulate_response do |resp|
+          resp.data = Core::XML::Parser.new(XML::ListBuckets.rules).simulate
+        end
+
       end
 
-      ##
       # Sets the access policy for a bucket.
-      #
-      # == Required Options
-      #
-      # * +:bucket_name+ -- The name of the bucket.
-      #
-      # * +:policy+ -- The new policy.  This can be a string (which
-      #   is assumed to contain a valid policy expressed in JSON), a
-      #   Policy or any object that responds to +to_json+.
-      #
-      # == Response
-      #
-      # The response contains only the standard fields.
+      # @overload set_bucket_policy(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :policy This can be a String
+      #     or any object that responds to +#to_json+.
+      #   @return [Core::Response]
       bucket_method(:set_bucket_policy, :put, 'policy') do
 
         configure_request do |req, options|
-            require_policy!(options[:policy])
+          require_policy!(options[:policy])
           super(req, options)
           policy = options[:policy]
           policy = policy.to_json unless policy.respond_to?(:to_str)
@@ -229,37 +219,33 @@ module AWS
 
       end
 
-      ##
       # Gets the access policy for a bucket.
-      #
-      # == Required Options
-      #
-      # * +:bucket_name+ -- The name of the bucket.
-      #
-      # == Response
-      #
-      # A successful response will have a +policy+ method that
-      # returns an instance of Policy.
-      #
+      # @overload get_bucket_policy(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
       bucket_method(:get_bucket_policy, :get, 'policy') do
+
         process_response do |resp|
-          # FIXME: this makes unit testing easier, but is there something
-          # we should be doing in case of invalid JSON from the service?
-          policy = Policy.from_json(resp.http_response.body) rescue nil
-          Core::MetaUtils.extend_method(resp, :policy) { policy }
+          resp.data[:policy] = resp.http_response.body
         end
+
       end
 
-      ##
       # Deletes the access policy for a bucket.
-      #
-      # == Required Options
-      #
-      # * +:bucket_name+ -- The name of the bucket.
-      #
+      # @overload delete_bucket_policy(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
       bucket_method(:delete_bucket_policy, :delete, 'policy')
 
+      # @overload set_bucket_versioning(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :state
+      #   @return [Core::Response]
       bucket_method(:set_bucket_versioning, :put, 'versioning') do
+
         configure_request do |req, options|
           state = options[:state].to_s.downcase.capitalize
           unless state =~ /^(Enabled|Suspended)$/
@@ -272,24 +258,40 @@ module AWS
             </VersioningConfiguration>
           XML
         end
+
       end
 
-      ##
       # Gets the bucket's location constraint.  
-      # @return [String] The bucket location constraint.  Returns nil if
-      #   the bucket was created in the US classic region.
+      # @overload get_bucket_location(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
       bucket_method(:get_bucket_location, :get, 'location') do
+
         process_response do |response|
           regex = />(.*)<\/LocationConstraint>/
           matches = response.http_response.body.match(regex)
-          location = matches ? matches[1] : nil
-          Core::MetaUtils.extend_method(response, :location_constraint) { location }
+          response.data[:location_constraint] = matches ? matches[1] : nil
         end
+
       end
 
+      # @overload get_bucket_versioning(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
       bucket_method(:get_bucket_versioning, :get, 'versioning',
         XML::GetBucketVersioning)
 
+      # @overload list_object_versions(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [String] :prefix
+      #   @option options [String] :delimiter
+      #   @option options [String] :max_keys
+      #   @option options [String] :key_marker
+      #   @option options [String] :version_id_marker
+      #   @return [Core::Response]
       bucket_method(:list_object_versions, :get, 'versions',
         XML::ListObjectVersions) do
 
@@ -305,24 +307,19 @@ module AWS
 
       end
 
-      ##
       # Sets the access control list for a bucket.
-      #
-      # == Required Options
-      #
-      # * +:bucket_name+ -- The name of the bucket.
-      #
-      # * +:acl+ -- The new acl.  This can be any of the following:
-      #   * 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.
-      #
-      # == Response
-      #
-      # The response contains only the standard fields.
+      # @overload set_bucket_acl(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String,AccessControlList,Hash] :acl
+      #     This may be any of the following:
+      #     * An XML policy as a  string (which is passed to S3 uninterpreted)
+      #     * An {AccessControlList} object
+      #     * Any object that responds to +#to_xml+
+      #     * A hash that is compatible with {AccessControlList} #new.
+      #   @return [Core::Response]
       bucket_method(:set_bucket_acl, :put, 'acl') do
+
         configure_request do |req, options|
             require_acl!(options[:acl])
           super(req, options)
@@ -334,40 +331,28 @@ module AWS
             req.body = options[:acl].to_xml
           end
         end
+
       end
 
-      ##
       # Gets the access control list for a bucket.
-      #
-      # == Required Options
-      #
-      # * +:bucket_name+ -- The name of the bucket.
-      #
-      # == Response
-      #
-      # A successful response will have an +acl+ method that
-      # returns an instance of AccessControlList.
-      #
-      bucket_method(:get_bucket_acl, :get, 'acl',
-                    XML::GetBucketAcl)
+      # @overload get_bucket_acl(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @return [Core::Response]
+      bucket_method(:get_bucket_acl, :get, 'acl', XML::GetBucketAcl)
 
-      ##
       # Sets the access control list for an object.
-      #
-      # == Required Options
-      #
-      # * +:bucket_name+ -- The name of the bucket.
-      #
-      # * +:key+ -- The key of the object.
-      #
-      # * +:acl+ -- The new acl.  This can be a string (which is
-      #   assumed to contain a valid ACL expressed in XML), a
-      #   AccessControlList or any object whose +to_xml+ returns a
-      #   valid ACL expressed in XML.
-      #
-      # == Response
-      #
-      # The response contains only the standard fields.
+      # @overload set_object_acl(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :key
+      #   @option options [required,String,AccessControlList,Hash] :acl
+      #     This may be any of the following:
+      #     * An XML policy as a  string (which is passed to S3 uninterpreted)
+      #     * An {AccessControlList} object
+      #     * Any object that responds to +#to_xml+
+      #     * A hash that is compatible with {AccessControlList} #new.
+      #   @return [Core::Response]
       object_method(:set_object_acl, :put, 'acl') do
         configure_request do |req, options|
           require_acl!(options[:acl]) unless options[:acl].kind_of?(Symbol)
@@ -384,79 +369,21 @@ module AWS
         end
       end
 
-      ##
       # Gets the access control list for an object.
-      #
-      # == Required Options
-      #
-      # * +:bucket_name+ -- The name of the bucket.
-      #
-      # * +:key+ -- The key of the object.
-      #
-      # == Response
-      #
-      # A successful response will have an +acl+ method that
-      # returns an instance of AccessControlList.
-      object_method(:get_object_acl, :get, 'acl',
-                    XML::GetBucketAcl)
+      # @overload get_object_acl(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :key
+      #   @return [Core::Response]
+      object_method(:get_object_acl, :get, 'acl', XML::GetBucketAcl)
 
-      ##
       # Puts data into an object, replacing the current contents.
       #
-      # == Required Options
-      #
-      # * +:bucket_name+ -- The name of the bucket that will contain the data.
-      #
-      # * +:key+ -- The key under which the data will be saved.
-      #
-      # * +:data+ -- The data to upload.  This can be provided as an option
-      #   or when using block form (see below).  Valid values include:
-      #
-      #   * A string
-      #
-      #   * A Pathname object.
-      #
-      #   * Any object with +read+ and +eof?+ methods that behave
-      #     like Ruby's IO class (e.g. IO, File, Tempfile, StringIO, etc).
-      #     The object must support the following access methods:
-      #
-      #       read                      # all at once
-      #       read(length) until eof?   # in chunks
-      #
-      # == Optional
-      #
-      # * +:content_length+ -- Required if you are using block form to 
-      #   write data or if it is not possible to determine the size of 
-      #   +:data+.  Best effort is made to determine the content length of
-      #   strings, files, tempfiles, io objects, and any object that responds
-      #   to #length or #size.  
-      #
-      # * +:metadata+ -- A hash of metadata to be included with the
-      #   object.  These will be sent to S3 as headers prefixed with
-      #   +x-amz-meta+.
-      #
-      # * +:acl+ -- A canned access control policy, valid values are:
-      #   * +:private+
-      #   * +:public_read+
-      #   * ...
-      #   Defaults to +:private+
-      #
-      # * +:storage_class+ -- Controls whether Reduced Redundancy
-      #   Storage is enabled for the object.  Valid values are
-      #   +:standard+ (the default) or +:reduced_redundancy+
-      #
-      # * +:cache_control+ -- Can be used to specify caching
-      #   behavior [...]
-      #
-      # * +:content_disposition+ -- Specifies presentational
-      #   information [...]
-      #
-      # * +:content_encoding+ -- Specifies what content encodings
-      #   have been [...]
-      #
-      # * +:content_md5+ -- The base64 encoded 128-bit [...]
-      #
-      # * +:content_type+ -- A standard MIME type describing [...]
+      #   s3_client.put_object({
+      #     :bucket_name => 'bucket-name',
+      #     :key => 'readme.txt', 
+      #     :data => 'This is the readme for ...',
+      #   })
       #
       # == Block Form
       #
@@ -485,11 +412,45 @@ module AWS
       # sure the HTTP handler you configure for the client meets
       # your needs.
       #
-      # == Response
-      #
-      # If bucket versioning is enabled, a successful response will
-      # have a +version_id+ method that returns the version ID of
-      # the version that was written in the request.
+      # @overload put_object(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :key
+      #   @option options [required,String,Pathname,File,IO] :data
+      #     The data to upload.  This can be provided as a string,
+      #     a Pathname object, or any object that responds to 
+      #     +#read+ and +#eof?+ (e.g. IO, File, Tempfile, StringIO, etc).
+      #   @option options [Integer] :content_length
+      #     Required if you are using block form to write data or if it is 
+      #     not possible to determine the size of +:data+.  A best effort 
+      #     is made to determine the content length of strings, files, 
+      #     tempfiles, io objects, and any object that responds
+      #     to +#length+ or +#size+.
+      #   @option options [Hash] :metadata 
+      #     A hash of metadata to be included with the
+      #     object.  These will be sent to S3 as headers prefixed with
+      #     +x-amz-meta+.
+      #   @option options [Symbol] :acl (:private) A canned access
+      #     control policy.  Accepted values include:
+      #     * +:private+
+      #     * +:public_read+
+      #     * ...
+      #   @option options [Symbol] :storage_class+ (:standard) 
+      #     Controls whether Reduced Redundancy Storage is enabled for 
+      #     the object.  Valid values are +:standard+ and 
+      #     +:reduced_redundancy+.
+      #   @option options [String] :cache_control
+      #     Can be used to specify caching behavior.
+      #   @option opitons [String] :content_disposition
+      #     Specifies presentational information.
+      #   @option options [String] :content_encoding
+      #     Specifies the content encoding.
+      #   @option options [String] :content_md5
+      #     The base64 encoded content md5 of the +:data+.
+      #   @option options [String] :content_type
+      #     Specifies the content type.
+      #   @option options [String] :expires
+      #   @return [Core::Response]
       #
       object_method(:put_object, :put,
                     :header_options => {
@@ -514,91 +475,54 @@ module AWS
         end
 
         process_response do |response|
-          Core::MetaUtils.extend_method(response, :version_id) do
+
+          response.data[:version_id] = 
             response.http_response.header('x-amz-version-id')
+
+          response.data[:etag] = response.http_response.header('ETag')
+
+          if time = response.http_response.header('Last-Modified')
+            response.data[:last_modified] = Time.parse(time)
           end
-          Core::MetaUtils.extend_method(response, :etag) do
-            response.http_response.header('ETag')
-          end
-          Core::MetaUtils.extend_method(response, :last_modified) do
-            Time.parse(response.http_response.header('Last-Modified'))
-          end
+
           add_sse_to_response(response)
         end
 
         simulate_response do |response|
-          Core::MetaUtils.extend_method(response, :etag) { "abc123" }
-          Core::MetaUtils.extend_method(response, :version_id) { nil }
+          response.data[:etag] = 'abc123'
+          response.data[:version_id] = nil
         end
+
       end
 
-      ##
       # Gets the data for a key.
+      # @overload get_object(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :key
+      #   @option options [Time] :if_modified_since If specified, the
+      #     response will contain an additional +:modified+ value that
+      #     returns true if the object was modified after the given
+      #     time.  If +:modified+ is false, then the response
+      #     +:data+ value will be +nil+.
+      #   @option options [Time] :if_unmodified_since If specified, the
+      #     response will contain an additional +:unmodified+ value
+      #     that is true if the object was not modified after the
+      #     given time.  If +:unmodified+ returns false, the +:data+
+      #     value will be +nil+.
+      #   @option options [String] :if_match If specified, the response 
+      #     will contain an additional +:matches+ value that is true
+      #     if the object ETag matches the value for this option.  If
+      #     +:matches+ is false, the +:data+ value of the
+      #     response will be +nil+.
+      #   @option options [String] :if_none_match If specified, the 
+      #     response will contain an additional +:matches+ value that 
+      #     is true if and only if the object ETag matches the value for
+      #     this option.  If +:matches+ is true, the +:data+ value
+      #     of the response will be +nil+.
+      #   @option options [Range<Integer>] :range A byte range of data to request.
+      #   @return [Core::Response]
       #
-      # == Required Options
-      #
-      # * +:bucket_name+ -- The name of the bucket that contains the data.
-      #
-      # * +:key+ -- The key under which the data exists.
-      #
-      # == Optional
-      #
-      # * +:if_modified_since+ -- A Time object; if specified, the
-      #   response will contain an additional +modified?+ method that
-      #   returns true if the object was modified after the given
-      #   time.  If +modified?+ returns false, the +data+ method of
-      #   the response will return +nil+.
-      #
-      # * +:if_unmodified_since+ -- A Time object; if specified, the
-      #   response will contain an additional +unmodified?+ method
-      #   that returns true if the object was not modified after the
-      #   given time.  If +unmodified?+ returns false, the +data+
-      #   method of the response will return +nil+.
-      #
-      # * +:if_match+ -- A string; if specified, the response will
-      #   contain an additional +matches?+ method that returns true
-      #   if the object ETag matches the value for this option.  If
-      #   +matches?+ returns false, the +data+ method of the
-      #   response will return +nil+.
-      #
-      # * +:if_none_match+ -- A string; if specified, the response
-      #   will contain an additional +matches?+ method that returns
-      #   true if and only if the object ETag matches the value for
-      #   this option.  If +matches?+ returns true, the +data+
-      #   method of the response will return +nil+.
-      #
-      # * +:to+ -- A destination for the data.  Valid values:
-      #
-      #   * The path to a file as a string
-      #
-      #   * A Pathname object
-      #
-      #   * Any object that supports <code>write(data)</code> and
-      #     +close+ methods like Ruby's IO class
-      #
-      # * +:range+ -- TODO: figure out the format for this
-      #   parameter.
-      #
-      # == Response
-      #
-      # A successful response will have some combination of the
-      # following methods:
-      #
-      # * +data+ -- The object data as a string.  This will return
-      #   +nil+ if one of the conditional options above is specified
-      #   and the condition is not met.  It will also return +nil+
-      #   if +deleted?+ returns true.  It will not be present if the
-      #   +:to+ option is specified.
-      #
-      # * +modified?+, +unmodified?+, +matches?+ -- These will be
-      #   present as documented in the conditional options above.
-      #
-      # * +version_id+ -- Returns the version ID of the object that
-      #   was written (only for versioned buckets).
-      #
-      # * +deleted?+ -- This will return +true+ if the bucket has
-      #   versioning enabled and the object retrieved was a delete
-      #   marker.
       object_method(:get_object, :get,
                     :header_options => {
                       :if_modified_since => "If-Modified-Since",
@@ -633,15 +557,20 @@ module AWS
         end
 
         process_response do |resp|
-          Core::MetaUtils.extend_method(resp, :data) { resp.http_response.body }
-          Core::MetaUtils.extend_method(resp, :version_id) do
-            http_response.header('x-amz-version-id')
-          end
+          resp.data[:data] = resp.http_response.body
+          resp.data[:version_id] = resp.http_response.header('x-amz-version-id')
           add_sse_to_response(resp)
         end
       end
 
+      # @overload head_object(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :key
+      #   @option options [String] :version_id
+      #   @return [Core::Response]
       object_method(:head_object, :head) do
+
         configure_request do |req, options|
           super(req, options)
           if options[:version_id]
@@ -652,51 +581,55 @@ module AWS
         process_response do |resp|
 
           # create a hash of user-supplied metadata
-          Core::MetaUtils.extend_method(resp, :meta) do
-            meta = {}
-            resp.http_response.headers.each_pair do |name,value|
-              if name =~ /^x-amz-meta-(.+)$/i
-                meta[$1] = [value].flatten.join
-              end
+          meta = {}
+          resp.http_response.headers.each_pair do |name,value|
+            if name =~ /^x-amz-meta-(.+)$/i
+              meta[$1] = [value].flatten.join
             end
-            meta
           end
+          meta
+          resp.data[:meta] = meta
 
           if expiry = resp.http_response.headers['x-amz-expiration']
             expiry.first =~ /^expiry-date="(.+)", rule-id="(.+)"$/
-            date = DateTime.parse($1)
-            rule_id = $2
+            exp_date = DateTime.parse($1)
+            exp_rule_id = $2
           else
-            date = nil
-            rule_id = nil
+            exp_date = nil
+            exp_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
+          resp.data[:expiration_date] = exp_date
+          resp.data[:expiration_rule_id] = exp_rule_id
+
           {
             'x-amz-version-id' => :version_id,
             'content-type' => :content_type,
             'etag' => :etag,
           }.each_pair do |header,method|
-            Core::MetaUtils.extend_method(resp, method) do
-              http_response.header(header)
-            end
+            resp.data[method] = resp.http_response.header(header)
           end
 
-          Core::MetaUtils.extend_method(resp, :last_modified) do
-            Time.parse(resp.http_response.header('Last-Modified'))
+          if time = resp.http_response.header('Last-Modified')
+            resp.data[:last_modified] = Time.parse(time)
           end
 
-          Core::MetaUtils.extend_method(resp, :content_length) do
-            http_response.header('content-length').to_i
-          end
+          resp.data[:content_length] = 
+            resp.http_response.header('content-length').to_i
 
           add_sse_to_response(resp)
+
         end
       end
 
+      # @overload delete_object(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :key
+      #   @option options [String] :version_id
+      #   @return [Core::Response]
       object_method(:delete_object, :delete) do
+
         configure_request do |req, options|
           super(req, options)
           if options[:version_id]
@@ -705,13 +638,19 @@ module AWS
         end
 
         process_response do |resp|
-          Core::MetaUtils.extend_method(resp, :version_id) do
-            http_response.header('x-amz-version-id')
-          end
+          resp.data[:version_id] = resp.http_response.header('x-amz-version-id')
         end
 
       end
 
+      # @overload list_objects(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [String] :delimiter
+      #   @option options [String] :marker
+      #   @option options [String] :max_keys
+      #   @option options [String] :prefix
+      #   @return [Core::Response]
       bucket_method(:list_objects, :get, XML::ListObjects) do
         configure_request do |req, options|
           super(req, options)
@@ -724,6 +663,22 @@ module AWS
         end
       end
 
+      alias_method :get_bucket, :list_objects
+
+      # @overload initiate_multipart_upload(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :key
+      #   @option options [Hash] :metadata
+      #   @option options [Symbol] :acl
+      #   @option options [String] :cache_control
+      #   @option options [String] :content_disposition
+      #   @option options [String] :content_encoding
+      #   @option options [String] :content_type
+      #   @option options [String] :storage_class
+      #   @option options [String] :server_side_encryption
+      #   @option options [String] :expires
+      #   @return [Core::Response]
       object_method(:initiate_multipart_upload, :post, 'uploads',
                     XML::InitiateMultipartUpload,
                     :header_options => {
@@ -750,6 +705,16 @@ module AWS
         end
       end
 
+      # @overload list_multipart_uploads(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [String] :delimiter
+      #   @option options [String] :key_marker
+      #   @option options [String] :max_keys
+      #   @option options [String] :upload_id_marker
+      #   @option options [String] :max_uploads
+      #   @option options [String] :prefix
+      #   @return [Core::Response]
       bucket_method(:list_multipart_uploads,
                     :get, 'uploads',
                     XML::ListMultipartUploads) do
@@ -765,6 +730,12 @@ module AWS
         end
       end
 
+      # @overload delete_objects(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,Array<String>] :keys
+      #   @option options [Boolean] :quiet (true)
+      #   @return [Core::Response]
       bucket_method(:delete_objects, :post, 'delete', XML::DeleteObjects) do
         configure_request do |req, options|
 
@@ -772,7 +743,10 @@ module AWS
 
           quiet = options.key?(:quiet) ? options[:quiet] : true
 
-          objects = options[:objects].inject('') do |xml,o|
+          # previously named this option :objects, since renamed
+          keys = options[:objects] || options[:keys]
+
+          objects = keys.inject('') do |xml,o|
             xml << "<Object><Key>#{o[:key]}</Key>"
             xml << "<VersionId>#{o[:version_id]}</VersionId>" if o[:version_id]
             xml << "</Object>"
@@ -790,6 +764,17 @@ module AWS
         end
       end
 
+      # @overload upload_part(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :key
+      #   @option options [required,String,Pathname,File,IO] :data
+      #     The data to upload.  This can be provided as a string,
+      #     a Pathname object, or any object that responds to 
+      #     +#read+ and +#eof?+ (e.g. IO, File, Tempfile, StringIO, etc).
+      #   @option options [required,String] :upload_id
+      #   @option options [required,Integer] :part_number
+      #   @return [Core::Response]
       object_method(:upload_part, :put,
                     :header_options => {
                       :content_md5 => 'Content-MD5'
@@ -806,20 +791,25 @@ module AWS
         end
 
         process_response do |response|
-          Core::MetaUtils.extend_method(response, :etag) do
-            response.http_response.header('ETag')
-          end
-          Core::MetaUtils.extend_method(response, :last_modified) do
-            Time.parse(response.http_response.header('Last-Modified'))
+          response.data[:etag] = response.http_response.header('ETag')
+          if time = response.http_response.header('Last-Modified')
+            response.data[:last_modified] = Time.parse(time)
           end
           add_sse_to_response(response)
         end
 
         simulate_response do |response|
-          Core::MetaUtils.extend_method(response, :etag) { "abc123" }
+          response.data[:etag] = 'abc123'
         end
       end
 
+      # @overload complete_multipart_upload(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :key
+      #   @option options [required,String] :upload_id
+      #   @option options [required,Array<String>] :parts
+      #   @return [Core::Response]
       object_method(:complete_multipart_upload, :post,
                     XML::CompleteMultipartUpload) do
         configure_request do |req, options|
@@ -838,17 +828,22 @@ module AWS
         end
 
         process_response do |response|
-          Core::MetaUtils.extend_method(response, :version_id) do
-            response.http_response.header('x-amz-version-id')
-          end
           add_sse_to_response(response)
+          response.data[:version_id] = 
+            response.http_response.header('x-amz-version-id')
         end
 
         simulate_response do |response|
-          Core::MetaUtils.extend_method(response, :version_id) { nil }
+          response.data[:version_id] = nil
         end
       end
 
+      # @overload abort_multipart_upload(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :key
+      #   @option options [required,String] :upload_id
+      #   @return [Core::Response]
       object_method(:abort_multipart_upload, :delete) do
         configure_request do |req, options|
             require_upload_id!(options[:upload_id])
@@ -857,8 +852,16 @@ module AWS
         end
       end
 
-      object_method(:list_parts, :get,
-                    XML::ListParts) do
+      # @overload list_parts(options = {})
+      #   @param [Hash] options
+      #   @option options [required,String] :bucket_name
+      #   @option options [required,String] :key
+      #   @option options [required,String] :upload_id
+      #   @option options [Integer] :max_parts
+      #   @option options [Integer] :part_number_marker
+      #   @return [Core::Response]
+      object_method(:list_parts, :get, XML::ListParts) do
+
         configure_request do |req, options|
             require_upload_id!(options[:upload_id])
           super(req, options)
@@ -866,21 +869,22 @@ module AWS
           req.add_param('max-parts', options[:max_parts])
           req.add_param('part-number-marker', options[:part_number_marker])
         end
+
       end
 
-      ##
-      # @param [Hash] options
-      # @option options [required, String] :bucket_name Name of the bucket
-      #   to copy a object into.
-      # @option options [required, String] :key Where (object key) in the
-      #   bucket the object should be copied to.
-      # @option options [required, String] :copy_source The name of the 
-      #   source bucket and key name of the source object, separated by a 
-      #   slash (/). This string must be URL-encoded. Additionally, the 
-      #   source bucket must be valid and you must have READ access to 
-      #   the valid source object.
-      # @option options [Symbol] :acl
-      #
+      # Copies an object from one key to another.
+      # @overload copy_object(options = {})
+      #   @param [Hash] options
+      #   @option options [required, String] :bucket_name Name of the bucket
+      #     to copy a object into.
+      #   @option options [required, String] :key Where (object key) in the
+      #     bucket the object should be copied to.
+      #   @option options [required, String] :copy_source The source
+      #     bucket name and key, joined by a forward slash ('/').
+      #     This string must be URL-encoded. Additionally, you must
+      #     have read access to the source object.
+      #   @option options [Symbol] :acl
+      #   @return [Core::Response]
       object_method(:copy_object, :put,
                     :header_options => {
                       :copy_source => 'x-amz-copy-source',
@@ -912,14 +916,11 @@ module AWS
         end
 
         process_response do |response|
-          Core::MetaUtils.extend_method(response, :version_id) do
+          response.data[:version_id] = 
             response.http_response.header('x-amz-version-id')
-          end
-          Core::MetaUtils.extend_method(response, :etag) do
-            response.http_response.header('ETag')
-          end
-          Core::MetaUtils.extend_method(response, :last_modified) do
-            Time.parse(response.http_response.header('Last-Modified'))
+          response.data[:etag] = response.http_response.header('ETag')
+          if time = response.http_response.header('Last-Modified')
+            response.data[:last_modified] = Time.parse(time)
           end
           add_sse_to_response(response)
         end
@@ -927,59 +928,60 @@ module AWS
       end
 
       protected
-      def extract_error_code response
-        if (response.http_response.status >= 300 ||
+
+      def extract_error_details response
+        if 
+          (response.http_response.status >= 300 ||
             response.request_type == :complete_multipart_upload) and
-            body = response.http_response.body and
-            parse = Core::XmlGrammar.parse(body) and
-            parse.respond_to?(:code)
-          parse.code
+          body = response.http_response.body and
+          error = Core::XML::Parser.parse(body) and
+          error[:code]
+        then
+          [error[:code], error[:message]]
         end
       end
 
-      protected
-      def populate_error response
-        code = response.http_response.status
-        if EMPTY_BODY_ERRORS.include?(code) and
-            response.http_response.body.nil?
-          response.error =
-            EMPTY_BODY_ERRORS[code].new(response.http_request,
-                                        response.http_response)
+      # There are a few of s3 requests that can generate empty bodies and
+      # yet still be errors.  These return empty bodies to comply with the
+      # HTTP spec.  We have to detect these errors specially.
+      def populate_error resp
+        code = resp.http_response.status
+        if EMPTY_BODY_ERRORS.include?(code) and resp.http_response.body.nil?
+          error_class = EMPTY_BODY_ERRORS[code]
+          resp.error = error_class.new(resp.http_request, resp.http_response)
         else
           super
         end
       end
 
-      protected
       def should_retry? response
         super or
           response.request_type == :complete_multipart_upload &&
-          extract_error_code(response)
+          extract_error_details(response)
+          # complete multipart upload can return an error inside a 
+          # 200 level response -- this forces us to parse the
+          # response for errors every time
       end
 
-      protected
       def set_request_data request, options, block
         request.body_stream = data_stream_from(options, &block)
         request.headers['Content-Length'] = content_length_from(options)
       end
 
-      protected
       def new_request
         S3::Request.new
       end
 
-      protected
-      def add_sse_to_response(response)
-        sse = nil
-        if value = response.http_response.header('x-amz-server-side-encryption')
-          sse = value.downcase.to_sym
+      def add_sse_to_response response
+        if sse = response.http_response.header('x-amz-server-side-encryption')
+          sse = sse.downcase.to_sym
         end
-        Core::MetaUtils.extend_method(response, :server_side_encryption) { sse }
+        response.data[:server_side_encryption] = sse
       end
 
       module Validators
 
-        # Returns true if the given bucket name is valid.
+        # @return [Boolean] Returns true if the given bucket name is valid.
         def valid_bucket_name?(bucket_name)
           validate_bucket_name!(bucket_name) rescue false
         end
@@ -998,6 +1000,7 @@ module AWS
         # @return [Boolean] Returns true if the given bucket name may be
         #   is dns compatible.  
         #   this bucket n
+        #
         def dns_compatible_bucket_name?(bucket_name)
           return false if
             !valid_bucket_name?(bucket_name) or
@@ -1034,6 +1037,7 @@ module AWS
         # @return [Boolean] Returns true if the bucket name should be used
         #   as a path segement instead of dns prefix when making requests
         #   against s3.  
+        #
         def path_style_bucket_name? bucket_name
           if dns_compatible_bucket_name?(bucket_name)
             bucket_name =~ /\./ ? true : false
@@ -1042,7 +1046,6 @@ module AWS
           end
         end
 
-        protected
         def validate! name, value, &block
           if error_msg = yield
             raise ArgumentError, "#{name} #{error_msg}"
@@ -1050,7 +1053,6 @@ module AWS
           value
         end
 
-        protected
         def validate_key!(key)
           validate!('key', key) do
             case
@@ -1060,17 +1062,14 @@ module AWS
           end
         end
 
-        protected 
         def require_bucket_name! bucket_name
           if [nil, ''].include?(bucket_name)
             raise ArgumentError, "bucket_name may not be blank"
           end
         end
 
-
         # Returns true if the given bucket name is valid.  If the name
         # is invalid, an ArgumentError is raised.
-        protected
         def validate_bucket_name!(bucket_name)
           validate!('bucket_name', bucket_name) do
             case
@@ -1091,7 +1090,6 @@ module AWS
           end
         end
 
-        protected
         def require_policy!(policy)
           validate!('policy', policy) do
             case
@@ -1103,7 +1101,6 @@ module AWS
           end
         end
 
-        protected
         def require_acl!(acl)
           validate!('acl', acl) do
             case
@@ -1120,14 +1117,12 @@ module AWS
           end
         end
 
-        protected
         def require_upload_id!(upload_id)
           validate!("upload_id", upload_id) do
             "must not be blank" if upload_id.to_s.empty?
           end
         end
 
-        protected
         def validate_parts!(parts)
           validate!("parts", parts) do
             if !parts.kind_of?(Array)
@@ -1146,7 +1141,6 @@ module AWS
           end
         end
 
-        protected
         def json_validation_message(obj)
           if obj.respond_to?(:to_str)
             obj = obj.to_str
@@ -1163,7 +1157,6 @@ module AWS
           "contains invalid JSON: #{error}" if error
         end
 
-        protected
         def xml_validation_message(obj)
           if obj.respond_to?(:to_str)
             obj = obj.to_str