Changeset 7173

Timestamp:

07/09/07 22:07:39 (3 years ago)

Author:

xal

Message:

Support for non heterogeneous arrays when serializing to xml. Unless guessable from array name the type name will be included as attribute

Files:

• trunk/actionpack/test/template/asset_tag_helper_test.rb (modified) (1 diff)
• trunk/activerecord/lib/active_record/xml_serialization.rb (modified) (2 diffs)
• trunk/activerecord/test/xml_serialization_test.rb (modified) (3 diffs)
• trunk/activesupport/lib/active_support/core_ext/hash/conversions.rb (modified) (4 diffs)
• trunk/activesupport/test/core_ext/hash_ext_test.rb (modified) (1 diff)

trunk/actionpack/test/template/asset_tag_helper_test.rb

@@ -365 +365 @@
-    ActionController::Base.asset_host = nil
-  end
+
+  def test_asset_host_without_protocol_should_use_request_protocol_even_if_path_present
+    ActionController::Base.asset_host = 'a.example.com/files/go/here'
+    assert_equal 'gopher://a.example.com/files/go/here/collaboration/hieraki/images/xml.png', image_path('xml.png')
+  ensure
+    ActionController::Base.asset_host = nil
+  end
-end

trunk/activerecord/lib/active_record/xml_serialization.rb

@@ -212 +212 @@
-            else
-              builder.tag!(tag, :type => :array) do
-
+
+
+
+
+
+
+
-              end
-            end
@@ -247 +253 @@
-      if options[:namespace]
-        args << {:xmlns=>options[:namespace]}
+      end
+      
+      if options[:type]
+        args << {:type=>options[:type]}
-      end
-        

trunk/activerecord/test/xml_serialization_test.rb

@@ -3 +3 @@
-require 'fixtures/author'
-require 'fixtures/tagging'
+require 'fixtures/comment'
-
-class Contact < ActiveRecord::Base
@@ -148 +149 @@
-    xml = authors(:david).to_xml :include=>:hello_posts, :indent => 0
-    assert_match %r{<hello-posts type="array">}, xml
-post
-sti-post
+hello-post type="Post"
+hello-post type="StiPost"
-  end
-  
@@ -172 +173 @@
-  end
-  
+  def test_should_has_many_array_elements_should_include_type_when_different_from_guessed_value
+    xml = authors(:david).to_xml :include=>:posts_with_comments, :indent => 2
+    
+    assert Hash.from_xml(xml)
+    assert_match %r{^  <posts-with-comments type="array">}, xml
+    assert_match %r{^    <posts-with-comment type="Post">}, xml
+    assert_match %r{^    <posts-with-comment type="StiPost">}, xml
+
+    types = Hash.from_xml(xml)['author']['posts_with_comments'].collect {|t| t['type'] }
+    assert types.include?('SpecialPost')
+    assert types.include?('Post')
+    assert types.include?('StiPost')
+  end
+  
-end

trunk/activesupport/lib/active_support/core_ext/hash/conversions.rb

@@ -168 +168 @@
-            def typecast_xml_value(value)
-              case value.class.to_s
-"Hash"
+'Hash'
-                  if value.has_key?("__content__")
-                    content = translate_xml_entities(value["__content__"])
@@ -196 +196 @@
-                  elsif value['type'] == 'string' && value['nil'] != 'true'
-                    ""
+                  # blank or nil parsed values are represented by nil
+                  elsif value.blank? || value['nil'] == 'true'
+                    nil
+                  # If the type is the only element which makes it then 
+                  # this still makes the value nil
+                  elsif value['type'] && value.size == 1
+                    nil
-                  else
-(value.blank? || value['type'] || value['nil'] == 'true') ? nil : 
+
-                      h[k] = typecast_xml_value(v)
-                      h
@@ -204 +211 @@
-                    # Turn { :files => { :file => #<StringIO> } into { :files => #<StringIO> } so it is compatible with
-                    # how multipart uploaded files from HTML appear
-
-
-
-
-
-
-
+
+
+
-                  value.map! { |i| typecast_xml_value(i) }
-                  case value.length
@@ -217 +220 @@
-                    else value
-                  end
-"String"
+'String'
-                  value
-                else
-
+class.name} - #{value.
-              end
-            end

trunk/activesupport/test/core_ext/hash_ext_test.rb

@@ -589 +589 @@
-    assert_equal expected_bacon_hash, Hash.from_xml(bacon_xml)["bacon"]
-  end
+  
+  def test_type_trickles_through_when_unknown
+    product_xml = <<-EOT
+    <product>
+      <weight type="double">0.5</weight>
+      <image type="ProductImage"><filename>image.gif</filename></image>
+      
+    </product>
+    EOT
+
+    expected_product_hash = {
+      :weight => 0.5,
+      :image => {'type' => 'ProductImage', 'filename' => 'image.gif' },
+    }.stringify_keys
+
+    assert_equal expected_product_hash, Hash.from_xml(product_xml)["product"]    
+  end
-
-  def test_should_use_default_value_for_unknown_key