summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--lib/csv.rb17
-rwxr-xr-xtest/csv/test_encodings.rb8
3 files changed, 24 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 95822ec3a5f..8ac39d9913a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jun 10 10:57:07 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/csv.rb (CSV#<<): honor explicity given encoding. based on
+ the patch by DAISUKE TANIWAKI <daisuketaniwaki AT gmail.com> at
+ [ruby-core:62113]. [Bug #9766]
+
Mon Jun 9 20:40:48 2014 Koichi Sasada <ko1@atdot.net>
* gc.c: change full GC timing to keep lower memory usage.
diff --git a/lib/csv.rb b/lib/csv.rb
index e1199185f92..60b22e76ba3 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -1148,9 +1148,9 @@ class CSV
io.seek(0, IO::SEEK_END)
args.unshift(io)
else
- encoding = (args[-1] = args[-1].dup).delete(:encoding) if args.last.is_a?(Hash)
+ encoding = args[-1][:encoding] if args.last.is_a?(Hash)
str = ""
- str.encode!(encoding) if encoding
+ str.force_encoding(encoding) if encoding
args.unshift(str)
end
csv = new(*args) # wrap
@@ -1524,7 +1524,7 @@ class CSV
init_headers(options)
init_comments(options)
- options.delete(:encoding)
+ @force_encoding = !!(encoding || options.delete(:encoding))
options.delete(:internal_encoding)
options.delete(:external_encoding)
unless options.empty?
@@ -1664,10 +1664,13 @@ 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, output))
- @io.set_encoding(compatible_encoding)
- @io.seek(0, IO::SEEK_END)
+ output.encoding != (encoding = raw_encoding)
+ if @force_encoding
+ output = output.encode(encoding)
+ elsif (compatible_encoding = Encoding.compatible?(@io.string, output))
+ @io.set_encoding(compatible_encoding)
+ @io.seek(0, IO::SEEK_END)
+ end
end
@io << output
diff --git a/test/csv/test_encodings.rb b/test/csv/test_encodings.rb
index 21b997c9ec4..dc45692ce48 100755
--- a/test/csv/test_encodings.rb
+++ b/test/csv/test_encodings.rb
@@ -247,6 +247,14 @@ class TestCSV::Encodings < TestCSV
assert_equal("UTF-8", data.to_csv.encoding.name)
end
+ def test_explicit_encoding
+ bug9766 = '[ruby-core:62113] [Bug #9766]'
+ s = CSV.generate(encoding: "Windows-31J") do |csv|
+ csv << ["foo".force_encoding("ISO-8859-1"), "\u3042"]
+ end
+ assert_equal(["foo,\u3042\n".encode(Encoding::Windows_31J), Encoding::Windows_31J], [s, s.encoding], bug9766)
+ end
+
private
def assert_parses(fields, encoding, options = { })