diff --git a/lib/csv.rb b/lib/csv.rb index ce05164..13f86ec 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 785f431..9cdbcec 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