aws-sdk 1.6.3 → 1.6.4

data/lib/aws/core/json_error_parser.rb

@@ -0,0 +1,25 @@
+# Copyright 2011-2012 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.
+
+module AWS
+  module Core
+
+    # @private
+    module JSONErrorParser
+
+      end
+
+    end
+
+  end
+end

data/lib/aws/core/json_request_builder.rb

@@ -0,0 +1,34 @@
+# Copyright 2011-2012 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.
+
+module AWS
+  module Core
+
+    # @private
+    class JSONRequestBuilder
+
+      def initialize target_prefix, operation
+        @x_amz_target = target_prefix + operation[:name]
+        @grammar = OptionGrammar.customize(operation[:inputs])
+      end
+
+      def populate_request request, options
+        request.headers["content-type"] = "application/x-amz-json-1.0"
+        request.headers["x-amz-target"] = @x_amz_target
+        request.body = @grammar.to_json(options)
+      end
+
+    end
+
+  end
+end

data/lib/aws/core/json_response_parser.rb

@@ -0,0 +1,81 @@
+# Copyright 2011-2012 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 'json'
+require 'time'
+require 'bigdecimal'
+require 'base64'
+
+module AWS
+  module Core
+
+    # @private
+    class JSONResponseParser
+
+      def initialize rules
+        @rules = rules
+      end
+
+      def extract_data response
+        body = response.http_response.body
+        body = "{}" if [nil, ''].include?(body)
+        translate(JSON.load(body))
+      end
+
+      def simulate
+        {}
+      end
+
+      protected
+
+      # @param [Hash] values
+      # @param [Hash] rules
+      # @return [Hash]
+      def translate values, rules = @rules
+        rules.inject({}) do |data,(key,rule)|
+          if values.key?(key)
+            #data.merge(rule[:symbol] => translate_value(values[key], rule))
+            data.merge(key => translate_value(values[key], rule))
+          else
+            data
+          end
+        end
+      end
+
+      def translate_hash values, rules
+        translate(values, rules[:members])
+      end
+
+      def translate_map values, rules
+        values.inject({}) do |data,(key,value)|
+          data.merge(key => translate_value(value, rules[:members]))
+        end
+      end
+
+      def translate_value value, rule
+        case
+        when value.is_a?(Array) then value.map{|v| translate_value(v, rule) }
+        #when rule[:list] then value.map{|v| translate_value(v, rule) }
+        when rule[:type] == :hash then translate_hash(value, rule)
+        when rule[:type] == :map then translate_map(value, rule)
+        when rule[:type] == :blob then Base64.decode64(value)
+        when rule[:type] == :time then Time.at(value)
+        when rule[:type] == :big_decimal then BigDecimal.new(value)
+        else value
+        end
+      end
+
+    end
+
+  end
+end

data/lib/aws/core/log_formatter.rb

@@ -51,8 +51,8 @@ module AWS
     # * {LogFormatter.colored}
     #
     # = Pattern Substitutions
-    # 
-    # You can put any of these placeholders into you pattern.  
+    #
+    # You can put any of these placeholders into you pattern.
     #
     # [+:service+]
     #   The AWS service name (e.g. 'S3', 'EC2', 'SimpleDB', etc)
@@ -61,32 +61,32 @@ module AWS
     #   The AWS region name (e.g. 'us-east-1', 'us-west-1', etc)
     #
     # [+:operation+]
-    #   The name of the client request method.  This maps to the name of 
+    #   The name of the client request method.  This maps to the name of
     #   the serivce API operation (e.g. :describe_instances).
     #
-    # [+:options+] 
+    # [+:options+]
     #   The hash of options passed to the client request method.
     #   Long strings are truncated/summarized if they excede the log
     #   formatters {#max_string_size}.  Other objects are inspected.
-    # 
-    # [+:retry_count+] 
+    #
+    # [+:retry_count+]
     #   The number of times a client request was retried.
     #   Throttlings and service errors trigger the automatic retry logic.
     #   This value indicates how many extra attempts were made before
     #   getting a successful response or giving up.
     #
-    # [+:duration+] 
+    # [+:duration+]
     #   The time it took to generate a response, expressed
     #   in decimal seconds.  This time includes everything from
     #   calling the client request method, until that method returns
     #   a value (event retries and retry delays).
     #
-    # [+:error_class+] 
-    #   The class name of the error returned by the 
+    # [+:error_class+]
+    #   The class name of the error returned by the
     #   service.  If no error was returned, this will be replcaed by
     #   an empty string.
     #
-    # [+:error_message+]  
+    # [+:error_message+]
     #   The message of the error returned.  If
     #   no error was returned by the service, this will be an empty
     #   string.
@@ -94,17 +94,17 @@ module AWS
     # [+:http_request_method+]
     #   The HTTP request verb (e.g. 'POST', 'PUT', 'GET', etc).
     #
-    # [+:http_request_protocol+] 
+    # [+:http_request_protocol+]
     #   This is replaced by 'http' or 'https'.
     #
-    # [+:http_request_host+]  
+    # [+:http_request_host+]
     #   The host name of the http request endpoint (e.g. 's3.amazon.com').
     #
-    # [+:http_request_port+] 
+    # [+:http_request_port+]
     #   The port number (e.g. '443' or '80').
     #
     # [+:http_request_uri+]
-    #   The http request uri folling the host (e.g. 
+    #   The http request uri folling the host (e.g.
     #   '/bucket_name/objects/key?versions').
     #
     # [+:http_request_body+]
@@ -124,7 +124,7 @@ module AWS
     #
     # [+:http_response_body+]
     #   The http response body contents.
-    # 
+    #
     class LogFormatter
 
       # @param [String] pattern The log format pattern should be a string
@@ -272,7 +272,7 @@ module AWS
       # @return [String]
       def summarize_hash hash
         hash.map do |key,v|
-          ":#{key}=>#{summarize_value(v)}"
+          "#{key.inspect}=>#{summarize_value(v)}"
         end.sort.join(",")
       end
 
@@ -288,7 +288,7 @@ module AWS
         else value.inspect
         end
       end
-  
+
       # @param [String] str
       # @return [String]
       def summarize_string str
@@ -307,7 +307,7 @@ module AWS
       def summarize_file path
         "#<File:#{path} (#{File.size(path)} bytes)>"
       end
-  
+
       # @param [Array] array
       # @return [String]
       def summarize_array array
@@ -315,13 +315,13 @@ module AWS
       end
 
       class << self
-      
+
         # The default log format.
         #
         # @example A sample of the default format.
         #
         #   [AWS SimpleEmailService 200 0.580066 0 retries] list_verified_email_addresses()
-        # 
+        #
         # @return [LogFormatter]
         #
         def default
@@ -346,7 +346,7 @@ module AWS
         # @example A sample of the short format
         #
         #   [AWS SimpleEmailService 200 0.494532] list_verified_email_addresses
-        # 
+        #
         # @return [LogFormatter]
         #
         def short
@@ -375,7 +375,7 @@ module AWS
         #   +-------------------------------------------------------------------------------
         #   |    METHOD: POST
         #   |       URL: https://email.us-east-1.amazonaws.com::443:/
-        #   |   HEADERS: {"content-type"=>"application/x-www-form-urlencoded" ... 
+        #   |   HEADERS: {"content-type"=>"application/x-www-form-urlencoded" ...
         #   |      BODY: Action=ListVerifiedEmailAddresses&Timestamp= ...
         #   +-------------------------------------------------------------------------------
         #   |  RESPONSE
@@ -383,7 +383,7 @@ module AWS
         #   |    STATUS: 200
         #   |   HEADERS: {"x-amzn-requestid"=>["..."], ...
         #   |      BODY: <ListVerifiedEmailAddressesResponse ...
-        #   
+        #
         # @return [LogFormatter]
         #
         def debug
@@ -404,7 +404,7 @@ module AWS
           uri_pattern << ':'
           uri_pattern << ':http_request_uri'
 
-          line = "+" + '-' * 79 
+          line = "+" + '-' * 79
 
           pattern = []
           pattern << line
@@ -432,7 +432,7 @@ module AWS
         # @example A sample of the colored format (sans the ansi colors).
         #
         #   [AWS SimpleEmailService 200 0.580066 0 retries] list_verified_email_addresses()
-        # 
+        #
         # @return [LogFormatter]
         #
         def colored

data/lib/aws/core/option_grammar.rb

@@ -20,44 +20,44 @@ module AWS
 
     # @private
     class OptionGrammar
-  
+
       # @private
       class DefaultOption; end
-  
+
       # @private
       class FormatError < ArgumentError
         attr_accessor :expectation
         attr_accessor :context_description
-  
+
         def initialize(expectation, context)
           @expectation = expectation
           @context_description = context
         end
-  
+
         def to_s
           "expected #{expectation} for #{context_description}"
         end
       end
-  
+
       # @private
       module Descriptors
-  
+
         # @private
         module NoArgs
           def apply(option)
             option.extend self
           end
         end
-  
+
         module Timestamp
-  
+
           extend NoArgs
-  
+
           def validate(value, context = nil)
             true
   #             raise format_error("timestamp value", context) unless
   #               case value
-  #               when String 
+  #               when String
   #                 value =~ /^\d+$/ or value =~ /^\d{4}-\d{2}-d{2}T\d{2}:\d{2}:\d{2}Z$/
   #               when String then value =~ /^2009-12-04T20:56:05.000Z\d+$/
   #               when Integer then true
@@ -69,13 +69,13 @@ module AWS
   #             end
   #               value.respond_to? :to_str
           end
-  
+
           def encode_value(value)
             value.to_s
   #             value.to_s
   #             case value
   #             when Integer
-  #             when 
+  #             when
   #             case value
   #             when nil, ''  then nil
   #             when DateTime then raw
@@ -84,98 +84,106 @@ module AWS
   #             end
           end
         end
-  
+
         # @private
         module String
-  
+
           extend NoArgs
-  
+
           def validate(value, context = nil)
             raise format_error("string value", context) unless
               value.respond_to? :to_str
           end
-  
+
           def encode_value(value)
             value.to_s
           end
-  
+
         end
-  
+
         # @private
         module Blob
-  
+
           extend NoArgs
-  
+
           def validate(value, context = nil)
             raise format_error("string value", context) unless
               value.respond_to? :to_str
           end
-  
+
           def encode_value(value)
             Base64.encode64(value.to_s)
           end
-  
+
+          def hash_format(value)
+            Base64.encode64(value.to_s).strip
+          end
+
         end
-  
+
         # @private
         module Integer
-  
+
           extend NoArgs
-  
+
           def validate(value, context = nil)
             raise format_error("integer value", context) unless
               value.respond_to? :to_int
           end
-  
+
           def encode_value(value)
             value.to_s
           end
-  
+
         end
 
         Long = Integer
-  
+
         # @private
         module Boolean
-  
+
           extend NoArgs
-  
+
           def validate(value, context = nil)
             raise format_error("boolean value", context) unless
               value == true || value == false
           end
-  
+
           def encode_value(value)
             value.to_s
           end
-  
+
         end
-  
+
         # @private
         module Required
           extend NoArgs
           def required?; true; end
         end
-  
+
+        module Position
+          def self.apply *args; end
+        end
+
         # @private
         module Float
-  
+
           extend NoArgs
-  
+
           def validate(value, context = nil)
             raise format_error("float value", context) unless
               value.kind_of?(Numeric) or
               value.respond_to? :to_f
           end
-  
+
           def encode_value(value)
             value.to_f.to_s
           end
-  
+
         end
 
         Double = Float
- 
+
         # @private
         module Rename
           def self.apply(option, new_name)
@@ -183,31 +191,31 @@ module AWS
             MetaUtils.extend_method(option, :ruby_name) { new_name }
           end
         end
-  
+
         # @private
         module Pattern
-  
+
   #         def validate value, context = nil
   #           unless value =~ regex
   #             raise format_error("value to match #{regex}", context)
   #           end
   #         end
-  #       
+  #
   #         def self.apply option, regex
   #           option.extend(self)
   #           MetaUtils.extend_method(option, :regex) { regex }
   #         end
-  
+
           def self.apply *args
           end
-  
+
         end
-  
+
         # @private
         module ListMethods
-  
+
           module ClassMethods
-  
+
             def apply(option, member_descriptors)
               super(option)
               member_option = option.member_option if option.respond_to?(:member_option)
@@ -224,11 +232,11 @@ module AWS
               member_option = member_option.extend_with_config(*descriptors)
               MetaUtils.extend_method(option, :member_option) { member_option }
             end
-  
+
           end
-  
+
           module InstanceMethods
-  
+
             def validate(value, context = nil)
               raise format_error("enumerable value", context) unless
                 value.respond_to? :each
@@ -239,7 +247,7 @@ module AWS
                                        "member #{i} of #{context_description(context)}")
               end
             end
-  
+
             def request_params(value, prefix = nil)
               params = []
               value.each do |v|
@@ -259,64 +267,64 @@ module AWS
             def join
               '.'
             end
-  
+
           end
-  
+
         end
-  
+
         module List
-  
+
           extend NoArgs
           extend ListMethods::ClassMethods
           include ListMethods::InstanceMethods
-  
+
         end
-  
+
         module MemberedList
-  
+
           extend NoArgs
           extend ListMethods::ClassMethods
           include ListMethods::InstanceMethods
-  
+
           def join
             '.member.'
           end
-  
+
         end
-  
+
         class ListMember < DefaultOption
-  
+
           def initialize options = {}
             super("##list-member##")
             @prefix = options[:prefix] || ''
           end
-  
+
           def prefixed_name(prefix)
             "#{prefix}#{@prefix}"
           end
-  
+
         end
-  
+
         # @private
         module Structure
-  
+
           extend NoArgs
-  
+
           def self.apply(option, members)
             options = {}
             options = option.member_options.inject({}) do |memo, member_option|
               memo[member_option.name] = member_option
               memo
             end if option.respond_to?(:member_options)
-  
+
             super(option)
-  
+
             members.each do |(name, descriptors)|
               member_option = options[name] || DefaultOption.new(name)
               member_option = member_option.extend_with_config(*descriptors)
               options[name] = member_option
             end
-  
+
             MetaUtils.extend_method(option, :member_options) { options.values }
             by_ruby_name = options.values.inject({}) do |memo, member_option|
               memo[member_option.ruby_name] = member_option
@@ -325,20 +333,20 @@ module AWS
             end
             MetaUtils.extend_method(option, :member_option) { |n| by_ruby_name[n] }
           end
-  
+
           def validate(value, context = nil)
             raise format_error("hash value", context) unless
               value.respond_to?(:to_hash)
-  
+
             context = context_description(context)
-  
+
             value.each do |name, v|
               name = name.to_s
               raise ArgumentError.new("unexpected key #{name} for #{context}") unless
                 member_option(name)
               member_option(name).validate(v, "key #{name} of #{context}")
             end
-  
+
             member_options.each do |option|
               raise ArgumentError.new("missing required key #{option.ruby_name} for #{context}") if
                 option.required? and
@@ -347,7 +355,7 @@ module AWS
                 !value.has_key?(option.name)
             end
           end
-  
+
           def request_params(values, prefix = nil)
             values.map do |name, value|
               name = name.to_s
@@ -416,7 +424,7 @@ module AWS
 
             end
           end
-  
+
 
           def hash_format(value)
             value.inject({}) do |hash, (key, value)|
@@ -451,26 +459,26 @@ module AWS
           end
 
         end
-  
+
         # @private
         module Boolean
           extend NoArgs
         end
-  
+
       end
-  
+
       class DefaultOption
-  
+
         attr_reader :name
-  
+
         def initialize(name)
           @name = name
         end
-  
+
         def ruby_name
           Inflection.ruby_name(name)
         end
-  
+
         def request_params(value, prefix = nil)
           [Http::Request::Param.new(prefixed_name(prefix), encode_value(value))]
         end
@@ -483,24 +491,24 @@ module AWS
           return "#{prefix}.#{name}" if prefix
           name
         end
-  
+
         def encode_value(value)
           value
         end
-  
+
         def required?
           false
         end
-  
+
         def format_error(expected, context = nil)
           context = context_description(context)
           FormatError.new(expected, context)
         end
-  
+
         def context_description(context)
           context or "option #{ruby_name}"
         end
-  
+
         def extend_with_config(*descriptors)
           option = clone
           descriptors.each do |desc|
@@ -521,16 +529,16 @@ module AWS
           end
           option
         end
-  
+
         include Descriptors::String
-  
+
       end
-  
+
       # @private
       module ModuleMethods
-  
+
         include Inflection
-  
+
         def customize(config = [])
           m = Class.new(self)
           supported_options = m.supported_options.inject({}) do |memo, opt|
@@ -547,7 +555,7 @@ module AWS
             option = option.extend_with_config(*value_desc)
             supported_options[option.name] = option
           end
-  
+
           supported_ary = supported_options.values
           MetaUtils.extend_method(m, :supported_options) { supported_ary }
           supported_ruby_names = supported_ary.inject({}) do |memo, opt|
@@ -560,18 +568,18 @@ module AWS
               opt.validate(value)
             end
           end
-  
+
           m
         end
-  
+
         def option(name)
           nil
         end
-  
+
         def supported_options
           []
         end
-  
+
         def validate(options)
           options.each do |name, value|
             name = name.to_s
@@ -614,20 +622,20 @@ module AWS
         def included(m)
           m.extend(self::ModuleMethods)
         end
-  
+
         protected
         def parse_option(option)
           value_desc = nil
           if option.kind_of? Hash
             raise ArgumentError.new("passed empty hash where an option was expected") if
               option.empty?
-  
+
             raise ArgumentError.new("too many entries in option description") if
               option.size > 1
-  
+
             (name, value_desc) = option.to_a.first
             name = name.to_s
-  
+
             raise ArgumentError.new("expected an array for "+
                                     "value description of option #{name},"+
                                     "got #{value_desc.inspect}") unless
@@ -635,12 +643,12 @@ module AWS
           else
             name = option
           end
-  
+
           value_desc ||= []
-  
+
           [name, value_desc]
         end
-  
+
         protected
         def apply_required_descriptor(m, name)
           name = ruby_name(name)
@@ -649,7 +657,7 @@ module AWS
               opts.key? name or opts.key? name.to_sym
           end
         end
-  
+
         protected
         def apply_integer_descriptor(m, name)
           MetaUtils.extend_method(m, "validate_#{ruby_name(name)}") do |value|
@@ -657,7 +665,7 @@ module AWS
               value.respond_to? :to_int
           end
         end
-  
+
         protected
         def apply_string_descriptor(m, name)
           MetaUtils.extend_method(m, "validate_#{ruby_name(name)}") do |value|
@@ -665,7 +673,7 @@ module AWS
               value.respond_to? :to_str
           end
         end
-  
+
         protected
         def apply_list_descriptor(m, name, arg)
           MetaUtils.extend_method(m, "validate_#{ruby_name(name)}") do |value|
@@ -687,14 +695,14 @@ module AWS
             end
           end
         end
-  
+
         protected
         def apply_rename_descriptor(m, name, new_name)
           name = ruby_name(name)
           MetaUtils.extend_method(m, :validate) do |opts|
             raise ArgumentError.new("unexpected option foo") if
               opts.key?(name) or opts.key?(name.to_sym)
-  
+
             opts = opts.dup
             opts[name] = opts[new_name] if opts.key?(new_name)
             opts[name.to_sym] = opts[new_name.to_sym] if opts.key?(new_name.to_sym)
@@ -702,27 +710,27 @@ module AWS
             opts.delete(new_name.to_sym)
             super(opts)
           end
-  
+
           # couldn't find a better way to alias a class method
           method = m.method("params_for_#{name}")
           MetaUtils.extend_method(m, "params_for_#{new_name}") do |value|
             method.call(value)
           end
         end
-  
+
       end
 
       class MapOption < DefaultOption
         def param_name
-          @param_name || name  
+          @param_name || name
         end
         def param_name= name
           @param_name = name
         end
       end
-  
+
       extend ModuleMethods
-  
+
     end
   end
 end