aws-sdk 1.3.2 → 1.3.3

data/lib/aws/core/collection.rb

@@ -44,23 +44,16 @@ module AWS
       #   collection.each {|item| ... }
       #
       # @note If you want fewer than all items, it is generally better 
-      #   to call #{page} than {#each} with a +:limit+.
+      #   to call {#page} than {#each} with a +:limit+.
       #
       # @param [Hash] options
       #
       # @option options [Integer] :limit (nil) The maximum number of
       #   items to enumerate from this collection.
       #
-      # @option options [next_token] :next_token (nil) Next tokens
-      #   act as offsets into the collection.  Next tokens vary in
-      #   format from one service to the next, (e.g. may be a number,
-      #   an opaque string, a hash of values, etc).
-      #
-      #   {#each} and {#each_batch} return a +:next_token+ when called
-      #   with +:limit+ and there were more items matching the request.
-      #
-      #   *NOTE* It is generally better to call {#page} if you only
-      #   want a few items with the ability to request more later.
+      # @option options [next_token] :next_token (nil) 
+      #   Acts as an offset.  +:next_token+ may be returned by {#each} and
+      #   {#each_batch} when a +:limit+ is provided.
       #
       # @return [nil_or_next_token] Returns nil if all items were enumerated.
       #   If some items were excluded because of a +:limit+ option then
@@ -205,7 +198,7 @@ module AWS
       #   the next page of results.  You can not choose an offset
       #   or know how many pages of results there will be.
       #
-      # @params [Hash] options A hash of options that modifies the
+      # @param [Hash] options A hash of options that modifies the
       #   items returned in the page of results.
       #
       # @option options [Integer] :per_page (10) The number of results

data/lib/aws/core/collection/limitable.rb

@@ -30,11 +30,18 @@ module AWS
         def each_batch options = {}, &block
 
           each_opts  = options.dup
-          limit      = each_opts.delete(:limit) || _limit
-          next_token = each_opts.delete(:next_token)
+
+          ## limit and batch size should accept string values like '10'
+
+          limit = each_opts.delete(:limit) || _limit
+          limit = limit.to_i if limit
+
           batch_size = each_opts.delete(:batch_size)
+          batch_size = batch_size.to_i if batch_size
+
+          next_token = each_opts.delete(:next_token)
 
-          total = 0  # count of items yeileded across all batches
+          total = 0  # count of items yeilded across all batches
 
           begin
 

data/lib/aws/core/collection/simple.rb

@@ -40,6 +40,7 @@ module AWS
 
           each_opts  = options.dup
           limit      = each_opts.delete(:limit)
+          limit      = limit.to_i if limit
           next_token = each_opts.delete(:next_token)
           offset     = next_token ? next_token.to_i - 1 : 0
           total      = 0

data/lib/aws/core/configuration.rb

@@ -379,6 +379,8 @@ module AWS
   
       add_option :ssl_ca_file, 
         File.expand_path(File.dirname(__FILE__) + "/../../../ca-bundle.crt")
+
+      add_option :ssl_ca_path
   
       add_option :stub_requests, false, :boolean => true
   

data/lib/aws/core/configured_json_client_methods.rb

@@ -39,13 +39,16 @@ module AWS
             option_grammar = self::Options.operation_grammar(name)
             target_prefix = self::TARGET_PREFIX
             add_client_request_method(Inflection.ruby_name(name).to_sym) do
+
               configure_request do |request, options|
                 request.headers["x-amz-target"] = target_prefix + name
                 request.body = option_grammar.to_json(options)
               end
 
               process_response do |response|
-                data = JSON.load(response.http_response.body)
+                response_body = response.http_response.body
+                response_body = "{}" if response_body == ""
+                data = JSON.load(response_body)
                 MetaUtils.extend_method(response, :data) { data }
               end
 
@@ -53,6 +56,7 @@ module AWS
                 data = {}
                 MetaUtils.extend_method(response, :data) { data }
               end
+
             end
           end
 
@@ -68,4 +72,3 @@ module AWS
 
   end
 end
-

data/lib/aws/core/http/httparty_handler.rb

@@ -44,7 +44,7 @@ module AWS
         #   that +:body+, +:headers+, +:parser+, and +:ssl_ca_file+ are
         #   ignored.  If you need to set the CA file, you should use the
         #   +:ssl_ca_file+ option to {AWS.config} or
-        #   {AWS::Configuration} instead.
+        #   {Configuration} instead.
         def initialize options = {}
           @default_request_options = options
         end

data/lib/aws/core/http/net_http_handler.rb

@@ -34,7 +34,8 @@ module AWS
           options[:ssl] = request.use_ssl?
           options[:proxy_uri] = request.proxy_uri
           options[:ssl_verify_peer] = request.ssl_verify_peer?
-          options[:ssl_ca_file] = request.ssl_ca_file
+          options[:ssl_ca_file] = request.ssl_ca_file if request.ssl_ca_file
+          options[:ssl_ca_path] = request.ssl_ca_path if request.ssl_ca_path
 
           connection = self.class.pool.connection_for(request.host, options)
 

data/lib/aws/core/http/request.rb

@@ -26,7 +26,13 @@ module AWS
           @headers = CaseInsensitiveHash.new
           @params = []
           @use_ssl = true
+          @read_timeout = 60 
         end
+
+        # @return [Integer] The number of seconds the service has to respond
+        #   before a timeout error is raised on the request.  Defaults to 
+        #   60 seconds.
+        attr_accessor :read_timeout
   
         # @return [String] hostname of the request
         attr_accessor :host
@@ -88,6 +94,20 @@ module AWS
           @ssl_ca_file
         end
   
+        # @param [String] ca_path Path to a bundle of CA certs in PEM
+        #   format; the HTTP handler should use this to verify all HTTPS
+        #   requests if {#ssl_verify_peer?} is true.
+        def ssl_ca_path=(ca_path)
+          @ssl_ca_path = ca_path
+        end
+  
+        # @return [String] Path to a bundle of CA certs in PEM format;
+        #   the HTTP handler should use this to verify all HTTPS
+        #   requests if {#ssl_verify_peer?} is true.
+        def ssl_ca_path
+          @ssl_ca_path
+        end
+  
         # Adds a request param.
         #
         # @overload add_param(param_name, param_value = nil)
@@ -106,12 +126,19 @@ module AWS
             @params << Param.new(name_or_param, value)
           end
         end
+        alias_method :[]=, :add_param
   
         # @private
         def get_param param_name
           @params.detect{|p| p.name == param_name } ||
             raise("undefined param #{param_name}")
         end
+        
+        # @private
+        def param_value_for param_name
+          param = @params.detect{|p| p.name == param_name }
+          param ? param.value : nil
+        end
   
         # @return [String] the request uri
         def uri

data/lib/aws/core/json_client.rb

@@ -0,0 +1,41 @@
+# 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
+
+    class JsonClient < Client  
+        
+      include Core::ConfiguredJsonClientMethods
+
+      protected
+      def new_request
+        req = super
+        req.headers["content-type"] = "application/x-amz-json-1.0"
+        req
+      end
+
+      protected
+      def extract_error_code response
+        if response.http_response.status >= 300 and
+            body = response.http_response.body and
+            json = (JSON.load(body) rescue nil) and
+            type = json["__type"] and
+            type =~ /\#(.*)$/
+          $1
+        end
+      end
+
+    end
+  end
+end

data/lib/aws/core/lazy_error_classes.rb

@@ -11,6 +11,8 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+require 'thread'
+
 module AWS
   module Core
 

data/lib/aws/core/option_grammar.rb

@@ -338,7 +338,7 @@ module AWS
 
         module Map
 
-          def self.apply(option, members)
+          def self.apply option, members = {}
 
             option.extend self
 

data/lib/aws/core/resource.rb

@@ -60,12 +60,11 @@ module AWS
   
       # @return [Boolean] Returns true if the objects references the same
       #   AWS resource.
-      def == other
+      def eql? other
         other.kind_of?(self.class) and 
           resource_identifiers == other.resource_identifiers
       end
-  
-      alias_method :eql?, :==
+      alias_method :==, :eql?
   
       # @private
       protected
@@ -152,7 +151,6 @@ module AWS
         end
       end
   
-  
       class << self
   
         # @private
@@ -299,9 +297,9 @@ module AWS
           return nil if value.nil? and @translates_nil != true
   
           case
-          when @options[:to_sym]  then value.tr('-','_').downcase.to_sym
+          when @options[:to_sym]    then value.tr('-','_').downcase.to_sym
           when @options[:timestamp] then Time.at(value.to_i)
-          when @output_translator then @output_translator.call(value)
+          when @output_translator   then @output_translator.call(value)
           else value
           end
   
@@ -326,7 +324,7 @@ module AWS
         end
   
         def finder_method
-          "find_in_response_#{@id}"
+          "_find_in_#{request_types.join('_or_')}_response_#{@id}"
         end
   
         # Indicates that all of the the named attributes can be retrieved
@@ -366,13 +364,13 @@ module AWS
             method = options[:get_as] || attr.get_as
   
             v = case
-                when resp_obj.respond_to?(method)
-                  resp_obj.send(method)
-                when resp_obj.respond_to?(:key?) && resp_obj.key?(method)
-                  resp_obj[method]
-                else
-                  nil
-                end
+            when resp_obj.respond_to?(:key?) && resp_obj.key?(method.to_s)
+              resp_obj[method.to_s]
+            when resp_obj.respond_to?(method)
+              resp_obj.send(method)
+            else
+              nil
+            end
             v = v.value if v and options[:value_wrapped]
             v = attr.translate_output_value(v)
   

data/lib/aws/core/session_signer.rb

@@ -76,11 +76,6 @@ module AWS
           session = get_session
         end
 
-        if session.expires_at < (Time.now + 15 * 60)
-          refresh_session 
-          session = get_session
-        end
-
         session
 
       end

data/lib/aws/core/xml_grammar.rb

@@ -14,6 +14,7 @@
 require 'rexml/document'
 require 'rexml/streamlistener'
 require 'base64'
+require 'time'
 
 begin
   require 'nokogiri'
@@ -254,14 +255,22 @@ module AWS
         end
   
         alias_method :float, :float_value
-  
+
         def symbol_value
           format_value do |value|
             value = super(value)
             ['', nil].include?(value) ? nil : Inflection.ruby_name(value).to_sym
           end
         end
-  
+
+        def blob_value
+          format_value do |value|
+            value = super(value)
+            Base64.decode64(value) if value
+          end
+        end
+        alias_method :blob, :blob_value
+
         def format_value &block
           @current[:value_formatter] ||= ValueFormatter.new
           @current[:value_formatter].extend_format_value(&block)
@@ -405,6 +414,7 @@ module AWS
           allow_methods = %w(
             rename attribute_name boolean integer long float list force
             ignore collect_values symbol_value timestamp map_entry map
+            blob
           )
           unless allow_methods.include?(method.to_s)
             raise "#{method} cannot be used in configuration"

data/lib/aws/dynamo_db.rb

@@ -11,6 +11,9 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
+require 'aws/core'
+require 'aws/dynamo_db/config'
+
 module AWS
 
   # Provides a high-level interface for using DynamoDB.
@@ -43,7 +46,7 @@ module AWS
   #     "MyTable",
   #     :hash_key => { :id => :string }
   #   )
-  #   sleep 1 while t.status == :creating
+  #   sleep 1 while table.status == :creating
   #
   # See {Table} and {TableCollection} for more information on creating
   # and managing tables.

data/lib/aws/dynamo_db/client.rb

@@ -15,7 +15,7 @@ module AWS
   class DynamoDB
 
     # @private
-    class Client < Core::Client
+    class Client < Core::JsonClient
 
       API_VERSION = '2011-06-01'
 
@@ -27,8 +27,6 @@ module AWS
 
       CACHEABLE_REQUESTS = Set[:list_tables, :describe_table]
 
-      include Core::ConfiguredJsonClientMethods
-
       configure_client
 
       def initialize *args
@@ -45,23 +43,12 @@ module AWS
 
       end
 
-      protected
-      def new_request
-        req = super
-        req.headers["content-type"] = "application/x-amz-json-1.0"
-        req
-      end
-
       protected
       def extract_error_code response
         if response.http_response.status == 413
           'RequestEntityTooLarge'
-        elsif response.http_response.status >= 300 and
-            body = response.http_response.body and
-            json = (JSON.load(body) rescue nil) and
-            type = json["__type"] and
-            type =~ /\#(.*)$/
-          $1
+        else
+          super(response)
         end
       end
 
@@ -111,7 +98,7 @@ module AWS
       # our signer is capible of getting new short-term credentials
       def possible_expired_credentials? response
         signer.respond_to?(:refresh_session) and
-        response.error.is_a?(Errors::AccessDeniedException)
+        response.error.is_a?(Errors::ExpiredTokenException)
       end
 
     end

data/lib/aws/dynamo_db/item_collection.rb

@@ -645,6 +645,20 @@ module AWS
       #   * +:range_lte+
       #   * +:range_begins_with+
       #
+      # @option [Boolean] :scan_index_forward (true) Specifies which
+      #   order records will be returned.  Defaults to returning them
+      #   in ascending range key order.  Pass false to reverse this.
+      #
+      # @option :select (nil) By default {#query} yields {Item}
+      #   objects without any attribute data.  If you want to select
+      #   specific attributes, pass a list of them to :select.
+      #
+      #      :select => [:id, :category, :size]
+      #
+      #   If you want to select ALL attributes, pass the symbol +:all+
+      #
+      #      :select => :all
+      #
       # @option options [String, Numeric] :hash_value Attribute value
       #   of the hash component of the composite primary key.
       #
@@ -679,6 +693,7 @@ module AWS
       # @option options [String, Numeric] :range_begins_with Matches
       #   items where the range key value begins with this value.
       #   This option is only valid if the range key is a string.
+      #
       def query(options = {}, &block)
 
         options = options.merge(:query => true)