aws-sdk 1.5.8 → 1.6.0

data/lib/aws/s3/paginated_collection.rb

@@ -29,7 +29,7 @@ module AWS
         response = list_request(options)
 
         each_member_in_page(response, &block)
-      
+
         response.data[:truncated] ? next_markers(response) : nil
 
       end

data/lib/aws/s3/request.rb

@@ -60,15 +60,20 @@ module AWS
         end
       end
 
-      def path
+      def uri
+
         parts = []
         parts << bucket if bucket and path_style?
         parts << escape_path(key) if key
-        "/#{parts.join('/')}"
-      end
 
-      def querystring
-        url_encoded_params
+        path = '/' + parts.join('/')
+        querystring = url_encoded_params
+
+        uri = ''
+        uri << path
+        uri << "?#{querystring}" if querystring
+        uri
+
       end
 
       # @param [String, IO] body The http request body.  This can be a string or

data/lib/aws/simple_db/client.rb

@@ -19,7 +19,7 @@ module AWS
 
       API_VERSION = '2009-04-15'
 
-      extend Core::Client::QueryXML
+      extend Core::QueryClient
 
       # @private
       REGION_US_E1 = 'sdb.amazonaws.com'
@@ -60,286 +60,236 @@ module AWS
 
       # Calls the BatchDeleteAttributes API operation.
       # @method batch_delete_attributes(options = {})
-      #
-      # === Options:
-      #
-      # * +:domain_name+ - *required* - (String) The name of the domain in
-      #   which the attributes are being deleted.
-      # * +:items+ - *required* - (Array<Hash>) A list of items on which to
-      #   perform the operation.
-      #   * +:name+ - *required* - (String)
-      #   * +:attributes+ - (Array<Hash>)
-      #     * +:name+ - *required* - (String) The name of the attribute.
-      #     * +:value+ - *required* - (String) The value of the attribute.
-      #
-      # === Response Structure:
-      #
-      # * +:response_metadata+ - (Hash)
-      #   * +:box_usage+ - (Numeric)
-      #   * +:response_id+ - (String)
-      #
+      # @param [Hash] options
+      #   * +:domain_name+ - *required* - (String) The name of the domain in
+      #     which the attributes are being deleted.
+      #   * +:items+ - *required* - (Array<Hash>) A list of items on which to
+      #     perform the operation.
+      #     * +:name+ - *required* - (String)
+      #     * +:attributes+ - (Array<Hash>)
+      #       * +:name+ - *required* - (String) The name of the attribute.
+      #       * +:value+ - *required* - (String) The value of the attribute.
       # @return [Core::Response]
-      #
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:response_metadata+ - (Hash)
+      #     * +:box_usage+ - (Numeric)
+      #     * +:response_id+ - (String)
       define_client_method :batch_delete_attributes, 'BatchDeleteAttributes'
 
       # Calls the BatchPutAttributes API operation.
       # @method batch_put_attributes(options = {})
-      #
-      # === Options:
-      #
-      # * +:domain_name+ - *required* - (String) The name of the domain in
-      #   which the attributes are being stored.
-      # * +:items+ - *required* - (Array<Hash>) A list of items on which to
-      #   perform the operation.
-      #   * +:name+ - *required* - (String) The name of the replaceable item.
-      #   * +:attributes+ - *required* - (Array<Hash>) The list of attributes
-      #     for a replaceable item.
-      #     * +:name+ - *required* - (String) The name of the replaceable
-      #       attribute.
-      #     * +:value+ - *required* - (String) The value of the replaceable
-      #       attribute.
-      #     * +:replace+ - (Boolean) A flag specifying whether or not to
-      #       replace the attribute/value pair or to add a new attribute/value
-      #       pair. The default setting is +false+ .
-      #
-      # === Response Structure:
-      #
-      # * +:response_metadata+ - (Hash)
-      #   * +:box_usage+ - (Numeric)
-      #   * +:response_id+ - (String)
-      #
+      # @param [Hash] options
+      #   * +:domain_name+ - *required* - (String) The name of the domain in
+      #     which the attributes are being stored.
+      #   * +:items+ - *required* - (Array<Hash>) A list of items on which to
+      #     perform the operation.
+      #     * +:name+ - *required* - (String) The name of the replaceable item.
+      #     * +:attributes+ - *required* - (Array<Hash>) The list of attributes
+      #       for a replaceable item.
+      #       * +:name+ - *required* - (String) The name of the replaceable
+      #         attribute.
+      #       * +:value+ - *required* - (String) The value of the replaceable
+      #         attribute.
+      #       * +:replace+ - (Boolean) A flag specifying whether or not to
+      #         replace the attribute/value pair or to add a new
+      #         attribute/value pair. The default setting is +false+ .
       # @return [Core::Response]
-      #
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:response_metadata+ - (Hash)
+      #     * +:box_usage+ - (Numeric)
+      #     * +:response_id+ - (String)
       define_client_method :batch_put_attributes, 'BatchPutAttributes'
 
       # Calls the CreateDomain API operation.
       # @method create_domain(options = {})
-      #
-      # === Options:
-      #
-      # * +:domain_name+ - *required* - (String) The name of the domain to
-      #   create. The name can range between 3 and 255 characters and can
-      #   contain the following characters: a-z, A-Z, 0-9, '_', '-', and '.'.
-      #
-      # === Response Structure:
-      #
-      # * +:response_metadata+ - (Hash)
-      #   * +:box_usage+ - (Numeric)
-      #   * +:response_id+ - (String)
-      #
+      # @param [Hash] options
+      #   * +:domain_name+ - *required* - (String) The name of the domain to
+      #     create. The name can range between 3 and 255 characters and can
+      #     contain the following characters: a-z, A-Z, 0-9, '_', '-', and '.'.
       # @return [Core::Response]
-      #
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:response_metadata+ - (Hash)
+      #     * +:box_usage+ - (Numeric)
+      #     * +:response_id+ - (String)
       define_client_method :create_domain, 'CreateDomain'
 
       # Calls the DeleteAttributes API operation.
       # @method delete_attributes(options = {})
-      #
-      # === Options:
-      #
-      # * +:domain_name+ - *required* - (String) The name of the domain in
-      #   which to perform the operation.
-      # * +:item_name+ - *required* - (String) The name of the item. Similar to
-      #   rows on a spreadsheet, items represent individual objects that
-      #   contain one or more value-attribute pairs.
-      # * +:attributes+ - (Array<Hash>) A list of Attributes. Similar to
-      #   columns on a spreadsheet, attributes represent categories of data
-      #   that can be assigned to items.
-      #   * +:name+ - *required* - (String) The name of the attribute.
-      #   * +:value+ - (String) The value of the attribute.
-      # * +:expected+ - (Hash) The update condition which, if specified,
-      #   determines whether the specified attributes will be deleted or not.
-      #   The update condition must be satisfied in order for this request to
-      #   be processed and the attributes to be deleted.
-      #   * +:name+ - (String) The name of the attribute involved in the
-      #     condition.
-      #   * +:value+ - (String) The value of an attribute. This value can only
-      #     be specified when the Exists parameter is equal to +true+ .
-      #   * +:exists+ - (Boolean) A value specifying whether or not the
-      #     specified attribute must exist with the specified value in order
-      #     for the update condition to be satisfied. Specify +true+ if the
-      #     attribute must exist for the update condition to be satisfied.
-      #     Specify +false+ if the attribute should not exist in order for the
-      #     update condition to be satisfied.
-      #
-      # === Response Structure:
-      #
-      # * +:response_metadata+ - (Hash)
-      #   * +:box_usage+ - (Numeric)
-      #   * +:response_id+ - (String)
-      #
+      # @param [Hash] options
+      #   * +:domain_name+ - *required* - (String) The name of the domain in
+      #     which to perform the operation.
+      #   * +:item_name+ - *required* - (String) The name of the item. Similar
+      #     to rows on a spreadsheet, items represent individual objects that
+      #     contain one or more value-attribute pairs.
+      #   * +:attributes+ - (Array<Hash>) A list of Attributes. Similar to
+      #     columns on a spreadsheet, attributes represent categories of data
+      #     that can be assigned to items.
+      #     * +:name+ - *required* - (String) The name of the attribute.
+      #     * +:value+ - (String) The value of the attribute.
+      #   * +:expected+ - (Hash) The update condition which, if specified,
+      #     determines whether the specified attributes will be deleted or not.
+      #     The update condition must be satisfied in order for this request to
+      #     be processed and the attributes to be deleted.
+      #     * +:name+ - (String) The name of the attribute involved in the
+      #       condition.
+      #     * +:value+ - (String) The value of an attribute. This value can
+      #       only be specified when the Exists parameter is equal to +true+ .
+      #     * +:exists+ - (Boolean) A value specifying whether or not the
+      #       specified attribute must exist with the specified value in order
+      #       for the update condition to be satisfied. Specify +true+ if the
+      #       attribute must exist for the update condition to be satisfied.
+      #       Specify +false+ if the attribute should not exist in order for
+      #       the update condition to be satisfied.
       # @return [Core::Response]
-      #
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:response_metadata+ - (Hash)
+      #     * +:box_usage+ - (Numeric)
+      #     * +:response_id+ - (String)
       define_client_method :delete_attributes, 'DeleteAttributes'
 
       # Calls the DeleteDomain API operation.
       # @method delete_domain(options = {})
-      #
-      # === Options:
-      #
-      # * +:domain_name+ - *required* - (String) The name of the domain to
-      #   delete.
-      #
-      # === Response Structure:
-      #
-      # * +:response_metadata+ - (Hash)
-      #   * +:box_usage+ - (Numeric)
-      #   * +:response_id+ - (String)
-      #
+      # @param [Hash] options
+      #   * +:domain_name+ - *required* - (String) The name of the domain to
+      #     delete.
       # @return [Core::Response]
-      #
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:response_metadata+ - (Hash)
+      #     * +:box_usage+ - (Numeric)
+      #     * +:response_id+ - (String)
       define_client_method :delete_domain, 'DeleteDomain'
 
       # Calls the DomainMetadata API operation.
       # @method domain_metadata(options = {})
-      #
-      # === Options:
-      #
-      # * +:domain_name+ - *required* - (String) The name of the domain for
-      #   which to display the metadata of.
-      #
-      # === Response Structure:
-      #
-      # * +:item_count+ - (Integer)
-      # * +:item_names_size_bytes+ - (Integer)
-      # * +:attribute_name_count+ - (Integer)
-      # * +:attribute_names_size_bytes+ - (Integer)
-      # * +:attribute_value_count+ - (Integer)
-      # * +:attribute_values_size_bytes+ - (Integer)
-      # * +:timestamp+ - (Integer)
-      # * +:response_metadata+ - (Hash)
-      #   * +:box_usage+ - (Numeric)
-      #   * +:response_id+ - (String)
-      #
+      # @param [Hash] options
+      #   * +:domain_name+ - *required* - (String) The name of the domain for
+      #     which to display the metadata of.
       # @return [Core::Response]
-      #
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:item_count+ - (Integer)
+      #   * +:item_names_size_bytes+ - (Integer)
+      #   * +:attribute_name_count+ - (Integer)
+      #   * +:attribute_names_size_bytes+ - (Integer)
+      #   * +:attribute_value_count+ - (Integer)
+      #   * +:attribute_values_size_bytes+ - (Integer)
+      #   * +:timestamp+ - (Integer)
+      #   * +:response_metadata+ - (Hash)
+      #     * +:box_usage+ - (Numeric)
+      #     * +:response_id+ - (String)
       define_client_method :domain_metadata, 'DomainMetadata'
 
       # Calls the GetAttributes API operation.
       # @method get_attributes(options = {})
-      #
-      # === Options:
-      #
-      # * +:domain_name+ - *required* - (String) The name of the domain in
-      #   which to perform the operation.
-      # * +:item_name+ - *required* - (String) The name of the item.
-      # * +:attribute_names+ - (Array<String>) The names of the attributes.
-      # * +:consistent_read+ - (Boolean) Determines whether or not strong
-      #   consistency should be enforced when data is read from SimpleDB. If
-      #   +true+ , any data previously written to SimpleDB will be returned.
-      #   Otherwise, results will be consistent eventually, and the client may
-      #   not see data that was written immediately before your read.
-      #
-      # === Response Structure:
-      #
-      # * +:attributes+ - (Array<Hash>)
-      #   * +:name+ - (String)
-      #   * +:alternate_name_encoding+ - (String)
-      #   * +:value+ - (String)
-      #   * +:alternate_value_encoding+ - (String)
-      # * +:response_metadata+ - (Hash)
-      #   * +:box_usage+ - (Numeric)
-      #   * +:response_id+ - (String)
-      #
+      # @param [Hash] options
+      #   * +:domain_name+ - *required* - (String) The name of the domain in
+      #     which to perform the operation.
+      #   * +:item_name+ - *required* - (String) The name of the item.
+      #   * +:attribute_names+ - (Array<String>) The names of the attributes.
+      #   * +:consistent_read+ - (Boolean) Determines whether or not strong
+      #     consistency should be enforced when data is read from SimpleDB. If
+      #     +true+ , any data previously written to SimpleDB will be returned.
+      #     Otherwise, results will be consistent eventually, and the client
+      #     may not see data that was written immediately before your read.
       # @return [Core::Response]
-      #
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:attributes+ - (Array<Hash>)
+      #     * +:name+ - (String)
+      #     * +:alternate_name_encoding+ - (String)
+      #     * +:value+ - (String)
+      #     * +:alternate_value_encoding+ - (String)
+      #   * +:response_metadata+ - (Hash)
+      #     * +:box_usage+ - (Numeric)
+      #     * +:response_id+ - (String)
       define_client_method :get_attributes, 'GetAttributes'
 
       # Calls the ListDomains API operation.
       # @method list_domains(options = {})
-      #
-      # === Options:
-      #
-      # * +:max_number_of_domains+ - (Integer) The maximum number of domain
-      #   names you want returned. The range is 1 to 100. The default setting
-      #   is 100.
-      # * +:next_token+ - (String) A string informing Amazon SimpleDB where to
-      #   start the next list of domain names.
-      #
-      # === Response Structure:
-      #
-      # * +:domain_names+ - (Array<String>)
-      # * +:next_token+ - (String)
-      # * +:response_metadata+ - (Hash)
-      #   * +:box_usage+ - (Numeric)
-      #   * +:response_id+ - (String)
-      #
+      # @param [Hash] options
+      #   * +:max_number_of_domains+ - (Integer) The maximum number of domain
+      #     names you want returned. The range is 1 to 100. The default setting
+      #     is 100.
+      #   * +:next_token+ - (String) A string informing Amazon SimpleDB where
+      #     to start the next list of domain names.
       # @return [Core::Response]
-      #
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:domain_names+ - (Array<String>)
+      #   * +:next_token+ - (String)
+      #   * +:response_metadata+ - (Hash)
+      #     * +:box_usage+ - (Numeric)
+      #     * +:response_id+ - (String)
       define_client_method :list_domains, 'ListDomains'
 
       # Calls the PutAttributes API operation.
       # @method put_attributes(options = {})
-      #
-      # === Options:
-      #
-      # * +:domain_name+ - *required* - (String) The name of the domain in
-      #   which to perform the operation.
-      # * +:item_name+ - *required* - (String) The name of the item.
-      # * +:attributes+ - *required* - (Array<Hash>) The list of attributes.
-      #   * +:name+ - *required* - (String) The name of the replaceable
-      #     attribute.
-      #   * +:value+ - *required* - (String) The value of the replaceable
-      #     attribute.
-      #   * +:replace+ - (Boolean) A flag specifying whether or not to replace
-      #     the attribute/value pair or to add a new attribute/value pair. The
-      #     default setting is +false+ .
-      # * +:expected+ - (Hash) The update condition which, if specified,
-      #   determines whether the specified attributes will be updated or not.
-      #   The update condition must be satisfied in order for this request to
-      #   be processed and the attributes to be updated.
-      #   * +:name+ - (String) The name of the attribute involved in the
-      #     condition.
-      #   * +:value+ - (String) The value of an attribute. This value can only
-      #     be specified when the Exists parameter is equal to +true+ .
-      #   * +:exists+ - (Boolean) A value specifying whether or not the
-      #     specified attribute must exist with the specified value in order
-      #     for the update condition to be satisfied. Specify +true+ if the
-      #     attribute must exist for the update condition to be satisfied.
-      #     Specify +false+ if the attribute should not exist in order for the
-      #     update condition to be satisfied.
-      #
-      # === Response Structure:
-      #
-      # * +:response_metadata+ - (Hash)
-      #   * +:box_usage+ - (Numeric)
-      #   * +:response_id+ - (String)
-      #
+      # @param [Hash] options
+      #   * +:domain_name+ - *required* - (String) The name of the domain in
+      #     which to perform the operation.
+      #   * +:item_name+ - *required* - (String) The name of the item.
+      #   * +:attributes+ - *required* - (Array<Hash>) The list of attributes.
+      #     * +:name+ - *required* - (String) The name of the replaceable
+      #       attribute.
+      #     * +:value+ - *required* - (String) The value of the replaceable
+      #       attribute.
+      #     * +:replace+ - (Boolean) A flag specifying whether or not to
+      #       replace the attribute/value pair or to add a new attribute/value
+      #       pair. The default setting is +false+ .
+      #   * +:expected+ - (Hash) The update condition which, if specified,
+      #     determines whether the specified attributes will be updated or not.
+      #     The update condition must be satisfied in order for this request to
+      #     be processed and the attributes to be updated.
+      #     * +:name+ - (String) The name of the attribute involved in the
+      #       condition.
+      #     * +:value+ - (String) The value of an attribute. This value can
+      #       only be specified when the Exists parameter is equal to +true+ .
+      #     * +:exists+ - (Boolean) A value specifying whether or not the
+      #       specified attribute must exist with the specified value in order
+      #       for the update condition to be satisfied. Specify +true+ if the
+      #       attribute must exist for the update condition to be satisfied.
+      #       Specify +false+ if the attribute should not exist in order for
+      #       the update condition to be satisfied.
       # @return [Core::Response]
-      #
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:response_metadata+ - (Hash)
+      #     * +:box_usage+ - (Numeric)
+      #     * +:response_id+ - (String)
       define_client_method :put_attributes, 'PutAttributes'
 
       # Calls the Select API operation.
       # @method select(options = {})
-      #
-      # === Options:
-      #
-      # * +:select_expression+ - *required* - (String) The expression used to
-      #   query the domain.
-      # * +:next_token+ - (String) A string informing Amazon SimpleDB where to
-      #   start the next list of ItemNames.
-      # * +:consistent_read+ - (Boolean) Determines whether or not strong
-      #   consistency should be enforced when data is read from SimpleDB. If
-      #   +true+ , any data previously written to SimpleDB will be returned.
-      #   Otherwise, results will be consistent eventually, and the client may
-      #   not see data that was written immediately before your read.
-      #
-      # === Response Structure:
-      #
-      # * +:items+ - (Array<Hash>)
-      #   * +:name+ - (String)
-      #   * +:alternate_name_encoding+ - (String)
-      #   * +:attributes+ - (Array<Hash>)
+      # @param [Hash] options
+      #   * +:select_expression+ - *required* - (String) The expression used to
+      #     query the domain.
+      #   * +:next_token+ - (String) A string informing Amazon SimpleDB where
+      #     to start the next list of ItemNames.
+      #   * +:consistent_read+ - (Boolean) Determines whether or not strong
+      #     consistency should be enforced when data is read from SimpleDB. If
+      #     +true+ , any data previously written to SimpleDB will be returned.
+      #     Otherwise, results will be consistent eventually, and the client
+      #     may not see data that was written immediately before your read.
+      # @return [Core::Response]
+      #   The #data method of the response object returns
+      #   a hash with the following structure:
+      #   * +:items+ - (Array<Hash>)
       #     * +:name+ - (String)
       #     * +:alternate_name_encoding+ - (String)
-      #     * +:value+ - (String)
-      #     * +:alternate_value_encoding+ - (String)
-      # * +:next_token+ - (String)
-      # * +:response_metadata+ - (Hash)
-      #   * +:box_usage+ - (Numeric)
-      #   * +:response_id+ - (String)
-      #
-      # @return [Core::Response]
-      #
+      #     * +:attributes+ - (Array<Hash>)
+      #       * +:name+ - (String)
+      #       * +:alternate_name_encoding+ - (String)
+      #       * +:value+ - (String)
+      #       * +:alternate_value_encoding+ - (String)
+      #   * +:next_token+ - (String)
+      #   * +:response_metadata+ - (Hash)
+      #     * +:box_usage+ - (Numeric)
+      #     * +:response_id+ - (String)
       define_client_method :select, 'Select'
 
       ## end client methods ##