roo 1.11.2 → 1.12.0

data/lib/roo/csv.rb

@@ -1,27 +1,24 @@
 require 'csv'
 require 'time'
 
-# The Csv class can read csv files (must be separated with commas) which then
+# The CSV class can read csv files (must be separated with commas) which then
 # can be handled like spreadsheets. This means you can access cells like A5
 # within these files.
-# The Csv class provides only string objects. If you want conversions to other
+# The CSV class provides only string objects. If you want conversions to other
 # types you have to do it yourself.
+#
+# You can pass options to the underlying CSV parse operation, via the
+# :csv_options option.
+#
 
-class Roo::Csv < Roo::GenericSpreadsheet
-  def initialize(filename, packed=nil, file_warning=:error, tmpdir=nil)
-    @filename = filename
-    @cell = Hash.new
-    @cell_type = Hash.new
-    @cells_read = Hash.new
-    @first_row = Hash.new
-    @last_row = Hash.new
-    @first_column = Hash.new
-    @last_column = Hash.new
+class Roo::CSV < Roo::Base
+  def initialize(filename, options = {})
+    super
   end
 
   attr_reader :filename
 
-  # Returns an array with the names of the sheets. In Csv class there is only
+  # Returns an array with the names of the sheets. In CSV class there is only
   # one dummy sheet, because a csv file cannot have more than one sheet.
   def sheets
     ['default']
@@ -29,22 +26,24 @@ class Roo::Csv < Roo::GenericSpreadsheet
 
   def cell(row, col, sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
-    row,col = normalize(row,col)
-    @cell[[row,col]]
+    read_cells(sheet)
+    @cell[normalize(row,col)]
   end
 
   def celltype(row, col, sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
-    row,col = normalize(row,col)
-    @cell_type[[row,col]]
+    read_cells(sheet)
+    @cell_type[normalize(row,col)]
   end
 
   def cell_postprocessing(row,col,value)
     value
   end
 
+  def csv_options
+    @options[:csv_options] || {}
+  end
+
   private
 
   TYPE_MAP = {
@@ -58,27 +57,26 @@ class Roo::Csv < Roo::GenericSpreadsheet
     TYPE_MAP[value.class]
   end
 
-  def data
-    @data ||=
+  def each_row(options, &block)
+    if uri?(filename)
       make_tmpdir do |tmpdir|
-        File.open(
-          uri?(filename) ?
-            open_from_uri(filename, tmpdir) :
-            filename
-        ) { |f| f.read }
+        filename = download_uri(filename, tmpdir)
+        CSV.foreach(filename, options, &block)
       end
+    else
+      CSV.foreach(filename, options, &block)
+    end
   end
 
   def read_cells(sheet=nil)
     sheet ||= @default_sheet
-    @cell_type = {} unless @cell_type
-    @cell = {} unless @cell
+    return if @cells_read[sheet]
     @first_row[sheet] = 1
     @last_row[sheet] = 0
     @first_column[sheet] = 1
     @last_column[sheet] = 1
     rownum = 1
-    CSV.parse data do |row|
+    each_row csv_options 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]]
@@ -112,4 +110,4 @@ class Roo::Csv < Roo::GenericSpreadsheet
       @last_column[sheet] -= 1
     end
   end
-end # class Csv
+end

data/lib/roo/excel.rb

@@ -1,23 +1,33 @@
 require 'spreadsheet'
-#require 'lib/roo/generic_spreadsheet'
-#require 'parseexcel'
-CHARGUESS =
-  begin
-    require 'charguess'
-    true
-  rescue LoadError
-    false
-  end
 
 # Class for handling Excel-Spreadsheets
-class Roo::Excel < Roo::GenericSpreadsheet
+class Roo::Excel < Roo::Base
+  FORMULAS_MESSAGE = 'the spreadsheet gem does not support forumulas, so roo can not.'
+  CHARGUESS =
+    begin
+      require 'charguess'
+      true
+    rescue LoadError
+      false
+    end
+
+  attr_reader :workbook
 
   # Creates a new Excel spreadsheet object.
   # Parameter packed: :zip - File is a zip-file
-  def initialize(filename, packed = nil, file_warning = :error)
+  def initialize(filename, options = {}, deprecated_file_warning = :error)
+    if Hash === options
+      packed = options[:packed]
+      file_warning = options[:file_warning] || :error
+    else
+      warn 'Supplying `packed` or `file_warning` as separate arguments to `Roo::Excel.new` is deprected. Use an options hash instead.'
+      packed = options
+      file_warning = deprecated_file_warning
+    end
+
     file_type_check(filename,'.xls','an Excel', file_warning, packed)
     make_tmpdir do |tmpdir|
-      filename = open_from_uri(filename, tmpdir) if uri?(filename)
+      filename = download_uri(filename, tmpdir) if uri?(filename)
       filename = open_from_stream(filename[7..-1], tmpdir) if filename[0,7] == "stream:"
       filename = unzip(filename, tmpdir) if packed == :zip
 
@@ -27,16 +37,8 @@ class Roo::Excel < Roo::GenericSpreadsheet
       end
       @workbook = Spreadsheet.open(filename)
     end
-    @default_sheet = self.sheets.first
-    @cell = Hash.new
-    @cell_type = Hash.new
+    super(filename, options)
     @formula = Hash.new
-    @first_row = Hash.new
-    @last_row = Hash.new
-    @first_column = Hash.new
-    @last_column = Hash.new
-    @header_line = 1
-    @cells_read = Hash.new
     @fonts = Hash.new
   end
 
@@ -49,12 +51,19 @@ class Roo::Excel < Roo::GenericSpreadsheet
     @workbook.worksheets.collect {|worksheet| normalize_string(worksheet.name)}
   end
 
+  # this method lets you find the worksheet with the most data
+  def longest_sheet
+    sheet(@workbook.worksheets.inject {|m,o|
+      o.row_count > m.row_count ? o : m
+    }.name)
+  end
+
   # returns the content of a cell. The upper left corner is (1,1) or ('A',1)
   def cell(row,col,sheet=nil)
     sheet ||= @default_sheet
     validate_sheet!(sheet)
 
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     raise "should be read" unless @cells_read[sheet]
     row,col = normalize(row,col)
     if celltype(row,col,sheet) == :date
@@ -82,7 +91,7 @@ class Roo::Excel < Roo::GenericSpreadsheet
   # * :datetime
   def celltype(row,col,sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     row,col = normalize(row,col)
     begin
       if @formula[sheet] and @formula[sheet][[row,col]]
@@ -98,23 +107,19 @@ class Roo::Excel < Roo::GenericSpreadsheet
 
   # returns NO formula in excel spreadsheets
   def formula(row,col,sheet=nil)
-    wait_for_version_080
-  end
-
-  # raises an exception because formulas are not supported for excel files
-  def formula?(row,col,sheet=nil)
-    wait_for_version_080
+    raise NotImplementedError, FORMULAS_MESSAGE
   end
+  alias_method :formula?, :formula
 
   # returns NO formulas in excel spreadsheets
   def formulas(sheet=nil)
-    wait_for_version_080
+    raise NotImplementedError, FORMULAS_MESSAGE
   end
 
   # Given a cell, return the cell's font
   def font(row, col, sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     row,col = normalize(row,col)
     @fonts[sheet][[row,col]]
   end
@@ -123,7 +128,7 @@ class Roo::Excel < Roo::GenericSpreadsheet
   # mainly for debugging purposes
   def to_s(sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     @cell[sheet].inspect
   end
 
@@ -239,10 +244,7 @@ class Roo::Excel < Roo::GenericSpreadsheet
   def read_cells(sheet=nil)
     sheet ||= @default_sheet
     validate_sheet!(sheet)
-
-    if @cells_read[sheet]
-      raise "sheet #{sheet} already read"
-    end
+    return if @cells_read[sheet]
 
     worksheet = @workbook.worksheet(sheet_no(sheet))
     row_index=1
@@ -286,7 +288,6 @@ class Roo::Excel < Roo::GenericSpreadsheet
       false
     end
   end
-  private :date_or_time?
 
   # Read the date-time cell and convert to,
   # the date-time values for Roo
@@ -326,7 +327,6 @@ class Roo::Excel < Roo::GenericSpreadsheet
     end
     return value_type, value
   end
-  private :read_cell_date_or_time
 
   # Read the cell and based on the class,
   # return the values for Roo
@@ -345,15 +345,5 @@ class Roo::Excel < Roo::GenericSpreadsheet
     end # case
     return value_type, value
   end
-  private :read_cell
-
-  def wait_for_version_080
-    if Spreadsheet::VERSION<='0.8.0'
-      raise 'Formulas are not supported for excel spreadsheets.' +
-        " We have to wait for the 0.8.0 version of the Spreadsheet gem (currently used version is #{Spreadsheet::VERSION})"
-    else
-      raise 'Thomas should implement formulas from Spreadsheet gem'
-    end
-  end
 
 end

data/lib/roo/excel2003xml.rb

@@ -1,35 +1,34 @@
-require 'fileutils'
 require 'date'
 require 'base64'
-require 'cgi'
 require 'nokogiri'
 
-class Roo::Excel2003XML < Roo::GenericSpreadsheet
+class Roo::Excel2003XML < Roo::Base
 
   # initialization and opening of a spreadsheet file
   # values for packed: :zip
-  def initialize(filename, packed=nil, file_warning=:error)
+  def initialize(filename, options={}, deprecated_file_warning=:error)
+    if Hash === options
+      packed = options[:packed]
+      file_warning = options[:file_warning] || :error
+    else
+      warn 'Supplying `packed` or `file_warning` as separate arguments to `Roo::Excel2003XML.new` is deprected. Use an options hash instead.'
+      packed = options
+      file_warning = deprecated_file_warning
+    end
+
     make_tmpdir do |tmpdir|
-      filename = open_from_uri(filename, tmpdir) if uri?(filename)
+      filename = download_uri(filename, tmpdir) if uri?(filename)
       filename = unzip(filename, tmpdir) if packed == :zip
 
       file_type_check(filename,'.xml','an Excel 2003 XML', file_warning)
-      @cells_read = Hash.new
       @filename = filename
       unless File.file?(@filename)
         raise IOError, "file #{@filename} does not exist"
       end
-      @doc = Nokogiri::XML(open(@filename))
+      @doc = load_xml(@filename)
     end
-    @default_sheet = self.sheets.first
-    @cell = Hash.new
-    @cell_type = Hash.new
+    super(filename, options)
     @formula = Hash.new
-    @first_row = Hash.new
-    @last_row = Hash.new
-    @first_column = Hash.new
-    @last_column = Hash.new
-    @header_line = 1
     @style = Hash.new
     @style_defaults = Hash.new { |h,k| h[k] = [] }
     @style_definitions = Hash.new
@@ -42,7 +41,7 @@ class Roo::Excel2003XML < Roo::GenericSpreadsheet
   # cell at the first line and first row.
   def cell(row, col, sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     row,col = normalize(row,col)
     if celltype(row,col,sheet) == :date
       yyyy,mm,dd = @cell[sheet][[row,col]].split('-')
@@ -56,22 +55,11 @@ class Roo::Excel2003XML < Roo::GenericSpreadsheet
   # The method #formula? checks if there is a formula.
   def formula(row,col,sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
-    row,col = normalize(row,col)
-    if @formula[sheet][[row,col]] == nil
-      return nil
-    else
-      return @formula[sheet][[row,col]]["oooc:".length..-1]
-    end
-  end
-
-  # true, if there is a formula
-  def formula?(row,col,sheet=nil)
-    sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     row,col = normalize(row,col)
-    formula(row,col) != nil
+    @formula[sheet][[row,col]] && @formula[sheet][[row,col]]["oooc:".length..-1]
   end
+  alias_method :formula?, :formula
 
   class Font
     attr_accessor :bold, :italic, :underline
@@ -92,7 +80,7 @@ class Roo::Excel2003XML < Roo::GenericSpreadsheet
   # Given a cell, return the cell's style
   def font(row, col, sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     row,col = normalize(row,col)
     style_name = @style[sheet][[row,col]] || @style_defaults[sheet][col - 1] || 'Default'
     @style_definitions[style_name]
@@ -108,7 +96,7 @@ class Roo::Excel2003XML < Roo::GenericSpreadsheet
   # * :datetime
   def celltype(row,col,sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     row,col = normalize(row,col)
     if @formula[sheet][[row,col]]
       return :formula
@@ -134,7 +122,7 @@ class Roo::Excel2003XML < Roo::GenericSpreadsheet
   # mainly for debugging purposes
   def to_s(sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     @cell[sheet].inspect
   end
 
@@ -148,7 +136,7 @@ class Roo::Excel2003XML < Roo::GenericSpreadsheet
   def formulas(sheet=nil)
     theformulas = Array.new
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     first_row(sheet).upto(last_row(sheet)) {|row|
       first_column(sheet).upto(last_column(sheet)) {|col|
         if formula?(row,col,sheet)
@@ -204,9 +192,9 @@ class Roo::Excel2003XML < Roo::GenericSpreadsheet
   #++
   def read_cells(sheet=nil)
     sheet ||= @default_sheet
+    validate_sheet!(sheet)
+    return if @cells_read[sheet]
     sheet_found = false
-    raise ArgumentError, "Error: sheet '#{sheet||'nil'}' not valid" if @default_sheet == nil and sheet==nil
-    raise RangeError unless self.sheets.include? sheet
     @doc.xpath("/ss:Workbook/ss:Worksheet[@ss:Name='#{sheet}']").each do |ws|
       sheet_found = true
       row = 1

data/lib/roo/excelx.rb

@@ -1,8 +1,7 @@
-require 'fileutils'
 require 'date'
 require 'nokogiri'
 
-class Roo::Excelx < Roo::GenericSpreadsheet
+class Roo::Excelx < Roo::Base
   module Format
     EXCEPTIONAL_FORMATS = {
       'h:mm am/pm' => :date,
@@ -66,56 +65,47 @@ class Roo::Excelx < Roo::GenericSpreadsheet
 
   # initialization and opening of a spreadsheet file
   # values for packed: :zip
-  def initialize(filename, packed=nil, file_warning = :error) #, create = false)
+  def initialize(filename, options = {}, deprecated_file_warning = :error)
+    if Hash === options
+      packed = options[:packed]
+      file_warning = options[:file_warning] || :error
+    else
+      warn 'Supplying `packed` or `file_warning` as separate arguments to `Roo::Excelx.new` is deprected. Use an options hash instead.'
+      packed = options
+      file_warning = deprecated_file_warning
+    end
+
     file_type_check(filename,'.xlsx','an Excel-xlsx', file_warning, packed)
     make_tmpdir do |tmpdir|
-      filename = open_from_uri(filename, tmpdir) if uri?(filename)
+      filename = download_uri(filename, tmpdir) if uri?(filename)
       filename = unzip(filename, tmpdir) if packed == :zip
-      @cells_read = Hash.new
       @filename = filename
       unless File.file?(@filename)
         raise IOError, "file #{@filename} does not exist"
       end
       @comments_files = Array.new
       extract_content(tmpdir, @filename)
-      @workbook_doc = File.open(File.join(tmpdir, "roo_workbook.xml")) do |file|
-        Nokogiri::XML(file)
-      end
+      @workbook_doc = load_xml(File.join(tmpdir, "roo_workbook.xml"))
       @shared_table = []
       if File.exist?(File.join(tmpdir, 'roo_sharedStrings.xml'))
-        @sharedstring_doc = File.open(File.join(tmpdir, 'roo_sharedStrings.xml')) do |file|
-          Nokogiri::XML(file)
-        end
+        @sharedstring_doc = load_xml(File.join(tmpdir, 'roo_sharedStrings.xml'))
         read_shared_strings(@sharedstring_doc)
       end
       @styles_table = []
       @style_definitions = Array.new # TODO: ??? { |h,k| h[k] = {} }
       if File.exist?(File.join(tmpdir, 'roo_styles.xml'))
-        @styles_doc = File.open(File.join(tmpdir, 'roo_styles.xml')) do |file|
-          Nokogiri::XML(file)
-        end
+        @styles_doc = load_xml(File.join(tmpdir, 'roo_styles.xml'))
         read_styles(@styles_doc)
       end
       @sheet_doc = @sheet_files.map do |item|
-        File.open(item) do |file|
-          Nokogiri::XML(file)
-        end
+        load_xml(item)
       end
       @comments_doc = @comments_files.map do |item|
-        File.open(item) do |file|
-          Nokogiri::XML(file)
-        end
+        load_xml(item)
       end
     end
-    @default_sheet = self.sheets.first
-    @cell = Hash.new
-    @cell_type = Hash.new
+    super(filename, options)
     @formula = Hash.new
-    @first_row = Hash.new
-    @last_row = Hash.new
-    @first_column = Hash.new
-    @last_column = Hash.new
-    @header_line = 1
     @excelx_type = Hash.new
     @excelx_value = Hash.new
     @s_attribute = Hash.new # TODO: ggf. wieder entfernen nur lokal benoetigt
@@ -128,7 +118,7 @@ class Roo::Excelx < Roo::GenericSpreadsheet
     read_labels
     if @label.has_key?(m.to_s)
       sheet ||= @default_sheet
-      read_cells(sheet) unless @cells_read[sheet]
+      read_cells(sheet)
       row,col = label(m.to_s)
       cell(row,col)
     else
@@ -143,7 +133,7 @@ class Roo::Excelx < Roo::GenericSpreadsheet
   # cell at the first line and first row.
   def cell(row, col, sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     row,col = normalize(row,col)
     if celltype(row,col,sheet) == :date
       yyyy,mm,dd = @cell[sheet][[row,col]].split('-')
@@ -162,28 +152,17 @@ class Roo::Excelx < Roo::GenericSpreadsheet
   # The method #formula? checks if there is a formula.
   def formula(row,col,sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     row,col = normalize(row,col)
-    if @formula[sheet][[row,col]] == nil
-      return nil
-    else
-      return @formula[sheet][[row,col]]
-    end
-  end
-
-  # true, if there is a formula
-  def formula?(row,col,sheet=nil)
-    sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
-    row,col = normalize(row,col)
-    formula(row,col) != nil
+    @formula[sheet][[row,col]] && @formula[sheet][[row,col]]
   end
+  alias_method :formula?, :formula
 
     # returns each formula in the selected sheet as an array of elements
   # [row, col, formula]
   def formulas(sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     if @formula[sheet]
       @formula[sheet].each.collect do |elem|
         [elem[0][0], elem[0][1], elem[1]]
@@ -212,7 +191,7 @@ class Roo::Excelx < Roo::GenericSpreadsheet
   # Given a cell, return the cell's style
   def font(row, col, sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     row,col = normalize(row,col)
     s_attribute = @s_attribute[sheet][[row,col]]
     s_attribute ||= 0
@@ -230,7 +209,7 @@ class Roo::Excelx < Roo::GenericSpreadsheet
   # * :datetime
   def celltype(row,col,sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     row,col = normalize(row,col)
     if @formula[sheet][[row,col]]
       return :formula
@@ -245,7 +224,7 @@ class Roo::Excelx < Roo::GenericSpreadsheet
   # Note: this is only available within the Excelx class
   def excelx_type(row,col,sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     row,col = normalize(row,col)
     return @excelx_type[sheet][[row,col]]
   end
@@ -254,7 +233,7 @@ class Roo::Excelx < Roo::GenericSpreadsheet
   # Note: this is only available within the Excelx class
   def excelx_value(row,col,sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     row,col = normalize(row,col)
     return @excelx_value[sheet][[row,col]]
   end
@@ -262,7 +241,7 @@ class Roo::Excelx < Roo::GenericSpreadsheet
   # returns the internal format of an excel cell
   def excelx_format(row,col,sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     row,col = normalize(row,col)
     s = @s_attribute[sheet][[row,col]]
     attribute2format(s).to_s
@@ -279,7 +258,7 @@ class Roo::Excelx < Roo::GenericSpreadsheet
   # for debugging purposes
   def to_s(sheet=nil)
     sheet ||= @default_sheet
-    read_cells(sheet) unless @cells_read[sheet]
+    read_cells(sheet)
     @cell[sheet].inspect
   end
 
@@ -291,7 +270,7 @@ class Roo::Excelx < Roo::GenericSpreadsheet
       return nil,nil,nil
     else
       return @label[labelname][1].to_i,
-        Roo::GenericSpreadsheet.letter_to_number(@label[labelname][2]),
+        Roo::Base.letter_to_number(@label[labelname][2]),
         @label[labelname][0]
     end
   end
@@ -300,12 +279,12 @@ class Roo::Excelx < Roo::GenericSpreadsheet
   # [labelname, [row,col,sheetname]]
   def labels
     # sheet ||= @default_sheet
-    # read_cells(sheet) unless @cells_read[sheet]
+    # read_cells(sheet)
     read_labels
     @label.map do |label|
       [ label[0], # name
         [ label[1][1].to_i, # row
-          Roo::GenericSpreadsheet.letter_to_number(label[1][2]), # column
+          Roo::Base.letter_to_number(label[1][2]), # column
           label[1][0], # sheet
         ] ]
     end
@@ -315,7 +294,7 @@ class Roo::Excelx < Roo::GenericSpreadsheet
   # nil if there is no comment
   def comment(row,col,sheet=nil)
     sheet ||= @default_sheet
-    #read_cells(sheet) unless @cells_read[sheet]
+    #read_cells(sheet)
     read_comments(sheet) unless @comments_read[sheet]
     row,col = normalize(row,col)
     return nil unless @comment[sheet]
@@ -325,7 +304,7 @@ class Roo::Excelx < Roo::GenericSpreadsheet
   # true, if there is a comment
   def comment?(row,col,sheet=nil)
     sheet ||= @default_sheet
-    # read_cells(sheet) unless @cells_read[sheet]
+    # read_cells(sheet)
     read_comments(sheet) unless @comments_read[sheet]
     row,col = normalize(row,col)
     comment(row,col) != nil
@@ -365,9 +344,9 @@ class Roo::Excelx < Roo::GenericSpreadsheet
       when :string
         v
       when :date
-        (Date.new(1899,12,30)+v.to_i).strftime("%Y-%m-%d")
+        (base_date+v.to_i).strftime("%Y-%m-%d")
       when :datetime
-        (DateTime.new(1899,12,30)+v.to_f).strftime("%Y-%m-%d %H:%M:%S")
+        (base_date+v.to_f).strftime("%Y-%m-%d %H:%M:%S")
       when :percentage
         v.to_f
       when :time
@@ -387,6 +366,8 @@ class Roo::Excelx < Roo::GenericSpreadsheet
   def read_cells(sheet=nil)
     sheet ||= @default_sheet
     validate_sheet!(sheet)
+    return if @cells_read[sheet]
+
     @sheet_doc[sheets.index(sheet)].xpath("/xmlns:worksheet/xmlns:sheetData/xmlns:row/xmlns:c").each do |c|
       s_attribute = c['s'].to_i   # should be here
       # c: <c r="A5" s="2">
@@ -420,7 +401,7 @@ class Roo::Excelx < Roo::GenericSpreadsheet
               value_type = :string
               v = inlinestr_content
               excelx_type = :string
-              y, x = Roo::GenericSpreadsheet.split_coordinate(c['r'])
+              y, x = Roo::Base.split_coordinate(c['r'])
               excelx_value = inlinestr_content #cell.content
               set_cell_values(sheet,x,y,0,v,value_type,formula,excelx_type,excelx_value,s_attribute)
             end
@@ -461,7 +442,7 @@ class Roo::Excelx < Roo::GenericSpreadsheet
               value_type = :float
               cell.content
             end
-          y, x = Roo::GenericSpreadsheet.split_coordinate(c['r'])
+          y, x = Roo::Base.split_coordinate(c['r'])
           set_cell_values(sheet,x,y,0,v,value_type,formula,excelx_type,excelx_value,s_attribute)
         end
       end
@@ -519,7 +500,7 @@ Datei xl/comments1.xml
     return unless @comments_doc[n] #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     @comments_doc[n].xpath("//xmlns:comments/xmlns:commentList/xmlns:comment").each do |comment|
       ref = comment.attributes['ref'].to_s
-      row,col = Roo::GenericSpreadsheet.split_coordinate(ref)
+      row,col = Roo::Base.split_coordinate(ref)
       comment.xpath('./xmlns:text/xmlns:r/xmlns:t').each do |text|
         @comment[sheet] ||= {}
         @comment[sheet][[row,col]] = text.text
@@ -637,4 +618,21 @@ Datei xl/comments1.xml
     @numFmts[id] || Format::STANDARD_FORMATS[id.to_i]
   end
 
+  def base_date
+    @base_date ||= read_base_date
+  end
+
+  # Default to 1900 (minus one day due to excel quirk) but use 1904 if
+  # it's set in the Workbook's workbookPr
+  # http://msdn.microsoft.com/en-us/library/ff530155(v=office.12).aspx
+  def read_base_date
+    base_date = Date.new(1899,12,30)
+    @workbook_doc.xpath("//xmlns:workbookPr").map do |workbookPr|
+      if workbookPr["date1904"] && workbookPr["date1904"] =~ /true|1/i
+        base_date = Date.new(1904,01,01)
+      end
+    end
+    base_date
+  end
+
 end # class