From b97e0a1127d45e25e4281d6c1b5fb9a57f0efea6 Mon Sep 17 00:00:00 2001
From: Angelo capilleri <capilleri@yahoo.com>
Date: Fri, 8 Jun 2012 19:39:17 +0200
Subject: Fix the the backport of the object dup with the ruby 1.9.3p194.

At the end of initialize_dup was added the call to super if it exists,
so it also works with 1.8.7 where initialize_dup doesn't exist.
This issu was introduced with the pull request #6324
---
 activemodel/lib/active_model/validations.rb |  3 ++-
 activemodel/test/cases/validations_test.rb  | 11 +++++++++++
 activemodel/test/models/book.rb             |  3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 activemodel/test/models/book.rb

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
-- 
cgit v1.2.3