validations.rb in activeresource-3.1.0.beta1

- old
+ new

@@ -6,16 +6,16 @@
   end
 
   # Active Resource validation is reported to and from this object, which is used by Base#save
   # to determine whether the object in a valid state to be saved. See usage example in Validations.
   class Errors < ActiveModel::Errors
-    # Grabs errors from an array of messages (like ActiveRecord::Validations)
+    # Grabs errors from an array of messages (like ActiveRecord::Validations).
     # The second parameter directs the errors cache to be cleared (default)
-    # or not (by passing true)
+    # or not (by passing true).
     def from_array(messages, save_cache = false)
       clear unless save_cache
-      humanized_attributes = @base.attributes.keys.inject({}) { |h, attr_name| h.update(attr_name.humanize => attr_name) }
+      humanized_attributes = Hash[@base.attributes.keys.map { |attr_name| [attr_name.humanize, attr_name] }]
       messages.each do |message|
         attr_message = humanized_attributes.keys.detect do |attr_name|
           if message[0, attr_name.size + 1] == "#{attr_name} "
             add humanized_attributes[attr_name], message[(attr_name.size + 1)..-1]
           end
@@ -66,42 +66,34 @@
       alias_method_chain :save, :validation
     end
 
     # Validate a resource and save (POST) it to the remote web service.
     # If any local validations fail - the save (POST) will not be attempted.
-    def save_with_validation(options=nil)
-      perform_validation = case options
-        when Hash
-          options[:validate] != false
-        when NilClass
-          true
-        else
-          ActiveSupport::Deprecation.warn "save(#{options}) is deprecated, please give save(:validate => #{options}) instead", caller
-          options
-      end
+    def save_with_validation(options={})
+      perform_validation = options[:validate] != false
 
       # clear the remote validations so they don't interfere with the local
       # ones. Otherwise we get an endless loop and can never change the
-      # fields so as to make the resource valid
+      # fields so as to make the resource valid.
       @remote_errors = nil
       if perform_validation && valid? || !perform_validation
         save_without_validation
         true
       else
         false
       end
     rescue ResourceInvalid => error
       # cache the remote errors because every call to <tt>valid?</tt> clears
       # all errors. We must keep a copy to add these back after local
-      # validations
+      # validations.
       @remote_errors = error
       load_remote_errors(@remote_errors, true)
       false
     end
 
 
     # Loads the set of remote errors into the object's Errors based on the
-    # content-type of the error-block received
+    # content-type of the error-block received.
     def load_remote_errors(remote_errors, save_cache = false ) #:nodoc:
       case self.class.format
       when ActiveResource::Formats[:xml]
         errors.from_xml(remote_errors.response.body, save_cache)
       when ActiveResource::Formats[:json]