aws-sdk 1.3.8 → 1.3.9

data/lib/aws/core/resource.rb

@@ -24,6 +24,7 @@ module AWS
       # @private
       class NotFound < StandardError; end
   
+      # @private
       def initialize *args
   
         super
@@ -62,7 +63,7 @@ module AWS
       #   AWS resource.
       def eql? other
         other.kind_of?(self.class) and 
-          resource_identifiers == other.resource_identifiers
+        other.resource_identifiers == resource_identifiers
       end
       alias_method :==, :eql?
   

data/lib/aws/core/response.rb

@@ -44,6 +44,10 @@ module AWS
       # @return [Integer] Returns the number of times the request
       #   was retried.
       attr_accessor :retry_count
+
+      # @return [Float] The total number of seconds taken to make the
+      #   request and return the response.
+      attr_accessor :duration
   
       # @param [Http::Request] http_request
       # @param [Http::Response] http_request
@@ -52,6 +56,7 @@ module AWS
         @http_response = http_response
         @request_builder = block
         @retry_count = 0
+        @duration = 0
         rebuild_request if @request_builder && !http_request
       end
   

data/lib/aws/core/uri_escape.rb

@@ -25,7 +25,7 @@ module AWS
       protected
       def escape value
         value = value.encode("UTF-8") if value.respond_to?(:encode)
-        CGI::escape(value.to_s).gsub('+', '%20')
+        CGI::escape(value.to_s).gsub('+', '%20').gsub('%7E', '~')
       end
 
       # URI-escapes a path without escaping the separators

data/lib/aws/core/xml_grammar.rb

@@ -48,6 +48,26 @@ module AWS
         def respond_to?(m)
           @data.key?(m.to_sym) or super
         end
+        
+        def to_hash
+          @data.inject({}) do |hash,(key,value)|
+
+            # strip question marks from hash keys
+            if matches = key.to_s.match(/(.+)\?$/)
+              key = matches[1].to_sym
+            end
+
+            # recursively convert hashes
+            if value.is_a?(Array)
+              value = value.map{|v| v.is_a?(Context) ? v.to_hash : v }
+            elsif value.is_a?(Context)
+              value = value.to_hash
+            end
+
+            hash.merge(key => value)
+
+          end
+        end
   
         def inspect
           methods = @data.keys
@@ -517,6 +537,7 @@ module AWS
   
       end
   
+      # @private
       module NokogiriAdapter
   
         def xmldecl(*args); end

data/lib/aws/dynamo_db/request.rb

@@ -50,7 +50,7 @@ module AWS
       end
 
       def headers_to_sign
-        headers.keys.select do |header|
+        headers.keys.sort.select do |header|
           header == "content-encoding" ||
             header == "host" ||
             header =~ /^x-amz/

data/lib/aws/ec2/network_acl_collection.rb

@@ -24,8 +24,7 @@ module AWS
       # @param [Hash] options
       #
       # @option options [VPC,String] :vpc The vpc or vpc id of where you want
-      #   to create the subnet.  This option is required if this collection
-      #   does not have a populated vpc ({#vpc} returns nil).
+      #   to create the subnet.
       #
       # @return [NetworkACL]
       #

data/lib/aws/ec2/route_table_collection.rb

@@ -24,8 +24,7 @@ module AWS
       # @param [Hash] options
       #
       # @option options [VPC,String] :vpc The vpc or vpc id of where you want
-      #   to create the route table.  This option is required if this 
-      #   collection does not have a populated vpc ({#vpc} returns nil).
+      #   to create the route table. 
       #
       # @return [RouteTable]
       #

data/lib/aws/ec2/vpn_gateway_collection.rb

@@ -31,7 +31,7 @@ module AWS
       # @option options [AvailabilityZone,String] :availability_zone
       #   The Availability Zone where you want the virtual private gateway.
       #   AWS can select a default zone for you.  This can be an
-      #   {AvailablityZone} object or availability zone name string.
+      #   {AvailabilityZone} object or availability zone name string.
       #   
       # @return [VPNGateway]
       #

data/lib/aws/elb/load_balancer.rb

@@ -14,8 +14,6 @@
 module AWS
   class ELB
 
-  
-    #
     # @attr_reader [String] name The name of the load balancer.
     #
     # @attr_reader [Array<String>] availability_zone_names Return the names of

data/lib/aws/errors.rb

@@ -101,9 +101,9 @@ module AWS
           super(nil, nil, req)
           @message = req
         elsif req and resp
-          super(req, resp, message)
-          include_error_type
           parse_body(resp.body)
+          super(req, resp, self.message)
+          include_error_type
         else
           super()
         end

data/lib/aws/s3/object_version_collection.rb

@@ -41,7 +41,7 @@ module AWS
     #
     # If you know the id of a particular version you can get that object.
     #
-    #   bucket.objets['myobj'].version[version_id].delete
+    #   bucket.objects['myobj'].version[version_id].delete
     #   
     class ObjectVersionCollection
 

data/lib/aws/s3/s3_object.rb

@@ -448,7 +448,7 @@ module AWS
       # new object once this is done.
       #
       #   bucket = s3.buckets['old-bucket']
-      #   old_obj = bucket.objets['old-key']
+      #   old_obj = bucket.objects['old-key']
       #
       #   # renaming an object returns a new object
       #   new_obj = old_obj.move_to('new-key')
@@ -465,7 +465,7 @@ module AWS
       #   obj = s3.buckets['old-bucket'].objects['old-key]
       #   obj.move_to('new-key', :bucket_name => 'new_bucket')
       # 
-      # If the copy succedes, but the then the delete fails, an error
+      # If the copy succeeds, but the then the delete fails, an error
       # will be raised.  
       #
       # @param [String] target The key to move this object to.
@@ -474,7 +474,7 @@ module AWS
       #
       # @option (see #copy_to)
       #
-      # @return [S3Object] Returns a new objet with the new key.
+      # @return [S3Object] Returns a new object with the new key.
       #
       def move_to target, options = {}
         copy = copy_to(target, options)
@@ -806,7 +806,7 @@ module AWS
       #   as a date using Time#parse), a Time, or a DateTime object.
       #   This option defaults to one hour after the current time.
       #
-      # @option options [String] :secure Whether to generate a
+      # @option options [Boolean] :secure (true) Whether to generate a
       #   secure (HTTPS) URL or a plain HTTP url.
       #
       # @option options [String] :response_content_type Sets the

data/lib/aws/sqs/queue.rb

@@ -452,7 +452,7 @@ module AWS
       # You can also set an optional delay for all of the messages:
       #
       #   # delay all messages 1 hour
-      #   queue.batch_send_message(msg1, msg2, :delay_seconds => 3600)
+      #   queue.batch_send(msg1, msg2, :delay_seconds => 3600)
       #
       # If you need to set a custom delay for each message you can pass
       # hashes:
@@ -461,7 +461,7 @@ module AWS
       #   messages << { :message_body => 'msg1', :delay_seconds => 60 }
       #   messages << { :message_body => 'msg2', :delay_seconds => 30 }
       #
-      #   queue.batch_send_message(messages)
+      #   queue.batch_send(messages)
       #
       # @param [String,Hash] messages A list of messages.  Each message
       #   should be a string, or a hash with a +:message_body+,

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: aws-sdk
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 1
   - 3
-  - 8
-  version: 1.3.8
+  - 9
+  version: 1.3.9
 platform: ruby
 authors: 
 - Amazon Web Services
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-16 00:00:00 Z
+date: 2012-03-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,11 +29,11 @@ dependencies:
         - 1
         version: "2.1"
   name: uuidtools
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,27 +44,27 @@ dependencies:
         - 7
         version: "0.7"
   name: httparty
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <=
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
         - 1
-        - 5
-        - 0
-        version: 1.5.0
+        - 4
+        - 4
+        version: 1.4.4
   name: nokogiri
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,7 +75,9 @@ dependencies:
         - 4
         version: "1.4"
   name: json
-  version_requirements: *id004
+  type: :runtime
+  prerelease: false
+  requirement: *id004
 description: AWS SDK for Ruby
 email: 
 executables: []
@@ -89,6 +89,30 @@ extra_rdoc_files: []
 files: 
 - ca-bundle.crt
 - rails/init.rb
+- lib/aws/auto_scaling/activity.rb
+- lib/aws/auto_scaling/activity_collection.rb
+- lib/aws/auto_scaling/client/xml.rb
+- lib/aws/auto_scaling/client.rb
+- lib/aws/auto_scaling/config.rb
+- lib/aws/auto_scaling/errors.rb
+- lib/aws/auto_scaling/group.rb
+- lib/aws/auto_scaling/group_collection.rb
+- lib/aws/auto_scaling/group_options.rb
+- lib/aws/auto_scaling/instance.rb
+- lib/aws/auto_scaling/instance_collection.rb
+- lib/aws/auto_scaling/launch_configuration.rb
+- lib/aws/auto_scaling/launch_configuration_collection.rb
+- lib/aws/auto_scaling/notification_configuration.rb
+- lib/aws/auto_scaling/notification_configuration_collection.rb
+- lib/aws/auto_scaling/request.rb
+- lib/aws/auto_scaling/scaling_policy.rb
+- lib/aws/auto_scaling/scaling_policy_collection.rb
+- lib/aws/auto_scaling/scaling_policy_options.rb
+- lib/aws/auto_scaling/scheduled_action.rb
+- lib/aws/auto_scaling/scheduled_action_collection.rb
+- lib/aws/auto_scaling/tag.rb
+- lib/aws/auto_scaling/tag_collection.rb
+- lib/aws/auto_scaling.rb
 - lib/aws/core/api_config.rb
 - lib/aws/core/async_handle.rb
 - lib/aws/core/authorize_v2.rb
@@ -98,7 +122,6 @@ files:
 - lib/aws/core/autoloader.rb
 - lib/aws/core/cacheable.rb
 - lib/aws/core/client.rb
-- lib/aws/core/client_logging.rb
 - lib/aws/core/collection/limitable.rb
 - lib/aws/core/collection/simple.rb
 - lib/aws/core/collection.rb
@@ -120,6 +143,7 @@ files:
 - lib/aws/core/inflection.rb
 - lib/aws/core/json_client.rb
 - lib/aws/core/lazy_error_classes.rb
+- lib/aws/core/log_formatter.rb
 - lib/aws/core/meta_utils.rb
 - lib/aws/core/model.rb
 - lib/aws/core/naming.rb
@@ -428,6 +452,7 @@ files:
 - lib/net/http/connection_pool/connection.rb
 - lib/net/http/connection_pool/session.rb
 - lib/net/http/connection_pool.rb
+- lib/aws/api_config/AutoScaling-2011-01-01.yml
 - lib/aws/api_config/DynamoDB-2011-12-05.yml
 - lib/aws/api_config/EC2-2011-12-15.yml
 - lib/aws/api_config/ELB-2011-08-15.yml
@@ -472,7 +497,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: AWS SDK for Ruby

data/lib/aws/core/client_logging.rb

@@ -1,133 +0,0 @@
-# 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 'benchmark'
-
-module AWS
-  module Core
-
-    # @private
-    module ClientLogging
-  
-      def log_client_request(name, options)
-        response = nil
-        time = Benchmark.measure do
-          response = yield
-        end
-  
-        if config.logger
-          if options[:async]
-            response.on_complete do
-              log_client_request_on_success(name, options, response, time)
-            end
-          else
-            log_client_request_on_success(name, options, response, time)
-          end
-        end
-        response
-      end
-  
-      # Summarizes long strings and adds file size information
-      # @private
-      def sanitize_options(options)
-        sanitize_hash(options)
-      end
-  
-      protected
-      def log severity, message
-        config.logger.send(severity, message + "\n") if config.logger
-      end
-  
-      protected
-      def log_client_request_on_success(method_name, options, response, time)
-        status = response.http_response.status
-        service = self.class.service_name
-  
-        pattern = "[AWS %s %s %.06f %d retries] %s(%s)"
-        parts = [
-          service, 
-          status, 
-          time.real, 
-          response.retry_count,
-          method_name, 
-          sanitize_options(options)]
-
-        severity = :info
-  
-        if response.error
-          pattern += " %s: %s"
-          parts << response.error.class
-          parts << response.error.message
-          severity = :error
-        end
-  
-        if response.cached
-          pattern << " [CACHED]"
-        end
-  
-        log(severity, pattern % parts)
-      end
-  
-      protected
-      def sanitize_value(value)
-        case value
-        when Hash
-          '{' + sanitize_hash(value) + '}'
-        when Array
-          sanitize_array(value)
-        when File
-          sanitize_file(value)
-        when String
-          sanitize_string(value)
-        else
-          value.inspect
-        end
-      end
-  
-      protected
-      def sanitize_string str
-        inspected = str.inspect
-        if inspected.size > config.logger_truncate_strings_at
-          summarize_string(str)
-        else
-          inspected
-        end
-      end
-  
-      protected
-      def summarize_string str
-        # skip the openning "
-        string_start = str.inspect[1,config.logger_truncate_strings_at]
-        "#<String \"#{string_start}\" ... (#{str.size} characters)>"
-      end
-  
-      protected
-      def sanitize_file file
-        "#<File:#{file.path} (#{File.size(file.path)} bytes)>"
-      end
-  
-      protected
-      def sanitize_array array
-        "[" + array.map { |v| sanitize_value(v) }.join(",") + "]"
-      end
-  
-      protected
-      def sanitize_hash hash
-        hash.map do |k,v|
-          "#{sanitize_value(k)}=>#{sanitize_value(v)}"
-        end.sort.join(",")
-      end
-  
-    end
-  end
-end