Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use a decorator module for Files instantiated by Hash.from_xml. Add t…

…est coverage. Closes #10726 [Cheah Chu Yeow]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8579 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 880081549d600a3d592241aadc8b2c6653a3d716 1 parent a1b0349
@jeremy jeremy authored
View
21 activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -24,10 +24,25 @@ def self.xml_in_string(string, options = nil)
end
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",
"Fixnum" => "integer",
@@ -63,11 +78,11 @@ module Conversions
"string" => Proc.new { |string| string.to_s },
"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))
- eval "def f.original_filename() '#{entity["name"]}' || 'untitled' end"
- eval "def f.content_type() '#{entity["content_type"]}' || 'application/octet-stream' end"
+ f.extend(FileLike)
+ f.original_filename = entity['name']
+ f.content_type = entity['content_type']
f
end
}
View
34 activesupport/test/core_ext/hash_ext_test.rb
@@ -533,9 +533,9 @@ def test_multiple_records_from_xml
def test_single_record_from_xml_with_attributes_other_than_type
topic_xml = <<-EOT
<rsp stat="ok">
- <photos page="1" pages="1" perpage="100" total="16">
- <photo id="175756086" owner="55569174@N00" secret="0279bf37a1" server="76" title="Colored Pencil PhotoBooth Fun" ispublic="1" isfriend="0" isfamily="0"/>
- </photos>
+ <photos page="1" pages="1" perpage="100" total="16">
+ <photo id="175756086" owner="55569174@N00" secret="0279bf37a1" server="76" title="Colored Pencil PhotoBooth Fun" ispublic="1" isfriend="0" isfamily="0"/>
+ </photos>
</rsp>
EOT
@@ -599,6 +599,34 @@ def test_array_with_multiple_entries_from_xml
assert_equal expected_blog_hash, Hash.from_xml(blog_xml)
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
<bacon>
Please sign in to comment.
Something went wrong with that request. Please try again.