Ticket #10162: noChildProcs.diff

test/xml_serialization_test.rb

@@ -172 +172 @@
-    assert types.include?('StiPost')
-  end
-  
+  def test_should_allow_custom_procs
+    proc = Proc.new do |options|
+      options[:builder].tag!('wasCustomized', true)      
+    end
+    @xml = authors(:david).to_xml(:procs => [proc])
+    assert_match %r{<wasCustomized>true</wasCustomized>}, @xml
+  end
+  
+  def test_custom_procs_arent_applied_to_associations
+    author = authors(:david)
+    author_proc = Proc.new do |options|
+      options[:builder].label(author.label)
+    end
+    @xml = author.to_xml(:procs => [author_proc], :include => :posts)
+    assert_match Regexp.new("<label>#{author.label}</label>"), @xml
+    
+    # find the xml for the posts association:
+    posts_xml = %r{<posts type="array">.*</posts>}m.match(@xml).to_s
+    # The posts xml shouldn't have be altered by the author proc:
+    assert_no_match Regexp.new("<label>#{author.label}</label>"), posts_xml
+  end
+  
+  
-end

lib/active_record/serializers/xml_serializer.rb

@@ -196 +196 @@
-    end
-
-    def add_associations(association, records, opts)
+      # associations probably aren't interested in the top-level procs, strip them out:
+      opts = opts.except(:procs)
-      if records.is_a?(Enumerable)
-        tag = association.to_s
-        tag = tag.dasherize if dasherize?