diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/csv.rb | 3 | ||||
| -rw-r--r-- | test/csv/test_encodings.rb | 8 |
3 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Thu Nov 18 00:02:17 2010 James Edward Gray II <jeg2@ruby-lang.org> + + * lib/csv.rb: Upgrading output encoding with ASCII content + as needed. [ruby-core:33229] + Wed Nov 17 23:19:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * win32/configure.bat: remove quotes from arguments to be quoted. @@ -43,7 +48,7 @@ Wed Nov 17 09:49:10 2010 NARUSE, Yui <naruse@ruby-lang.org> * enc/euc_jp.c (property_name_to_ctype): ditto. -Tue Nov 17 08:54:04 2010 James Edward Gray II <jeg2@ruby-lang.org> +Wed Nov 17 08:54:04 2010 James Edward Gray II <jeg2@ruby-lang.org> * lib/csv.rb: Upgrading output encoding as needed. [ruby-core:33135] diff --git a/lib/csv.rb b/lib/csv.rb index fe7309009b..31388bc9da 100644 --- a/lib/csv.rb +++ b/lib/csv.rb @@ -1715,8 +1715,7 @@ class CSV output = row.map(&@quote).join(@col_sep) + @row_sep # quote and separate if @io.is_a?(StringIO) and output.encoding != raw_encoding and - ( compatible_encoding = Encoding.compatible?( @io.string.encoding, - output.encoding ) ) + (compatible_encoding = Encoding.compatible?(@io.string, output)) @io = StringIO.new(@io.string.force_encoding(compatible_encoding)) @io.seek(0, IO::SEEK_END) end diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb index 8d7de2e728..8470286941 100644 --- a/test/csv/test_encodings.rb +++ b/test/csv/test_encodings.rb @@ -225,6 +225,14 @@ class TestEncodings < Test::Unit::TestCase assert_equal("UTF-8", data.join.encoding.name) assert_equal("UTF-8", data.to_csv.encoding.name) end + + def test_encoding_is_upgraded_for_ascii_content_during_writing_as_needed + data = ["foo".force_encoding("ISO-8859-1"), "\u3042"] + assert_equal("ISO-8859-1", data.first.encoding.name) + assert_equal("UTF-8", data.last.encoding.name) + assert_equal("UTF-8", data.join.encoding.name) + assert_equal("UTF-8", data.to_csv.encoding.name) + end private |