From 9a6f51012ac7eda9c0d576dab3b806ccbfd9d355 Mon Sep 17 00:00:00 2001
From: Michael Goff <thephred@gmail.com>
Date: Sun, 9 Aug 2009 10:57:16 -0700
Subject: [PATCH] Setup the patch for ticket #2698 to apply cleanly again.

---
 .../active_record/serializers/xml_serializer.rb    |    3 ++-
 activerecord/test/cases/xml_serialization_test.rb  |    6 ++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/activerecord/lib/active_record/serializers/xml_serializer.rb b/activerecord/lib/active_record/serializers/xml_serializer.rb
index fa75874..7a9957c 100644
--- a/activerecord/lib/active_record/serializers/xml_serializer.rb
+++ b/activerecord/lib/active_record/serializers/xml_serializer.rb
@@ -166,7 +166,8 @@ module ActiveRecord #:nodoc:
     def builder
       @builder ||= begin
         options[:indent] ||= 2
-        builder = options[:builder] ||= Builder::XmlMarkup.new(:indent => options[:indent])
+        options[:margin] ||= 0
+        builder = options[:builder] ||= ::Builder::XmlMarkup.new(:indent => options[:indent], :margin => options[:margin])
 
         unless options[:skip_instruct]
           builder.instruct!
diff --git a/activerecord/test/cases/xml_serialization_test.rb b/activerecord/test/cases/xml_serialization_test.rb
index b499976..c6a5580 100644
--- a/activerecord/test/cases/xml_serialization_test.rb
+++ b/activerecord/test/cases/xml_serialization_test.rb
@@ -37,6 +37,12 @@ class XmlSerializationTest < ActiveRecord::TestCase
     assert_match %r{</XmlContact>$}, @xml
     assert_match %r{<CreatedAt},    @xml
   end
+  
+  def test_should_serialize_custom_root
+    @xml = Contact.new.to_xml :margin => 3
+    assert_match %r{^ {6}<contact>},  @xml
+    assert_match %r{ {8}<created-at}, @xml
+  end
 
   def test_should_allow_skipped_types
     @xml = Contact.new(:age => 25).to_xml :skip_types => true
-- 
1.6.1.2