diff options
-rw-r--r-- | activemodel/lib/active_model/validations.rb | 3 | ||||
-rw-r--r-- | activemodel/test/cases/validations_test.rb | 11 | ||||
-rw-r--r-- | activemodel/test/models/book.rb | 3 | ||||
-rw-r--r-- | activerecord/lib/active_record/attribute_assignment.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/mass_assignment_security_test.rb | 6 |
5 files changed, 22 insertions, 3 deletions
diff --git a/activemodel/lib/active_model/validations.rb b/activemodel/lib/active_model/validations.rb index 18cd53e130..f38121c175 100644 --- a/activemodel/lib/active_model/validations.rb +++ b/activemodel/lib/active_model/validations.rb @@ -168,8 +168,9 @@ module ActiveModel # Clean the +Errors+ object if instance is duped def initialize_dup(other) # :nodoc: @errors = nil + super if defined?(super) end - + # Backport dup from 1.9 so that #initialize_dup gets called unless Object.respond_to?(:initialize_dup) def dup # :nodoc: diff --git a/activemodel/test/cases/validations_test.rb b/activemodel/test/cases/validations_test.rb index 56c9a5592c..d000a88ce1 100644 --- a/activemodel/test/cases/validations_test.rb +++ b/activemodel/test/cases/validations_test.rb @@ -5,6 +5,7 @@ require 'models/topic' require 'models/reply' require 'models/custom_reader' require 'models/automobile' +require 'models/book' require 'active_support/json' require 'active_support/xml_mini' @@ -354,4 +355,14 @@ class ValidationsTest < ActiveModel::TestCase assert topic.invalid? assert duped.valid? end + + def test_dup_call_parent_dup_when_include_validations + book = Book.new + book['title'] = "Litterature" + book['author'] = "Foo" + duped = book.dup + + assert_equal book.keys, duped.keys + assert_equal book.values, duped.values + end end diff --git a/activemodel/test/models/book.rb b/activemodel/test/models/book.rb new file mode 100644 index 0000000000..c5c19046c8 --- /dev/null +++ b/activemodel/test/models/book.rb @@ -0,0 +1,3 @@ +class Book < Hash + include ActiveModel::Validations +end diff --git a/activerecord/lib/active_record/attribute_assignment.rb b/activerecord/lib/active_record/attribute_assignment.rb index bf9fe70b31..ca5f7b9c6c 100644 --- a/activerecord/lib/active_record/attribute_assignment.rb +++ b/activerecord/lib/active_record/attribute_assignment.rb @@ -64,7 +64,7 @@ module ActiveRecord # user.name # => "Josh" # user.is_admin? # => true def assign_attributes(new_attributes, options = {}) - return unless new_attributes + return if new_attributes.blank? attributes = new_attributes.stringify_keys multi_parameter_attributes = [] diff --git a/activerecord/test/cases/mass_assignment_security_test.rb b/activerecord/test/cases/mass_assignment_security_test.rb index 8122857f52..5153945546 100644 --- a/activerecord/test/cases/mass_assignment_security_test.rb +++ b/activerecord/test/cases/mass_assignment_security_test.rb @@ -95,7 +95,11 @@ class MassAssignmentSecurityTest < ActiveRecord::TestCase end def test_mass_assigning_does_not_choke_on_nil - Firm.new.assign_attributes(nil) + assert_nil Firm.new.assign_attributes(nil) + end + + def test_mass_assigning_does_not_choke_on_empty_hash + assert_nil Firm.new.assign_attributes({}) end def test_assign_attributes_uses_default_role_when_no_role_is_provided |