roo 0.2.7 → 0.3.0

data/History.txt

@@ -1,3 +1,7 @@
+== 0.3.0 2007-06-20
+* 1 enhancement:
+  * Openoffice: formula support
+
 == 0.2.7 2007-06-20
 * 1 bugfix:
   * Excel: float-numbers were truncated to integer

data/lib/roo/openoffice.rb

@@ -30,7 +30,10 @@ class Openoffice
     file.close
     @cell = Hash.new
     @cell_type = Hash.new
-    FileUtils::rm_r(@tmpdir)
+    @formula = Hash.new
+    if DateTime.now > Date.new(2007,6,21)
+      FileUtils::rm_r(@tmpdir)
+    end
     @default_sheet = nil
   end
 
@@ -65,6 +68,21 @@ class Openoffice
     @cell["#{row},#{col}"]
   end
 
+  # returns the formula at (row,col)
+  def formula(row,col)
+    read_cells unless @cells_read
+    row,col = normalize(row,col)
+    if @formula["#{row},#{col}"] == nil
+      return nil
+    else
+      return @formula["#{row},#{col}"]["oooc:".length..-1]
+    end
+  end
+
+  def formula?(row,col)
+    formula(row,col) != nil
+  end
+
   def set(row,col,value)
     puts "setze zelle(#{row},#{col})"
     @cell["#{row},#{col}"] = value
@@ -74,7 +92,13 @@ class Openoffice
   def celltype(row,col)
     read_cells unless @cells_read
     row,col = normalize(row,col)
-    @cell_type["#{row},#{col}"]
+    
+    # p  @formula["#{row},#{col}"]
+    if @formula["#{row},#{col}"]
+      return :formula
+    else
+      @cell_type["#{row},#{col}"]
+    end
   end
 
 
@@ -285,6 +309,7 @@ private
                         # p tr
                         if tr.name == 'table-cell'
                            skip = tr.attributes['number-columns-repeated']
+                           formula = tr.attributes['formula']
                            vt = tr.attributes['value-type']
                            v  = tr.attributes['value']
                            if vt == 'string'
@@ -300,6 +325,7 @@ private
                              else
                                0.upto(skip.to_i-1) do |i|
                                  @cell_type["#{y},#{x+i}"] = vt
+                                 @formula["#{y},#{x+i}"] = formula if formula
                                  if @cell_type["#{y},#{x+i}"] == 'float'
                                    @cell["#{y},#{x+i}"] = v.to_f
                                  elsif @cell_type["#{y},#{x+i}"] == 'string'
@@ -320,7 +346,7 @@ private
                                x += 1
                              end
                            end # if skip
-                           # puts "#{vt} #{v}"
+                           @formula["#{y},#{x}"] = formula if formula
                            @cell_type["#{y},#{x}"] = vt
                            if @cell_type["#{y},#{x}"] == 'float'
                              @cell["#{y},#{x}"] = v.to_f

data/lib/roo/version.rb

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

data/test/test_roo.rb

@@ -619,7 +619,6 @@ end
   
   def test_italo_table
     oo = Openoffice.new(File.join("test","simple_spreadsheet_from_italo.ods"))
-    p oo.sheets
     oo.default_sheet = oo.sheets.first
     
     assert_equal  '1', oo.cell('A',1)
@@ -678,30 +677,69 @@ end
 
   end
 
-  def test_latlondata
-    #-- this testfile contains confident data and will not be released in the public
-    if File.exist?(File.join("test","latlondata.xls"))
-      oo = Excel.new(File.join("test","latlondata.xls"))
-      #oo = Excel.new("numbers1.xls")
+  def test_external1
+    if File.exist?(File.join("test","external1.xls"))
+      oo = Excel.new(File.join("test","external1.xls"))
       oo.default_sheet = 2
-      5.upto(oo.last_row) do |line|
-        waypoint = oo.cell(line,'V')
-        desc = oo.cell(line,'W')
-        color = oo.cell(line,'X')
-        symbol = oo.cell(line,'Y')
-        longitude = oo.cell(line,'Z')
-        latitude = oo.cell(line,'AA')
-        alt = oo.cell(line,'AB')
-        if waypoint
-          puts "#{waypoint}\t#{desc}\t#{color}\t#{symbol}\t#{longitude.to_f}\t#{latitude.to_f}\t#{alt.to_f}" 
+      assert_equal(-105.675, oo.cell('Z',5))
+      assert_equal(41.31205555, oo.cell('AA',5))
+      assert_equal(2218.3344, oo.cell('AB',5))
+    end
+  end
+
+
+  def test_formula
+
+    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
+          end
         end
       end
-      #--
-      assert_equal "[1] KLAR (takeoff)", oo.cell('V',5)
-      assert_equal "takeoff LAR (VFR)", oo.cell('w',5)
-      assert_equal -105.675, oo.cell('Z',5)
-      assert_equal 41.31205555, oo.cell('AA',5)
-      assert_equal 2218.3344, oo.cell('AB',5)
+    }
+    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
 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.2.7</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.3.0</a>
     </div>
     <h2>What</h2>
 
@@ -137,6 +137,25 @@
 </code>
 </pre>
 
+	<h3>Formulas</h3>
+
+
+	<p>Formulas in Openoffice-Spreadsheets can be handled.</p>
+
+
+	<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.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>Please note: formulas in Excel-Spreadsheets cannot be handled (this is another gem, see: &#8220;Thanks&#8221;)</p>
+
+
 	<h3>Using MS-Excel spreadsheets</h3>
 
 
@@ -154,6 +173,21 @@ Replace Openoffice with
 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>
+
+
+	<h2>Where is it used?</h2>
+
+
+	<p>How do you use roo? What are you doing with roo?</p>
+
+
+	<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>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>
+
+
 	<h2>Documentation</h2>
 
 
@@ -199,7 +233,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>, 18th June 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 20th June 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -87,6 +87,19 @@ to
 </code>
 </pre>
 
+h3. Formulas
+
+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.cell(row,col) returns the computed result of the formula (as it was saved in the file, no recalculation is done in this Gem).
+
+Please note: formulas in Excel-Spreadsheets cannot be handled (this is another gem, see: "Thanks")
+
 h3. Using MS-Excel spreadsheets
 
 You can also access MS-Excel spreadsheat.
@@ -101,6 +114,16 @@ Replace Openoffice with
 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.
+
+
+h2. Where is it used?
+
+How do you use roo? What are you doing with roo?
+
+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). 
+
+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,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.3.0
 date: 2007-06-20 00:00:00 +02:00
 summary: roo can access the contents of OpenOffice-Spreadsheets
 require_paths: