lib/simple-spreadsheet/classes/csv_extended.rb in simple-spreadsheet-0.1.1 vs lib/simple-spreadsheet/classes/csv_extended.rb in simple-spreadsheet-0.2.0
- old
+ new
@@ -1,64 +1,11 @@
-require 'roo/generic_spreadsheet'
-require 'roo/csv'
+class CsvExtended < Roo::Csv
-class CsvExtended < Csv
- # def read_cells(sheet=nil)
- # sheet = @default_sheet unless sheet
- # @cell_type = {} unless @cell_type
- # @cell = {} unless @cell
- # @first_row[sheet] = 1
- # @last_row[sheet] = 0
- # @first_column[sheet] = 1
- # @last_column[sheet] = 1
- # rownum = 1
- # CSV.foreach(@filename) do |row|
- # row.each_with_index do |elem,i|
- # @cell[[rownum,i+1]] = cell_postprocessing rownum,i+1, elem
- # @cell_type[[rownum,i+1]] = celltype_class @cell[[rownum,i+1]]
- # if i+1 > @last_column[sheet]
- # @last_column[sheet] += 1
- # end
- # end
- # rownum += 1
- # @last_row[sheet] += 1
- # end
- # @cells_read[sheet] = true
- # #-- adjust @first_row if neccessary
- # loop do
- # if !row(@first_row[sheet]).any? and @first_row[sheet] < @last_row[sheet]
- # @first_row[sheet] += 1
- # else
- # break
- # end
- # end
- # #-- adjust @last_row if neccessary
- # loop do
- # if !row(@last_row[sheet]).any? and @last_row[sheet] and
- # @last_row[sheet] > @first_row[sheet]
- # @last_row[sheet] -= 1
- # else
- # break
- # end
- # end
- # #-- adjust @first_column if neccessary
- # loop do
- # if !column(@first_column[sheet]).any? and
- # @first_column[sheet] and
- # @first_column[sheet] < @last_column[sheet]
- # @first_column[sheet] += 1
- # else
- # break
- # end
- # end
- # #-- adjust @last_column if neccessary
- # loop do
- # if !column(@last_column[sheet]).any? and
- # @last_column[sheet] and
- # @last_column[sheet] > @first_column[sheet]
- # @last_column[sheet] -= 1
- # else
- # break
- # end
- # end
- # end
+ def foreach(sheet = nil, &block)
+ index = 1
+ CSV.foreach(@filename, col_sep: ",") do |row|
+ yield(row, index)
+ index += 1
+ end
+ end
+
end
\ No newline at end of file