aws-sdk 1.8.0 → 1.8.1

data/lib/aws/rds/config.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 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

data/lib/aws/rds/db_instance.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 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
@@ -45,6 +45,8 @@ module AWS
     #
     # @attr_reader [Boolean] multi_az
     #
+    # @attr_reader [Integer] iops
+    #
     # @attr_reader [String] engine_version
     #
     # @attr_reader [Boolean] auto_minor_version_upgrade
@@ -116,6 +118,8 @@ module AWS
 
       attribute :multi_az, :static => true, :alias => :multi_az?
 
+      attribute :iops, :static => true
+
       attribute :preferred_backup_window, :static => true
 
       attribute :preferred_maintenance_window, :static => true

data/lib/aws/rds/db_instance_collection.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 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

data/lib/aws/rds/db_snapshot.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 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

data/lib/aws/rds/db_snapshot_collection.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 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

data/lib/aws/rds/errors.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 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

data/lib/aws/rds/request.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 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

data/lib/aws/record.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 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

data/lib/aws/record/abstract_base.rb

@@ -1,4 +1,4 @@
-# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2013 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
@@ -25,7 +25,7 @@ require 'aws/record/exceptions'
 module AWS
   module Record
     module AbstractBase
-    
+
       def self.extended base
 
         base.send(:extend, ClassMethods)
@@ -45,50 +45,50 @@ module AWS
         # Constructs a new record.
         #
         # @param [Hash] attributes Attributes that should be bulk assigned
-        #   to this record.  You can also specify the shard (i.e. domain 
+        #   to this record.  You can also specify the shard (i.e. domain
         #   or table) this record should persist to via +:shard+).
         #
         # @option attributes [String] :shard The domain/table this record
         #   should persist to.  If this is omitted, it will persist to the
         #   class default shard (which defaults to the class name).
         #
-        # @return [Model,HashModel] Returns a new (non-persisted) record.  
+        # @return [Model,HashModel] Returns a new (non-persisted) record.
         #   Call {#save} to persist changes to AWS.
         #
         def initialize attributes = {}
-  
+
           attributes = attributes.dup
-  
+
           # supporting :domain for backwards compatability, :shard is prefered
           @_shard = attributes.delete(:domain)
           @_shard ||= attributes.delete('domain')
           @_shard ||= attributes.delete(:shard)
           @_shard ||= attributes.delete('shard')
           @_shard = self.class.shard_name(@_shard)
-  
+
           @_data = {}
           assign_default_values
           bulk_assign(attributes)
-  
+
         end
-  
+
         # @return [String] Returns the name of the shard this record
-        #   is persisted to or will be persisted to.  Defaults to the 
+        #   is persisted to or will be persisted to.  Defaults to the
         #   domain/table named after this record class.
         def shard
           @_shard
         end
         alias_method :domain, :shard # for backwards compatability
-  
-        # The id for each record is auto-generated.  The default strategy 
+
+        # The id for each record is auto-generated.  The default strategy
         # generates uuid strings.
         # @return [String] Returns the id string (uuid) for this record.  Retuns
         #   nil if this is a new record that has not been persisted yet.
         def id
           @_id
         end
-  
-        # @return [Hash] A hash with attribute names as hash keys (strings) and 
+
+        # @return [Hash] A hash with attribute names as hash keys (strings) and
         #   attribute values (of mixed types) as hash values.
         def attributes
           attributes = Core::IndifferentHash.new
@@ -97,20 +97,20 @@ module AWS
             hash.merge(attr_name => __send__(attr_name))
           end
         end
-  
+
         # Acts like {#update} but does not call {#save}.
         #
         #   record.attributes = { :name => 'abc', :age => 20 }
         #
         # @param [Hash] attributes A hash of attributes to set on this record
-        #   without calling save. 
+        #   without calling save.
         #
         # @return [Hash] Returns the attribute hash that was passed in.
         #
         def attributes= attributes
           bulk_assign(attributes)
         end
-  
+
         # Persistence indicates if the record has been saved previously or not.
         #
         # @example
@@ -123,28 +123,32 @@ module AWS
         def persisted?
           !!@_persisted
         end
-  
+
         # @return [Boolean] Returns true if this record has not been persisted
         #   to SimpleDB.
         def new_record?
           !persisted?
         end
-  
+
+        # @param [Hash] opts Pass :validate => false to skip validations
         # @return [Boolean] Returns true if this record has no validation errors.
-        def valid?
-          run_validations
+        def valid? opts = {}
+          opts = {} if opts.nil?
+          opts = {:validate => true}.merge(opts)
+          run_validations if opts[:validate]
           errors.empty?
         end
-  
+
         def errors
           @errors ||= Errors.new
         end
-  
+
         # Creates new records, updates existing records.
+        # @param [Hash] opts Pass :validate => false to skip validations
         # @return [Boolean] Returns true if the record saved without errors,
         #   false otherwise.
-        def save
-          if valid?
+        def save opts = {}
+          if valid?(opts)
             persisted? ? update : create
             clear_changes!
             true
@@ -152,17 +156,17 @@ module AWS
             false
           end
         end
-  
+
         # Creates new records, updates exsting records.  If there is a validation
         # error then an exception is raised.
-        # @raise [InvalidRecordError] Raised when the record has validation 
+        # @raise [InvalidRecordError] Raised when the record has validation
         #   errors and can not be saved.
         # @return [true] Returns true after a successful save.
         def save!
           raise InvalidRecordError.new(self) unless save
           true
         end
-  
+
         # Bulk assigns the attributes and then saves the record.
         # @param [Hash] attribute_hash A hash of attribute names (keys) and
         #   attribute values to assign to this record.
@@ -171,9 +175,9 @@ module AWS
           bulk_assign(attribute_hash)
           save
         end
-  
+
         # Bulk assigns the attributes and then saves the record.  Raises
-        # an exception (AWS::Record::InvalidRecordError) if the record is not 
+        # an exception (AWS::Record::InvalidRecordError) if the record is not
         # valid.
         # @param (see #update_attributes)
         # @return [true]
@@ -184,7 +188,7 @@ module AWS
             raise InvalidRecordError.new(self)
           end
         end
-  
+
         # Deletes the record.
         # @return [true]
         def delete
@@ -200,13 +204,13 @@ module AWS
           end
         end
         alias_method :destroy, :delete
-  
+
         # @return [Boolean] Returns true if this instance object has been deleted.
         def deleted?
           persisted? ? !!@_deleted : false
         end
-  
-        # If you define a custom setter, you use #[]= to set the value 
+
+        # If you define a custom setter, you use #[]= to set the value
         # on the record.
         #
         #   class Book < AWS::Record::Model
@@ -225,8 +229,8 @@ module AWS
         protected
         def []= attribute_name, new_value
           self.class.attribute_for(attribute_name) do |attribute|
-  
-            if_tracking_changes do 
+
+            if_tracking_changes do
               original_value = type_cast(attribute, attribute_was(attribute.name))
               incoming_value = type_cast(attribute, new_value)
               if original_value == incoming_value
@@ -235,12 +239,12 @@ module AWS
                 attribute_will_change!(attribute.name)
               end
             end
-  
+
             @_data[attribute.name] = new_value
-  
+
           end
         end
-  
+
         # Returns the typecasted value for the named attribute.
         #
         #   book = Book.new(:title => 'My Book')
@@ -274,7 +278,7 @@ module AWS
             type_cast(attribute, @_data[attribute.name])
           end
         end
-  
+
         protected
         def create
           populate_id
@@ -291,26 +295,26 @@ module AWS
           increment_optimistic_lock_value
           update_storage
         end
-  
+
         protected
         def populate_id
           @_id = UUIDTools::UUID.random_create.to_s
         end
-  
+
         protected
         def touch_timestamps *attributes
           now = Time.now
           attributes.each do |attr_name|
-            if 
-              self.class.attributes[attr_name] and 
-              !attribute_changed?(attr_name) 
+            if
+              self.class.attributes[attr_name] and
+              !attribute_changed?(attr_name)
               # don't touch timestamps the user modified
             then
               __send__("#{attr_name}=", now)
             end
           end
         end
-  
+
         protected
         def increment_optimistic_lock_value
           if_locks_optimistically do |lock_attr|
@@ -321,14 +325,14 @@ module AWS
             end
           end
         end
-  
+
         protected
         def if_locks_optimistically &block
           if opt_lock_attr = self.class.optimistic_locking_attr
             yield(opt_lock_attr)
           end
         end
-  
+
         protected
         def opt_lock_conditions
           conditions = {}
@@ -341,14 +345,14 @@ module AWS
           end
           conditions
         end
-  
+
         private
         def assign_default_values
           # populate default attribute values
           ignore_changes do
             self.class.attributes.values.each do |attribute|
               begin
-                # copy default values down so methods like #gsub! don't 
+                # copy default values down so methods like #gsub! don't
                 # modify the default values for other objects
                 @_data[attribute.name] = attribute.default_value.clone
               rescue TypeError
@@ -357,7 +361,7 @@ module AWS
             end
           end
         end
-  
+
         private
         def bulk_assign hash
           flatten_date_parts(hash).each_pair do |attr_name, attr_value|
@@ -375,7 +379,7 @@ module AWS
         # This method converts these attributes back into a single
         # value and converts them to Date and DateTime objects.
         def flatten_date_parts attributes
-    
+
           multi_attributes = Set.new
 
           hash = attributes.inject({}) do |hash,(key,value)|
@@ -398,7 +402,7 @@ module AWS
 
             hash[key] = case values.size
             when 0 then nil
-            when 2 
+            when 2
               now = Time.now
               Time.local(now.year, now.month, now.day, values[0], values[1], 0, 0)
             when 3 then Date.new(*values)
@@ -410,7 +414,7 @@ module AWS
           hash
 
         end
-  
+
         private
         def type_cast attribute, raw
           if attribute.set?
@@ -455,7 +459,7 @@ module AWS
         # @private
         protected
         def hydrate id, data
-          
+
           # @todo need to do something about partial hyrdation of attributes
 
           @_id = id
@@ -464,7 +468,7 @@ module AWS
           # want these values to hang around when hydrating persisted values
           # (those values may have been blanked out before save).
           self.class.attributes.values.each do |attribute|
-            @_data[attribute.name] = nil 
+            @_data[attribute.name] = nil
           end
 
           ignore_changes do
@@ -474,12 +478,12 @@ module AWS
           @_persisted = true
 
         end
-  
+
         protected
         def create_storage
           raise NotImplementedError
         end
-  
+
         protected
         def update_storage
           raise NotImplementedError
@@ -496,7 +500,7 @@ module AWS
 
         # Allows you to override the default shard name for this class.
         # The shard name defaults to the class name.
-        # @param [String] name 
+        # @param [String] name
         def set_shard_name name
           @_shard_name = name
         end
@@ -524,7 +528,7 @@ module AWS
         # Adds a scoped finder to this class.
         #
         #   class Book < AWS::Record::Model
-        #     scope :top_10, order(:popularity, :desc).limit(10) 
+        #     scope :top_10, order(:popularity, :desc).limit(10)
         #   end
         #
         #   Book.top_10.to_a
@@ -539,14 +543,14 @@ module AWS
         #   class Book < AWS::Record::Model
         #     scope :by_author, lambda {|name| where(:author => name) }
         #   end
-        # 
+        #
         #   # top 10 books by the author 'John Doe'
         #   Book.by_author('John Doe').top_10
-        # 
+        #
         # @param [Symbol] name The name of the scope.  Scope names should be
         #   method-safe and should not conflict with any other class methods.
         #
-        # @param [Scope] scope 
+        # @param [Scope] scope
         #
         def scope name, scope = nil, &block
 
@@ -556,6 +560,46 @@ module AWS
 
         end
 
+        # Creates an object (or multiple if you pass an array of attributes).
+        # The {#save} method is called on the object(s) after construction.
+        # The object(s) are returned wether or not the object(s) are valid.
+        #
+        #   class Book < AWS::Record::Model
+        #     string_attr :title
+        #   end
+        #
+        #   book = Book.create(:title => "The big book of tests")
+        #   book.persisted?
+        #   #=> true
+        #
+        #   books = Book.create([{:title => 'abc'}, {:title => 'xyz'}])
+        #   books.each(&:persisted?)
+        #   #=> [true, true]
+        #
+        def create attributes = {}
+          create_impl(attributes, :create, :save)
+        end
+
+        # Creates an object (or multiple if you pass an array of attributes).
+        # The {#save!} method is called on the object(s) after construction.
+        # If the object(s) are not valid, then an error is raised.
+        #
+        #   class Book < AWS::Record::Model
+        #     string_attr :title
+        #     validates_presence_of :title
+        #   end
+        #
+        #   book = Book.create!(:title => "The big book of tests")
+        #   book.persisted?
+        #   #=> true
+        #
+        #   book = Book.create!()
+        #   #=> raises AWS::Record::InvalidRecordError
+        #
+        def create! attributes = {}
+          create_impl(attributes, :create!, :save!)
+        end
+
         # @private
         def new_scope
           self::Scope.new(self)
@@ -639,6 +683,18 @@ module AWS
 
         end
 
+        private
+
+        def create_impl attributes = {}, create_method = :create, save_method = :save
+          if attributes.is_a?(Array)
+            attributes.map {|attr| send(create_method, attributes) }
+          else
+            obj = new(attributes)
+            obj.send(save_method)
+            obj
+          end
+        end
+
       end
     end
   end