Skip to content

Commit

Permalink
[ruby/csv] Fix a bug that write_nil_value or write_empty_value don't …
Browse files Browse the repository at this point in the history
…work with non String

GitHub: fix rubyGH-123

Reported by asm256. Thanks!!!

ruby/csv@b4492139be
  • Loading branch information
kou authored and nobu committed Jul 19, 2020
1 parent c5a4d47 commit 9db8442
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion lib/csv/fields_converter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def convert(fields, headers, lineno)
fields.collect.with_index do |field, index|
if field.nil?
field = @nil_value
elsif field.empty?
elsif field.is_a?(String) and field.empty?
field = @empty_value unless @empty_value_is_empty_string
end
@converters.each do |converter|
Expand Down
8 changes: 4 additions & 4 deletions test/csv/write/test_converters.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ def test_multiple
end

def test_nil_value
assert_equal(%Q[a,NaN,c\n],
generate_line(["a", nil, "c"],
assert_equal(%Q[a,NaN,29\n],
generate_line(["a", nil, 29],
write_nil_value: "NaN"))
end

def test_empty_value
assert_equal(%Q[a,,c\n],
generate_line(["a", "", "c"],
assert_equal(%Q[a,,29\n],
generate_line(["a", "", 29],
write_empty_value: nil))
end
end
Expand Down

0 comments on commit 9db8442

Please sign in to comment.