aws-sdk 1.4.0 → 1.4.1

data/lib/aws/cloud_formation/stack.rb

@@ -124,7 +124,7 @@ module AWS
         provider.provides *template_attributes.keys
       end
 
-      # @retun [Array<StackOutput>]
+      # @return [Array<StackOutput>]
       def outputs
         output_details.collect do |o|
           StackOutput.new(self, o.output_key, o.output_value, o.description)

data/lib/aws/core.rb

@@ -61,7 +61,7 @@ require 'aws/core/autoloader'
 module AWS
 
   # Current version of the AWS SDK for Ruby
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 
   register_autoloads(self) do
     autoload :Errors, 'errors'

data/lib/aws/dynamo_db.rb

@@ -113,6 +113,7 @@ module AWS
     AWS.register_autoloads(self, 'aws/dynamo_db') do
       autoload :AttributeCollection, 'attribute_collection'
       autoload :BatchGet, 'batch_get'
+      autoload :BatchWrite, 'batch_write'
       autoload :Client, 'client'
       autoload :Errors, 'errors'
       autoload :Expectations, 'expectations'
@@ -169,5 +170,44 @@ module AWS
       batch.enumerator
     end
 
+    # Yields a batch for writing (put and delete) items across multiple
+    # tables.  You can put and delete items in the same batch.
+    #
+    # @example Putting items across tables
+    #
+    #   # shard data across two tables with batch write
+    #   items = [
+    #     { :id => '123', :color => 'red' },
+    #     { :id => '456', :color => 'blue' },
+    #     { :id => '789', :color => 'green' },
+    #   ]
+    #
+    #   ddb.batch_write do |batch|
+    #     batch.put('table1', items)
+    #     batch.put('table2', items)
+    #   end
+    #
+    # @example Mixing puts and deletes
+    #
+    #   ddb.batch_write do |batch|
+    #     batch.write('table1', :put => [...], :delete => [...])
+    #     batch.write('table2', :put => [...], :delete => [...])
+    #   end
+    #
+    # @yield [BatchWrite]
+    #
+    # @return (see BatchWrite#process!)
+    #
+    # @see BatchWrite
+    # @see BatchWrite#put
+    # @see BatchWrite#delete
+    # @see BatchWrite#write
+    #
+    def batch_write &block
+      batch = BatchWrite.new(:config => config)
+      yield(batch)
+      batch.process!
+    end
+
   end
 end

data/lib/aws/dynamo_db/batch_write.rb

@@ -0,0 +1,251 @@
+# 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 DynamoDB
+    class BatchWrite
+
+      include Types
+      include Core::Model
+
+      def initialize options = {}
+        super(options)
+        @request_items = {}
+      end
+
+      # Adds one or more items to the batch write operation.
+      #
+      #   # adding one item at a time to the batch
+      #   batch = AWS::DynamoDB::BatchWrite.new
+      #   batch.put('table-name', :id => 'id1', :color => 'red')
+      #   batch.put('table-name', :id => 'id2', :color => 'blue')
+      #   batch.process!
+      #
+      #   # adding multiple items to a batch
+      #   batch = AWS::DynamoDB::BatchWrite.new
+      #   batch.put('table-name', [
+      #     { :id => 'id1', :color => 'red' },
+      #     { :id => 'id2', :color => 'blue' },
+      #     { :id => 'id3', :color => 'green' },
+      #   ])
+      #   batch.process!
+      #
+      # @param [Table,String] table A {Table} object or table name string.
+      #
+      # @param [Array<Hash>] items A list of item attributes to put.
+      #   The hash must contain the table hash key element and range key 
+      #   element (if one is defined).
+      #
+      # @return [nil]
+      #
+      def put table, items
+        write(table, :put => items.flatten)
+        nil
+      end
+
+      # Adds one or more items to the batch to delete.
+      #
+      #   # for a table w/out a range key
+      #   batch = AWS::DynamoDB::BatchWrite.new
+      #   batch.delete('table-name', %w(hk1 hk2))
+      #   batch.process!
+      #
+      #   # for a table with a range key
+      #   batch = AWS::DynamoDB::BatchWrite.new
+      #   batch.delete('table-name', [['hk1', 'rk2'], ['hk1', 'rk2']]])
+      #   batch.process!
+      #
+      # @param [Table,String] table A {Table} object or table name string.
+      #
+      # @param [Array<String>,Array<Array>] items A list of item keys to 
+      #   delete.  For tables without a range key, items should be an array
+      #   of hash key strings.
+      #
+      #      batch.delete('table-name', ['hk1', 'hk2', 'hk3'])
+      #
+      #   For tables with a range key, items should be an array of 
+      #   hash key and range key pairs.
+      #
+      #      batch.delete('table-name', [['hk1', 'rk1'], ['hk1', 'rk2']])
+      #
+      # @return [nil]
+      #
+      def delete table, items
+        write(table, :delete => items)
+        nil
+      end
+
+      # Add items to the batch.  Accepts both item to put and and items
+      # to delete.
+      #
+      # @param [Table,String] table A {Table} object or table name string.
+      #
+      # @param [Hash] options
+      #
+      # @option options [Array<Hash>] :put An array of items to put.  Each item
+      #   should be an array of attribute hashes.
+      #
+      #     # add 3 items to the batch
+      #     batch.write(table, :put => [
+      #       { :id => 'abc', :color => 'red', :count => 2 },
+      #       { :id => 'mno', :color => 'blue', :count => 3 },
+      #       { :id => 'xyz', :color => 'green', :count => 5 },
+      #     ])
+      #
+      # @option options [Array<String>,Array<Array>] :delete A list of item keys
+      #   to delete.  For tables without a range key, items should be an array
+      #   of hash key strings.
+      #
+      #      batch.write('table-name', :delete => ['hk1', 'hk2', 'hk3'])
+      #
+      #   For tables with a range key, items should be an array of 
+      #   hash key and range key pairs.
+      #
+      #      batch.write('table-name', :delete => [['hk1', 'rk1'], ['hk1', 'rk2']])
+      #
+      def write table, options = {}
+
+        items = table_items(table) 
+
+        if put = options[:put]
+          put.each do |attributes|
+            items << { :put_request => { :item => format_put(attributes) }}
+          end
+        end
+
+        if del = options[:delete]
+          del.each do |keys|
+            items << { :delete_request => { :key => format_delete(keys) }}
+          end
+        end
+
+      end
+
+      # Proccesses pending request items.
+      # @return [nil]
+      def process!
+
+        return if @request_items.empty?
+
+        opts = { :request_items => @request_items }
+
+        begin
+
+          response = client.batch_write_item(opts)
+
+          unprocessed = response.data['UnprocessedItems']
+
+          opts[:request_items] = convert_unprocessed_items(unprocessed)
+
+        end while opts[:request_items]
+
+        @request_items = {}
+        nil
+
+      end
+
+      protected
+
+      def table_name table
+        table.is_a?(Table) ? table.name : table.to_s
+      end
+
+      def table_items table
+        @request_items[table_name(table)] ||= []
+      end
+
+      def format_put attributes
+        attributes.inject({}) do |hash, (key, value)|
+          context = "value for attribute #{key}"
+          hash.merge(key.to_s => format_attribute_value(value, context))
+        end
+      end
+
+      def format_delete keys
+
+        keys = [keys] unless keys.is_a?(Array)
+
+        item = {}
+        item[:hash_key_element] = format_attribute_value(keys.first)
+        item[:range_key_element] = format_attribute_value(keys.last) if
+          keys.count > 1
+
+        item
+
+      end
+
+      def convert_unprocessed_items items
+
+        return nil if items.empty?
+
+        request_items = {}
+
+        items.each_pair do |table,requests|
+
+          request_items[table] ||= []
+
+          requests.each do |request|
+
+            item = request.values.first
+
+            request_items[table] << 
+              case request.keys.first
+              when 'PutRequest'    then convert_put_item(item['Item'])
+              when 'DeleteRequest' then convert_delete_item(item['Key'])
+              end
+
+          end
+
+        end
+
+        request_items
+
+      end
+
+      def convert_put_item item
+        
+        attributes = {}
+        item.each_pair do |name,value|
+          attributes[name] = str2sym(value)
+        end
+        
+        { :put_request => { :item => attributes }} 
+
+      end
+
+      def convert_delete_item item
+
+        key = {}
+        key[:hash_key_element] = str2sym(item['HashKeyElement'])
+        key[:range_key_element] = str2sym(item['RangeKeyElement']) if 
+          item['RangeKeyElement']
+
+        { :delete_request => { :key => key}}
+
+      end
+
+      def str2sym key_desc
+        type, value = key_desc.to_a.flatten
+        case type
+        when "S"  then { :s  => value }
+        when "N"  then { :n  => value }
+        when "SS" then { :ss => value }
+        when "NS" then { :ns => value }
+        else 
+          raise "unhandled key type: #{type.inspect}"
+        end
+      end
+
+    end
+  end
+end

data/lib/aws/dynamo_db/table.rb

@@ -402,6 +402,96 @@ module AWS
         block_given? ? enum.each(&block) : enum
       end
 
+      # Batch puts up to 25 items to this table.
+      #
+      #   table.batch_put([
+      #     { :id => 'id1', :color => 'red' },
+      #     { :id => 'id2', :color => 'blue' },
+      #     { :id => 'id3', :color => 'green' },
+      #   ])
+      #
+      # @param [Array<Hash>] items A list of item attributes to put.
+      #   The hash must contain the table hash key element and range key 
+      #   element (if one is defined).
+      #
+      # @return (see BatchWrite#process!)
+      # 
+      def batch_put items
+        batch = BatchWrite.new(:config => config)
+        batch.put(self, options)
+        batch.process!
+      end
+
+      # Batch delets up to 25 items.
+      #
+      #   table.batch_delete(%w(id1 id2 id3 id4))
+      #
+      # @param [Array<String>,Array<Array>] items A list of item keys to 
+      #   delete.  For tables without a range key, items should be an array
+      #   of hash key strings.
+      #
+      #      batch.delete('table-name', ['hk1', 'hk2', 'hk3'])
+      #
+      #   For tables with a range key, items should be an array of 
+      #   hash key and range key pairs.
+      #
+      #      batch.delete('table-name', [['hk1', 'rk1'], ['hk1', 'rk2']])
+      #
+      # @return (see BatchWrite#process!)
+      # 
+      def batch_put items
+        batch = BatchWrite.new(:config => config)
+        batch.put(self, items)
+        batch.process!
+      end
+
+      # Batch writes up to 25 items to this table.  A batch may contain
+      # a mix of items to put and items to delete.
+      #
+      #   table.batch_write(
+      #     :put => [
+      #       { :id => 'id1', :color => 'red' },
+      #       { :id => 'id2', :color => 'blue' },
+      #       { :id => 'id3', :color => 'green' },
+      #     ],
+      #     :delete => ['id4', 'id5']
+      #   )
+      #
+      # @param [Hash] options
+      #
+      # @option options (BatchWrite#write)
+      #
+      # @return (see BatchWrite#process!)
+      # 
+      def batch_write options = {}
+        batch = BatchWrite.new(:config => config)
+        batch.write(self, options)
+        batch.process!
+      end
+
+      # Delete up to 25 items in a single batch.
+      #
+      #   table.batch_delete(%w(id1 id2 id3 id4 id5))
+      #
+      # @param [Array<String>,Array<Array>] items A list of item keys to 
+      #   delete.  For tables without a range key, items should be an array
+      #   of hash key strings.
+      #
+      #      batch.delete('table-name', ['hk1', 'hk2', 'hk3'])
+      #
+      #   For tables with a range key, items should be an array of 
+      #   hash key and range key pairs.
+      #
+      #      batch.delete('table-name', [['hk1', 'rk1'], ['hk1', 'rk2']])
+      #
+      # @return (see BatchWrite#process!)
+      # 
+      def batch_delete items
+        batch = BatchWrite.new(:config => config)
+        batch.delete(self, items)
+        batch.process!
+      end
+
       protected
       def get_resource attribute_name = nil
         client.describe_table(resource_options)

data/lib/aws/ec2/elastic_ip_collection.rb

@@ -17,8 +17,8 @@ module AWS
 
       # @param [Hash] options
       #
-      # @option [Boolean] :vpc (false) When true, the elastic ip address
-      #   will be allocated to your VPC.
+      # @option options [Boolean] :vpc (false) When true, the elastic ip 
+      #   address will be allocated to your VPC.
       #
       # @return [ElasticIp]
       #

data/lib/aws/ec2/vpc_collection.rb

@@ -33,9 +33,8 @@ module AWS
       # @option options [Boolean] :instance_tenancy (:default) 
       #   The allowed tenancy of instances launched into the VPC. A value of 
       #   +:default+ means instances can be launched with any tenancy; a value 
-      #   of +:dedicated+ means instances must be launched with tenancy as 
-      #   dedicated.
-      #   dedicated tenancy.
+      #   of +:dedicated+ means all instances launched into the VPC will be launched with 
+      #   dedicated tenancy regardless of the tenancy assigned to the instance at launch.
       #
       # @return [VPC]
       #

metadata

@@ -1,92 +1,86 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: aws-sdk
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 1.4.1
   prerelease: 
-  segments: 
-  - 1
-  - 4
-  - 0
-  version: 1.4.0
 platform: ruby
-authors: 
+authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-04-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 2
-        - 1
-        version: "2.1"
-  name: uuidtools
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
   prerelease: false
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
   name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
   prerelease: false
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 4
-        - 4
-        version: 1.4.4
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
   name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
   type: :runtime
   prerelease: false
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        version: "1.4"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
+- !ruby/object:Gem::Dependency
   name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :runtime
   prerelease: false
-  requirement: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: AWS SDK for Ruby
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - ca-bundle.crt
 - rails/init.rb
 - lib/aws/auto_scaling/activity.rb
@@ -178,6 +172,7 @@ files:
 - lib/aws/core.rb
 - lib/aws/dynamo_db/attribute_collection.rb
 - lib/aws/dynamo_db/batch_get.rb
+- lib/aws/dynamo_db/batch_write.rb
 - lib/aws/dynamo_db/client.rb
 - lib/aws/dynamo_db/config.rb
 - lib/aws/dynamo_db/errors.rb
@@ -487,37 +482,31 @@ files:
 - NOTICE.txt
 - LICENSE.txt
 homepage: http://aws.amazon.com/sdkforruby
-licenses: 
+licenses:
 - Apache 2.0
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 886230137059201469
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: AWS SDK for Ruby
 test_files: []
-