excel_extended.rb in simple-spreadsheet-0.2.0

- old
+ new
@@ -1,37 +1,37 @@
-require 'roo/generic_spreadsheet'
-require 'roo/excel'
+class ExcelExtended < Roo::Excel
 
-class ExcelExtended < Excel
-  # def read_cells(sheet=nil)
-  #   sheet = @default_sheet unless sheet
-  #   raise ArgumentError, "Error: sheet '#{sheet||'nil'}' not valid" if @default_sheet == nil and sheet==nil
-  #   raise RangeError unless self.sheets.include? sheet
-  #   
-  #   if @cells_read[sheet]
-  #     raise "sheet #{sheet} already read"
-  #   end
-  #   
-  #   worksheet = @workbook.worksheet(sheet_no(sheet))
-  #   row_index=1
-  #   worksheet.each(0) do |row| 
-  #     (0..row.size).each do |cell_index|
-  #       cell = row.at(cell_index)
-  #       next if cell.nil?  #skip empty cells
-  #       next if cell.class == Spreadsheet::Formula && cell.value.nil? # skip empty formula cells
-  #       if date_or_time?(row, cell_index)
-  #         vt, v = read_cell_date_or_time(row, cell_index)
-  #       else
-  #         vt, v = read_cell(row, cell_index)
-  #       end
-  #       formula = tr = nil #TODO:???
-  #       col_index = cell_index + 1
-  #       font = row.format(cell_index).font
-  #       font.extend(ExcelFontExtensions)
-  #       set_cell_values(sheet,row_index,col_index,0,v,vt,formula,tr,font)
-  #     end #row
-  #     row_index += 1
-  #   end # worksheet
-  #   @cells_read[sheet] = true
-  # end
-  
+  def foreach(sheet=nil, &block)
+    sheet = @default_sheet unless sheet
+    raise ArgumentError, "Error: sheet '#{sheet||'nil'}' not valid" if @default_sheet == nil and sheet==nil
+    raise RangeError unless self.sheets.include? sheet
+
+    if @cells_read[sheet]
+      raise "sheet #{sheet} already read"
+    end
+
+    worksheet = @workbook.worksheet(sheet_no(sheet))
+    row_index=1
+    worksheet.each(0) do |row|
+      row_content = []
+      (0..row.size).each do |cell_index|
+        cell = row.at(cell_index)
+        next if cell.nil?  #skip empty cells
+        next if cell.class == Spreadsheet::Formula && cell.value.nil? # skip empty formula cells
+        if date_or_time?(row, cell_index)
+          vt, v = read_cell_date_or_time(row, cell_index)
+        else
+          vt, v = read_cell(row, cell_index)
+        end
+        formula = tr = nil #TODO:???
+        col_index = cell_index + 1
+        font = row.format(cell_index).font
+        font.extend(ExcelFontExtensions)
+        # set_cell_values(sheet,row_index,col_index,0,v,vt,formula,tr,font)
+        row_content << v
+      end #row
+      yield(row_content, row_index)
+      row_index += 1
+    end # worksheet
+  end
+
 end
\ No newline at end of file