diff options
author | Koichi ITO <koic.ito@gmail.com> | 2020-06-02 08:30:25 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-07-20 02:32:51 +0900 |
commit | 4e33a878793a5ced47a4f14b8a73cbc2795d97b7 (patch) | |
tree | cd3173a3b2dbbe97d84e800598a874c8620d00bf | |
parent | cf8157e0016dd0eb60fe6f03bef168261f729b83 (diff) |
[ruby/csv] Add `undef: :replace` for `CSV.open` (#129)
This PR adds `undef: :replace` option for `CSV.open`.
`File.open` has `undef: :replace` option, but `CSV.open` does not.
It would be convenient if `CSV.open` could have a shortcut by having
`undef: :replace` option.
https://github.com/ruby/csv/commit/cff8b18480
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/3332
-rw-r--r-- | lib/csv.rb | 7 | ||||
-rw-r--r-- | test/csv/interface/test_read.rb | 22 |
2 files changed, 29 insertions, 0 deletions
diff --git a/lib/csv.rb b/lib/csv.rb index 4ffffe4056..a06c92a1b9 100644 --- a/lib/csv.rb +++ b/lib/csv.rb @@ -960,6 +960,11 @@ class CSV # open( filename, mode = "rb", **options ) # open( filename, **options ) # + # possible options elements: + # hash form: + # :undef => :replace # replace undefined conversion + # :replace => string # replacement string ("?" or "\uFFFD" if not specified) + # # This method opens an IO object, and wraps that with CSV. This is intended # as the primary interface for writing a CSV file. # @@ -1021,6 +1026,8 @@ class CSV # wrap a File opened with the remaining +args+ with no newline # decorator file_opts = {universal_newline: false}.merge(options) + options.delete(:undef) + options.delete(:replace) begin f = File.open(filename, mode, **file_opts) diff --git a/test/csv/interface/test_read.rb b/test/csv/interface/test_read.rb index 58ec188f94..4b0f5e7e96 100644 --- a/test/csv/interface/test_read.rb +++ b/test/csv/interface/test_read.rb @@ -125,6 +125,28 @@ class TestCSVInterfaceRead < Test::Unit::TestCase end end + def test_open_with_undef_replace + # U+00B7 Middle Dot + CSV.open(@input.path, "w", encoding: Encoding::CP932, undef: :replace) do |rows| + rows << ["\u00B7"] + end + CSV.open(@input.path, encoding: Encoding::CP932) do |csv| + assert_equal([["?"]], + csv.to_a) + end + end + + def test_open_with_undef_replace_and_replace_string + # U+00B7 Middle Dot + CSV.open(@input.path, "w", encoding: Encoding::CP932, undef: :replace, replace: "X") do |rows| + rows << ["\u00B7"] + end + CSV.open(@input.path, encoding: Encoding::CP932) do |csv| + assert_equal([["X"]], + csv.to_a) + end + end + def test_parse assert_equal(@rows, CSV.parse(@data, col_sep: "\t", row_sep: "\r\n")) |