From c9346322b15c15f51234c33a3db1b3895ffe84ab Mon Sep 17 00:00:00 2001
From: Mauricio Linhares <mauricio.linhares@gmail.com>
Date: Wed, 29 Jan 2014 00:54:13 -0300
Subject: Fixing issue with activerecord serialization not being able to dump a
 record after loading it from YAML - fixes #13861

---
 activerecord/CHANGELOG.md                          | 12 +++++++++++
 .../lib/active_record/attribute_methods.rb         |  5 +++++
 .../attribute_methods/serialization.rb             | 11 +++++++++++
 activerecord/lib/active_record/core.rb             |  2 +-
 activerecord/test/cases/store_test.rb              | 23 ++++++++++++++++++++++
 5 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index fe0d7b2b35..3422474d14 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,15 @@
+*   ActiveRecord objects can now be correctly dumped, loaded and dumped again without issues.
+
+    Previously, if you did `YAML.dump`, `YAML.load` and then `YAML.dump` again
+    in an ActiveRecord model that used serialization it would fail at the last
+    dump due to the fields not being correctly serialized before being dumped
+    to YAML. Now it is possible to dump and load the same object as many times
+    as needed without any issues.
+
+    Fixes #13861.
+
+    *Maurício Linhares*
+
 *   `find_in_batches` now returns an `Enumerator` when called without a block, so that it
     can be chained with other `Enumerable` methods.
 
diff --git a/activerecord/lib/active_record/attribute_methods.rb b/activerecord/lib/active_record/attribute_methods.rb
index ccbff8d1ff..9326c9c117 100644
--- a/activerecord/lib/active_record/attribute_methods.rb
+++ b/activerecord/lib/active_record/attribute_methods.rb
@@ -278,6 +278,11 @@ module ActiveRecord
       }
     end
 
+    # Placeholder so it can be overriden when needed by serialization
+    def attributes_for_coder # :nodoc:
+      attributes
+    end
+
     # Returns an <tt>#inspect</tt>-like string for the value of the
     # attribute +attr_name+. String attributes are truncated upto 50
     # characters, Date and Time attributes are returned in the
diff --git a/activerecord/lib/active_record/attribute_methods/serialization.rb b/activerecord/lib/active_record/attribute_methods/serialization.rb
index 3227464032..93e3ca8000 100644
--- a/activerecord/lib/active_record/attribute_methods/serialization.rb
+++ b/activerecord/lib/active_record/attribute_methods/serialization.rb
@@ -76,6 +76,7 @@ module ActiveRecord
       end
 
       class Attribute < Struct.new(:coder, :value, :state) # :nodoc:
+
         def unserialized_value(v = value)
           state == :serialized ? unserialize(v) : value
         end
@@ -164,6 +165,16 @@ module ActiveRecord
             super
           end
         end
+
+        def attributes_for_coder
+          attribute_names.each_with_object({}) do |name,attrs|
+            attrs[name] = if self.class.serialized_attributes.include?(name)
+                @attributes[name].serialized_value
+              else
+                read_attribute(name)
+            end
+          end
+        end
       end
     end
   end
diff --git a/activerecord/lib/active_record/core.rb b/activerecord/lib/active_record/core.rb
index 6f02c763fe..6303fe5ee4 100644
--- a/activerecord/lib/active_record/core.rb
+++ b/activerecord/lib/active_record/core.rb
@@ -275,7 +275,7 @@ module ActiveRecord
     #   Post.new.encode_with(coder)
     #   coder # => {"attributes" => {"id" => nil, ... }}
     def encode_with(coder)
-      coder['attributes'] = attributes
+      coder['attributes'] = attributes_for_coder
     end
 
     # Returns true if +comparison_object+ is the same exact object, or +comparison_object+
diff --git a/activerecord/test/cases/store_test.rb b/activerecord/test/cases/store_test.rb
index 6f632b4d8d..e24df6abe9 100644
--- a/activerecord/test/cases/store_test.rb
+++ b/activerecord/test/cases/store_test.rb
@@ -166,4 +166,27 @@ class StoreTest < ActiveRecord::TestCase
   test "YAML coder initializes the store when a Nil value is given" do
     assert_equal({}, @john.params)
   end
+
+  test "attributes_for_coder should return stored fields already serialized" do
+    attributes = {
+      "id" => @john.id,
+      "name"=> @john.name,
+      "settings" => "--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\ncolor: black\n",
+      "preferences" => "--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\nremember_login: true\n",
+      "json_data" => "{\"height\":\"tall\"}", "json_data_empty"=>"{\"is_a_good_guy\":true}",
+      "params" => "--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess {}\n",
+      "account_id"=> @john.account_id }
+    assert_equal attributes, @john.attributes_for_coder
+  end
+
+  test "dump, load and dump again a model" do
+    dumped = YAML.dump( @john )
+    loaded = YAML.load( dumped )
+    assert_equal @john, loaded
+
+    second_dump = YAML.dump( loaded )
+    assert_equal dumped, second_dump
+    assert_equal @john, YAML.load( second_dump )
+  end
+
 end
-- 
cgit v1.2.3