hmcgowan-roo 1.3.5 → 1.3.6

data/README.markdown

@@ -1,6 +1,6 @@
 # README for Roo
 
-This is now the official roo repository and I'll be making a release on RubyForge in the next few weeks.  
+1.3.5 is now available on Rubyforge. You can install the official release with 'gem install roo' or refer to the installation instructions below for the latest development gem. 
 
 
 ## Installation
@@ -35,7 +35,7 @@ This is now the official roo repository and I'll be making a release on RubyForg
     s.cell(1,'A',s.sheets[0])                   # same cell
 
     # almost all methods have an optional argument 'sheet'.
-    # If this parameter is ommitted, the default_sheet will be used.
+    # If this parameter is omitted, the default_sheet will be used.
     
     s.info                                      # prints infos about the spreadsheet file
 
@@ -44,6 +44,12 @@ This is now the official roo repository and I'll be making a release on RubyForg
     s.first_column                              # the number of the first column
     s.last_column                               # the number of the last column
 
+    # limited font information is available
+
+    s.font(1,1).bold?
+    s.font(1,1).italic?
+    s.font(1,1).underline?
+
 
 see http://roo.rubyforge.org for a more complete tutorial
 

data/lib/roo/excel.rb

@@ -6,6 +6,26 @@ rescue LoadError => e
   false
 end
 
+# The Spreadsheet library has a bug in handling Excel 
+# base dates so if the file is a 1904 base date then 
+# dates are off by a day. 1900 base dates work fine
+module Spreadsheet
+  module Excel
+    class Row < Spreadsheet::Row
+      def _date data # :nodoc:
+        return data if data.is_a?(Date)
+        date = @worksheet.date_base + data.to_i
+        if LEAP_ERROR > @worksheet.date_base
+          date -= 1
+        end
+        date
+      end
+      public :_datetime
+    end
+  end
+end
+
+
 # ruby-spreadsheet has a font object so we're extending it 
 # with our own functionality but still providing full access
 # to the user for other font information
@@ -55,11 +75,7 @@ class Excel < GenericSpreadsheet
         raise IOError, "file #{@filename} does not exist"
       end
       @workbook = Spreadsheet.open(filename)
-      @default_sheet = nil
-      # no need to set default_sheet if there is only one sheet in the document
-      if self.sheets.size == 1
-        @default_sheet = self.sheets.first
-      end
+      @default_sheet = self.sheets.first
     ensure
       #if ENV["roo_local"] != "thomas-p"
       FileUtils::rm_r(@tmpdir)
@@ -128,38 +144,6 @@ class Excel < GenericSpreadsheet
     end
   end
 
-  # returns the first non empty column
-  def first_column(sheet=nil)
-    sheet = @default_sheet unless sheet
-    return @first_column[sheet] if @first_column[sheet]
-    fr, lr, fc, lc = get_firsts_lasts(sheet)
-    fc
-  end
-
-  # returns the last non empty column
-  def last_column(sheet=nil)
-    sheet = @default_sheet unless sheet
-    return @last_column[sheet] if @last_column[sheet]
-    fr, lr, fc, lc = get_firsts_lasts(sheet)
-    lc
-  end
-
-  # returns the first non empty row
-  def first_row(sheet=nil)
-    sheet = @default_sheet unless sheet
-    return @first_row[sheet] if @first_row[sheet]
-    fr, lr, fc, lc = get_firsts_lasts(sheet)
-    fr
-  end
-
-  # returns the last non empty row
-  def last_row(sheet=nil)
-    sheet = @default_sheet unless sheet
-    return @last_row[sheet] if @last_row[sheet]
-    fr, lr, fc, lc = get_firsts_lasts(sheet)
-    lr
-  end
-
   # returns NO formula in excel spreadsheets
   def formula(row,col,sheet=nil)
     raise EXCEL_NO_FORMULAS
@@ -192,42 +176,6 @@ class Excel < GenericSpreadsheet
   end
 
   private
-  # determine the first and last boundaries
-  def get_firsts_lasts(sheet=nil)
-    
-    # 2008-09-14 BEGINf
-    fr=lr=fc=lc=nil
-    sheet = @default_sheet unless sheet
-    if ! @cells_read[sheet]
-      read_cells(sheet)
-    end
-    if @cell[sheet] # nur wenn ueberhaupt Zellen belegt sind
-      @cell[sheet].each {|cellitem|
-        key = cellitem.first
-        y,x = key
-
-        if cellitem[1].class != String or
-            (cellitem[1].class == String and cellitem[1] != "")
-          fr = y unless fr
-          fr = y if y < fr  
-      
-          lr = y unless lr
-          lr = y if y > lr 
-      
-          fc = x unless fc
-          fc = x if x < fc
-      
-          lc = x unless lc
-          lc = x if x > lc 
-        end
-      }
-    end
-    @first_row[sheet]    = fr
-    @last_row[sheet]     = lr
-    @first_column[sheet] = fc
-    @last_column[sheet]  = lc
-    return fr, lr, fc, lc
-  end
 
   # converts name of a sheet to index (0,1,2,..)
   def sheet_no(name)
@@ -355,7 +303,7 @@ class Excel < GenericSpreadsheet
       (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
+        next if cell.class == Spreadsheet::Formula && cell.value.nil? # skip empty formla cells
         if date_or_time?(row, cell_index)
           vt, v = read_cell_date_or_time(row, cell_index)
         else
@@ -371,12 +319,20 @@ class Excel < GenericSpreadsheet
     end # worksheet
     @cells_read[sheet] = true
   end
-  
+
+  # Get the contents of a cell, accounting for the
+  # way formula stores the value
+  def read_cell_content(row, idx)
+    cell = row.at(idx)
+    cell = cell.value if cell.class == Spreadsheet::Formula
+    cell
+  end
+    
   # Test the cell to see if it's a valid date/time. 
   def date_or_time?(row, idx)
     format = row.format(idx)
     if format.date_or_time?
-      cell = row.at(idx)
+      cell = read_cell_content(row, idx)
       true if Float(cell) > 0 rescue false
     else
       false
@@ -387,7 +343,8 @@ class Excel < GenericSpreadsheet
   # Read the date-time cell and convert to, 
   # the date-time values for Roo
   def read_cell_date_or_time(row, idx)
-    cell = row.at(idx).to_s.to_f
+    cell = read_cell_content(row, idx)
+    cell = cell.to_s.to_f
     if cell < 1.0
       value_type = :time
       f = cell*24.0*60.0*60.0
@@ -399,7 +356,11 @@ class Excel < GenericSpreadsheet
       s = secs
       value = h*3600+m*60+s
     else
-      datetime = row.datetime(idx)
+      if row.at(idx).class == Spreadsheet::Formula
+        datetime = row._datetime(cell)
+      else
+        datetime = row.datetime(idx)
+      end    
       if datetime.hour != 0 or
          datetime.min != 0 or
          datetime.sec != 0 
@@ -407,7 +368,11 @@ class Excel < GenericSpreadsheet
         value = datetime
       else
         value_type = :date
-        value = row.date(idx)
+        if row.at(idx).class == Spreadsheet::Formula
+          value = row._date(cell)
+        else
+          value = row.date(idx)
+        end    
         value = sprintf("%04d-%02d-%02d",value.year,value.month,value.day)
       end
     end  
@@ -418,7 +383,7 @@ class Excel < GenericSpreadsheet
   # Read the cell and based on the class, 
   # return the values for Roo
   def read_cell(row, idx)
-    cell = row.at(idx)
+    cell = read_cell_content(row, idx)
     case cell
     when Float, Integer, Fixnum, Bignum 
       value_type = :float

data/lib/roo/excelx.rb

@@ -128,11 +128,7 @@ class Excelx < GenericSpreadsheet
       FileUtils::rm_r(@tmpdir)
       #end
     end
-    @default_sheet = nil
-    # no need to set default_sheet if there is only one sheet in the document
-    if self.sheets.size == 1
-      @default_sheet = self.sheets.first
-    end
+    @default_sheet = self.sheets.first
     @cell = Hash.new
     @cell_type = Hash.new
     @formula = Hash.new

data/lib/roo/generic_spreadsheet.rb

@@ -258,18 +258,8 @@ class GenericSpreadsheet
     sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     result = []
-    tmp_arr = []
-    @cell[sheet].each_pair {|key,value|
-      y,x = key # _to_string(key).split(',')
-      x = x.to_i
-      y = y.to_i
-      if y == rownumber
-        tmp_arr[x] = value
-      end
-    }
-    result = tmp_arr[1..-1]
-    while result && result[-1] == nil
-      result = result[0..-2]
+    first_column(sheet).upto(last_column(sheet)) do |col|
+      result << cell(rownumber,col,sheet)
     end
     result
   end

data/lib/roo/google.rb

@@ -109,10 +109,7 @@ class Google < GenericSpreadsheet
     #-- ----------------------------------------------------------------------
     #-- TODO: Behandlung von Berechtigungen hier noch einbauen ???
     #-- ----------------------------------------------------------------------
-
-    if self.sheets.size  == 1
-      @default_sheet = self.sheets.first
-    end
+    @default_sheet = self.sheets.first
   end
 
   # returns an array of sheet names in the spreadsheet
@@ -241,28 +238,6 @@ class Google < GenericSpreadsheet
     theformulas
   end
 
-  # returns all values in this row as an array
-  # row numbers are 1,2,3,... like in the spreadsheet
-  def row(rownumber,sheet=nil)
-    sheet = @default_sheet unless sheet
-    read_cells(sheet) unless @cells_read[sheet]
-    result = []
-    tmp_arr = []
-    @cell[sheet].each_pair {|key,value|
-      y,x = key.split(',')
-      x = x.to_i
-      y = y.to_i
-      if y == rownumber
-        tmp_arr[x] = value
-      end
-    }
-    result = tmp_arr[1..-1]
-    while result[-1] == nil
-      result = result[0..-2]
-    end
-    result
-  end
-
   # true, if the cell is empty
   def empty?(row, col, sheet=nil)
     value = cell(row, col, sheet)
@@ -273,23 +248,6 @@ class Google < GenericSpreadsheet
     value.empty?
   end
 
-  # returns all values in this column as an array
-  # column numbers are 1,2,3,... like in the spreadsheet
-  #--
-  #TODO: refactoring nach GenericSpreadsheet?
-  def column(columnnumber, sheet=nil)
-    if columnnumber.class == String
-      columnnumber = GenericSpreadsheet.letter_to_number(columnnumber)
-    end
-    sheet = @default_sheet unless sheet
-    read_cells(sheet) unless @cells_read[sheet]
-    result = []
-    first_row(sheet).upto(last_row(sheet)) do |row|
-      result << cell(row,columnnumber,sheet)
-    end
-    result
-  end
-
   # sets the cell to the content of 'value'
   # a formula can be set in the form of '=SUM(...)'
   def set_value(row,col,value,sheet=nil)

data/lib/roo/openoffice.rb

@@ -43,11 +43,7 @@ class Openoffice < GenericSpreadsheet
       FileUtils::rm_r(@tmpdir)
       #end
     end
-    @default_sheet = nil
-    # no need to set default_sheet if there is only one sheet in the document
-    if self.sheets.size == 1
-      @default_sheet = self.sheets.first
-    end
+    @default_sheet = self.sheets.first
     @cell = Hash.new
     @cell_type = Hash.new
     @formula = Hash.new

data/lib/roo/version.rb

@@ -2,7 +2,7 @@ module Roo #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 3
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/roo.rb

@@ -1,4 +1,22 @@
 module Roo
+  class Spreadsheet
+    class << self
+      def open(file)
+        case File.extname(file)
+        when '.xls'
+          Excel.new(file)
+        when '.xlsx'
+          Excelx.new(file)
+        when '.ods'
+          Openoffice.new(file)
+        when ''
+          Google.new(file)
+        else
+          raise ArgumentError, "Don't know how to open file #{filename}"
+        end      
+      end
+    end
+  end
 end
 
 require 'roo/version'