Permalink
Browse files

Merge pull request #1713 from dmathieu/3-1-cherry

Cherry picking encoding for 3.1
  • Loading branch information...
josevalim committed Jun 15, 2011
2 parents 9267a43 + 055a88d commit 1f813d98e02cf05bf4cefc828b822258afcccf96
Showing with 18 additions and 1 deletion.
  1. +11 −1 actionpack/lib/action_dispatch/http/upload.rb
  2. +7 −0 actionpack/test/dispatch/uploaded_file_test.rb
@@ -4,7 +4,7 @@ class UploadedFile
attr_accessor :original_filename, :content_type, :tempfile, :headers
def initialize(hash)
- @original_filename = hash[:filename]
+ @original_filename = encode_filename(hash[:filename])
@content_type = hash[:type]
@headers = hash[:head]
@tempfile = hash[:tempfile]
@@ -30,6 +30,16 @@ def rewind
def size
@tempfile.size
end
+
+ private
+ def encode_filename(filename)
+ # Encode the filename in the utf8 encoding, unless it is nil or we're in 1.8
+ if "ruby".encoding_aware? && filename
+ filename.force_encoding("UTF-8").encode!
+ else
+ filename
+ end
+ end
end
module Upload
@@ -12,6 +12,13 @@ def test_original_filename
uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
assert_equal 'foo', uf.original_filename
end
+
+ if "ruby".encoding_aware?
+ def test_filename_should_be_in_utf_8
+ uf = Http::UploadedFile.new(:filename => 'foo', :tempfile => Object.new)
+ assert_equal "UTF-8", uf.original_filename.encoding.to_s
+ end
+ end
def test_content_type
uf = Http::UploadedFile.new(:type => 'foo', :tempfile => Object.new)

0 comments on commit 1f813d9

Please sign in to comment.