Allow serialization of dynamic conflicting attributes. Fixes #2023.

CHANGELOG.md

@@ -7,6 +7,9 @@ For instructions on upgrading to newer versions, visit
 
 ### Resolved Issues
 
+* \#2023 Allow serilialization of dynamic types that conflict with core
+  Ruby methods to still be serialized.
+
 * \#2008 Presence validation should hit the db to check validity if the
   relation in memory is blank.
 

lib/mongoid/serialization.rb

@@ -47,11 +47,13 @@ def serializable_hash(options = nil)
 
       {}.tap do |attrs|
         (attribute_names + method_names).each do |name|
-          value = send(name)
           if relations.has_key?(name)
+            value = send(name)
             attrs[name] = value.serializable_hash(options)
+          elsif attribute_names.include?(name.to_s)
+            attrs[name] = read_attribute(name)
           else
-            attrs[name] = value
+            attrs[name] = send(name)
           end
         end
         serialize_relations(attrs, options) if options[:include]

spec/functional/mongoid/serialization_spec.rb

@@ -48,15 +48,15 @@
     context "when a dynamic attribute has the same name as a ruby method" do
 
       before do
-        person[:loop] = true
+        person[:loop] = "testing"
       end
 
       let(:attributes) do
         person.serializable_hash
       end
 
       it "grabs the attribute direct from the hash" do
-        attributes["loop"].should be_true
+        attributes["loop"].should eq("testing")
       end
     end