activemodel 4.2.0.beta1 → 4.2.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0ba324f942bc460e8ac9ddf05db07b267fddba7
-  data.tar.gz: dcc2d9b2e52755dc827b2880015524238d1d7b69
+  metadata.gz: 6aed706498bb76758fef9222954e4c3d8b3955fc
+  data.tar.gz: 69e08b91b2132101fb48aedc77c44a4fcd02653a
 SHA512:
-  metadata.gz: e3c419a3cbe8624a7a38c212c8cb87e6931cc0b8319090c0fbe7029cc4650f875d4faba74dbe009d8940e6fd7a7fd8e3bb4d4d8c2059fb91663609f08f684931
-  data.tar.gz: 2fb78243d20a5ba5d167b132946d782629ea932308ff1ba970bf177ee0e79894b62b13985a112abd43a0cf3357071510090a6bbea38d3ce82eb2b0774fbec4ed
+  metadata.gz: 2e4005029000eeb7378c1260820a55ef936236cc0aec561b1b57d64c327c82c501c7f83be687cfd530cdc5e2d7c19f61af33930192d012be77abaefd17b6b4c0
+  data.tar.gz: 828f6ddc8fd5645e568405897be9356c1c5edf69d86c8394bb40b6885e479a39f9396facaffbea25547916b69b86e5f850a8633fa2c2d5a946339ff439e6501b

data/CHANGELOG.md

@@ -12,18 +12,21 @@
 
 *   Deprecate `reset_#{attribute}` in favor of `restore_#{attribute}`.
 
-    These methods may cause confusion with the `reset_changes` that behaves differently
-    of them.
+    These methods may cause confusion with the `reset_changes`, which has
+    different behaviour.
+
+    *Rafael Mendonça França*
 
 *   Deprecate `ActiveModel::Dirty#reset_changes` in favor of `#clear_changes_information`.
 
-    This method name is causing confusion with the `reset_#{attribute}`
-    methods. While `reset_name` set the value of the name attribute for the
-    previous value `reset_changes` only discard the changes and previous
-    changes.
+    Method's name is causing confusion with the `reset_#{attribute}` methods.
+    While `reset_name` sets the value of the name attribute to previous value
+    `reset_changes` only discards the changes.
+
+    *Rafael Mendonça França*
 
-*   Added `restore_attributes` method to `ActiveModel::Dirty` API to restore all the
-    changed values to the previous data.
+*   Added `restore_attributes` method to `ActiveModel::Dirty` API which restores
+    the value of changed attributes to previous value.
 
     *Igor G.*
 

data/lib/active_model/errors.rb

@@ -251,11 +251,9 @@ module ActiveModel
     #   person.errors.to_hash(true) # => {:name=>["name cannot be nil"]}
     def to_hash(full_messages = false)
       if full_messages
-        messages = {}
-        self.messages.each do |attribute, array|
+        self.messages.each_with_object({}) do |(attribute, array), messages|
           messages[attribute] = array.map { |message| full_message(attribute, message) }
         end
-        messages
       else
         self.messages.dup
       end

data/lib/active_model/gem_version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
-  # Returns the version of the currently loaded ActiveModel as a <tt>Gem::Version</tt>
+  # Returns the version of the currently loaded Active Model as a <tt>Gem::Version</tt>
   def self.gem_version
     Gem::Version.new VERSION::STRING
   end
@@ -8,7 +8,7 @@ module ActiveModel
     MAJOR = 4
     MINOR = 2
     TINY  = 0
-    PRE   = "beta1"
+    PRE   = "beta2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_model/model.rb

@@ -56,13 +56,13 @@ module ActiveModel
   # refer to the specific modules included in <tt>ActiveModel::Model</tt>
   # (see below).
   module Model
-    def self.included(base) #:nodoc:
-      base.class_eval do
-        extend  ActiveModel::Naming
-        extend  ActiveModel::Translation
-        include ActiveModel::Validations
-        include ActiveModel::Conversion
-      end
+    extend ActiveSupport::Concern
+    include ActiveModel::Validations
+    include ActiveModel::Conversion
+
+    included do
+      extend ActiveModel::Naming
+      extend ActiveModel::Translation
     end
 
     # Initializes a new model with the given +params+.

data/lib/active_model/secure_password.rb

@@ -75,7 +75,7 @@ module ActiveModel
           end
 
           validates_length_of :password, maximum: ActiveModel::SecurePassword::MAX_PASSWORD_LENGTH_ALLOWED
-          validates_confirmation_of :password, if: ->{ password.present? }
+          validates_confirmation_of :password, allow_blank: true
         end
 
         # This code is necessary as long as the protected_attributes gem is supported.

data/lib/active_model/validations.rb

@@ -86,6 +86,8 @@ module ActiveModel
         validates_with BlockValidator, _merge_attributes(attr_names), &block
       end
 
+      VALID_OPTIONS_FOR_VALIDATE = [:on, :if, :unless].freeze
+
       # Adds a validation method or block to the class. This is useful when
       # overriding the +validate+ instance method becomes too unwieldy and
       # you're looking for more descriptive declaration of your validations.
@@ -144,7 +146,11 @@ module ActiveModel
         options = args.extract_options!
 
         if args.all? { |arg| arg.is_a?(Symbol) }
-          options.assert_valid_keys([:on, :if, :unless])
+          options.each_key do |k|
+            unless VALID_OPTIONS_FOR_VALIDATE.include?(k)
+              raise ArgumentError.new("Unknown key: #{k.inspect}. Valid keys are: #{VALID_OPTIONS_FOR_VALIDATE.map(&:inspect).join(', ')}. Perhaps you meant to call `validates` instead of `validate`?")
+            end
+          end
         end
 
         if options.key?(:on)

data/lib/active_model/validations/confirmation.rb

@@ -54,7 +54,7 @@ module ActiveModel
       #
       # Configuration options:
       # * <tt>:message</tt> - A custom error message (default is: "doesn't match
-      #   confirmation").
+      #   <tt>%{translated_attribute_name}</tt>").
       #
       # There is also a list of default options supported by every validator:
       # +:if+, +:unless+, +:on+, +:allow_nil+, +:allow_blank+, and +:strict+.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta1
+  version: 4.2.0.beta2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta1
+        version: 4.2.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta1
+        version: 4.2.0.beta2
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement