roo 0.8.0 → 0.8.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.8.1 2007-12-22
+* 3 bugfixes
+  * fixed a bug with first/last-row/column in empty sheet
+  * #info prints now '- empty -' if a sheet within a document is empty
+  * tried to fix the iconv conversion problem
 == 0.8.0 2007-12-15
 * 2 enhancements:
   * Google online spreadsheets were implemented

data/Manifest.txt

@@ -15,6 +15,13 @@ lib/roo/excel.rb
 lib/roo/google.rb
 scripts/txt2html
 setup.rb
+test/false_encoding.xls
+test/Bibelbund1.ods
+test/bbu.xls
+test/bbu.ods
+test/simple_spreadsheet.ods
+test/simple_spreadsheet_from_italo.ods
+test/simple_spreadsheet_from_italo.xls
 test/test_helper.rb
 test/test_roo.rb
 test/numbers1.ods

data/lib/roo/excel.rb

@@ -4,7 +4,7 @@ require 'parseexcel'
 CHARGUESS=false
 require 'charguess' if CHARGUESS
 
-module Spreadsheet
+module Spreadsheet # :nodoc
   module ParseExcel
     class Worksheet
       include Enumerable
@@ -13,8 +13,8 @@ module Spreadsheet
   end
 end
 
-
-class Excel < GenericSpreadsheet  #Openoffice
+# Class for handling Excel-Spreadsheets
+class Excel < GenericSpreadsheet 
 
   EXCEL_NO_FORMULAS = 'formulas are not supported for excel spreadsheets'
 
@@ -51,6 +51,7 @@ class Excel < GenericSpreadsheet  #Openoffice
     @cells_read = Hash.new
   end
 
+  # returns an array of sheet names in the spreadsheet
   def sheets
     result = []
     0.upto(@workbook.sheet_count - 1) do |i|
@@ -64,9 +65,17 @@ class Excel < GenericSpreadsheet  #Openoffice
           @workbook.worksheet(i).name
         )
       else
-        result << Iconv.new('utf-8','unicode').iconv(
-          @workbook.worksheet(i).name
-        )
+        result << platform_specific_iconv(@workbook.worksheet(i).name)
+        #case RUBY_PLATFORM.downcase
+        #when /darwin/
+        #  result << Iconv.new('utf-8','utf-8').iconv(
+        #    @workbook.worksheet(i).name
+        #  )
+        #else
+        #  result << Iconv.new('utf-8','unicode').iconv(
+        #    @workbook.worksheet(i).name
+        #  )
+        #end # case
       end
     end
     return result
@@ -105,7 +114,7 @@ class Excel < GenericSpreadsheet  #Openoffice
         when :numeric then return cell.to_f
         when :text then return cell.to_s('utf-8')
         when :date then return cell.date
-        else  
+        else
           return nil # cell.to_s('utf-8')
         end
       end
@@ -128,13 +137,13 @@ class Excel < GenericSpreadsheet  #Openoffice
         cell = row_par.at(col-1)
         return nil unless cell
         case cell.type
-        when :numeric 
+        when :numeric
           return :float
-        when :text 
+        when :text
           return :string
-        when :date 
+        when :date
           return :date
-        else  
+        else
           return cell.type.to_sym
         end
       end
@@ -148,7 +157,7 @@ class Excel < GenericSpreadsheet  #Openoffice
     sheet = @default_sheet unless sheet
     default_sheet_check
     worksheet = @workbook.worksheet(sheet_no(sheet))
-    #therow = worksheet.row(rownumber-1) 
+    #therow = worksheet.row(rownumber-1)
     result = []
     worksheet.row(rownumber-1).each {|cell|
       if cell
@@ -195,7 +204,7 @@ class Excel < GenericSpreadsheet  #Openoffice
       else
         result << nil
       end
-    } 
+    }
     result
   end
 
@@ -230,7 +239,7 @@ class Excel < GenericSpreadsheet  #Openoffice
     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
@@ -240,7 +249,7 @@ class Excel < GenericSpreadsheet  #Openoffice
   def formula?(row,col,sheet=nil)
     raise EXCEL_NO_FORMULAS
   end
-  
+
   # returns NO formulas in excel spreadsheets
   def formulas(sheet=nil)
     raise EXCEL_NO_FORMULAS
@@ -257,18 +266,36 @@ class Excel < GenericSpreadsheet  #Openoffice
   def get_firsts_lasts(sheet=nil)
     sheet = @default_sheet unless sheet
     fr = fc = 999_999
-    lr = lc = -999_999  
+    lr = lc = -999_999
     worksheet = @workbook.worksheet(sheet_no(sheet))
-    fr = worksheet.min_row + 1
-    lr = worksheet.max_row + 1
-    fc = worksheet.min_col + 1
-    lc = worksheet.max_col + 1
-    # 2007-11-05 BEGIN
-    # parsexcel liefert (mir unverstaendlich) eine Zeile als letzte Zeile
-    # zurueck, die aber leer ist. Deshalb Korrekturfunktion, die wirklich
-    # die letzte nicht leere Zeile liefert.
-    while empty_row? row(lr,sheet)
-      lr -= 1
+    unless worksheet.min_row 
+      fr = nil
+    else
+      fr = worksheet.min_row + 1
+    end
+    unless worksheet.max_row
+      lr = nil
+    else
+      lr = worksheet.max_row + 1
+    end
+    unless worksheet.min_col 
+      fc = nil
+    else
+      fc = worksheet.min_col + 1
+    end
+    unless worksheet.max_col
+      lc = nil
+    else
+      lc = worksheet.max_col + 1
+    end
+    if lr 
+      # 2007-11-05 BEGIN
+      # parsexcel liefert (mir unverstaendlich) eine Zeile als letzte Zeile
+      # zurueck, die aber leer ist. Deshalb Korrekturfunktion, die wirklich
+      # die letzte nicht leere Zeile liefert.
+      while empty_row? row(lr,sheet)
+        lr -= 1
+      end
     end
     # 2007-11-05 END
     @first_row[sheet]    = fr
@@ -283,9 +310,11 @@ class Excel < GenericSpreadsheet  #Openoffice
     return name-1 if name.kind_of?(Fixnum)
     0.upto(@workbook.sheet_count - 1) do |i|
       # TODO: is there a better way to do conversion?
-      return i if name == Iconv.new('utf-8','unicode').iconv(
-        @workbook.worksheet(i).name
-      )
+      return i if name == platform_specific_iconv(
+                            @workbook.worksheet(i).name)
+#Iconv.new('utf-8','unicode').iconv(
+#        @workbook.worksheet(i).name
+#      )
     end
     raise StandardError, "sheet '#{name}' not found"
   end
@@ -304,21 +333,21 @@ class Excel < GenericSpreadsheet  #Openoffice
           empty = true
         else
           case cell.type
-          when :numeric 
+          when :numeric
             onecelltype = :float
             onecell = cell.to_f
-          when :text 
+          when :text
             onecelltype = :string
             onecell = cell.to_s('utf-8')
-          when :date 
+          when :date
             onecelltype = :date
             onecell = cell.date
           else
             onecelltype = nil
-            onecell = nil 
+            onecell = nil
           end
-        end 
-        file.print one_cell_output(onecelltype,onecell,empty) 
+        end
+        file.print one_cell_output(onecelltype,onecell,empty)
       }
       file.print("\n")
     }
@@ -331,8 +360,20 @@ class Excel < GenericSpreadsheet  #Openoffice
         #if elem.class == String and elem.size > 0
         content = true
       end
-    } 
+    }
     ! content
   end
 
+def platform_specific_iconv(value)
+        case RUBY_PLATFORM.downcase
+        when /darwin/
+          result = Iconv.new('utf-8','utf-8').iconv(value)
+        when /mswin32/
+          result = Iconv.new('utf-8','iso-8859-1').iconv(value)
+        else
+          result = Iconv.new('utf-8','unicode').iconv(value)
+        end # case
+ result
+end
+
 end

data/lib/roo/generic_spreadsheet.rb

@@ -68,13 +68,24 @@ class GenericSpreadsheet
       self.default_sheet = sheet
       # $log.debug("nach default_sheet=")
       result << "Sheet " + n.to_s + ":\n"
-      result << "  First row: #{first_row}\n"
+      if !(first_row) # && last_row && first_column) # && last_column)
+        result << "  - empty -"
+      end
+      if first_row
+        result << "  First row: #{first_row}\n"
+      end
       # $log.debug("nach first_row")
-      result << "  Last row: #{last_row}\n"
+      if last_row
+        result << "  Last row: #{last_row}\n"
+      end
       # $log.debug("nach last_row")
-      result << "  First column: #{GenericSpreadsheet.number_to_letter(first_column)}\n"
+      if first_column
+        result << "  First column: #{GenericSpreadsheet.number_to_letter(first_column)}\n"
+      end
       # $log.debug("nach first_column")
-      result << "  Last column: #{GenericSpreadsheet.number_to_letter(last_column)}"
+      if last_column
+        result << "  Last column: #{GenericSpreadsheet.number_to_letter(last_column)}"
+      end
       # $log.debug("nach last_column")
       result << "\n" if sheet != sheets.last
       n += 1
@@ -141,7 +152,7 @@ class GenericSpreadsheet
 
   # returns the number of the last non-empty row
   def last_row(sheet=nil)
-    sheet = @default_sheet unless sheet 
+    sheet = @default_sheet unless sheet
     read_cells(sheet) unless @cells_read[sheet]
     if @last_row[sheet]
       return @last_row[sheet]
@@ -153,7 +164,7 @@ class GenericSpreadsheet
       y = y.to_i
       result = [result, y].max if value
     }
-    result = nil if result == impossible_value 
+    result = nil if result == impossible_value
     @last_row[sheet] = result
     result
   end
@@ -190,7 +201,7 @@ class GenericSpreadsheet
       return @first_row[sheet]
     end
     impossible_value = 999_999 # more than a spreadsheet can hold
-    result = impossible_value 
+    result = impossible_value
     @cell[sheet].each_pair {|key,value|
       y,x = key.split(',')
       y = y.to_i
@@ -211,7 +222,7 @@ class GenericSpreadsheet
       return @first_column[sheet]
     end
     impossible_value = 999_999 # more than a spreadsheet can hold
-    result = impossible_value 
+    result = impossible_value
     @cell[sheet].each_pair {|key,value|
       y,x = key.split(',')
       x = x.to_i
@@ -221,7 +232,7 @@ class GenericSpreadsheet
     @first_column[sheet] = result
     result
   end
-  
+
   # convert a number to something like this: 'AB'
   def GenericSpreadsheet.number_to_letter(n)
     letters=""
@@ -261,15 +272,15 @@ class GenericSpreadsheet
   def after(d)
     if DateTime.now > d
       yield
-    end  
-  end  
+    end
+  end
 
   # helper method
   def before(d)
-    if DateTime.now <= d 
+    if DateTime.now <= d
       yield
-    end  
-  end  
+    end
+  end
 
   private
 

data/lib/roo/google.rb

@@ -8,9 +8,9 @@ module GData
     #-- modified
     def evaluate_cell(cell, sheet_no=1)
       raise ArgumentError, "invalid cell: #{cell}" unless cell
-      raise ArgumentError, "invalid sheet_no: #{sheet_no}" unless sheet_no >0 and sheet_no.class == Fixnum 
+      raise ArgumentError, "invalid sheet_no: #{sheet_no}" unless sheet_no >0 and sheet_no.class == Fixnum
       path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/#{@headers ? "private" : "public"}/basic/#{cell}"
-  
+
       doc = Hpricot(request(path))
       result = (doc/"content").inner_html
     end
@@ -26,7 +26,7 @@ module GData
       result
     end
 
-    # #-- new (testing only)  
+    # #-- new (testing only)
     # def raw_url(url)
     #   path = "/feeds/worksheets/#{@spreadsheet_id}/private/basic"
     #   path = url
@@ -38,7 +38,7 @@ module GData
       path = "/feeds/cells/#{@spreadsheet_id}/1/#{@headers ? 'private' : 'public'}/full"
       post(path, entry)
     end
-  
+
     #-- new
     def entry_roo(formula, row=1, col=1)
       <<XML
@@ -47,7 +47,7 @@ module GData
     </entry>
 XML
     end
-  
+
     #-- new
     def add_to_cell_roo(row,col,value)
       save_entry_roo(entry_roo(value,row,col))
@@ -55,41 +55,20 @@ XML
 
     #-- new
     def get_one_sheet
-      ath = "/feeds/worksheets/#{@spreadsheet_id}/private/basic"
       path = "/feeds/cells/#{@spreadsheet_id}/1/private/full"
       doc = Hpricot(request(path))
-      #pp doc
-      #p doc # TODO:prey:
-      # result = (doc/"content[@type='text']").inner_html
-      # p (doc/"content").inner_html
-      #result = (doc/"content").inner_html.each { |item| item + '#'}
-      #-- result = []
-      #-- (doc/"content").each { |elem|
-      #--   #p elem
-      #--   result << elem.inner_html
-      #-- }
-      #-- result
     end
 
     #new
     def oben_unten_links_rechts(sheet_no)
-      #sheet_no = sheets.index(sheet) + 1
       path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/private/full"
       doc = Hpricot(request(path))
-      #(doc/"entry").each {|item|
       rows = []
       cols = []
       (doc/"gs:cell").each {|item|
-        #    p item
-        #p item['row']
         rows.push item['row'].to_i
-        #p item['col']
         cols.push item['col'].to_i
       }
-      # $log.debug("row min: #{rows.min}")
-      # $log.debug("row max: #{rows.max}")
-      # $log.debug("col min: #{cols.min}")
-      # $log.debug("col max: #{cols.max}")
       return rows.min, rows.max, cols.min, cols.max
     end
 
@@ -97,54 +76,31 @@ XML
       path = "/feeds/cells/#{@spreadsheet_id}/#{sheet_no}/private/full"
       doc = Hpricot(request(path))
       return doc
-      #(doc/"entry").each {|item|
-      rows = []
-      cols = []
-      (doc/"gs:cell").each {|item|
-        #    p item
-        #p item['row']
-        rows.push item['row'].to_i
-        #p item['col']
-        cols.push item['col'].to_i
-      }
-      # $log.debug("row min: #{rows.min}")
-      # $log.debug("row max: #{rows.max}")
-      # $log.debug("col min: #{cols.min}")
-      # $log.debug("col max: #{cols.max}")
-      return rows.min, rows.max, cols.min, cols.max
     end
   end # class
 end # module
 
 class Google < GenericSpreadsheet
   #include Log4r
- 
-  attr_accessor :header_line 
 
-  # TIMEOUT_IN_SECONDS = 42
-  # GOOGLE_MAX_ROWS = 99
-  # GOOGLE_MAX_COLS = 10 # TODO:
-  
+  attr_accessor :header_line
+
   # Creates a new Google spreadsheet object.
   def initialize(spreadsheetkey,user=nil,password=nil)
     @filename = spreadsheetkey
     # $log = Logger.new("my_log")
     # $log.outputters = FileOutputter.new("f1", :filename => "roo.log")
- 
-     # $log.debug("created a new Google-object")
+
+    # $log.debug("created a new Google-object")
     @spreadsheetkey = spreadsheetkey
     @user = user
     @password = password
-    unless user 
+    unless user
       user = ENV['GOOGLE_MAIL']
     end
     unless password
       password = ENV['GOOGLE_PASSWORD']
     end
-    #p spreadsheetkey
-    #p user
-    #p password
-    #spreadsheetkey = ENV['GOOGLE_KEY']
     @default_sheet = nil
     @cell = Hash.new
     @cell_type = Hash.new
@@ -155,73 +111,28 @@ class Google < GenericSpreadsheet
     @last_column = Hash.new
     @cells_read = Hash.new
     @header_line = 1
-    #??? @sheets = Array.new
-    
+
     @gs = GData::Spreadsheet.new(spreadsheetkey)
-    #@column = FromGData::Spreadsheet.new(spreadsheetkey)
     @gs.authenticate(user, password)
-   
-    #--Test only
-    #@gs.get_one_sheet 
-    #@gs.oben_unten_links_rechts
-    #--
+
     #-- ----------------------------------------------------------------------
-    #-- Behandlung von Berechtigungen hier noch einbauen
+    #-- Behandlung von Berechtigungen hier noch einbauen ???
     #-- ----------------------------------------------------------------------
-    
-    #result = gs.add_to_cell formula
-    #puts gs.evaluate_cell('A1')
-    #p gs.evaluate_cell('A1')
-    #puts gs.evaluate_cell('A2')
-    #puts gs.evaluate_cell('A3')
-
-    #Timeout.timeout(TIMEOUT_IN_SECONDS) {
-    #  @gs = GoogleSpreadSheet.new(spreadsheetkey)
-    #  @gs.authenticate(user, password)
-    #  @default_sheet = nil
-    #}
-    # alle eigenen Spreadsheets bei Google
-    # @spreadsheets= GData::Spreadsheet.spreadsheets("emmanuel.pirsch@gmail.com", "secret") # funktioniert anscheinend noch nicht!!!!!!!!!
-    # ein einzelnes Spreadsheet bei Google
-    # @spreadsheet= spreadsheet[spreadsheetname]
-
-    #gb = GData::Base.new
-    #gb.authenticate("thopre@gmail.com","secret")
-
-    #g = GData::Spreadsheet.new("ttt")
-    #@default_sheet = nil
+
     if self.sheets.size  == 1
       @default_sheet = self.sheets.first
-    end 
+    end
   end
 
-  #def gssheetlist
-   # @gs.sheetlist
-  #end
-
   # returns an array of sheet names in the spreadsheet
   def sheets
-      #if @sheets == []
-      #  @sheets = @gs.sheetlist
-      #end
-      #return @sheets 
-      #p gssheetlist
-      return @gs.sheetlist
+    return @gs.sheetlist
   end
 
-  #def reload
-  #  sav_default_sheet = default_sheet
-  #  super
-  #  @sheets = sheets #[]
-  #  puts "DEBUG: reload: erneutes Einlesen ergibt @sheets=#{@sheets.to_s}"
-  #  @default_sheet = sav_default_sheet
-  #end
-
   # set the working sheet in the document
   #--
   # TODO: eigenlich identisch mit Openoffice => refactoring
   def default_sheet=(sheet)
-    #puts "DEBUG: default_sheet=#{sheet}"
     if ! sheet.kind_of?(String)
       raise TypeError, "what are you trying to set as default sheet?"
     end
@@ -249,23 +160,23 @@ class Google < GenericSpreadsheet
     row,col = normalize(row,col)
 
     if celltype(row,col,sheet) == :date
- # $log.debug("splitte Datumsfeld auf (#{row},#{col}): #{ @cell[sheet]["#{row},#{col}"]}")
+      # $log.debug("splitte Datumsfeld auf (#{row},#{col}): #{ @cell[sheet]["#{row},#{col}"]}")
       yyyy,mm,dd = @cell[sheet]["#{row},#{col}"].split('-')
       # $log.debug(yyyy)
       # $log.debug(mm)
       # $log.debug(dd)
-#TODO:
-if dd.to_i < 1 or dd.to_i >31 or mm.to_i < 1 or mm.to_i > 12 or yyyy.to_i < 1900 or yyyy.to_i > 3000
-  raise "Invalid date parameter: #{yyyy}, #{mm}, #{dd}"
-end
+      #TODO:
+      if dd.to_i < 1 or dd.to_i >31 or mm.to_i < 1 or mm.to_i > 12 or yyyy.to_i < 1900 or yyyy.to_i > 3000
+        raise "Invalid date parameter: #{yyyy}, #{mm}, #{dd}"
+      end
       return Date.new(yyyy.to_i,mm.to_i,dd.to_i)
     end
     return @cell[sheet]["#{row},#{col}"]
   end
 
   # returns the type of a cell:
-  # * :float 
-  # * :string, 
+  # * :float
+  # * :string,
   # * :date
   # * :percentage
   def celltype(row, col, sheet=nil)
@@ -278,7 +189,7 @@ end
       @cell_type[sheet]["#{row},#{col}"]
     end
   end
- 
+
   # Returns the formula at (row,col).
   # Returns nil if there is no formula.
   # The method #formula? checks if there is a formula.
@@ -314,25 +225,10 @@ end
           theformulas << f
         end
       }
-    } 
+    }
     theformulas
   end
 
-#  # returns all values in this row as an array
-#  # row numbers are 1,2,3,... like in the spreadsheet
-#  def row_old(rownumber,sheet=nil)
-#    sheet = @default_sheet unless sheet
-#    result = []
-#    1.upto(GOOGLE_MAX_ROWS) { |col| # TODO: maximum size of x-coordinate of google spreadsheet
-#      result[col] = cell(rownumber,col,sheet)
-#    }
-#    result = result[1..-1]
-#    while result[-1] == '' #TODO: besser?
-#      result = result[0..-2]
-#    end
-#    result
-#  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)
@@ -346,15 +242,15 @@ end
       y = y.to_i
       if y == rownumber
         tmp_arr[x] = value
-      end 
-    }   
+      end
+    }
     result = tmp_arr[1..-1]
-    while result[-1] == nil 
+    while result[-1] == nil
       result = result[0..-2]
-    end 
+    end
     result
-  end 
-  
+  end
+
   # true, if the cell is empty
   def empty?(row, col, sheet=nil)
     value = cell(row, col, sheet)
@@ -363,7 +259,7 @@ end
     return false if value.class == Float
     value.empty?
   end
-  
+
   # returns all values in this column as an array
   # column numbers are 1,2,3,... like in the spreadsheet
   #--
@@ -379,7 +275,7 @@ end
       result << cell(row,columnnumber,sheet)
     end
     result
-  end 
+  end
 
   # sets the cell to the content of 'value'
   # a formula can be set in the form of '=SUM(...)'
@@ -407,7 +303,7 @@ end
     return @last_row[sheet]
   end
 
-    # returns the first non-empty column in a sheet
+  # returns the first non-empty column in a sheet
   def first_column(sheet=nil)
     sheet = @default_sheet unless sheet
     unless @first_column[sheet]
@@ -417,7 +313,7 @@ end
     return @first_column[sheet]
   end
 
-    # returns the last non-empty column in a sheet
+  # returns the last non-empty column in a sheet
   def last_column(sheet=nil)
     sheet = @default_sheet unless sheet
     unless @last_column[sheet]
@@ -441,8 +337,8 @@ end
     end
     true
   end
-  
-   
+
+
   # find a row either by row number or a condition
   # Caution: this works only within the default sheet -> set default_sheet before you call this method
   # (experimental. see examples in the test_roo.rb file)
@@ -479,11 +375,11 @@ end
             x = key
           end
         }
-        tmp[x] = cell(rownum,j) 
-      } 
+        tmp[x] = cell(rownum,j)
+      }
       result = [ tmp ] # row(rownum)
       #-- :all
-    elsif args[0] == :all 
+    elsif args[0] == :all
       if args[1].class == Hash
         args[1].each {|key,val|
           if key == :conditions
@@ -512,8 +408,8 @@ end
                       x = key
                     end
                   }
-                  tmp[x] = cell(i,j) 
-                } 
+                  tmp[x] = cell(i,j)
+                }
                 if result_array
                   result << self.row(i)
                 else
@@ -529,38 +425,9 @@ end
   end
   private
 
-#  def read_cells_old(sheet=nil) #TODO:
-#    sheet = @default_sheet unless sheet
-#    sheet_found = true # TODO:
-#    #TODO: raise ArgumentError falls sheet nicht existiert - siehe openoffice
-#    #TODO: boundaries !!!
-#    1.upto(25) { |y|
-#      1.upto(20) { |x|
-#        key = "#{y},#{x}"
-#        @cell[sheet] = {} unless @cell[sheet]
-#        value = cell(y,x,sheet)
-#        @cell[sheet][key] = value unless value == "" or value == nil
-#      }
-#    }
-#    if !sheet_found
-#      raise RangeErrror, "invalid sheet name"
-#    end
-#    @cells_read[sheet] = true
-#  end
-
-# read all cells in a sheet
+  # read all cells in a sheet
   def read_cells(sheet=nil)
     sheet = @default_sheet unless sheet
-    # sheet_no = sheets.index(sheet) + 1
-    # @first_row[sheet], @last_row[sheet], @first_column[sheet], @last_column[sheet] = @gs.oben_unten_links_rechts(sheet_no)
-    #@first_row[sheet].upto(@last_row[sheet]) { |y|
-    #  @first_column[sheet].upto(@last_column[sheet]) { |x|
-    #    key = "#{y},#{x}"
-    #    @cell[sheet] = {} unless @cell[sheet]
-    #    value = cell(y,x,sheet)
-    #    @cell[sheet][key] = value unless value == "" or value == nil
-    #  }
-    #}
     sheet_no = sheets.index(sheet)+1
     doc = @gs.fulldoc(sheet_no)
     (doc/"gs:cell").each {|item|
@@ -568,29 +435,23 @@ end
       col = item['col']
       value = item['inputvalue']
       numericvalue = item['numericvalue']
-      # puts numericvalue
-      # puts value 
-      # puts value[0,1] 
       if value[0,1] == '='
         formula = value
-# $log.debug("formula: <#{formula}>")
-        # puts "Formel gefunden"
+        # $log.debug("formula: <#{formula}>")
       else
         formula = nil
       end
-      # puts formula
-      #--
       @cell_type[sheet] = {} unless @cell_type[sheet]
-      if formula 
+      if formula
         ty = :formula
-if numeric?(numericvalue)
-        value = numericvalue.to_f 
-else
-        value = numericvalue
-end
+        if numeric?(numericvalue)
+          value = numericvalue.to_f
+        else
+          value = numericvalue
+        end
       elsif Google.date?(value)
         ty = :date
-      elsif numeric?(value) # or o.class ??? 
+      elsif numeric?(value) # or o.class ???
         ty = :float
         value = value.to_f
       else
@@ -600,13 +461,13 @@ end
       @cell[sheet] = {} unless @cell[sheet]
       if ty == :date
         dd,mm,yyyy = value.split('/')
-        @cell[sheet][key] = sprintf("%04d-%02d-%02d",yyyy.to_i,mm.to_i,dd.to_i) 
+        @cell[sheet][key] = sprintf("%04d-%02d-%02d",yyyy.to_i,mm.to_i,dd.to_i)
       else
         @cell[sheet][key] = value unless value == "" or value == nil
       end
       @cell_type[sheet][key] = ty # Openoffice.oo_type_2_roo_type(vt)
       @formula[sheet] = {} unless @formula[sheet]
-# $log.debug("formula vor belegen @formula: <#{formula}>") if formula
+      # $log.debug("formula vor belegen @formula: <#{formula}>") if formula
       @formula[sheet][key] = formula  if formula
       # $log.debug("@formula[#{sheet}][#{key}] = #{formula}")  if formula
       # $log.debug("#{@formula[sheet][key]}")  if formula
@@ -616,12 +477,12 @@ end
     @cells_read[sheet] = true
   end
 
-  # Checks if the default_sheet exists. Otherwise a RangeError exception is 
+  # Checks if the default_sheet exists. Otherwise a RangeError exception is
   # raised
   def check_default_sheet
     sheet_found = false
     raise ArgumentError, "Error: default_sheet not set" if @default_sheet == nil
-    if sheets.index(@default_sheet) 
+    if sheets.index(@default_sheet)
       sheet_found = true
     end
     if ! sheet_found
@@ -662,10 +523,10 @@ end
   #TODO: refactor to Generic....
   def one_cell_output(onecelltype,onecell,empty)
     str = ""
-    if empty 
+    if empty
       str += ''
     else
-      case onecelltype 
+      case onecelltype
       when :string
         if onecell == ""
           str << ''

data/lib/roo/openoffice.rb

@@ -37,13 +37,13 @@ class Openoffice < GenericSpreadsheet
     @@nr += 1
     @file_nr = @@nr
     extract_content
-    file = File.new(File.join(@tmpdir, @file_nr.to_s+"_roo_content.xml")) 
+    file = File.new(File.join(@tmpdir, @file_nr.to_s+"_roo_content.xml"))
     @doc = REXML::Document.new file
     file.close
     #if ENV["roo_local"] != "thomas-p"
     FileUtils::rm_r(@tmpdir)
     #end
-    @default_sheet = nil 
+    @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
@@ -122,12 +122,12 @@ class Openoffice < GenericSpreadsheet
       set_type(row,col,:string,sheet)
     else
       raise ArgumentError, "Type for "+value.to_s+" not set"
-    end 
+    end
   end
 
   # returns the type of a cell:
-  # * :float 
-  # * :string, 
+  # * :float
+  # * :string,
   # * :date
   # * :percentage
   def celltype(row,col,sheet=nil)
@@ -179,7 +179,7 @@ class Openoffice < GenericSpreadsheet
 
   alias set_default_sheet default_sheet=
 
-  # version of the openoffice document 
+  # version of the openoffice document
   # at 2007 this is always "1.0"
   def officeversion
     # read_cells(false) unless @cells_read
@@ -216,7 +216,7 @@ class Openoffice < GenericSpreadsheet
     end
     result
   end
- 
+
   # returns all values in this column as an array
   # column numbers are 1,2,3,... like in the spreadsheet
   def column(columnnumber,sheet=nil)
@@ -230,14 +230,14 @@ class Openoffice < GenericSpreadsheet
       result << cell(row,columnnumber,sheet)
     end
     result
-  end 
+  end
 
   # save spreadsheet
   def save #:nodoc:
     42
   end
 
-  # evaluate the formula at this cell 
+  # evaluate the formula at this cell
   # experimental: DO NOT USE THIS!
   def solve(row,col) #:nodoc:
     parser = SpreadsheetParser.new
@@ -264,12 +264,12 @@ class Openoffice < GenericSpreadsheet
           theformulas << f
         end
       }
-    } 
+    }
     theformulas
   end
-  
+
   # write the current spreadsheet to stdout or into a file
-#TODO: refactoring --> GenericSpreadsheet
+  #TODO: refactoring --> GenericSpreadsheet
 
   def to_csv(filename=nil,sheet=nil)
     sheet = @default_sheet unless sheet
@@ -313,11 +313,11 @@ class Openoffice < GenericSpreadsheet
             x = key
           end
         }
-        tmp[x] = cell(rownum,j) 
-      } 
+        tmp[x] = cell(rownum,j)
+      }
       result = [ tmp ] # row(rownum)
       #-- :all
-    elsif args[0] == :all 
+    elsif args[0] == :all
       if args[1].class == Hash
         args[1].each {|key,val|
           if key == :conditions
@@ -346,8 +346,8 @@ class Openoffice < GenericSpreadsheet
                       x = key
                     end
                   }
-                  tmp[x] = cell(i,j) 
-                } 
+                  tmp[x] = cell(i,j)
+                }
                 if result_array
                   result << self.row(i)
                 else
@@ -362,7 +362,7 @@ class Openoffice < GenericSpreadsheet
     result
   end
 
-  
+
   private
 
   # read the version of the OO-Version
@@ -377,22 +377,22 @@ class Openoffice < GenericSpreadsheet
   def set_cell_values(sheet,x,y,i,v,vt,formula,tr,str_v)
     key = "#{y},#{x+i}"
     @cell_type[sheet] = {} unless @cell_type[sheet]
-    @cell_type[sheet][key] = Openoffice.oo_type_2_roo_type(vt) 
+    @cell_type[sheet][key] = Openoffice.oo_type_2_roo_type(vt)
     @formula[sheet] = {} unless @formula[sheet]
     @formula[sheet][key] = formula  if formula
     @cell[sheet]    = {} unless @cell[sheet]
-    case @cell_type[sheet][key] 
+    case @cell_type[sheet][key]
     when :float
-      @cell[sheet][key] = v.to_f 
+      @cell[sheet][key] = v.to_f
     when :string
-      @cell[sheet][key] = str_v 
+      @cell[sheet][key] = str_v
     when :date
-      @cell[sheet][key] = tr.attributes['date-value'] 
+      @cell[sheet][key] = tr.attributes['date-value']
     when :percentage
-      @cell[sheet][key] = v.to_f 
+      @cell[sheet][key] = v.to_f
     else
-      @cell[sheet][key] = v 
-    end                      
+      @cell[sheet][key] = v
+    end
   end
 
   # read all cells in the selected sheet
@@ -425,7 +425,7 @@ class Openoffice < GenericSpreadsheet
                         rep = te.attributes["number-columns-repeated"]
                       elsif te.name == "table-row"
                         if te.attributes['number-rows-repeated']
-                          skip_y = te.attributes['number-rows-repeated'].to_i 
+                          skip_y = te.attributes['number-rows-repeated'].to_i
                           y = y + skip_y - 1 # minus 1 because this line will be counted as a line element
                         end
                         te.each_element do |tr|
@@ -472,7 +472,7 @@ class Openoffice < GenericSpreadsheet
                         x = 1
                       end
                     end
-                  end # sheet 
+                  end # sheet
                 end
               end
             end
@@ -480,13 +480,13 @@ class Openoffice < GenericSpreadsheet
         end
       end
     end
-    if !sheet_found 
-      raise RangeError 
+    if !sheet_found
+      raise RangeError
     end
     @cells_read[sheet] = true
   end
 
-  # Checks if the default_sheet exists. If not an RangeError exception is 
+  # Checks if the default_sheet exists. If not an RangeError exception is
   # raised
   def check_default_sheet
     sheet_found = false
@@ -502,7 +502,7 @@ class Openoffice < GenericSpreadsheet
                 if se.name == "table"
                   if se.attributes['name'] == @default_sheet
                     sheet_found = true
-                  end # sheet 
+                  end # sheet
                 end
               end
             end
@@ -519,17 +519,17 @@ class Openoffice < GenericSpreadsheet
     if zip.file.file? path
       if path == "content.xml"
         open(@tmpdir+'/'+@file_nr.to_s+'_roo_content.xml','wb') {|f|
-          f << zip.read(path) 
+          f << zip.read(path)
         }
-      end 
+      end
     else
       unless path.empty?
-        path += '/' 
-      end 
+        path += '/'
+      end
       zip.dir.foreach(path) do |filename|
         process_zipfile(zip, path+filename)
-      end 
-    end 
+      end
+    end
   end
 
   def extract_content
@@ -559,7 +559,7 @@ class Openoffice < GenericSpreadsheet
     return A_ROO_TYPE[ootype]
   end
 
- 
+
   #TODO: refactoring to GenericSpreadsheet?
   def write_csv_content(file=nil,sheet=nil)
     file = STDOUT unless file
@@ -576,13 +576,13 @@ class Openoffice < GenericSpreadsheet
     end
   end
 
-#TODO: refactor to Generic...
+  #TODO: refactor to Generic...
   def one_cell_output(onecelltype,onecell,empty)
     str = ""
-    if empty 
+    if empty
       str += ''
     else
-      case onecelltype 
+      case onecelltype
       when :string
         if onecell == ""
           str << ''
@@ -623,7 +623,7 @@ class Openoffice < GenericSpreadsheet
     str
   end
 
-  # helper method to convert compressed spaces and other elements within 
+  # helper method to convert compressed spaces and other elements within
   # an text into a string
   def children_to_string(children)
     result = ''

data/lib/roo/version.rb

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

data/test/test_roo.rb

@@ -20,13 +20,14 @@ def local_only
 end
 
 DISPLAY_LOG = false
-DB_LOG = true
+DB_LOG = false
 
 if DB_LOG
   # gem 'activerecord', '< 2.0.0'
   # require 'activerecord'
-  require_gem 'activerecord', '< 2.0.0'
-  #require 'activerecord' 
+  # require_gem 'activerecord', '< 2.0.0'
+  gem 'activerecord', '< 2.0.0'
+  require 'activerecord' 
 end
 
 include FileUtils
@@ -125,7 +126,7 @@ class TestRoo < Test::Unit::TestCase
   GOOGLE     = true 	# do Google-Spreadsheet Tests?
 
   OPENOFFICEWRITE = false # experimental: write access with OO-Documents
-  ONLINE = false
+  ONLINE = true
   LONG_RUN = false
   GLOBAL_TIMEOUT = 2*12*60 # seconds
 
@@ -2416,4 +2417,80 @@ end
       assert_equal "hello from the tests", oo.cell(1,1)
     end
   end
+
+  def test_bug_bbu_openoffice
+    oo = Openoffice.new(File.join('test','bbu.ods'))
+    assert_nothing_raised() {
+      assert_equal "File: test/bbu.ods
+Number of sheets: 3
+Sheets: 2007_12, Tabelle2, Tabelle3
+Sheet 1:
+  First row: 1
+  Last row: 4
+  First column: A
+  Last column: F
+Sheet 2:
+  - empty -
+Sheet 3:
+  - empty -", oo.info
+    }
+
+    oo.default_sheet = oo.sheets[1] # empty sheet
+    assert_nil oo.first_row
+    assert_nil oo.last_row
+    assert_nil oo.first_column
+    assert_nil oo.last_column
+  end
+
+  def test_bug_bbu_excel
+    oo = Excel.new(File.join('test','bbu.xls'))
+    assert_nothing_raised() {
+      assert_equal "File: test/bbu.xls
+Number of sheets: 3
+Sheets: 2007_12, Tabelle2, Tabelle3
+Sheet 1:
+  First row: 1
+  Last row: 4
+  First column: A
+  Last column: F
+Sheet 2:
+  - empty -
+Sheet 3:
+  - empty -", oo.info
+    }
+
+    oo.default_sheet = oo.sheets[1] # empty sheet
+    assert_nil oo.first_row
+    assert_nil oo.last_row
+    assert_nil oo.first_column
+    assert_nil oo.last_column
+  end
+
+if false
+  # there is no google spreadsheet for this test
+  def test_bug_bbu_google
+    oo = Excel.new(key_of('bbu'))
+    assert_nothing_raised() {
+      assert_equal "File: test/bbu.xls
+Number of sheets: 3
+Sheets: 2007_12, Tabelle2, Tabelle3
+Sheet 1:
+  First row: 1
+  Last row: 4
+  First column: A
+  Last column: F
+Sheet 2:
+  - empty -
+Sheet 3:
+  - empty -", oo.info
+    }
+
+    oo.default_sheet = oo.sheets[1] # empty sheet
+    assert_nil oo.first_row
+    assert_nil oo.last_row
+    assert_nil oo.first_column
+    assert_nil oo.last_column
+  end
+end # false
+
 end # class

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>roo</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/roo"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/roo" class="numbers">0.8.0</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.8.1</a>
     </div>
     <h2>What</h2>
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
-platform: ""
+  version: 0.8.1
+platform: ruby
 authors: 
 - Thomas Preymesser
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2007-12-16 00:00:00 +01:00
+date: 2007-12-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,6 +78,13 @@ files:
 - lib/roo/google.rb
 - scripts/txt2html
 - setup.rb
+- test/false_encoding.xls
+- test/Bibelbund1.ods
+- test/bbu.xls
+- test/bbu.ods
+- test/simple_spreadsheet.ods
+- test/simple_spreadsheet_from_italo.ods
+- test/simple_spreadsheet_from_italo.xls
 - test/test_helper.rb
 - test/test_roo.rb
 - test/numbers1.ods
@@ -119,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: roo
-rubygems_version: 0.9.5
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
 summary: roo can access the contents of OpenOffice-, Excel- or Google-Spreadsheets