Changeset 8258 for trunk/activerecord/lib/active_record/serializers

Timestamp:

12/03/07 01:47:21 (1 year ago)

Author:

david

Message:

Fixed that to_xml should not automatically pass :procs to associations included with :include (closes #10162) [chuyeow]

Files:

• trunk/activerecord/lib/active_record/serializers/xml_serializer.rb (modified) (5 diffs)

trunk/activerecord/lib/active_record/serializers/xml_serializer.rb

@@ -2 +2 @@
-  module Serialization
-    # Builds an XML document to represent the model.   Some configuration is
- 
+
-    # override ActiveRecord's to_xml.
-    #
- 
+
-    # instruction and all object's attributes.  For example:
-    
+
-    #   <?xml version="1.0" encoding="UTF-8"?>
-    #   <topic>
@@ -43 +43 @@
-    #     <last-read type="date">2004-04-15</last-read>
-    #   </topic>
- 
+
-    # To include first level associations use :include
-    #
@@ -190 +190 @@
-    def add_tag(attribute)
-      builder.tag!(
- 
- 
+
+
-        attribute.decorations(!options[:skip_types])
-      )
@@ -205 +205 @@
-          builder.tag!(tag, :type => :array) do
-            association_name = association.to_s.singularize
- 
+
-              record.to_xml opts.merge(
- 
+
-                :type => (record.class.to_s.underscore == association_name ? nil : record.class.name)
-              )
@@ -232 +232 @@
-      builder.tag!(*args) do
-        add_attributes
+        procs = options.delete(:procs)
-        add_includes { |association, records, opts| add_associations(association, records, opts) }
+        options[:procs] = procs
-        add_procs
-        yield builder if block_given?