diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/csv.rb | 2 | ||||
| -rwxr-xr-x | test/csv/test_interface.rb | 15 |
3 files changed, 20 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Fri Jul 22 06:37:13 2011 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + + * lib/csv.rb: Do not modify CSV.generate's argument [ruby-core:38356] + Thu Jul 21 20:59:59 2011 Tanaka Akira <akr@fsij.org> * ext/socket/ancdata.c (discard_cmsg): workaround for MacOS X Lion. diff --git a/lib/csv.rb b/lib/csv.rb index ce05164c75..13f86ec318 100644 --- a/lib/csv.rb +++ b/lib/csv.rb @@ -1234,7 +1234,7 @@ class CSV io.seek(0, IO::SEEK_END) args.unshift(io) else - encoding = args.last.is_a?(Hash) ? args.last.delete(:encoding) : nil + encoding = (args[-1] = args[-1].dup).delete(:encoding) if args.last.is_a?(Hash) str = "" str.encode!(encoding) if encoding args.unshift(str) diff --git a/test/csv/test_interface.rb b/test/csv/test_interface.rb index 785f43126b..9cdbcec451 100755 --- a/test/csv/test_interface.rb +++ b/test/csv/test_interface.rb @@ -316,4 +316,19 @@ class TestCSV::Interface < TestCSV assert_equal(STDOUT, CSV.instance.instance_eval { @io }) assert_equal(STDOUT, CSV { |new_csv| new_csv.instance_eval { @io } }) end + + def test_options_are_not_modified + opt = {}.freeze + assert_nothing_raised { CSV.foreach(@path, opt) } + assert_nothing_raised { CSV.open(@path, opt){} } + assert_nothing_raised { CSV.parse("", opt) } + assert_nothing_raised { CSV.parse_line("", opt) } + assert_nothing_raised { CSV.read(@path, opt) } + assert_nothing_raised { CSV.readlines(@path, opt) } + assert_nothing_raised { CSV.table(@path, opt) } + assert_nothing_raised { CSV.generate(opt){} } + assert_nothing_raised { CSV.generate_line([], opt) } + assert_nothing_raised { CSV.filter("", "", opt){} } + assert_nothing_raised { CSV.instance("", opt) } + end end |