activemodel 4.0.13 → 4.1.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6480d698a29a2bde39643553d36ef1017845079e
-  data.tar.gz: 71864592fffd7b46b44ee17297db425e35d9c220
+  metadata.gz: 8ec99997b26ba6f42f0d52870e26c68b014b0ab2
+  data.tar.gz: 6d5a2a13605bfd0a34896e84e96aa36d96b702db
 SHA512:
-  metadata.gz: a9ba2cb78d6dcb7c2fe7da280c12441a6ba6f0a5d0288e54816c2599d928f54b5a436fab7481e43d0d324e4194683a2086a3780520484e7040cde28ae8faacae
-  data.tar.gz: 23d61ef3a44826c8f8cc38916a199e62d6b2d567b6ed7d2487dad93058e10e46804eae20ecff69b34852b784fc4c7a24afc6c7ce26a129d63f32d691f9c0364c
+  metadata.gz: c5275f490cc27d9bf4ba5b34378e7b61592aa0475826d6f69571ad2d4f76eb4966d50443f7342506c75b79c471c3c41fec24b829edd66bdc3c58dc217183f911
+  data.tar.gz: 13696e83d837d03bb99c0393f536fc35064aa08090b460c4adaa094c3d1854b8b54743bf54f95e0b3d9f8791c175c311fdcf51e093d72a644d44e62369d59ad7

data/CHANGELOG.md

@@ -1,300 +1,39 @@
-## Rails 4.0.13 (January 6, 2015) ##
-
-*No changes*
-
-
-## Rails 4.0.12 (November 16, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.11.1 (November 19, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.11 (September 11, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.10 (September 11, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.9 (August 18, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.8 (July 2, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.7 (July 2, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.6 (June 26, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.5 (May 6, 2014) ##
-
-*No changes*
-
-
-## Rails 4.0.4 (March 14, 2014) ##
-
-*   `#to_param` returns `nil` if `#to_key` returns `nil`. Fixes #11399.
-
-    *Yves Senn*
-
-
-## Rails 4.0.3 (February 18, 2014) ##
+*   Fix `has_secure_password` to honor bcrypt-ruby's cost attribute.
 
-*No changes*
+    *T.J. Schuck*
 
+*   Updated the `ActiveModel::Dirty#changed_attributes` method to be indifferent between using
+    symbols and strings as keys.
 
-## Rails 4.0.2 (December 02, 2013) ##
+    *William Myers*
 
-*No changes*
+*   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*
 
-## Rails 4.0.1 (November 01, 2013) ##
+*   Fix has_secure_password. `password_confirmation` validations are triggered
+    even if no `password_confirmation` is set.
 
-*   Fix `has_secure_password` to honor bcrypt-ruby's cost attribute.
-
-    *T.J. Schuck*
+    *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*
 
-
-## Rails 4.0.0 (June 25, 2013) ##
-
 *   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*
 
-*   Add `ActiveModel::Errors#full_messages_for`, to return all the error messages
-    for a given attribute.
-
-    Example:
-
-        class Person
-          include ActiveModel::Validations
-
-          attr_reader :name, :email
-          validates_presence_of :name, :email
-        end
-
-        person = Person.new
-        person.valid?                           # => false
-        person.errors.full_messages_for(:name)  # => ["Name can't be blank"]
-
-    *Volodymyr Shatsky*
-
-*   Added a method so that validations can be easily cleared on a model.
-    For example:
-
-        class Person
-          include ActiveModel::Validations
-
-          validates_uniqueness_of :first_name
-          validate :cannot_be_robot
-
-          def cannot_be_robot
-            errors.add(:base, 'A person cannot be a robot') if person_is_robot
-          end
-        end
-
-    Now, if someone runs `Person.clear_validators!`, then the following occurs:
-
-        Person.validators                  # => []
-        Person._validate_callbacks.empty?  # => true
-
-    *John Wang*
-
-*   `has_secure_password` does not fail the confirmation validation
-    when assigning empty String to `password` and `password_confirmation`.
-    Fixes #9535.
-
-    Example:
-
-        # Given User has_secure_password.
-        @user.password = ""
-        @user.password_confirmation = ""
-        @user.valid?(:update) # used to be false
-
-    *Yves Senn*
-
-*   `validates_confirmation_of` does not override writer methods for
-    the confirmation attribute if no reader is defined.
-
-    Example:
-
-        class Blog
-          def title=(new_title)
-            @title = new_title.downcase
-          end
-
-          # previously this would override the setter above.
-          validates_confirmation_of :title
-        end
-
-    *Yves Senn*
-
-*   Add `ActiveModel::Validations::AbsenceValidator`, a validator to check the
-    absence of attributes.
-
-        class Person
-          include ActiveModel::Validations
-
-          attr_accessor :first_name
-          validates_absence_of :first_name
-        end
-
-        person = Person.new
-        person.first_name = "John"
-        person.valid?
-        # => false
-        person.errors.messages
-        # => {:first_name=>["must be blank"]}
-
-    *Roberto Vasquez Angel*
-
-*   `[attribute]_changed?` now returns `false` after a call to `reset_[attribute]!`.
-
-    *Renato Mascarenhas*
-
-*   Observers was extracted from Active Model as `rails-observers` gem.
-
-    *Rafael Mendonça França*
-
-*   Specify type of singular association during serialization.
-
-    *Steve Klabnik*
-
-*   Fixed length validator to correctly handle `nil`. Fixes #7180.
-
-    *Michal Zima*
-
-*   Removed dispensable `require` statements. Make sure to require `active_model` before requiring
-    individual parts of the framework.
-
-    *Yves Senn*
-
-*   Use BCrypt's `MIN_COST` in the test environment for speedier tests when using `has_secure_password`.
-
-    *Brian Cardarella + Jeremy Kemper + Trevor Turk*
-
-*   Add `ActiveModel::ForbiddenAttributesProtection`, a simple module to
-    protect attributes from mass assignment when non-permitted attributes are passed.
-
-    *DHH + Guillermo Iguaran*
-
-*   `ActiveModel::MassAssignmentSecurity` has been extracted from Active Model and the
-    `protected_attributes` gem should be added to Gemfile in order to use
-    `attr_accessible` and `attr_protected` macros in your models.
-
-    *Guillermo Iguaran*
-
-*   Due to a change in builder, `nil` and empty strings now generate
-    closed tags, so instead of this:
-
-        <pseudonyms nil=\"true\"></pseudonyms>
-
-    it generates this:
-
-        <pseudonyms nil=\"true\"/>
-
-    *Carlos Antonio da Silva*
-
-*   Inclusion/exclusion validators accept a method name passed as a symbol to the
-    `:in` option.
-
-    This allows to use dynamic inclusion/exclusion values using methods, besides
-    the current lambda/proc support.
-
-    *Gabriel Sobrinho*
-
-*   `ActiveModel::Validation#validates` ability to pass custom exception to the
-    `:strict` option.
-
-    *Bogdan Gusiev*
-
-*   Changed `ActiveModel::Serializers::Xml::Serializer#add_associations` to by default
-    propagate `:skip_types, :dasherize, :camelize` keys to included associations.
-    It can be overridden on each association by explicitly specifying the option on one
-    or more associations
-
-    *Anthony Alberto*
-
-*   Changed `ActiveModel::Serializers::JSON.include_root_in_json` default value to false.
-    Now, AM Serializers and AR objects have the same default behaviour. Fixes #6578.
-
-        class User < ActiveRecord::Base; end
-
-        class Person
-          include ActiveModel::Model
-          include ActiveModel::AttributeMethods
-          include ActiveModel::Serializers::JSON
-
-          attr_accessor :name, :age
-
-          def attributes
-            instance_values
-          end
-        end
-
-        user.as_json
-        => {"id"=>1, "name"=>"Konata Izumi", "age"=>16, "awesome"=>true}
-        # root is not included
-
-        person.as_json
-        => {"name"=>"Francesco", "age"=>22}
-        # root is not included
-
-    *Francesco Rodriguez*
-
-*   Passing false hash values to `validates` will no longer enable the corresponding validators.
-
-    *Steve Purcell*
-
-*   `ConfirmationValidator` error messages will attach to `:#{attribute}_confirmation` instead of `attribute`.
-
-    *Brian Cardarella*
-
-*   Added `ActiveModel::Model`, a mixin to make Ruby objects work with AP out of box.
-
-    *Guillermo Iguaran*
-
-*   `AM::Errors#to_json`: support `:full_messages` parameter.
-
-    *Bogdan Gusiev*
-
-*   Trim down Active Model API by removing `valid?` and `errors.full_messages`.
-
-    *José Valim*
-
-*   When `^` or `$` are used in the regular expression provided to `validates_format_of`
-    and the `:multiline` option is not set to true, an exception will be raised. This is
-    to prevent security vulnerabilities when using `validates_format_of`. The problem is
-    described in detail in the Rails security guide.
+*   Deprecate `Validator#setup`. This should be done manually now in the validator's constructor.
 
-    *Jan Berdajs + Egor Homakov*
+    *Nick Sutterer*
 
-Please check [3-2-stable](https://github.com/rails/rails/blob/3-2-stable/activemodel/CHANGELOG.md) for previous changes.
+Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/activemodel/CHANGELOG.md) for previous changes.

data/README.rdoc

@@ -227,7 +227,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-0-stable/activemodel
+* https://github.com/rails/rails/tree/master/activemodel
 
 
 == License

data/lib/active_model.rb

@@ -37,7 +37,6 @@ module ActiveModel
   autoload :ForbiddenAttributesProtection
   autoload :Lint
   autoload :Model
-  autoload :DeprecatedMassAssignmentSecurity
   autoload :Name, 'active_model/naming'
   autoload :Naming
   autoload :SecurePassword
@@ -49,7 +48,6 @@ module ActiveModel
 
   eager_autoload do
     autoload :Errors
-    autoload :StrictValidationFailed, 'active_model/errors'
   end
 
   module Serializers
@@ -61,9 +59,9 @@ module ActiveModel
     end
   end
 
-  def self.eager_load!
+  def eager_load!
     super
-    ActiveModel::Serializers.eager_load!
+    ActiveModel::Serializer.eager_load!
   end
 end
 

data/lib/active_model/attribute_methods.rb

@@ -219,6 +219,16 @@ module ActiveModel
         end
       end
 
+      # Is +new_name+ an alias?
+      def attribute_alias?(new_name)
+        attribute_aliases.key? new_name.to_s
+      end
+
+      # Returns the original name for the alias +name+
+      def attribute_alias(name)
+        attribute_aliases[name.to_s]
+      end
+
       # Declares the attributes that should be prefixed and suffixed by
       # ActiveModel::AttributeMethods.
       #
@@ -323,7 +333,6 @@ module ActiveModel
         attribute_method_matchers_cache.clear
       end
 
-      # Returns true if the attribute methods defined have been generated.
       def generated_attribute_methods #:nodoc:
         @generated_attribute_methods ||= Module.new {
           extend Mutex_m
@@ -340,13 +349,13 @@ module ActiveModel
         # invoked often in a typical rails, both of which invoke the method
         # +match_attribute_method?+. The latter method iterates through an
         # array doing regular expression matches, which results in a lot of
-        # object creations. Most of the times it returns a +nil+ match. As the
+        # object creations. Most of the time it returns a +nil+ match. As the
         # match result is always the same given a +method_name+, this cache is
         # used to alleviate the GC, which ultimately also speeds up the app
         # significantly (in our case our test suite finishes 10% faster with
         # this cache).
         def attribute_method_matchers_cache #:nodoc:
-          @attribute_method_matchers_cache ||= ThreadSafe::Cache.new(:initial_capacity => 4)
+          @attribute_method_matchers_cache ||= ThreadSafe::Cache.new(initial_capacity: 4)
         end
 
         def attribute_method_matcher(method_name) #:nodoc:
@@ -391,14 +400,6 @@ module ActiveModel
           AttributeMethodMatch = Struct.new(:target, :attr_name, :method_name)
 
           def initialize(options = {})
-            if options[:prefix] == '' || options[:suffix] == ''
-              message = "Specifying an empty prefix/suffix for an attribute method is no longer " \
-                        "necessary. If the un-prefixed/suffixed version of the method has not been " \
-                        "defined when `define_attribute_methods` is called, it will be defined " \
-                        "automatically."
-              ActiveSupport::Deprecation.warn message
-            end
-
             @prefix, @suffix = options.fetch(:prefix, ''), options.fetch(:suffix, '')
             @regex = /^(?:#{Regexp.escape(@prefix)})(.*)(?:#{Regexp.escape(@suffix)})$/
             @method_missing_target = "#{@prefix}attribute#{@suffix}"

data/lib/active_model/callbacks.rb

@@ -100,10 +100,10 @@ module ActiveModel
     def define_model_callbacks(*callbacks)
       options = callbacks.extract_options!
       options = {
-        :terminator => "result == false",
-        :skip_after_callbacks_if_terminated => true,
-        :scope => [:kind, :name],
-        :only => [:before, :around, :after]
+        terminator: ->(_,result) { result == false },
+        skip_after_callbacks_if_terminated: true,
+        scope: [:kind, :name],
+        only: [:before, :around, :after]
       }.merge!(options)
 
       types = Array(options.delete(:only))
@@ -120,30 +120,27 @@ module ActiveModel
     private
 
     def _define_before_model_callback(klass, callback) #:nodoc:
-      klass.class_eval <<-CALLBACK, __FILE__, __LINE__ + 1
-        def self.before_#{callback}(*args, &block)
-          set_callback(:#{callback}, :before, *args, &block)
-        end
-      CALLBACK
+      klass.define_singleton_method("before_#{callback}") do |*args, &block|
+        set_callback(:"#{callback}", :before, *args, &block)
+      end
     end
 
     def _define_around_model_callback(klass, callback) #:nodoc:
-      klass.class_eval <<-CALLBACK, __FILE__, __LINE__ + 1
-        def self.around_#{callback}(*args, &block)
-          set_callback(:#{callback}, :around, *args, &block)
-        end
-      CALLBACK
+      klass.define_singleton_method("around_#{callback}") do |*args, &block|
+        set_callback(:"#{callback}", :around, *args, &block)
+      end
     end
 
     def _define_after_model_callback(klass, callback) #:nodoc:
-      klass.class_eval <<-CALLBACK, __FILE__, __LINE__ + 1
-        def self.after_#{callback}(*args, &block)
-          options = args.extract_options!
-          options[:prepend] = true
-          options[:if] = Array(options[:if]) << "value != false"
-          set_callback(:#{callback}, :after, *(args << options), &block)
-        end
-      CALLBACK
+      klass.define_singleton_method("after_#{callback}") do |*args, &block|
+        options = args.extract_options!
+        options[:prepend] = true
+        conditional = ActiveSupport::Callbacks::Conditionals::Value.new { |v|
+          v != false
+        }
+        options[:if] = Array(options[:if]) << conditional
+        set_callback(:"#{callback}", :after, *(args << options), &block)
+      end
     end
   end
 end