1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/csv.rb: accept to use Range object for row selection.

Browse Source 
[Feature #11267][ruby-dev:49091]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2015-06-17 01:58:34 +00:00
parent e5471cbe63
commit 96fb819676
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Jun 17 10:57:28 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* lib/csv.rb: accept to use Range object for row selection.
[Feature #11267][ruby-dev:49091]
Wed Jun 17 09:50:12 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jun 17 09:50:12 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rdoc/servlet.rb (documentation_search, root_search): * lib/rdoc/servlet.rb (documentation_search, root_search):

10
lib/csv.rb
View File

@ -284,11 +284,15 @@ class CSV
# #
def field(header_or_index, minimum_index = 0) def field(header_or_index, minimum_index = 0)
# locate the pair # locate the pair
finder = header_or_index.is_a?(Integer) ? :[] : :assoc finder = (header_or_index.is_a?(Integer) || header_or_index.is_a?(Range)) ? :[] : :assoc
pair = @row[minimum_index..-1].send(finder, header_or_index) pair = @row[minimum_index..-1].send(finder, header_or_index)
# return the field if we have a pair # return the field if we have a pair
pair.nil? ? nil : pair.last if pair.nil?
nil
else
header_or_index.is_a?(Range) ? pair.map(&:last) : pair.last
end
end end
alias_method :[], :field alias_method :[], :field
@ -690,7 +694,7 @@ class CSV
# #
def [](index_or_header) def [](index_or_header)
if @mode == :row or # by index if @mode == :row or # by index
(@mode == :col_or_row and index_or_header.is_a? Integer) (@mode == :col_or_row and (index_or_header.is_a?(Integer) or index_or_header.is_a?(Range)))
@table[index_or_header] @table[index_or_header]
else # by header else # by header
@table.map { |row| row[index_or_header] } @table.map { |row| row[index_or_header] }

3
test/csv/test_row.rb
View File

@ -64,6 +64,9 @@ class TestCSV::Row < TestCSV
# by index # by index
assert_equal(3, @row.field(2)) assert_equal(3, @row.field(2))
# by range
assert_equal([2,3], @row.field(1..2))
# missing # missing
assert_nil(@row.field("Missing")) assert_nil(@row.field("Missing"))
assert_nil(@row.field(10)) assert_nil(@row.field(10))

3
test/csv/test_table.rb
View File

@ -67,6 +67,9 @@ class TestCSV::Table < TestCSV
@rows.each_index { |i| assert_equal(@rows[i], @table[i]) } @rows.each_index { |i| assert_equal(@rows[i], @table[i]) }
assert_equal(nil, @table[100]) # empty row assert_equal(nil, @table[100]) # empty row
# by row with Range
assert_equal([@table[1], @table[2]], @table[1..2])
# by col # by col
@rows.first.headers.each do |header| @rows.first.headers.each do |header|
assert_equal(@rows.map { |row| row[header] }, @table[header]) assert_equal(@rows.map { |row| row[header] }, @table[header])