aws-sdk 1.1.4 → 1.2.0

data/lib/aws/iam/server_certificate_collection.rb

@@ -117,45 +117,9 @@ module AWS
         ServerCertificate.new(name, :config => config)
       end
 
-      # Yields once for each server certificate
-      #
-      # You can limit the number of certificates yielded using
-      # +:limit+ and +:path_prefix+.
-      #
-      # @param [Hash] options
-      #
-      # @option options [String] :path_prefix ('/') A path prefix that
-      #   filters according to the path of the certificate.
-      #
-      # @option options [Integer] :limit The maximum number of
-      #   certificates to yield.
-      #
-      # @option options [Integer] :batch_size The maximum number of
-      #   certificates to retrieve in each service request.
-      #
-      # @yieldparam [ServerCertificate] certificate
-      # @return [nil]
-      def each options = {}, &block
-        super(options, &block)
-      end
-
-      # Returns an enumerable object for this collection.  This can be
-      # useful if you want to call an enumerable method that does
-      # not accept options (e.g. +collect+, +first+, etc).
-      #
-      #   certificates.enumerator(:path_prefix => '/production').
-      #     collect(&:name)
-      #
-      # @param (see #each)
-      # @option (see #each)
-      # @return [Enumerator]
-      def enumerator options = {}
-        super(options)
-      end
-
       # @private
       protected
-      def each_item(response, &block)
+      def each_item response, &block
         response.server_certificate_metadata_list.each do |sc|
           certificate = ServerCertificate.new_from(:list_server_certificates,
                                                    sc,

data/lib/aws/record.rb

@@ -21,7 +21,7 @@ module AWS
     end
   
     # @private
-    class RecordNotFound < Exception; end
+    class RecordNotFound < StandardError; end
   
     # Sets a prefix to be applied to all SimpleDB domains associated with
     # AWS::Record::Base classes.

data/lib/aws/record/base.rb

@@ -326,6 +326,19 @@ module AWS
           hash
         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. 
+      #
+      # @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.
       #
@@ -348,7 +361,7 @@ module AWS
   
       # @return [Boolean] Returns true if this record has no validation errors.
       def valid?
-        validate
+        run_validations
         errors.empty?
       end
   

data/lib/aws/record/finder_methods.rb

@@ -150,13 +150,16 @@ module AWS
       #   Car.where('color = ? OR style = ?', 'red', 'compact')
       #
       #   # produces a condition using in, like: WHERE color IN ('red', 'blue')
-      #   Car.where('color = ?', ['red','blue'])
+      #   Car.where('color IN ?', ['red','blue'])
       # 
       # Hash arguments
       #
       #   # WHERE age = '40' AND gender = 'male'
       #   People.where(:age => 40, :gender => 'male').each {|person| ... }
       #
+      #   # WHERE name IN ('John', 'Jane')
+      #   People.where(:name => ['John', 'Jane']).each{|person| ... }
+      #
       # Chaining where with other scope modifiers
       #
       #   # 10 most expensive red cars

data/lib/aws/record/validations.rb

@@ -21,6 +21,7 @@ require 'aws/record/validators/inclusion'
 require 'aws/record/validators/length'
 require 'aws/record/validators/numericality'
 require 'aws/record/validators/presence'
+require 'aws/record/validators/method'
 
 module AWS
   module Record
@@ -100,17 +101,57 @@ module AWS
 
       def self.extended base
 
-        base.send(:define_method, :validate) do
+        base.send(:define_method, :run_validations) do
           errors.clear!
           self.class.send(:validators).each do |validator|
             validator.validate(self)
           end
         end
 
-        base.send(:private, :validate)
+        base.send(:private, :run_validations)
 
       end
 
+      # Registers a validation method.
+      #
+      #   validate :ensure_age_is_greater_than_shoe_size
+      #
+      #   def ensure_age_is_greater_than_shoe_size
+      #     unless age > shoe_size
+      #       errors.add(:age, 'should be greater than your shoe size')
+      #     end
+      #   end
+      #
+      # You can also pass a list of method names that should be called during
+      # validation.
+      #
+      #   validate :some_complex_validation, :some_other_validation
+      #
+      # As with most other validation methods you can also pass a hash of
+      # options that affect when the named validation methods get called.
+      #
+      #   validate :my_custom_validation, :unless => :new_record?
+      #
+      # @overload validate(*method_names, options = {})
+      #   @param [Array<Symbol>] method_names A list of methods to call
+      #     during validation.  
+      #   @param [Hash] options
+      #   @option options [Symbol] :on (:save) When this validation is run.
+      #     Valid values include:
+      #     * +:save+
+      #     * +:create+
+      #     * +:update+
+      #   @option options [Symbol,String,Proc] :if Specifies a method or proc
+      #     to call.  The validation will only be run if the return value is
+      #     of the method/proc is true (e.g. +:if => :name_changed?+ or
+      #     +:if => lambda{|book| book.in_stock? }+).
+      #   @option options [Symbol,String,Proc] :unless Specifies a method or 
+      #     proc to call.  The validation will *not* be run if the return value
+      #     is of the method/proc is false.
+      def validate *args
+        validators << MethodValidator.new(self, *args)
+      end
+
       # This validation method is primariliy intended for ensuring a form
       # checkbox (like an EULA agreement or terms of service acknowledgement)
       # is checked.
@@ -178,9 +219,9 @@ module AWS
       #     attribute value is +nil+.
       #   @option options [Symbol] :on (:save) When this validation is run.
       #     Valid values include:
-      #     * +:save:+
-      #     * +:create:+
-      #     * +:update:+
+      #     * +:save+
+      #     * +:create+
+      #     * +:update+
       #   @option options [Symbol,String,Proc] :if Specifies a method or proc
       #     to call.  The validation will only be run if the return value is
       #     of the method/proc is true (e.g. +:if => :name_changed?+ or
@@ -233,9 +274,9 @@ module AWS
       #     +:message+ is "doesn't match confirmation".
       #   @option options [Symbol] :on (:save) When this validation is run.
       #     Valid values include:
-      #     * +:save:+
-      #     * +:create:+
-      #     * +:update:+
+      #     * +:save+
+      #     * +:create+
+      #     * +:update+
       #   @option options [Symbol,String,Proc] :if Specifies a method or proc
       #     to call.  The validation will only be run if the return value is
       #     of the method/proc is true (e.g. +:if => :name_changed?+ or
@@ -319,9 +360,9 @@ module AWS
       #     number of values (should have exactly %{exactly}"</code>
       #   @option options [Symbol] :on (:save) When this validation is run.
       #     Valid values include:
-      #     * +:save:+
-      #     * +:create:+
-      #     * +:update:+
+      #     * +:save+
+      #     * +:create+
+      #     * +:update+
       #   @option options [Symbol,String,Proc] :if Specifies a method or proc
       #     to call.  The validation will only be run if the return value is
       #     of the method/proc is true (e.g. +:if => :name_changed?+ or
@@ -354,9 +395,9 @@ module AWS
       #     attribute value is +nil+.
       #   @option options [Symbol] :on (:save) When this validation is run.
       #     Valid values include:
-      #     * +:save:+
-      #     * +:create:+
-      #     * +:update:+
+      #     * +:save+
+      #     * +:create+
+      #     * +:update+
       #   @option options [Symbol,String,Proc] :if Specifies a method or proc
       #     to call.  The validation will only be run if the return value is
       #     of the method/proc is true (e.g. +:if => :name_changed?+ or
@@ -400,9 +441,9 @@ module AWS
       #     attribute value is +nil+.
       #   @option options [Symbol] :on (:save) When this validation is run.
       #     Valid values include:
-      #     * +:save:+
-      #     * +:create:+
-      #     * +:update:+
+      #     * +:save+
+      #     * +:create+
+      #     * +:update+
       #   @option options [Symbol,String,Proc] :if Specifies a method or proc
       #     to call.  The validation will only be run if the return value is
       #     of the method/proc is true (e.g. +:if => :name_changed?+ or
@@ -449,9 +490,9 @@ module AWS
       #     attribute value is +nil+.
       #   @option options [Symbol] :on (:save) When this validation is run.
       #     Valid values include:
-      #     * +:save:+
-      #     * +:create:+
-      #     * +:update:+
+      #     * +:save+
+      #     * +:create+
+      #     * +:update+
       #   @option options [Symbol,String,Proc] :if Specifies a method or proc
       #     to call.  The validation will only be run if the return value is
       #     of the method/proc is true (e.g. +:if => :name_changed?+ or
@@ -486,9 +527,9 @@ module AWS
       #     attribute value is +nil+.
       #   @option options [Symbol] :on (:save) When this validation is run.
       #     Valid values include:
-      #     * +:save:+
-      #     * +:create:+
-      #     * +:update:+
+      #     * +:save+
+      #     * +:create+
+      #     * +:update+
       #   @option options [Symbol,String,Proc] :if Specifies a method or proc
       #     to call.  The validation will only be run if the return value is
       #     of the method/proc is true (e.g. +:if => :name_changed?+ or
@@ -547,9 +588,9 @@ module AWS
       #     attribute value is +nil+.
       #   @option options [Symbol] :on (:save) When this validation is run.
       #     Valid values include:
-      #     * +:save:+
-      #     * +:create:+
-      #     * +:update:+
+      #     * +:save+
+      #     * +:create+
+      #     * +:update+
       #   @option options [Symbol,String,Proc] :if Specifies a method or proc
       #     to call.  The validation will only be run if the return value is
       #     of the method/proc is true (e.g. +:if => :name_changed?+ or
@@ -597,9 +638,9 @@ module AWS
       #     attribute value is +nil+.
       #   @option options [Symbol] :on (:save) When this validation is run.
       #     Valid values include:
-      #     * +:save:+
-      #     * +:create:+
-      #     * +:update:+
+      #     * +:save+
+      #     * +:create+
+      #     * +:update+
       #   @option options [Symbol,String,Proc] :if Specifies a method or proc
       #     to call.  The validation will only be run if the return value is
       #     of the method/proc is true (e.g. +:if => :name_changed?+ or
@@ -626,9 +667,9 @@ module AWS
       #     +:message+ is "may not be blank".
       #   @option options [Symbol] :on (:save) When this validation is run.
       #     Valid values include:
-      #     * +:save:+
-      #     * +:create:+
-      #     * +:update:+
+      #     * +:save+
+      #     * +:create+
+      #     * +:update+
       #   @option options [Boolean] :allow_nil (false) Skip validation if the
       #     attribute value is +nil+.
       #   @option options [Symbol,String,Proc] :if Specifies a method or proc

data/lib/aws/{core/api_config_transform.rb → record/validators/method.rb}

@@ -11,24 +11,21 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'yaml'
+require 'aws/record/validator'
 
 module AWS
-  module Core
-
+  module Record
+    
+    # Uses the base validator class to call user-defined validation methods.
     # @private
-    class ApiConfigTransform
-
-      def self.rename_input_list_to_membered_list api_config
-        api_config[:operations].each_pair do |name,customizations|
-
-          input = api_config[:operations][name][:input]
-          fixed_input = input.to_yaml.gsub(/:list:/, ':membered_list:')
+    class MethodValidator < Validator
 
-          api_config[:operations][name][:input] = YAML.load(fixed_input)
+      ACCEPTED_OPTIONS = [:on, :if, :unless]
 
+      def validate_attributes record
+        attribute_names.each do |method_name|
+          record.send(method_name)
         end
-        api_config
       end
 
     end

data/lib/aws/s3/bucket_collection.rb

@@ -85,10 +85,12 @@ module AWS
           config.s3_endpoint == 's3.amazonaws.com' or
           options[:location_constraint]
         then
-          options[:location_constraint] = case config.s3_endpoint
-          when 's3-eu-west-1.amazonaws.com' then 'EU'
-          else config.s3_endpoint.match(/^s3-(.*)\.amazonaws\.com$/)[1]
-          end
+          constraint =
+            case config.s3_endpoint
+            when 's3-eu-west-1.amazonaws.com' then 'EU'
+            when /^s3-(.*)\.amazonaws\.com$/ then $1
+            end
+          options[:location_constraint] = constraint if constraint
         end
 
         client.create_bucket(options.merge(:bucket_name => bucket_name))

data/lib/aws/s3/client.rb

@@ -459,9 +459,13 @@ module AWS
                       :content_encoding => 'Content-Encoding',
                       :content_type => 'Content-Type',
                       :storage_class => 'x-amz-storage-class',
+                      :server_side_encryption => 'x-amz-server-side-encryption',
                       :expires => 'Expires'
                     }) do
         configure_request do |request, options, block|
+          options[:server_side_encryption] =
+            options[:server_side_encryption].to_s.upcase if
+            options[:server_side_encryption].kind_of?(Symbol)
           super(request, options)
           set_request_data(request, options, block)
           request.metadata = options[:metadata]
@@ -479,6 +483,7 @@ module AWS
           Core::MetaUtils.extend_method(response, :last_modified) do
             Time.parse(response.http_response.header('Last-Modified'))
           end
+          add_sse_to_response(response)
         end
 
         simulate_response do |response|
@@ -583,6 +588,7 @@ module AWS
           Core::MetaUtils.extend_method(resp, :version_id) do
             http_response.header('x-amz-version-id')
           end
+          add_sse_to_response(resp)
         end
       end
 
@@ -625,6 +631,8 @@ module AWS
           Core::MetaUtils.extend_method(resp, :content_length) do
             http_response.header('content-length').to_i
           end
+
+          add_sse_to_response(resp)
         end
       end
 
@@ -664,14 +672,22 @@ module AWS
                       :content_encoding => 'Content-Encoding',
                       :content_type => 'Content-Type',
                       :storage_class => 'x-amz-storage-class',
+                      :server_side_encryption => 'x-amz-server-side-encryption',
                       :expires => 'Expires'
                     }) do
         configure_request do |req, options|
+          options[:server_side_encryption] =
+            options[:server_side_encryption].to_s.upcase if
+            options[:server_side_encryption].kind_of?(Symbol)
           super(req, options)
           req.metadata = options[:metadata]
           req.canned_acl = options[:acl]
           req.storage_class = options[:storage_class]
         end
+
+        process_response do |response|
+          add_sse_to_response(response)
+        end
       end
 
       bucket_method(:list_multipart_uploads,
@@ -711,6 +727,7 @@ module AWS
           Core::MetaUtils.extend_method(response, :last_modified) do
             Time.parse(response.http_response.header('Last-Modified'))
           end
+          add_sse_to_response(response)
         end
 
         simulate_response do |response|
@@ -739,6 +756,7 @@ module AWS
           Core::MetaUtils.extend_method(response, :version_id) do
             response.http_response.header('x-amz-version-id')
           end
+          add_sse_to_response(response)
         end
 
         simulate_response do |response|
@@ -779,12 +797,12 @@ module AWS
       # @option options [Symbol] :acl
       #
       object_method(:copy_object, :put,
-        :header_options => {
-          :copy_source => 'x-amz-copy-source',
-          :metadata_directive => 'x-amz-metadata-directive',
-          :storage_class => 'x-amz-storage-class',
-        }
-      ) do
+                    :header_options => {
+                      :copy_source => 'x-amz-copy-source',
+                      :metadata_directive => 'x-amz-metadata-directive',
+                      :storage_class => 'x-amz-storage-class',
+                      :server_side_encryption => 'x-amz-server-side-encryption',
+                    }) do
 
         configure_request do |req, options|
           # TODO : validate metadata directive COPY / REPLACE
@@ -794,6 +812,9 @@ module AWS
             "may not be blank" if options[:copy_source].to_s.empty?
           end
           options = options.merge(:copy_source => escape_path(options[:copy_source]))
+          options[:server_side_encryption] =
+            options[:server_side_encryption].to_s.upcase if
+            options[:server_side_encryption].kind_of?(Symbol)
           super(req, options)
           req.canned_acl = options[:acl]
           req.metadata = options[:metadata]
@@ -813,6 +834,7 @@ module AWS
           Core::MetaUtils.extend_method(response, :last_modified) do
             Time.parse(response.http_response.header('Last-Modified'))
           end
+          add_sse_to_response(response)
         end
 
       end
@@ -856,6 +878,15 @@ module AWS
         S3::Request.new
       end
 
+      protected
+      def add_sse_to_response(response)
+        sse = nil
+        if value = response.http_response.header('x-amz-server-side-encryption')
+          sse = value.downcase.to_sym
+        end
+        Core::MetaUtils.extend_method(response, :server_side_encryption) { sse }
+      end
+
       module Validators
 
         # Returns true if the given bucket name is valid.