merges r29808 and r29822 from trunk into ruby_1_9_2.; workaround for StringIO.

--
* lib/csv.rb: Upgrading output encoding as needed.  [ruby-core:33135]
--
* lib/csv.rb: Upgrading output encoding with ASCII content
  as needed.  [ruby-core:33229]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 16 insertions, 0 deletions

diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb
index 5d29ac1fa9..3dc80ccdb1 100644
--- a/test/csv/test_encodings.rb
+++ b/test/csv/test_encodings.rb
@@ -217,6 +217,22 @@ class TestEncodings < Test::Unit::TestCase
       assert_equal(data, CSV.read(@temp_csv_path, encoding: encoding.name))
     end
   end
+  
+  def test_encoding_is_upgraded_during_writing_as_needed
+    data = ["foo".force_encoding("US-ASCII"), "\u3042"]
+    assert_equal("US-ASCII", 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
+  
+  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