activemodel 4.1.16 → 4.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 661ea74dd96dd480e27c5b1e091706dcdd79f6ae
-  data.tar.gz: 37bec8de391a4ebb5471e9e0e790f47227cae388
+  metadata.gz: c0ba324f942bc460e8ac9ddf05db07b267fddba7
+  data.tar.gz: dcc2d9b2e52755dc827b2880015524238d1d7b69
 SHA512:
-  metadata.gz: 5af0edd2875a47bcb27e33c045c998dda2127d524833f884f3fa93132ae5b6a2757c070efc1d6d78ce13c666b2dd508fae86f1e3600dbbed812ad7ad86a793bb
-  data.tar.gz: fe161cb9636658586d2ce6eb7d822c15865f954dd34ac2d3cc9b9f80ab8883b1f6de0f00f24b8012f0524585c15d4c790a0e6744fc070bb094dc0d5e55f73a99
+  metadata.gz: e3c419a3cbe8624a7a38c212c8cb87e6931cc0b8319090c0fbe7029cc4650f875d4faba74dbe009d8940e6fd7a7fd8e3bb4d4d8c2059fb91663609f08f684931
+  data.tar.gz: 2fb78243d20a5ba5d167b132946d782629ea932308ff1ba970bf177ee0e79894b62b13985a112abd43a0cf3357071510090a6bbea38d3ce82eb2b0774fbec4ed

data/CHANGELOG.md

@@ -1,169 +1,58 @@
-## Rails 4.1.16 (July 12, 2016) ##
+*   Passwords with spaces only allowed in `ActiveModel::SecurePassword`.
 
-*   No changes.
+    Presence validation can be used to restore old behavior.
 
+    *Yevhene Shemet*
 
-## Rails 4.1.15 (March 07, 2016) ##
+*   Validate options passed to `ActiveModel::Validations.validate`.
 
-*   No changes.
+    Preventing, in many cases, the simple mistake of using `validate` instead of `validates`.
 
+    *Sonny Michaud*
 
-## Rails 4.1.14.2 (February 26, 2016) ##
+*   Deprecate `reset_#{attribute}` in favor of `restore_#{attribute}`.
 
-*   No changes.
+    These methods may cause confusion with the `reset_changes` that behaves differently
+    of them.
 
+*   Deprecate `ActiveModel::Dirty#reset_changes` in favor of `#clear_changes_information`.
 
-## Rails 4.1.14.1 (January 25, 2015) ##
+    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.
 
-*   No changes.
+*   Added `restore_attributes` method to `ActiveModel::Dirty` API to restore all the
+    changed values to the previous data.
 
+    *Igor G.*
 
-## Rails 4.1.14 (November 12, 2015) ##
+*   Allow proc and symbol as values for `only_integer` of `NumericalityValidator`
 
-*   No changes.
+    *Robin Mehner*
 
+*   `has_secure_password` now verifies that the given password is less than 72
+    characters if validations are enabled.
 
-## Rails 4.1.13 (August 24, 2015) ##
+    Fixes #14591.
 
-*   No changes.
+    *Akshay Vishnoi*
 
+*   Remove deprecated `Validator#setup` without replacement.
 
-## Rails 4.1.12 (June 25, 2015) ##
+    See #10716.
 
-*   No changes.
+    *Kuldeep Aggarwal*
 
+*   Add plural and singular form for length validator's default messages.
 
-## Rails 4.1.11 (June 16, 2015) ##
+    *Abd ar-Rahman Hamid*
 
-*   No changes.
+*   Introduce `validate` as an alias for `valid?`.
 
+    This is more intuitive when you want to run validations but don't care about
+    the return value.
 
-## Rails 4.1.10 (March 19, 2015) ##
+    *Henrik Nyh*
 
-*   No changes.
-
-
-## Rails 4.1.9 (January 6, 2015) ##
-
-*   No changes.
-
-
-## Rails 4.1.8 (November 16, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.7.1 (November 19, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.7 (October 29, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.6 (September 11, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.5 (August 18, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.4 (July 2, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.3 (July 2, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.2 (June 26, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.1 (May 6, 2014) ##
-
-*   No changes.
-
-
-## Rails 4.1.0 (April 8, 2014) ##
-
-*   `#to_param` returns `nil` if `#to_key` returns `nil`. Fixes #11399.
-
-    *Yves Senn*
-
-*   Ability to specify multiple contexts when defining a validation.
-
-    Example:
-
-        class Person
-          include ActiveModel::Validations
-
-          attr_reader :name
-          validates_presence_of :name, on: [:verify, :approve]
-        end
-
-        person = Person.new
-        person.valid?                           # => true
-        person.valid?(:verify)                  # => false
-        person.errors.full_messages_for(:name)  # => ["Name can't be blank"]
-        person.valid?(:approve)                 # => false
-        person.errors.full_messages_for(:name)  # => ["Name can't be blank"]
-
-    *Vince Puzzella*
-
-*   `attribute_changed?` now accepts a hash to check if the attribute was
-    changed `:from` and/or `:to` a given value.
-
-    Example:
-
-        model.name_changed?(from: "Pete", to: "Ringo")
-
-    *Tejas Dinkar*
-
-*   Fix `has_secure_password` to honor bcrypt-ruby's cost attribute.
-
-    *T.J. Schuck*
-
-*   Updated the `ActiveModel::Dirty#changed_attributes` method to be indifferent between using
-    symbols and strings as keys.
-
-    *William Myers*
-
-*   Added new API methods `reset_changes` and `changes_applied` to `ActiveModel::Dirty`
-    that control changes state. Previsously you needed to update internal
-    instance variables, but now API methods are available.
-
-    *Bogdan Gusiev*
-
-*   Fix `has_secure_password` not to trigger `password_confirmation` validations
-    if no `password_confirmation` is set.
-
-    *Vladimir Kiselev*
-
-*   `inclusion` / `exclusion` validations with ranges will only use the faster
-    `Range#cover` for numerical ranges, and the more accurate `Range#include?`
-    for non-numerical ones.
-
-    Fixes range validations like `:a..:f` that used to pass with values like `:be`.
-    Fixes #10593.
-
-    *Charles Bergeron*
-
-*   Fix regression in `has_secure_password`. When a password is set, but a
-    confirmation is an empty string, it would incorrectly save.
-
-    *Steve Klabnik* and *Phillip Calvin*
-
-*   Deprecate `Validator#setup`. This should be done manually now in the validator's constructor.
-
-    *Nick Sutterer*
-
-Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/activemodel/CHANGELOG.md) for previous changes.
+Please check [4-1-stable](https://github.com/rails/rails/blob/4-1-stable/activemodel/CHANGELOG.md) for previous changes.

data/README.rdoc

@@ -49,7 +49,8 @@ behavior out of the box:
         send("#{attr}=", nil)
       end
     end
-
+  
+    person = Person.new
     person.clear_name
     person.clear_age
 
@@ -78,7 +79,21 @@ behavior out of the box:
     class Person
       include ActiveModel::Dirty
 
-      attr_accessor :name
+      define_attribute_methods :name
+
+      def name
+        @name
+      end
+
+      def name=(val)
+        name_will_change! unless val == @name
+        @name = val
+      end
+
+      def save
+        # do persistence work
+        changes_applied
+      end
     end
 
     person = Person.new
@@ -88,6 +103,7 @@ behavior out of the box:
     person.changed?         # => true
     person.changed          # => ['name']
     person.changes          # => { 'name' => [nil, 'bob'] }
+    person.save
     person.name = 'robert'
     person.save
     person.previous_changes # => {'name' => ['bob, 'robert']}
@@ -116,7 +132,10 @@ behavior out of the box:
         "Name"
       end
     end
-
+  
+    person = Person.new
+    person.name = nil
+    person.validate!
     person.errors.full_messages
     # => ["Name cannot be nil"]
 
@@ -128,7 +147,7 @@ behavior out of the box:
       extend ActiveModel::Naming
     end
 
-    NamedPerson.model_name        # => "NamedPerson"
+    NamedPerson.model_name.name   # => "NamedPerson"
     NamedPerson.model_name.human  # => "Named person"
 
   {Learn more}[link:classes/ActiveModel/Naming.html]
@@ -180,41 +199,41 @@ behavior out of the box:
 
 * Validation support
 
-   class Person
-     include ActiveModel::Validations
+    class Person
+      include ActiveModel::Validations
 
-     attr_accessor :first_name, :last_name
+      attr_accessor :first_name, :last_name
 
-     validates_each :first_name, :last_name do |record, attr, value|
-       record.errors.add attr, 'starts with z.' if value.to_s[0] == ?z
-     end
-   end
+      validates_each :first_name, :last_name do |record, attr, value|
+        record.errors.add attr, 'starts with z.' if value.to_s[0] == ?z
+      end
+    end
 
-   person = Person.new
-   person.first_name = 'zoolander'
-   person.valid?  # => false
+    person = Person.new
+    person.first_name = 'zoolander'
+    person.valid?  # => false
 
   {Learn more}[link:classes/ActiveModel/Validations.html]
 
 * Custom validators
+  
+    class HasNameValidator < ActiveModel::Validator
+      def validate(record)
+        record.errors[:name] = "must exist" if record.name.blank?
+      end
+    end
 
-   class ValidatorPerson
-     include ActiveModel::Validations
-     validates_with HasNameValidator
-     attr_accessor :name
-   end
-
-   class HasNameValidator < ActiveModel::Validator
-     def validate(record)
-       record.errors[:name] = "must exist" if record.name.blank?
-     end
-   end
+    class ValidatorPerson
+      include ActiveModel::Validations
+      validates_with HasNameValidator
+      attr_accessor :name
+    end
 
-   p = ValidatorPerson.new
-   p.valid?                  # =>  false
-   p.errors.full_messages    # => ["Name must exist"]
-   p.name = "Bob"
-   p.valid?                  # =>  true
+    p = ValidatorPerson.new
+    p.valid?                  # =>  false
+    p.errors.full_messages    # => ["Name must exist"]
+    p.name = "Bob"
+    p.valid?                  # =>  true
 
   {Learn more}[link:classes/ActiveModel/Validator.html]
 
@@ -227,7 +246,7 @@ The latest version of Active Model can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/4-1-stable/activemodel
+* https://github.com/rails/rails/tree/master/activemodel
 
 
 == License
@@ -243,6 +262,11 @@ API documentation is at
 
 * http://api.rubyonrails.org
 
-Bug reports and feature requests can be filed with the rest for the Ruby on Rails project here:
+Bug reports can be filed for the Ruby on Rails project here:
 
 * https://github.com/rails/rails/issues
+
+Feature requests should be discussed on the rails-core mailing list here:
+
+* https://groups.google.com/forum/?fromgroups#!forum/rubyonrails-core
+

data/lib/active_model/conversion.rb

@@ -40,13 +40,15 @@ module ActiveModel
       self
     end
 
-    # Returns an Enumerable of all key attributes if any is set, regardless if
+    # Returns an Array of all key attributes if any is set, regardless if
     # the object is persisted or not. Returns +nil+ if there are no key attributes.
     #
-    #   class Person < ActiveRecord::Base
+    #   class Person
+    #     include ActiveModel::Conversion
+    #     attr_accessor :id
     #   end
     #
-    #   person = Person.create
+    #   person = Person.create(id: 1)
     #   person.to_key # => [1]
     def to_key
       key = respond_to?(:id) && id
@@ -56,10 +58,15 @@ module ActiveModel
     # Returns a +string+ representing the object's key suitable for use in URLs,
     # or +nil+ if <tt>persisted?</tt> is +false+.
     #
-    #   class Person < ActiveRecord::Base
+    #   class Person
+    #     include ActiveModel::Conversion
+    #     attr_accessor :id
+    #     def persisted?
+    #       true
+    #     end
     #   end
     #
-    #   person = Person.create
+    #   person = Person.create(id: 1)
     #   person.to_param # => "1"
     def to_param
       (persisted? && key = to_key) ? key.join('-') : nil
@@ -83,8 +90,8 @@ module ActiveModel
       # internal method and should not be accessed directly.
       def _to_partial_path #:nodoc:
         @_to_partial_path ||= begin
-          element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(self))
-          collection = ActiveSupport::Inflector.tableize(self)
+          element = ActiveSupport::Inflector.underscore(ActiveSupport::Inflector.demodulize(name))
+          collection = ActiveSupport::Inflector.tableize(name)
           "#{collection}/#{element}".freeze
         end
       end

data/lib/active_model/dirty.rb

@@ -15,8 +15,9 @@ module ActiveModel
   # * Call <tt>attr_name_will_change!</tt> before each change to the tracked
   #   attribute.
   # * Call <tt>changes_applied</tt> after the changes are persisted.
-  # * Call <tt>reset_changes</tt> when you want to reset the changes
+  # * Call <tt>clear_changes_information</tt> when you want to reset the changes
   #   information.
+  # * Call <tt>restore_attributes</tt> when you want to restore previous data.
   #
   # A minimal implementation could be:
   #
@@ -36,11 +37,18 @@ module ActiveModel
   #
   #     def save
   #       # do persistence work
+  #
   #       changes_applied
   #     end
   #
   #     def reload!
-  #       reset_changes
+  #       # get the values from the persistence layer
+  #
+  #       clear_changes_information
+  #     end
+  #
+  #     def rollback!
+  #       restore_attributes
   #     end
   #   end
   #
@@ -72,6 +80,13 @@ module ActiveModel
   #   person.reload!
   #   person.previous_changes # => {}
   #
+  # Rollback the changes:
+  #
+  #   person.name = "Uncle Bob"
+  #   person.rollback!
+  #   person.name           # => "Bill"
+  #   person.name_changed?  # => false
+  #
   # Assigning the same value leaves the attribute unchanged:
   #
   #   person.name = 'Bill'
@@ -84,9 +99,11 @@ module ActiveModel
   #   person.changed        # => ["name"]
   #   person.changes        # => {"name" => ["Bill", "Bob"]}
   #
-  # If an attribute is modified in-place then make use of <tt>[attribute_name]_will_change!</tt>
-  # to mark that the attribute is changing. Otherwise ActiveModel can't track
-  # changes to in-place attributes.
+  # If an attribute is modified in-place then make use of
+  # +[attribute_name]_will_change!+ to mark that the attribute is changing.
+  # Otherwise Active Model can't track changes to in-place attributes. Note
+  # that Active Record can detect in-place modifications automatically. You do
+  # not need to call +[attribute_name]_will_change!+ on Active Record models.
   #
   #   person.name_will_change!
   #   person.name_change    # => ["Bill", "Bill"]
@@ -99,6 +116,7 @@ module ActiveModel
     included do
       attribute_method_suffix '_changed?', '_change', '_will_change!', '_was'
       attribute_method_affix prefix: 'reset_', suffix: '!'
+      attribute_method_affix prefix: 'restore_', suffix: '!'
     end
 
     # Returns +true+ if any attribute have unsaved changes, +false+ otherwise.
@@ -162,20 +180,30 @@ module ActiveModel
       attribute_changed?(attr) ? changed_attributes[attr] : __send__(attr)
     end
 
+    # Restore all previous data of the provided attributes.
+    def restore_attributes(attributes = changed)
+      attributes.each { |attr| restore_attribute! attr }
+    end
+
     private
 
       # Removes current changes and makes them accessible through +previous_changes+.
-      def changes_applied
+      def changes_applied # :doc:
         @previously_changed = changes
         @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
       end
 
-      # Removes all dirty data: current changes and previous changes
-      def reset_changes
+      # Clear all dirty data: current changes and previous changes.
+      def clear_changes_information # :doc:
         @previously_changed = ActiveSupport::HashWithIndifferentAccess.new
         @changed_attributes = ActiveSupport::HashWithIndifferentAccess.new
       end
 
+      def reset_changes
+        ActiveSupport::Deprecation.warn "#reset_changes is deprecated and will be removed on Rails 5. Please use #clear_changes_information instead."
+        clear_changes_information
+      end
+
       # Handle <tt>*_change</tt> for +method_missing+.
       def attribute_change(attr)
         [changed_attributes[attr], __send__(attr)] if attribute_changed?(attr)
@@ -191,15 +219,36 @@ module ActiveModel
         rescue TypeError, NoMethodError
         end
 
-        changed_attributes[attr] = value
+        set_attribute_was(attr, value)
       end
 
       # Handle <tt>reset_*!</tt> for +method_missing+.
       def reset_attribute!(attr)
+        ActiveSupport::Deprecation.warn "#reset_#{attr}! is deprecated and will be removed on Rails 5. Please use #restore_#{attr}! instead."
+
+        restore_attribute!(attr)
+      end
+
+      # Handle <tt>restore_*!</tt> for +method_missing+.
+      def restore_attribute!(attr)
         if attribute_changed?(attr)
           __send__("#{attr}=", changed_attributes[attr])
-          changed_attributes.delete(attr)
+          clear_attribute_changes([attr])
         end
       end
+
+      # This is necessary because `changed_attributes` might be overridden in
+      # other implemntations (e.g. in `ActiveRecord`)
+      alias_method :attributes_changed_by_setter, :changed_attributes # :nodoc:
+
+      # Force an attribute to have a particular "before" value
+      def set_attribute_was(attr, old_value)
+        attributes_changed_by_setter[attr] = old_value
+      end
+
+      # Remove changes information for the provided attributes.
+      def clear_attribute_changes(attributes)
+        attributes_changed_by_setter.except!(*attributes)
+      end
   end
 end

data/lib/active_model/errors.rb

@@ -23,7 +23,7 @@ module ActiveModel
   #     attr_reader   :errors
   #
   #     def validate!
-  #       errors.add(:name, "cannot be nil") if name == nil
+  #       errors.add(:name, "cannot be nil") if name.nil?
   #     end
   #
   #     # The following methods are needed to be minimally implemented
@@ -289,6 +289,13 @@ module ActiveModel
     #   # => NameIsInvalid: name is invalid
     #
     #   person.errors.messages # => {}
+    #
+    # +attribute+ should be set to <tt>:base</tt> if the error is not
+    # directly associated with a single attribute.
+    #
+    #   person.errors.add(:base, "either name or email must be present")
+    #   person.errors.messages
+    #   # => {:base=>["either name or email must be present"]}
     def add(attribute, message = :invalid, options = {})
       message = normalize_message(attribute, message, options)
       if exception = options[:strict]
@@ -427,7 +434,7 @@ module ActiveModel
 
       options = {
         default: defaults,
-        model: @base.class.model_name.human,
+        model: @base.model_name.human,
         attribute: @base.class.human_attribute_name(attribute),
         value: value
       }.merge!(options)

data/lib/active_model/gem_version.rb

@@ -6,9 +6,9 @@ module ActiveModel
 
   module VERSION
     MAJOR = 4
-    MINOR = 1
-    TINY  = 16
-    PRE   = nil
+    MINOR = 2
+    TINY  = 0
+    PRE   = "beta1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_model/lint.rb

@@ -73,16 +73,19 @@ module ActiveModel
 
       # == \Naming
       #
-      # Model.model_name must return a string with some convenience methods:
-      # <tt>:human</tt>, <tt>:singular</tt> and <tt>:plural</tt>. Check
-      # ActiveModel::Naming for more information.
+      # Model.model_name and Model#model_name must return a string with some
+      # convenience methods: # <tt>:human</tt>, <tt>:singular</tt> and
+      # <tt>:plural</tt>. Check ActiveModel::Naming for more information.
       def test_model_naming
-        assert model.class.respond_to?(:model_name), "The model should respond to model_name"
+        assert model.class.respond_to?(:model_name), "The model class should respond to model_name"
         model_name = model.class.model_name
         assert model_name.respond_to?(:to_str)
         assert model_name.human.respond_to?(:to_str)
         assert model_name.singular.respond_to?(:to_str)
         assert model_name.plural.respond_to?(:to_str)
+
+        assert model.respond_to?(:model_name), "The model instance should respond to model_name"
+        assert_equal model.model_name, model.class.model_name
       end
 
       # == \Errors Testing

data/lib/active_model/locale/en.yml

@@ -14,9 +14,15 @@ en:
       empty: "can't be empty"
       blank: "can't be blank"
       present: "must be blank"
-      too_long: "is too long (maximum is %{count} characters)"
-      too_short: "is too short (minimum is %{count} characters)"
-      wrong_length: "is the wrong length (should be %{count} characters)"
+      too_long:
+        one: "is too long (maximum is 1 character)"
+        other: "is too long (maximum is %{count} characters)" 
+      too_short:
+        one: "is too short (minimum is 1 character)"
+        other: "is too short (minimum is %{count} characters)"
+      wrong_length:
+        one: "is the wrong length (should be 1 character)"
+        other: "is the wrong length (should be %{count} characters)"
       not_a_number: "is not a number"
       not_an_integer: "must be an integer"
       greater_than: "must be greater than %{count}"

data/lib/active_model/model.rb

@@ -16,8 +16,8 @@ module ActiveModel
   #   end
   #
   #   person = Person.new(name: 'bob', age: '18')
-  #   person.name # => 'bob'
-  #   person.age  # => 18
+  #   person.name # => "bob"
+  #   person.age  # => "18"
   #
   # Note that, by default, <tt>ActiveModel::Model</tt> implements <tt>persisted?</tt>
   # to return +false+, which is the most common case. You may want to override
@@ -74,7 +74,7 @@ module ActiveModel
     #
     #   person = Person.new(name: 'bob', age: '18')
     #   person.name # => "bob"
-    #   person.age  # => 18
+    #   person.age  # => "18"
     def initialize(params={})
       params.each do |attr, value|
         self.public_send("#{attr}=", value)

data/lib/active_model/naming.rb

@@ -129,7 +129,7 @@ module ActiveModel
     #
     # Equivalent to +to_s+.
     delegate :==, :===, :<=>, :=~, :"!~", :eql?, :to_s,
-             :to_str, :as_json, to: :name
+             :to_str, to: :name
 
     # Returns a new ActiveModel::Name instance. By default, the +namespace+
     # and +name+ option will take the namespace and name of the given class
@@ -204,7 +204,7 @@ module ActiveModel
   #     extend ActiveModel::Naming
   #   end
   #
-  #   BookCover.model_name        # => "BookCover"
+  #   BookCover.model_name.name   # => "BookCover"
   #   BookCover.model_name.human  # => "Book cover"
   #
   #   BookCover.model_name.i18n_key              # => :book_cover
@@ -214,14 +214,20 @@ module ActiveModel
   # is required to pass the Active Model Lint test. So either extending the
   # provided method below, or rolling your own is required.
   module Naming
+    def self.extended(base) #:nodoc:
+      base.remove_possible_method :model_name
+      base.delegate :model_name, to: :class
+    end
+
     # Returns an ActiveModel::Name object for module. It can be
     # used to retrieve all kinds of naming-related information
     # (See ActiveModel::Name for more information).
     #
-    #   class Person < ActiveModel::Model
+    #   class Person
+    #     include ActiveModel::Model
     #   end
     #
-    #   Person.model_name          # => Person
+    #   Person.model_name.name     # => "Person"
     #   Person.model_name.class    # => ActiveModel::Name
     #   Person.model_name.singular # => "person"
     #   Person.model_name.plural   # => "people"
@@ -298,12 +304,10 @@ module ActiveModel
     end
 
     def self.model_name_from_record_or_class(record_or_class) #:nodoc:
-      if record_or_class.respond_to?(:model_name)
-        record_or_class.model_name
-      elsif record_or_class.respond_to?(:to_model)
-        record_or_class.to_model.class.model_name
+      if record_or_class.respond_to?(:to_model)
+        record_or_class.to_model.model_name
       else
-        record_or_class.class.model_name
+        record_or_class.model_name
       end
     end
     private_class_method :model_name_from_record_or_class

data/lib/active_model/secure_password.rb

@@ -2,6 +2,11 @@ module ActiveModel
   module SecurePassword
     extend ActiveSupport::Concern
 
+    # BCrypt hash function can handle maximum 72 characters, and if we pass
+    # password of length more than 72 characters it ignores extra characters.
+    # Hence need to put a restriction on password length.
+    MAX_PASSWORD_LENGTH_ALLOWED = 72
+
     class << self
       attr_accessor :min_cost # :nodoc:
     end
@@ -11,16 +16,20 @@ module ActiveModel
       # Adds methods to set and authenticate against a BCrypt password.
       # This mechanism requires you to have a +password_digest+ attribute.
       #
-      # Validations for presence of password on create, confirmation of password
-      # (using a +password_confirmation+ attribute) are automatically added. If
-      # you wish to turn off validations, pass <tt>validations: false</tt> as an
-      # argument. You can add more validations by hand if need be.
+      # The following validations are added automatically:
+      # * Password must be present on creation
+      # * Password length should be less than or equal to 72 characters
+      # * Confirmation of password (using a +password_confirmation+ attribute)
+      #
+      # If password confirmation validation is not needed, simply leave out the
+      # value for +password_confirmation+ (i.e. don't provide a form field for
+      # it). When this attribute has a +nil+ value, the validation will not be
+      # triggered.
       #
-      # If you don't need the confirmation validation, just don't set any
-      # value to the password_confirmation attribute and the validation
-      # will not be triggered.
+      # For further customizability, it is possible to supress the default
+      # validations by passing <tt>validations: false</tt> as an argument.
       #
-      # You need to add bcrypt (~> 3.1.7) to Gemfile to use #has_secure_password:
+      # Add bcrypt (~> 3.1.7) to Gemfile to use #has_secure_password:
       #
       #   gem 'bcrypt', '~> 3.1.7'
       #
@@ -52,11 +61,11 @@ module ActiveModel
           raise
         end
 
-        attr_reader :password
-
         include InstanceMethodsOnActivation
 
         if options.fetch(:validations, true)
+          include ActiveModel::Validations
+
           # This ensures the model has a password by checking whether the password_digest
           # is present, so that this works with both new and existing records. However,
           # when there is an error, the message is added to the password attribute instead
@@ -65,9 +74,11 @@ module ActiveModel
             record.errors.add(:password, :blank) unless record.password_digest.present?
           end
 
+          validates_length_of :password, maximum: ActiveModel::SecurePassword::MAX_PASSWORD_LENGTH_ALLOWED
           validates_confirmation_of :password, if: ->{ password.present? }
         end
 
+        # This code is necessary as long as the protected_attributes gem is supported.
         if respond_to?(:attributes_protected_by_default)
           def self.attributes_protected_by_default #:nodoc:
             super + ['password_digest']
@@ -91,8 +102,10 @@ module ActiveModel
         BCrypt::Password.new(password_digest) == unencrypted_password && self
       end
 
+      attr_reader :password
+
       # Encrypts the password into the +password_digest+ attribute, only if the
-      # new password is not blank.
+      # new password is not empty.
       #
       #   class User < ActiveRecord::Base
       #     has_secure_password validations: false
@@ -106,7 +119,7 @@ module ActiveModel
       def password=(unencrypted_password)
         if unencrypted_password.nil?
           self.password_digest = nil
-        elsif unencrypted_password.present?
+        elsif !unencrypted_password.empty?
           @password = unencrypted_password
           cost = ActiveModel::SecurePassword.min_cost ? BCrypt::Engine::MIN_COST : BCrypt::Engine.cost
           self.password_digest = BCrypt::Password.create(unencrypted_password, cost: cost)

data/lib/active_model/serialization.rb

@@ -4,7 +4,7 @@ require 'active_support/core_ext/hash/slice'
 module ActiveModel
   # == Active \Model \Serialization
   #
-  # Provides a basic serialization to a serializable_hash for your object.
+  # Provides a basic serialization to a serializable_hash for your objects.
   #
   # A minimal implementation could be:
   #
@@ -25,14 +25,14 @@ module ActiveModel
   #   person.name = "Bob"
   #   person.serializable_hash   # => {"name"=>"Bob"}
   #
-  # You need to declare an attributes hash which contains the attributes you
-  # want to serialize. Attributes must be strings, not symbols. When called,
-  # serializable hash will use instance methods that match the name of the
-  # attributes hash's keys. In order to override this behavior, take a look at
-  # the private method +read_attribute_for_serialization+.
+  # An +attributes+ hash must be defined and should contain any attributes you
+  # need to be serialized. Attributes must be strings, not symbols.
+  # When called, serializable hash will use instance methods that match the name
+  # of the attributes hash's keys. In order to override this behavior, take a look
+  # at the private method +read_attribute_for_serialization+.
   #
-  # Most of the time though, you will want to include the JSON or XML
-  # serializations. Both of these modules automatically include the
+  # Most of the time though, either the JSON or XML serializations are needed.
+  # Both of these modules automatically include the
   # <tt>ActiveModel::Serialization</tt> module, so there is no need to
   # explicitly include it.
   #

data/lib/active_model/serializers/json.rb

@@ -10,7 +10,7 @@ module ActiveModel
       included do
         extend ActiveModel::Naming
 
-        class_attribute :include_root_in_json, instance_writer: false
+        class_attribute :include_root_in_json
         self.include_root_in_json = false
       end
 
@@ -93,7 +93,7 @@ module ActiveModel
         end
 
         if root
-          root = self.class.model_name.element if root == true
+          root = model_name.element if root == true
           { root => serializable_hash(options) }
         else
           serializable_hash(options)

data/lib/active_model/serializers/xml.rb

@@ -84,7 +84,7 @@ module ActiveModel
           @builder = options[:builder]
           @builder.instruct! unless options[:skip_instruct]
 
-          root = (options[:root] || @serializable.class.model_name.element).to_s
+          root = (options[:root] || @serializable.model_name.element).to_s
           root = ActiveSupport::XmlMini.rename_key(root, options)
 
           args = [root]

data/lib/active_model/validations.rb

@@ -39,6 +39,7 @@ module ActiveModel
     extend ActiveSupport::Concern
 
     included do
+      extend ActiveModel::Naming
       extend ActiveModel::Callbacks
       extend ActiveModel::Translation
 
@@ -46,10 +47,9 @@ module ActiveModel
       include HelperMethods
 
       attr_accessor :validation_context
-      private :validation_context=
       define_callbacks :validate, scope: :name
 
-      class_attribute :_validators, instance_writer: false
+      class_attribute :_validators
       self._validators = Hash.new { |h,k| h[k] = [] }
     end
 
@@ -142,6 +142,11 @@ module ActiveModel
       #   value.
       def validate(*args, &block)
         options = args.extract_options!
+
+        if args.all? { |arg| arg.is_a?(Symbol) }
+          options.assert_valid_keys([:on, :if, :unless])
+        end
+
         if options.key?(:on)
           options = options.dup
           options[:if] = Array(options[:if])
@@ -149,6 +154,7 @@ module ActiveModel
             Array(options[:on]).include?(o.validation_context)
           }
         end
+
         args << options
         set_callback(:validate, *args, &block)
       end
@@ -286,6 +292,8 @@ module ActiveModel
     # Runs all the specified validations and returns +true+ if no errors were
     # added otherwise +false+.
     #
+    # Aliased as validate.
+    #
     #   class Person
     #     include ActiveModel::Validations
     #
@@ -320,6 +328,8 @@ module ActiveModel
       self.validation_context = current_context
     end
 
+    alias_method :validate, :valid?
+
     # Performs the opposite of <tt>valid?</tt>. Returns +true+ if errors were
     # added, +false+ otherwise.
     #

data/lib/active_model/validations/numericality.rb

@@ -30,7 +30,7 @@ module ActiveModel
           return
         end
 
-        if options[:only_integer]
+        if allow_only_integer?(record)
           unless value = parse_raw_value_as_an_integer(raw_value)
             record.errors.add(attr_name, :not_an_integer, filtered_options(raw_value))
             return
@@ -75,6 +75,17 @@ module ActiveModel
         filtered[:value] = value
         filtered
       end
+
+      def allow_only_integer?(record)
+        case options[:only_integer]
+        when Symbol
+          record.send(options[:only_integer])
+        when Proc
+          options[:only_integer].call(record)
+        else
+          options[:only_integer]
+        end
+      end
     end
 
     module HelperMethods
@@ -121,6 +132,7 @@ module ActiveModel
       # * <tt>:equal_to</tt>
       # * <tt>:less_than</tt>
       # * <tt>:less_than_or_equal_to</tt>
+      # * <tt>:only_integer</tt>
       #
       # For example:
       #

data/lib/active_model/validations/with.rb

@@ -53,7 +53,7 @@ module ActiveModel
       #
       # Configuration options:
       # * <tt>:on</tt> - Specifies when this validation is active
-      #   (<tt>:create</tt> or <tt>:update</tt>.
+      #   (<tt>:create</tt> or <tt>:update</tt>).
       # * <tt>:if</tt> - Specifies a method, proc or string to call to determine
       #   if the validation should occur (e.g. <tt>if: :allow_validation</tt>,
       #   or <tt>if: Proc.new { |user| user.signup_step > 2 }</tt>).

data/lib/active_model/validator.rb

@@ -106,7 +106,6 @@ module ActiveModel
     # Accepts options that will be made available through the +options+ reader.
     def initialize(options = {})
       @options  = options.except(:class).freeze
-      deprecated_setup(options)
     end
 
     # Returns the kind for this validator.
@@ -122,21 +121,6 @@ module ActiveModel
     def validate(record)
       raise NotImplementedError, "Subclasses must implement a validate(record) method."
     end
-
-    private
-    def deprecated_setup(options) # TODO: remove me in 4.2.
-      return unless respond_to?(:setup)
-      ActiveSupport::Deprecation.warn "The `Validator#setup` instance method is deprecated and will be removed on Rails 4.2. Do your setup in the constructor instead:
-
-class MyValidator < ActiveModel::Validator
-  def initialize(options={})
-    super
-    options[:class].send :attr_accessor, :custom_attribute
-  end
-end
-"
-      setup(options[:class])
-    end
   end
 
   # +EachValidator+ is a validator which iterates through the attributes given

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 4.1.16
+  version: 4.2.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-12 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: 4.2.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.16
+        version: 4.2.0.beta1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -99,12 +99,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).