roo 0.3.0 → 0.4.0

data/History.txt

@@ -1,3 +1,17 @@
+* 7 enhancements:
+  * robustness: Exception if no default_sheet was set
+  * new method reload() implemented 
+  * about 15 % more method documentation
+  * optimization: huge increase of speed (no need to use fixed borders anymore)
+  * added the method 'formulas' which gives you all formulas in a spreadsheet
+  * added the method 'set' which can set cells to a certain value
+  * added the method 'to_yaml' which can produce output for importing in a (rails) database
+* 4 bugfixes
+  * ..row_as_letter methods were nonsense - removed
+  * @cells_read should be reset if the default_sheet is changed
+  * error in excel-part: strings are now converted to utf-8 (the parsexcel-gem gave me an error with my test data, which could not converted to .to_s using latin1 encoding)
+  * fixed bug when default_sheet is changed
+
 == 0.3.0 2007-06-20
 * 1 enhancement:
   * Openoffice: formula support

data/Manifest.txt

@@ -8,6 +8,7 @@ lib/roo/version.rb
 lib/roo/openoffice.rb
 lib/roo/excel.rb
 lib/roo/google.rb
+lib/roo/spreadsheetparser.rb
 scripts/txt2html
 setup.rb
 test/test_helper.rb

data/Rakefile

@@ -79,6 +79,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
     ['rubyzip', '>= 0.9.1'],
     ['hpricot', '>= 0.5'],
     ['hoe', '>= 0.0.0'],
+    ['llip', '>= 0.0.1'],
   ]
   #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
 end

data/lib/roo/excel.rb

@@ -4,8 +4,13 @@ require 'parseexcel'
 class Excel < Openoffice
 
   def initialize(filename)
+    if filename[-4..-1] != ".xls"
+      warn "are you sure, this is an excel file?"
+    end
+    @filename = filename
     @workbook = Spreadsheet::ParseExcel.parse(filename)
     @default_sheet = nil
+    @first_row = @last_row = @first_column = @last_column = nil
   end
 
   # TODO: waiting for
@@ -26,16 +31,19 @@ class Excel < Openoffice
   # im Excel-Bereich muesste man wahrscheinlich intern mit Nummern arbeiten
   # von aussen arbeite ich mit (1,2,3... intern wird Index 0,1,2,...
   # verwendet.
-
   def default_sheet=(n)
     unless n.kind_of?(Fixnum)
       fail ArgumentError.new("Number expected")
     end
     @default_sheet = n-1
+    @first_row = @last_row = @first_column = @last_column = nil
+    @cells_read = false
   end
 
+  # returns the content of a cell. The upper left corner is (1,1) or ('A',1)
   def cell(row,col)
     row,col = normalize(row,col)
+    default_sheet_check
     worksheet = @workbook.worksheet(@default_sheet)
     skip = 0
     line = 1
@@ -45,23 +53,23 @@ class Excel < Openoffice
           return nil
         end
         cell = row_par.at(col-1)
-        # p "celltype: "
-        # p cell.type
         return nil unless cell
         case cell.type
           when :numeric then return cell.to_f
-          when :text then return cell.to_s('latin1')
+          when :text then return cell.to_s('utf-8')
           when :date then return cell.date
         else  
-          return cell.to_s
+          return cell.to_s('utf-8')
         end
       end
       line += 1
     }
   end
 
+  # returns the type of a cell: "float", "string", "date"
   def celltype(row,col)
     row,col = normalize(row,col)
+    default_sheet_check
     worksheet = @workbook.worksheet(@default_sheet)
     skip = 0
     line = 1
@@ -80,17 +88,20 @@ class Excel < Openoffice
     }
   end
 
+  # return this row a an array off cells
   def row(rownumber)
+    default_sheet_check
     worksheet = @workbook.worksheet(@default_sheet)
     therow = worksheet.row(rownumber-1) 
     result = []
     therow.each {|cell|
       case cell.type
          when :numeric then result << cell.to_i
-         when :text then result << cell.to_s('latin1')
+         when :text then result << cell.to_s('utf-8')
          when :date then result << cell.date
       else
-        return result << cell.to_s
+        #p cell.type
+        return result << cell.to_s('utf-8')
       end
 
       #result << cell.value
@@ -98,42 +109,51 @@ class Excel < Openoffice
     return result
   end
 
+  # returns the first non empty column
   def first_column
+    return @first_column if @first_column
     fr, lr, fc, lc = get_firsts_lasts
     fc
   end
 
+  # returns the last non empty column
   def last_column
+    return @last_column if @last_column
     fr, lr, fc, lc = get_firsts_lasts
     lc
   end
 
+  # returns the first non empty row
   def first_row
+    return @first_row if @first_row
     fr, lr, fc, lc = get_firsts_lasts
     fr
   end
 
+  # returns the last non empty row
   def last_row
+    return @last_row if @last_row
     fr, lr, fc, lc = get_firsts_lasts
     lr
   end
 
+  # true if a cell is empty
   def empty?(row, col)
     row,col = normalize(row,col)
     return true if row < first_row || row > last_row || col < first_column || col > last_column
-    # read_cells unless @cells_read
     return true unless cell(row, col)
-    # p celltype(row,col)
-    #p cell(row,col)
     return true if celltype(row, col) == "string" && cell(row, col) == ""
-          #when :text then return cell.to_s('latin1')
-    # p celltype(row,col)
-    # return true if cell(row, col) == ""
     false
   end
 
 private
 
+  # check if default_sheet was set
+  def default_sheet_check
+    raise ArgumentError, "Error: default_sheet not set" if @default_sheet == nil
+  end
+
+  # determine the first and last boundaries
   def get_firsts_lasts
     fr = fc = 999_999
     lr = lc = -999_999  
@@ -159,6 +179,10 @@ private
       end
       line += 1
     }
+    @first_row = fr
+    @last_row = lr
+    @first_column = fc
+    @last_column = lc
     return fr, lr, fc, lc
   end
 

data/lib/roo/openoffice.rb

@@ -4,18 +4,18 @@ require 'rexml/document'
 require 'fileutils'
 require 'zip/zipfilesystem'
 require 'date'
+require 'llip'
 
-class Fixnum
-  def as_letter
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZ"[self-1,1]
-  end
-end
+require 'lib/roo/spreadsheetparser'
 
 class Openoffice
 
   @@nr = 0
 
   def initialize(filename)
+    if filename[-4..-1] != ".ods"
+      warn "are you sure, this is an openoffice file?"
+    end
     @cells_read = false
     @filename = filename
     @tmpdir = "oo_"+$$.to_s
@@ -31,13 +31,16 @@ class Openoffice
     @cell = Hash.new
     @cell_type = Hash.new
     @formula = Hash.new
-    if DateTime.now > Date.new(2007,6,21)
+#    if ENV["roo_local"] != "thomas-p"
       FileUtils::rm_r(@tmpdir)
-    end
+#    end
     @default_sheet = nil
+    @first_column = @last_column = nil
+    @first_row = @last_row = nil
   end
 
   # reopens and read a spreadsheet document
+  if false
   def reload
     @cells_read = false
     @tmpdir = "oo_"+$$.to_s
@@ -52,9 +55,20 @@ class Openoffice
     @cell_type = Hash.new
     FileUtils::rm_r(@tmpdir)
     @default_sheet = nil
+    @first_column = @last_column = nil
+    @first_row = @last_row = nil
+  end
+  end
+
+  def reload
+    default_sheet = @default_sheet
+    initialize(@filename) 
+    self.default_sheet = default_sheet
+     @first_row = @last_row = @first_column = @last_column = nil
+
   end
 
-  # return the content of a spreadsheet-cell
+  # returns the content of a spreadsheet-cell
   # (1,1) is the upper left corner
   # (1,1), (1,'A'), ('A',1), ('a',1) all refers to the
   # cell at first line, first row
@@ -69,6 +83,7 @@ class Openoffice
   end
 
   # returns the formula at (row,col)
+  # nil if there is no formula
   def formula(row,col)
     read_cells unless @cells_read
     row,col = normalize(row,col)
@@ -79,21 +94,33 @@ class Openoffice
     end
   end
 
+  # true, if there is a formula
   def formula?(row,col)
+    read_cells unless @cells_read
+    row,col = normalize(row,col)
     formula(row,col) != nil
   end
 
+  # set a cell to a certain value
+  # (this will not be saved back to the spreadsheet file!)
   def set(row,col,value)
-    puts "setze zelle(#{row},#{col})"
-    @cell["#{row},#{col}"] = value
+    row,col = normalize(row,col)
+    set_value(row,col,value)
+    if value.class == Fixnum
+      set_type(row,col,:float)
+    elsif value.class == String
+      set_type(row,col,:string)
+    elsif value.class == Float
+      set_type(row,col,:string)
+    else
+      raise ArgumentError, "Typ fuer "+value.to_s+" nicht gesetzt"
+    end 
   end
 
   # returns the open-office type of a cell
   def celltype(row,col)
     read_cells unless @cells_read
     row,col = normalize(row,col)
-    
-    # p  @formula["#{row},#{col}"]
     if @formula["#{row},#{col}"]
       return :formula
     else
@@ -101,8 +128,7 @@ class Openoffice
     end
   end
 
-
-  # returns an array of sheets in the spreadsheet
+  # returns an array of sheet names in the spreadsheet
   def sheets
     return_sheets = []
     oo_document_count = 0
@@ -130,11 +156,17 @@ class Openoffice
   # set the working sheet in the document
   def default_sheet=(s)
     @default_sheet = s
+    @first_row = @last_row = @first_column = @last_column = nil
+    @cells_read = false
+    @cell = Hash.new
+    @cell_type = Hash.new
+    @formula = Hash.new
   end
 
   # version of the openoffice document 
+  # at 2007 this is always "1.0"
   def officeversion
-    read_cells unless @cells_read
+    read_cells(:ignore_default_sheet => true) unless @cells_read
     @officeversion
   end
 
@@ -152,7 +184,6 @@ class Openoffice
     result = []
     tmp_arr = []
     @cell.each_pair {|key,value|
-  
       y,x = key.split(',')
       x = x.to_i
       y = y.to_i
@@ -170,81 +201,86 @@ class Openoffice
   # returns the number of the last non-empty row
   def last_row
     read_cells unless @cells_read
-    result = 0
+    if @last_row
+      return @last_row
+    end
+    impossible_value = 0
+    result = impossible_value
     @cell.each_pair {|key,value|
       y,x = key.split(',')
       y = y.to_i
       result = [result, y].max if value
     }
+    result = nil if result == impossible_value 
+    @last_row = result
     result
   end
 
   # returns the number of the last non-empty column
   def last_column
     read_cells unless @cells_read
-    result = 0
+    if @last_column
+      return @last_column
+    end
+    impossible_value = 0
+    result = impossible_value
     @cell.each_pair {|key,value|
       y,x = key.split(',')
       x = x.to_i
       result = [result, x].max if value
     }
+    result = nil if result == impossible_value
+    @last_column = result
     result
   end
 
   # returns the number of the first non-empty row
   def first_row
     read_cells unless @cells_read
-    result = 999_999 # more than a spreadsheet can hold
+    if @first_row
+      return @first_row
+    end
+    impossible_value = 999_999 # more than a spreadsheet can hold
+    result = impossible_value 
     @cell.each_pair {|key,value|
       y,x = key.split(',')
       y = y.to_i
       result = [result, y].min if value
     }
+    result = nil if result == impossible_value
+    @first_row = result
     result
   end
 
   # returns the number of the first non-empty column
   def first_column
     read_cells unless @cells_read
-    result = 999_999 # more than a spreadsheet can hold
+    if @first_column
+      return @first_column
+    end
+    impossible_value = 999_999 # more than a spreadsheet can hold
+    result = impossible_value 
     @cell.each_pair {|key,value|
       y,x = key.split(',')
       x = x.to_i
       result = [result, x].min if value
     }
+    result = nil if result == impossible_value
+    @first_column = result
     result
   end
 
+  # first non-empty column as a letter
   def first_column_as_letter
-    number_to_letter(first_column)
+    Openoffice.number_to_letter(first_column)
   end
 
+  # last non-empty column as a letter
   def last_column_as_letter
-    number_to_letter(last_column)
-  end
-
-  def first_row_as_letter
-    number_to_letter(first_row)
-  end
-
-  def last_row_as_letter
-    number_to_letter(last_row)
-  end
-
-  def as_letter(n)
-    number_to_letter(last_row)
-  end
-
-  def number_to_letter(n)
-    letters=""
-    while n > 0
-      num = n%26
-      letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"[num-1,1] + letters
-      n = n.div(26)
-     end
-     letters
+    Openoffice.number_to_letter(last_column)
   end
 
+  # true if cell is empty
   def empty?(row, col)
     read_cells unless @cells_read
     return true unless cell(row, col)
@@ -252,25 +288,72 @@ class Openoffice
     false
   end
 
-  def Openoffice.letter_to_number(letters)
-    result = 0
-    while letters && letters.length > 0
-      character = letters[0,1].upcase
-      num = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".index(character)+1
-      result = result * 26 + num
-      letters = letters[1..-1]
-    end
-    result
-  end
-
+=begin
+  # save spreadsheet
   def save
     42
   end
+=end
+
+  # evaluate the formula at this cell 
+  # experimental: DO NOT USE THIS!
+  def solve(row,col)
+    parser = SpreadsheetParser.new
+    visitor = Visitor.new
+    #puts cell(row,col)
+    puts formula(row,col)
+    formula = formula(row,col)[1..-1] # .downcase
+    puts formula
+    #eval formula
+    #parser.parse(formula)
+    parser.parse(formula).accept(visitor)
+  end
+
+  # returns each formula in the selected sheet as an array of elements
+  # [row, col, formula]
+  def formulas
+    theformulas = Array.new
+    read_cells unless @cells_read
+    first_row.upto(last_row) {|row|
+      first_column.upto(last_column) {|col|
+        if formula?(row,col)
+          f = [row, col, formula(row,col)]
+          theformulas << f
+        end
+      }
+    } 
+    theformulas
+  end
+  
+  # returns a rectangular area (default: all cells) as yaml-output 
+  # you can add additional attributes with the prefix parameter like:
+  # oo.to_yaml({"file"=>"flightdata_2007-06-26", "sheet" => "1"})
+  def to_yaml(prefix={}, from_row=nil, from_column=nil, to_row=nil, to_column=nil)
+    result = "--- \n"
+    (from_row||first_row).upto(to_row||last_row) do |row|
+      (from_column||first_column).upto(to_column||last_column) do |col|
+        unless self.empty?(row,col)
+          result << "cell_#{row}_#{col}: \n" 
+          prefix.each {|k,v|
+            result << "  #{k}: #{v} \n"
+          }
+          result << "  row: #{row} \n" 
+          result << "  col: #{col} \n" 
+          result << "  celltype: #{self.celltype(row,col)} \n" 
+          result << "  value: #{self.cell(row,col)} \n" 
+        end
+      end
+    end
+    result
+  end
 
 private
 
   # read all cells in the selected sheet
-  def read_cells
+  def read_cells(*args)
+    if :ignore_default_sheet == false
+      raise ArgumentError, "Error: default_sheet not set" if @default_sheet == nil
+    end
     oo_document_count = 0
     @doc.each_element do |oo_document|
       @officeversion = oo_document.attributes['version']
@@ -278,35 +361,24 @@ private
       oo_element_count = 0
       oo_document.each_element do |oo_element|
         oo_element_count += 1
-        # p oo_element.name
         if oo_element.name == "body"
-          # puts "Body gefunden "
           oo_element.each_element do |be|
-            # p be.name
             if be.name == "spreadsheet"
               be.each_element do |se|
-                # p se
                 if se.name == "table"
                   if se.attributes['name']==@default_sheet
 
                   x=1
                   y=1
-                  # puts "table gefunden"
-                  #se.each_element
                   se.each_element do |te|
-                    # p te.name
                     if te.name == "table-column"
-                      # p te.attributes
                       rep = te.attributes["number-columns-repeated"]
-                      # p "rep = "+rep.to_s
                     elsif te.name == "table-row"
                       if te.attributes['number-rows-repeated']
                         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
-                      # p te
                       te.each_element do |tr|
-                        # p tr
                         if tr.name == 'table-cell'
                            skip = tr.attributes['number-columns-repeated']
                            formula = tr.attributes['formula']
@@ -329,14 +401,7 @@ private
                                  if @cell_type["#{y},#{x+i}"] == 'float'
                                    @cell["#{y},#{x+i}"] = v.to_f
                                  elsif @cell_type["#{y},#{x+i}"] == 'string'
-                                   # puts "in string zweig..."
-                                   #tr.each_element do |str|
-                                   #  if str.name == 'p'
-                                   #    @cell["#{y},#{x+i}"] = str.text
-                                   #  end
-                                   #end
                                    @cell["#{y},#{x+i}"] = v
-                                   
                                  elsif @cell_type["#{y},#{x+i}"] == 'date'
                                    @cell["#{y},#{x+i}"] = tr.attributes['date-value']
                                  else
@@ -420,4 +485,36 @@ private
     return row,col
   end 
 
-end
+  # convert a number to something like this: 'AB'
+  def Openoffice.number_to_letter(n)
+    letters=""
+    while n > 0
+      num = n%26
+      letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"[num-1,1] + letters
+      n = n.div(26)
+     end
+     letters
+  end
+
+  # convert letters like 'AB' to a number
+  def Openoffice.letter_to_number(letters)
+    result = 0
+    while letters && letters.length > 0
+      character = letters[0,1].upcase
+      num = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".index(character)+1
+      result = result * 26 + num
+      letters = letters[1..-1]
+    end
+    result
+  end
+
+  
+  def set_value(row,col,value)
+    @cell["#{row},#{col}"] = value
+  end
+
+  def set_type(row,col,type)
+    @cell_type["#{row},#{col}"] = type
+  end
+
+end # class

data/lib/roo/spreadsheetparser.rb

@@ -0,0 +1,91 @@
+=begin
+This is experimental. Please do not use it. IT WILL NOT WORK
+I don't know if i will extend the work on the evaluation of formulas. 
+You can access all formulas as a string and do whatever you want with this.
+=end
+
+require 'llip'
+require 'llip/visitable'
+
+class Formula
+  include LLIP::Visitable
+
+  attr_accessor :name
+  attr_accessor :params
+end
+
+class Param
+  include LLIP::Visitable
+
+  attr_accessor :column_name
+end
+
+class Visitor
+  def visit_formula(formula)
+    puts " -- " + formula.name
+    formula.params.each { |p| p.accept(self) }
+  end
+
+  def visit_param(param)
+    puts " |-- " + param.column_name
+  end
+end
+
+class SpreadsheetParser < LLIP::Parser
+  letters = ("A".."Z").to_a.join("|")
+
+  token :id, "(#{letters})+"
+
+  token :"(", '\('
+
+  token :")", '\)'
+
+  token :"[", '['
+  token :"]", ']'
+  token :".", '.'
+
+  num = (1..9).to_a.join("|")
+  token :num , "(#{num})(#{num}|0)*"
+
+  token :sep, ":"
+
+  scope :formula
+
+  production :formula do |p|
+    p.token(:id) do |result,scanner,parser|
+      result = Formula.new
+      result.name = scanner.current
+puts "<"+result.name+">"
+      raise unless scanner.next == :"("
+      raise unless scanner.next == :"["
+      scanner.next
+      result.params = parser.parse_params
+      raise unless scanner.current == :"]"
+      raise unless scanner.current == :")"
+      scanner.next
+      result
+    end
+  end
+
+  production :params, :recursive do |p|
+    p.default do |scanner, parser|
+      []
+    end
+
+    p.token(:id) do |result, scanner, parser|
+      param = Param.new
+      param.column_name = scanner.current.to_s
+      raise unless scanner.next == :"."
+      raise unless scanner.next == :num
+      param.column_name += scanner.current.to_s
+      scanner.next
+      result << param
+    end
+
+    p.token(:sep) do |result,scanner,parser|
+      scanner.next
+      result
+    end
+  end
+
+end

data/lib/roo/version.rb

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

data/test/test_roo.rb

@@ -190,6 +190,7 @@ end
         
         assert_equal "thisisd9", oo.cell('d',9)
         assert_equal "thisisa11", oo.cell('a',11)
+        #assert_equal "lulua", oo.cell('b',10)
       end
       
       if GOOGLE
@@ -430,8 +431,6 @@ end
       assert_equal 5, oo.first_row
       assert_equal 'E', oo.last_column_as_letter
       assert_equal 14, oo.last_row
-      assert_equal 'E', oo.first_row_as_letter
-      assert_equal 'N', oo.last_row_as_letter
       if EXCEL
         #-- Excel
         oo = Excel.new(File.join("test","numbers1.xls"))
@@ -441,8 +440,6 @@ end
         assert_equal 5, oo.first_row
         assert_equal 'E', oo.last_column_as_letter
         assert_equal 14, oo.last_row
-        assert_equal 'E', oo.first_row_as_letter
-        assert_equal 'N', oo.last_row_as_letter
       end
     end
     
@@ -537,14 +534,22 @@ end
     end
 
     def test_reload
-      oo = Openoffice.new(File.join("test","numbers1.ods"))
-      oo.default_sheet = oo.sheets.first
-      assert_equal 1, oo.cell(1,1)
+      if OPENOFFICE
+        oo = Openoffice.new(File.join("test","numbers1.ods"))
+        oo.default_sheet = oo.sheets.first
+        assert_equal 1, oo.cell(1,1)
 
-if DateTime.now < Date.new(2007, 6, 15)
-      oo.reload
-      assert_equal 2, oo.cell(1,1)
-end
+        oo.reload
+        assert_equal 1, oo.cell(1,1)
+      end
+      if EXCEL
+        oo = Excel.new(File.join("test","numbers1.xls"))
+        oo.default_sheet = 1 # oo.sheets.first
+        assert_equal 1, oo.cell(1,1)
+
+        oo.reload
+        assert_equal 1, oo.cell(1,1)
+      end
     end
 
     def test_bug_contiguous_cells
@@ -687,59 +692,167 @@ end
     end
   end
 
+  def myfunc(n)
+    puts "#{n} Euro"
+  end
 
   def test_formula
+    if OPENOFFICE
+      oo = Openoffice.new(File.join("test","formula.ods"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal 1, oo.cell('A',1)
+      assert_equal 2, oo.cell('A',2)
+      assert_equal 3, oo.cell('A',3)
+      assert_equal 4, oo.cell('A',4)
+      assert_equal 5, oo.cell('A',5)
+      assert_equal 6, oo.cell('A',6)
+      assert_equal 21, oo.cell('A',7)
+      assert_equal :formula, oo.celltype('A',7)
+      assert_equal "=[Sheet2.A1]", oo.formula('C',7)
+      assert_nil oo.formula('A',6)
+      assert_equal [[7, 1, "=SUM([.A1:.A6])"],
+         [7, 2, "=SUM([.$A$1:.B6])"],
+         [7, 3, "=[Sheet2.A1]"],
+         [8, 2, "=SUM([.$A$1:.B7])"],
+         ], oo.formulas
 
-    oo = Openoffice.new(File.join("test","formula.ods"))
-    oo.default_sheet = oo.sheets.first
-    assert_equal 1, oo.cell('A',1)
-    assert_equal 2, oo.cell('A',2)
-    assert_equal 3, oo.cell('A',3)
-    assert_equal 4, oo.cell('A',4)
-    assert_equal 5, oo.cell('A',5)
-    assert_equal 6, oo.cell('A',6)
-    assert_equal 21, oo.cell('A',7)
-    assert_equal :formula, oo.celltype('A',7)
-    #assert_equal "=SUM(A1:A6)", oo.formula('A',7)
-    #assert_equal "=SUM(A1:A6)", oo.formula('B',7)
-    #assert_equal "=SUM(A1:A6)", oo.formula('B',7)
-    assert_equal "=[Sheet2.A1]", oo.formula('C',7)
-    assert_nil oo.formula('A',6)
-
-    oo = Openoffice.new(File.join("test","external1.ods"))
-    # each spreadsheet, each row, each column
-    oo.sheets.each {|sheet|
-      oo.default_sheet = sheet
-      oo.first_row.upto(oo.last_row) do |row|
-        oo.first_column.upto(oo.last_column) do |col|
-          value = oo.cell(row,col)
-          # is it a formula?
-          if oo.formula?(row,col)
-            # formula
-            puts oo.formula(row,col)
-            # value
-            puts value if value
-          else
-             puts value if value
+      if DateTime.now > Date.new(2007,6,25)
+        # setting a cell
+        oo.set('A',15, 41)
+        assert_equal 41, oo.cell('A',15)
+        oo.set('A',16, "41")
+        assert_equal "41", oo.cell('A',16)
+        oo.set('A',17, 42.5)
+        assert_equal 42.5, oo.cell('A',17)
+      end
+      if DateTime.now > Date.new(2007,6,30)
+        assert_equal 21, oo.solve('a',7)
+      end
+
+      oo = Openoffice.new(File.join("test","external1.ods"))
+      # each spreadsheet, each row, each column
+      oo.sheets.each {|sheet|
+        oo.default_sheet = sheet
+        if oo.first_row
+          oo.first_row.upto(oo.last_row) do |row|
+            oo.first_column.upto(oo.last_column) do |col|
+              value = oo.cell(row,col)
+              # is it a formula?
+              if oo.formula?(row,col)
+                # formula
+                puts oo.formula(row,col)
+                # value
+                puts value if value
+              else
+                puts value if value
+              end
+            end
           end
         end
-      end
-    }
-    if false
-    oo = Excel.new(File.join("test","formula.xls"))
-    oo.default_sheet = 1 # oo.sheets.first
-    assert_equal 1, oo.cell('A',1)
-    assert_equal 2, oo.cell('A',2)
-    assert_equal 3, oo.cell('A',3)
-    assert_equal 4, oo.cell('A',4)
-    assert_equal 5, oo.cell('A',5)
-    assert_equal 6, oo.cell('A',6)
-    assert_equal 21, oo.cell('A',7), oo.cell('A',7).to_yaml
-    assert_equal :formula, oo.celltype('A',7)
-    assert_equal "=SUM(A1:A6)", oo.formula('A',7)
-    assert_equal "=SUM(A1:A6)", oo.formula('B',7)
-    assert_nil oo.formula('A',6)
+      }
     end
+  end
+
+
+  def test_borders_sheets
+    if OPENOFFICE
+      oo = Openoffice.new(File.join("test","borders.ods"))
+      oo.default_sheet = oo.sheets[1]
+      assert_equal 6, oo.first_row
+      assert_equal 11, oo.last_row
+      assert_equal 4, oo.first_column
+      assert_equal 8, oo.last_column
 
+      oo.default_sheet = oo.sheets.first
+      #assert_nil  oo.first_row
+      assert_equal 5, oo.first_row
+      #assert_nil oo.last_row 
+      assert_equal 10, oo.last_row 
+      assert_equal 3, oo.first_column
+      #assert_nil oo.first_column
+      assert_equal 7, oo.last_column
+      #assert_nil oo.last_column
+
+      oo.default_sheet = oo.sheets[2]
+      assert_equal 7, oo.first_row
+      assert_equal 12, oo.last_row
+      assert_equal 5, oo.first_column
+      assert_equal 9, oo.last_column
+    end
+    if EXCEL
+      oo = Excel.new(File.join("test","borders.xls"))
+      oo.default_sheet = 2 # oo.sheets[1]
+      assert_equal 6, oo.first_row
+      assert_equal 11, oo.last_row
+      assert_equal 4, oo.first_column
+      assert_equal 8, oo.last_column
+
+      oo.default_sheet = 1 # oo.sheets.first
+      #assert_nil  oo.first_row
+      assert_equal 5, oo.first_row
+      #assert_nil oo.last_row 
+      assert_equal 10, oo.last_row 
+      assert_equal 3, oo.first_column
+      #assert_nil oo.first_column
+      assert_equal 7, oo.last_column
+      #assert_nil oo.last_column
+
+      oo.default_sheet = 3 # oo.sheets[2]
+      assert_equal 7, oo.first_row
+      assert_equal 12, oo.last_row
+      assert_equal 5, oo.first_column
+      assert_equal 9, oo.last_column
+    end
+    
   end
+
+  def yaml_entry(row,col,type,value)
+    "cell_#{row}_#{col}: \n  row: #{row} \n  col: #{col} \n  celltype: #{type} \n  value: #{value} \n"
+  end
+
+  def test_to_yaml
+    if OPENOFFICE
+      oo = Openoffice.new(File.join("test","numbers1.ods"))
+      oo.default_sheet = oo.sheets.first
+      assert_equal "--- \n"+yaml_entry(5,1,"date","1961-11-21"), oo.to_yaml({}, 5,1,5,1)
+      assert_equal "--- \n"+yaml_entry(8,3,"string","thisisc8"), oo.to_yaml({}, 8,3,8,3)
+      assert_equal "--- \n"+yaml_entry(12,3,"float",43.0), oo.to_yaml({}, 12,3,12,3)
+      assert_equal \
+        "--- \n"+yaml_entry(12,3,"float",43.0) +
+        yaml_entry(12,4,"float",44.0) +
+        yaml_entry(12,5,"float",45.0), oo.to_yaml({}, 12,3,12)
+      assert_equal \
+        "--- \n"+yaml_entry(12,3,"float",43.0)+
+        yaml_entry(12,4,"float",44.0)+
+        yaml_entry(12,5,"float",45.0)+
+        yaml_entry(15,3,"float",43.0)+
+        yaml_entry(15,4,"float",44.0)+
+        yaml_entry(15,5,"float",45.0)+
+        yaml_entry(16,3,"string","dreiundvierzig")+
+        yaml_entry(16,4,"string","vierundvierzig")+
+        yaml_entry(16,5,"string","fuenfundvierzig"), oo.to_yaml({}, 12,3)
+    end
+    if EXCEL
+      oo = Excel.new(File.join("test","numbers1.xls"))
+      oo.default_sheet = 1 
+      assert_equal "--- \n"+yaml_entry(5,1,"date","1961-11-21"), oo.to_yaml({}, 5,1,5,1)
+      assert_equal "--- \n"+yaml_entry(8,3,"string","thisisc8"), oo.to_yaml({}, 8,3,8,3)
+      assert_equal "--- \n"+yaml_entry(12,3,"float",43.0), oo.to_yaml({}, 12,3,12,3)
+      assert_equal \
+        "--- \n"+yaml_entry(12,3,"float",43.0) +
+        yaml_entry(12,4,"float",44.0) +
+        yaml_entry(12,5,"float",45.0), oo.to_yaml({}, 12,3,12)
+      assert_equal \
+        "--- \n"+yaml_entry(12,3,"float",43.0)+
+        yaml_entry(12,4,"float",44.0)+
+        yaml_entry(12,5,"float",45.0)+
+        yaml_entry(15,3,"float",43.0)+
+        yaml_entry(15,4,"float",44.0)+
+        yaml_entry(15,5,"float",45.0)+
+        yaml_entry(16,3,"string","dreiundvierzig")+
+        yaml_entry(16,4,"string","vierundvierzig")+
+        yaml_entry(16,5,"string","fuenfundvierzig"), oo.to_yaml({}, 12,3)
+    end
+  end
+
 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.3.0</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.4.0</a>
     </div>
     <h2>What</h2>
 
@@ -146,16 +146,49 @@
 	<p>oo.celltype(row,col) returns :formula if there is a formula in this cell.</p>
 
 
-	<p>oo.formula(row,col) returns the formula in this cell in a string variable.
-If there is no formula in this cell nil is return</p>
+	<p>oo.formula?(row,col) returns true if there is a formula</p>
+
+
+	<p>oo.formula(row,col) returns the formula in this cell in a string variable (like &#8221;=<acronym title="[.A1:.M13]">SUM</acronym>&#8221;). You can do whatever you want with this expression.
+If there is no formula in this cell nil is returned.</p>
 
 
 	<p>oo.cell(row,col) returns the computed result of the formula (as it was saved in the file, no recalculation is done in this Gem).</p>
 
 
+	<p>oo.formulas returns all formulas in the selected spreadsheet in an array like this:</p>
+
+
+	<p>Each entry consists of the elements row, col, formual.</p>
+
+
+	<p>Note: oo.cell(row,col) is the same for ordinary cells and formulas. So you can use the computated value of a formula. If you have to distinguish if a cell is a formula use #formula?</p>
+
+
 	<p>Please note: formulas in Excel-Spreadsheets cannot be handled (this is another gem, see: &#8220;Thanks&#8221;)</p>
 
 
+	<h3><span class="caps">YAML</span>-Output</h3>
+
+
+	<p>You can generate <span class="caps">YAML</span>-Output from your spreadsheet data. The method is called:</p>
+
+
+	<p>oo.to_yaml # =&gt; produces <span class="caps">YAML</span> output from the entire default spreadsheet
+oo.to_yaml({&#8220;myattribute1&#8221; =&gt; &#8220;myvalue1&#8221;, &#8220;myattribute2&#8221; =&gt; &#8220;myvalue2&#8221;)
+           # =&gt; <span class="caps">YAML</span> output with additional attributes
+oo.to_yaml({..}, 2,10, 300,10) # =&gt; only the rectangle from row 2, column 10 to row 300, column 10 will be returned</p>
+
+
+	<p>If you omit one or more parameters the maximum boundaries of your spreadsheet will be used.</p>
+
+
+	<p>With the <span class="caps">YAML</span> output you can import your data in a Ruby on Rails application in a manner that spreadsheet data can accessed in a Rails application.</p>
+
+
+	<p>This is not limited to a Rails application &#8211; you can also do further evaluations with your data.</p>
+
+
 	<h3>Using MS-Excel spreadsheets</h3>
 
 
@@ -169,11 +202,40 @@ Replace Openoffice with
 </code>
 </pre>
 
-	<p>all methode are the same for OpenOffice and Excel-objects. The only difference
+	<p>All methode are the same for OpenOffice and Excel-objects. The only difference
 is the setting of the default-worksheet. OpenOffice uses the name of the worksheet whereas Excel needs the index of the worksheet (1,2,3,..).</p>
 
 
-	<p>Formulas cannot be handled in Excel-spreadsheets.</p>
+	<p>Formulas can only be handled in OpenOffice-spreadsheets.</p>
+
+
+	<p>Features in OpenOffice and Excel:</p>
+
+
+	<table class="border:1px solid black">
+		<tr>
+			<td>feature</td>
+			<td>Open Office</td>
+			<td>Excel</td>
+		</tr>
+		<tr>
+			<td>default_sheet</td>
+			<td>as name</td>
+			<td>as number</td>
+		</tr>
+		<tr>
+			<td>formulas</td>
+			<td>yes</td>
+			<td>no</td>
+		</tr>
+		<tr>
+			<td>to_yaml</td>
+			<td>yes</td>
+			<td>yes</td>
+		</tr>
+	</table>
+
+
 
 
 	<h2>Where is it used?</h2>
@@ -182,9 +244,17 @@ is the setting of the default-worksheet. OpenOffice uses the name of the workshe
 	<p>How do you use roo? What are you doing with roo?</p>
 
 
+	<ul>
+	<li>The author of this gem uses roo for the generation of weekly reports which are (automatically) sent to his customers (Thomas Preymesser, Homepage: www.thopre.com, Blog: thopre.wordpress.com, email me: thopre@gmail.com)</li>
+	</ul>
+
+
 	<p>If you have an interesting application where you use roo then write me a short description of your project and i will publish it here (write, if your email-address should be published or not).</p>
 
 
+	<p>Or you can write directly in the project wiki at <a href="http://roo.rubyforge.org/wiki/wiki.pl?Who's_Using_Roo">http://roo.rubyforge.org/wiki/wiki.pl?Who&#8217;s_Using_Roo</a></p>
+
+
 	<p>If you don&#8217;t want to publish the details you can also write me an email and state, that it should not be published &#8211; i am just curious to hear, where it is used.</p>
 
 
@@ -233,7 +303,7 @@ is the setting of the default-worksheet. OpenOffice uses the name of the workshe
 		<li>Dirk Huth f&uuml;rs Testen unter Windows</li>
 	</ul>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 20th June 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 26th June 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -93,13 +93,40 @@ Formulas in Openoffice-Spreadsheets can be handled.
 
 oo.celltype(row,col) returns :formula if there is a formula in this cell.
 
-oo.formula(row,col) returns the formula in this cell in a string variable.
-If there is no formula in this cell nil is return
+oo.formula?(row,col) returns true if there is a formula
+
+oo.formula(row,col) returns the formula in this cell in a string variable (like "=SUM([.A1:.M13])"). You can do whatever you want with this expression.
+If there is no formula in this cell nil is returned.
 
 oo.cell(row,col) returns the computed result of the formula (as it was saved in the file, no recalculation is done in this Gem).
 
+oo.formulas returns all formulas in the selected spreadsheet in an array like this:
+
+  [[1,2,"=SUM(.A1:.B1)"],
+   [1,3,"=SIN(.C3)"],
+   [1,4,"=COS(.D4)"]]
+
+Each entry consists of the elements row, col, formual.
+
+Note: oo.cell(row,col) is the same for ordinary cells and formulas. So you can use the computated value of a formula. If you have to distinguish if a cell is a formula use #formula? 
+
 Please note: formulas in Excel-Spreadsheets cannot be handled (this is another gem, see: "Thanks")
 
+h3. YAML-Output
+
+You can generate YAML-Output from your spreadsheet data. The method is called:
+
+oo.to_yaml # => produces YAML output from the entire default spreadsheet
+oo.to_yaml({"myattribute1" => "myvalue1", "myattribute2" => "myvalue2")
+           # => YAML output with additional attributes
+oo.to_yaml({..}, 2,10, 300,10) # => only the rectangle from row 2, column 10 to row 300, column 10 will be returned
+
+If you omit one or more parameters the maximum boundaries of your spreadsheet will be used.
+
+With the YAML output you can import your data in a Ruby on Rails application in a manner that spreadsheet data can accessed in a Rails application.
+
+This is not limited to a Rails application - you can also do further evaluations with your data.
+
 h3. Using MS-Excel spreadsheets
 
 You can also access MS-Excel spreadsheat.
@@ -111,18 +138,32 @@ Replace Openoffice with
 </code>
 </pre>
 
-all methode are the same for OpenOffice and Excel-objects. The only difference
+All methode are the same for OpenOffice and Excel-objects. The only difference
 is the setting of the default-worksheet. OpenOffice uses the name of the worksheet whereas Excel needs the index of the worksheet (1,2,3,..).
 
-Formulas cannot be handled in Excel-spreadsheets.
+Formulas can only be handled in OpenOffice-spreadsheets.
+
+Features in OpenOffice and Excel:
+
+table(border:1px solid black).
+|feature|Open Office|Excel|
+|default_sheet|as name|as number|
+|formulas|yes|no|
+|to_yaml|yes|yes|
 
 
 h2. Where is it used?
 
 How do you use roo? What are you doing with roo?
 
+* The author of this gem uses roo for the generation of weekly reports which are (automatically) sent to his customers (Thomas Preymesser, Homepage: www.thopre.com, Blog: thopre.wordpress.com, email me: thopre@gmail.com)
+
+
 If you have an interesting application where you use roo then write me a short description of your project and i will publish it here (write, if your email-address should be published or not). 
 
+Or you can write directly in the project wiki at "http://roo.rubyforge.org/wiki/wiki.pl?Who's_Using_Roo":http://roo.rubyforge.org/wiki/wiki.pl?Who's_Using_Roo
+ 
+
 If you don't want to publish the details you can also write me an email and state, that it should not be published - i am just curious to hear, where it is used.
 
 h2. Documentation

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
-date: 2007-06-20 00:00:00 +02:00
+  version: 0.4.0
+date: 2007-06-27 00:00:00 +02:00
 summary: roo can access the contents of OpenOffice-Spreadsheets
 require_paths: 
 - lib
@@ -39,6 +39,7 @@ files:
 - lib/roo/openoffice.rb
 - lib/roo/excel.rb
 - lib/roo/google.rb
+- lib/roo/spreadsheetparser.rb
 - scripts/txt2html
 - setup.rb
 - test/test_helper.rb
@@ -96,3 +97,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.5"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: llip
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.1
+    version: