Changeset 8579

Timestamp:

01/06/08 20:53:47 (9 months ago)

Author:

bitsweat

Message:

Use a decorator module for Files instantiated by Hash.from_xml. Add test coverage. Closes #10726 [Cheah Chu Yeow]

Files:

• trunk/activesupport/lib/active_support/core_ext/hash/conversions.rb (modified) (2 diffs)
• trunk/activesupport/test/core_ext/hash_ext_test.rb (modified) (2 diffs)

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

@@ -25 +25 @@
-end
-
+# This module exists to decorate files deserialized using Hash.from_xml with
+# the <tt>original_filename</tt> and <tt>content_type</tt> methods.
+module FileLike #:nodoc:
+  attr_writer :original_filename, :content_type
+
+  def original_filename
+    @original_filename || 'untitled'
+  end
+
+  def content_type
+    @content_type || 'application/octet-stream'
+  end
+end
+
-module ActiveSupport #:nodoc:
-  module CoreExtensions #:nodoc:
-    module Hash #:nodoc:
-      module Conversions
+
-        XML_TYPE_NAMES = {
-          "Symbol"     => "symbol",
@@ -64 +79 @@
-            "yaml"         => Proc.new  { |yaml|    YAML::load(yaml) rescue yaml },
-            "base64Binary" => Proc.new  { |bin|     Base64.decode64(bin) },
-            # FIXME: Get rid of eval and institute a proper decorator here
-            "file"         => Proc.new do |file, entity|
-              f = StringIO.new(Base64.decode64(file))
-
-
+
+
+
-              f
-            end

trunk/activesupport/test/core_ext/hash_ext_test.rb

@@ -534 +534 @@
-    topic_xml = <<-EOT
-    <rsp stat="ok">
-   
-           
-   
+  
+    
+  
-    </rsp>
-    EOT
@@ -600 +600 @@
-  end
-
+  def test_file_from_xml
+    blog_xml = <<-XML
+      <blog>
+        <logo type="file" name="logo.png" content_type="image/png">
+        </logo>
+      </blog>
+    XML
+    hash = Hash.from_xml(blog_xml)
+    assert hash.has_key?('blog')
+    assert hash['blog'].has_key?('logo')
+
+    file = hash['blog']['logo']
+    assert_equal 'logo.png', file.original_filename
+    assert_equal 'image/png', file.content_type
+  end
+
+  def test_file_from_xml_with_defaults
+    blog_xml = <<-XML
+      <blog>
+        <logo type="file">
+        </logo>
+      </blog>
+    XML
+    file = Hash.from_xml(blog_xml)['blog']['logo']
+    assert_equal 'untitled', file.original_filename
+    assert_equal 'application/octet-stream', file.content_type
+  end
+
-  def test_xsd_like_types_from_xml
-    bacon_xml = <<-EOT