aws-sdk 1.7.1 → 1.8.0

data/lib/aws/cloud_front/config.rb

@@ -0,0 +1,18 @@
+# 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.
+
+AWS::Core::Configuration.module_eval do
+
+  add_service 'CloudFront', 'cloud_front', 'cloudfront.amazonaws.com'
+
+end

data/lib/aws/cloud_front/errors.rb

@@ -0,0 +1,22 @@
+# 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
+  class CloudFront
+    module Errors
+
+      extend Core::LazyErrorClasses
+
+    end
+  end
+end

data/lib/aws/cloud_front/request.rb

@@ -0,0 +1,44 @@
+# 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 'time'
+
+module AWS
+  class CloudFront
+
+    # @private
+    class Request < Core::Http::Request
+
+      def add_authorization! credentials
+
+        self.access_key_id = credentials.access_key_id
+
+        auth = "AWS #{access_key_id}:#{signature(credentials)}"
+        headers['authorization'] = auth
+
+      end
+
+      protected
+
+      def signature credentials
+        Core::Signer.sign(credentials.secret_access_key, string_to_sign, 'sha1')
+      end
+
+      def string_to_sign
+        headers['date'] ||= Time.now.rfc822
+      end
+
+    end
+
+  end
+end

data/lib/aws/core.rb

@@ -31,6 +31,7 @@ require 'aws/core/autoloader'
 # * {AWS::ElasticBeanstalk}
 # * {AWS::ELB}
 # * {AWS::EMR}
+# * {AWS::Glacier}
 # * {AWS::IAM}
 # * {AWS::RDS}
 # * {AWS::Route53}
@@ -90,6 +91,7 @@ module AWS
       autoload :Data,                      'data'
       autoload :IndifferentHash,           'indifferent_hash'
       autoload :Inflection,                'inflection'
+      autoload :JSONParser,                'json_parser'
 
       autoload :JSONClient,                'json_client'
       autoload :JSONRequestBuilder,        'json_request_builder'
@@ -98,6 +100,7 @@ module AWS
       autoload :LazyErrorClasses,          'lazy_error_classes'
       autoload :LogFormatter,              'log_formatter'
       autoload :MetaUtils,                 'meta_utils'
+      autoload :ManagedFile,               'managed_file'
       autoload :Model,                     'model'
       autoload :Naming,                    'naming'
       autoload :OptionGrammar,             'option_grammar'
@@ -113,7 +116,9 @@ module AWS
       autoload :Response,                  'response'
       autoload :ResponseCache,             'response_cache'
 
-      autoload :RESTClient,                'rest_client'
+      autoload :RESTClient,                'rest_xml_client'
+      autoload :RESTJSONClient,            'rest_json_client'
+      autoload :RESTXMLClient,             'rest_xml_client'
       autoload :RESTRequestBuilder,        'rest_request_builder'
       autoload :RESTResponseParser,        'rest_response_parser'
 
@@ -125,6 +130,7 @@ module AWS
 
     module Options
       AWS.register_autoloads(self) do
+        autoload :JSONSerializer, 'json_serializer'
         autoload :XMLSerializer, 'xml_serializer'
         autoload :Validator, 'validator'
       end
@@ -225,6 +231,9 @@ module AWS
     # @option options [String] :cloud_formation_endpoint ('cloudformation.us-east-1.amazonaws.com')
     #   The service endpoint for AWS CloudFormation.
     #
+    # @option options [String] :cloud_front_endpoint ('cloudfront.amazonaws.com')
+    #   The service endpoint for Amazon CloudFront.
+    #
     # @option options [String] :cloud_search ('cloudsearch.us-east-1.amazonaws.com')
     #   The service endpoint for Amazon CloudSearch.
     #
@@ -255,6 +264,9 @@ module AWS
     # @option options [String] :elb_endpoint ('elasticloadbalancing.us-east-1.amazonaws.com')
     #   The service endpoint for Elastic Load Balancing.
     #
+    # @option options [String] :glacier_endpoint ('glacier.us-east-1.amazonaws.com')
+    #   The service endpoint for Amazon Glacier.
+    #
     # @option options [Object] :http_handler (AWS::Core::Http::NetHttpHandler)
     #   The http handler that sends requests to AWS.
     #
@@ -278,6 +290,9 @@ module AWS
     # @option options [String] :iam_endpoint ('iam.amazonaws.com') The
     #   service endpoint for AWS Idenity Access Management (IAM).
     #
+    # @option options [String] :import_export_endpoint ('importexport.amazonaws.com')
+    #   The service endpoint for AWS Import/Export.
+    #
     # @option options [Logger,nil] :logger (nil) A logger to send
     #   log messages to.  Here is an example that logs to standard out.
     #
@@ -422,6 +437,9 @@ module AWS
     # @option options [String] :sqs_endpoint ('sqs.us-east-1.amazonaws.com') The
     #   service endpoint for Amazon SQS.
     #
+    # @option options [String] :storage_gateway_endpoint ('storagegateway.us-east-1.amazonaws.com')
+    #   The service endpoint for AWS Storage Gateway.
+    #
     # @option options [String] :sts_endpoint ('sts.amazonaws.com') The
     #   service endpoint for AWS Security Token Service.
     #

data/lib/aws/core/client.rb

@@ -458,6 +458,13 @@ module AWS
                   end
                 end
 
+                # close files we opened
+                response.on_complete do
+                  if response.http_request.body_stream.is_a?(ManagedFile)
+                    response.http_request.body_stream.close
+                  end
+                end
+
                 response
 
               end

data/lib/aws/core/collection.rb

@@ -99,7 +99,7 @@ module AWS
       #   collection.
       #
       def enum options = {}
-        Enumerator.new(self, :each, options)
+        to_enum(:each, options)
       end
       alias_method :enumerator, :enum
 

data/lib/aws/core/configuration.rb

@@ -69,6 +69,9 @@ module AWS
     # @attr_reader [String] cloud_formation_endpoint ('cloudformation.us-east-1.amazonaws.com')
     #   The service endpoint for AWS CloudFormation.
     #
+    # @attr_reader [String] cloud_front_endpoint ('cloudfront.amazonaws.com')
+    #   The service endpoint for Amazon CloudFront.
+    #
     # @attr_reader [String] cloud_search ('cloudsearch.us-east-1.amazonaws.com')
     #   The service endpoint for Amazon CloudSearch.
     #
@@ -99,6 +102,9 @@ module AWS
     # @attr_reader [String] elb_endpoint ('elasticloadbalancing.us-east-1.amazonaws.com')
     #   The service endpoint for Elastic Load Balancing.
     #
+    # @attr_reader [String] glacier_endpoint ('glacier.us-east-1.amazonaws.com')
+    #   The service endpoint for Amazon Glacier.
+    #
     # @attr_reader [Object] http_handler The http handler that sends requests
     #   to AWS.  Defaults to an HTTP handler built on net/http.
     #
@@ -121,6 +127,9 @@ module AWS
     # @attr_reader [String] iam_endpoint ('iam.amazonaws.com')
     #   The service endpoint for AWS Idenity Access Management (IAM).
     #
+    # @attr_reader [String] import_export_endpoint ('importexport.amazonaws.com')
+    #   The service endpoint for AWS Import/Export.
+    #
     # @attr_reader [Logger,nil] logger (nil) The logging interface.
     #
     # @attr_reader [Symbol] log_level (:info) The log level.
@@ -239,6 +248,9 @@ module AWS
     # @attr_reader [String] sqs_endpoint ('sqs.us-east-1.amazonaws.com')
     #   The service endpoint for Amazon SQS.
     #
+    # @attr_reader [String] :storage_gateway_endpoint ('storagegateway.us-east-1.amazonaws.com')
+    #   The service endpoint for AWS Storage Gateway.
+    #
     # @attr_reader [String] sts_endpoint ('sts.amazonaws.com')
     #   The service endpoint for AWS Security Token Service.
     #

data/lib/aws/core/data.rb

@@ -13,7 +13,7 @@
 
 module AWS
   module Core
-    
+
     # Data is a light wrapper around a Ruby hash that provides
     # method missing access to the hash contents.
     #
@@ -66,7 +66,7 @@ module AWS
 
         # @private
         def id
-          self[:id] || self.id  
+          self[:id] || self.id
         end
 
         def [] index_or_key
@@ -84,6 +84,11 @@ module AWS
         end
         alias_method :==, :eql?
 
+        def dup
+          Data.cast(@data.dup)
+        end
+        alias_method :clone, :dup
+
         protected
 
         def method_missing *args, &block
@@ -106,7 +111,7 @@ module AWS
       include MethodMissingProxy
 
       def method_missing method_name, *args, &block
-        if 
+        if
           args.empty? and !block_given? and
           key = _remove_question_mark(method_name) and
           @data.has_key?(key)
@@ -116,7 +121,7 @@ module AWS
           super
         end
       end
-      
+
       # @param [Hash] data The ruby hash of data you need wrapped.
       def initialize data
         @data = data
@@ -174,14 +179,14 @@ module AWS
       end
 
       class << self
-        
+
         # Given a hash, this method returns a {Data} object.  Given
         # an Array, this method returns a {Data::List} object.  Everything
         # else is returned as is.
         #
         # @param [Object] value The value to conditionally wrap.
         #
-        # @return [Data,Data::List,Object] Wraps hashes and lists with 
+        # @return [Data,Data::List,Object] Wraps hashes and lists with
         #   Data and List objects, all other objects are returned as
         #   is.
         #
@@ -198,7 +203,7 @@ module AWS
       class List
 
         include MethodMissingProxy
-        
+
         # @param [Array] array
         def initialize array
           @data = array
@@ -217,7 +222,7 @@ module AWS
         end
         alias_method :to_a, :to_ary
 
-        # #inject works on Core::Data::List in in 1.8.7 and 1.9.3, but not 
+        # #inject works on Core::Data::List in in 1.8.7 and 1.9.3, but not
         # in 1.9.2 unless we define it like so.
         # @private
         def inject *args, &block

data/lib/aws/core/json_client.rb

@@ -18,7 +18,7 @@ module AWS
       protected
 
       def self.request_builder_for api_config, operation
-        JSONRequestBuilder.new(api_config[:target_prefix], operation)
+        JSONRequestBuilder.new(api_config, operation)
       end
 
       def self.response_parser_for api_config, operation
@@ -30,10 +30,9 @@ module AWS
           response.http_response.status >= 300 and
           body = response.http_response.body and
           json = (::JSON.load(body) rescue nil) and
-          type = json["__type"] and
-          matches = type.match(/\#(.*)$/)
+          type = json["__type"]
         then
-          code = matches[1]
+          code = type.split('#').last
           if code == 'RequestEntityTooLarge'
             message = 'Request body must be less than 1 MB'
           else

data/lib/aws/core/json_parser.rb

@@ -0,0 +1,76 @@
+# 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 JSONParser
+
+      def initialize rules
+        @rules = rules
+      end
+
+      attr_reader :rules
+
+      def parse body
+        body = "{}" if [nil, ''].include?(body)
+        translate(JSON.load(body))
+      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[:sym] || 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[: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/json_request_builder.rb

@@ -17,13 +17,14 @@ module AWS
     # @private
     class JSONRequestBuilder
 
-      def initialize target_prefix, operation
-        @x_amz_target = target_prefix + operation[:name]
+      def initialize api, operation
+        @x_amz_target = api[:target_prefix] + operation[:name]
+        @content_type = "application/x-amz-json-#{api[:json_version] || 1.0}"
         @grammar = OptionGrammar.customize(operation[:inputs])
       end
 
       def populate_request request, options
-        request.headers["content-type"] = "application/x-amz-json-1.0"
+        request.headers["content-type"] = @content_type
         request.headers["x-amz-target"] = @x_amz_target
         request.body = @grammar.to_json(options)
       end

data/lib/aws/core/json_response_parser.rb

@@ -44,8 +44,7 @@ module AWS
       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))
+            data.merge(rule[:sym] || key => translate_value(values[key], rule))
           else
             data
           end
@@ -65,7 +64,6 @@ module AWS
       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)