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

* lib/csv.rb: Fixed test failures caused by changes to Ruby.

Browse source 
* test/csv/tc_serialization, test/csv/tc_csv_parsing, test/csv/tc_features:
  Fixed test failures caused by changes to Ruby.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
jeg2 2007-12-25 05:14:04 +00:00
parent 33a071016b
commit a2443bdcf9
5 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/csv.rb
View file

@ -187,10 +187,12 @@ class CSV
@header_row = header_row
# handle extra headers or fields
@row = if headers.size > fields.size
headers.zip(fields)
else
fields.zip(headers).map { |pair| pair.reverse }
larger, smaller, transform = headers.size > fields.size ?
[headers, fields, :to_a] :
[fields, headers, :reverse]
@row = Array.new
larger.each_with_index do |e, i|
@row << [e, smaller[i]].send(transform)
end
end
@ -1812,7 +1814,8 @@ class CSV
# see if we are converting headers or fields
converters = headers ? @header_converters : @converters
fields.enum_for(:each_with_index).map do |field, index| # map_with_index
converted = Array.new
fields.each_with_index do |field, index|
converters.each do |converter|
field = if converter.arity == 1 # straight field converter
converter[field]
@ -1822,8 +1825,9 @@ class CSV
end
break unless field.is_a? String # short-curcuit pipeline for speed
end
field # return final state of each field, converted or original
converted << field # final state of each field, converted or original
end
converted
end
#