kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Upgrade CSV to 3.0.4

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kou 2019-01-25 06:49:59 +00:00
parent cdca14e75e
commit 24b57b102c
27 changed files with 908 additions and 565 deletions
Download patch file Download diff file Expand all files Collapse all files

65
lib/csv/writer.rb
View file

@ -31,7 +31,10 @@ class CSV
@headers ||= row if @use_headers
@lineno += 1
line = row.collect(&@quote).join(@column_separator) + @row_separator
converted_row = row.collect do |field|
quote(field)
end
line = converted_row.join(@column_separator) + @row_separator
if @output_encoding
line = line.encode(@output_encoding)
end
@ -90,37 +93,16 @@ class CSV
else
@row_separator = row_separator.to_s.encode(@encoding)
end
quote_character = @options[:quote_character]
quote = lambda do |field|
field = String(field)
encoded_quote_character = quote_character.encode(field.encoding)
encoded_quote_character +
field.gsub(encoded_quote_character,
encoded_quote_character * 2) +
encoded_quote_character
end
if @options[:force_quotes]
@quote = quote
else
quotable_pattern =
@quote_character = @options[:quote_character]
@force_quotes = @options[:force_quotes]
unless @force_quotes
@quotable_pattern =
Regexp.new("[\r\n".encode(@encoding) +
Regexp.escape(@column_separator) +
Regexp.escape(quote_character.encode(@encoding)) +
Regexp.escape(@quote_character.encode(@encoding)) +
"]".encode(@encoding))
@quote = lambda do |field|
if field.nil? # represent +nil+ fields as empty unquoted fields
""
else
field = String(field) # Stringify fields
# represent empty fields as empty quoted fields
if field.empty? or quotable_pattern.match?(field)
quote.call(field)
else
field # unquoted field
end
end
end
end
@quote_empty = @options.fetch(:quote_empty, true)
end
def prepare_output
@ -140,5 +122,32 @@ class CSV
end
end
end
def quote_field(field)
field = String(field)
encoded_quote_character = @quote_character.encode(field.encoding)
encoded_quote_character +
field.gsub(encoded_quote_character,
encoded_quote_character * 2) +
encoded_quote_character
end
def quote(field)
if @force_quotes
quote_field(field)
else
if field.nil? # represent +nil+ fields as empty unquoted fields
""
else
field = String(field) # Stringify fields
# represent empty fields as empty quoted fields
if (@quote_empty and field.empty?) or @quotable_pattern.match?(field)
quote_field(field)
else
field # unquoted field
end
end
end
end
end
end