roo 0.2.5 → 0.2.6

data/History.txt

@@ -1,3 +1,7 @@
+== 0.2.6 2007-06-19
+* 1 bugfix:
+  * Openoffice: two or more consecutive cells with string content failed 
+
 == 0.2.5 2007-06-17
 
 * 2 enhancements:

data/lib/roo/excel.rb

@@ -47,6 +47,7 @@ class Excel < Openoffice
         cell = row_par.at(col-1)
         # p "celltype: "
         # p cell.type
+        return nil unless cell
         case cell.type
           when :numeric then return cell.to_i
           when :text then return cell.to_s('latin1')
@@ -67,6 +68,7 @@ class Excel < Openoffice
     worksheet.each(skip) { |row_par|
       if line == row
         cell = row_par.at(col-1)
+        return nil unless cell
         case cell.type
         when :numeric then return "float"
         when :text then return "string"

data/lib/roo/openoffice.rb

@@ -287,6 +287,13 @@ private
                            skip = tr.attributes['number-columns-repeated']
                            vt = tr.attributes['value-type']
                            v  = tr.attributes['value']
+                           if vt == 'string'
+                             tr.each_element do |str|
+                               if str.name == 'p'
+                                 v = str.text
+                               end
+                             end
+                           end
                            if skip
                              if v == nil
                                x += (skip.to_i - 1)
@@ -296,11 +303,14 @@ private
                                  if @cell_type["#{y},#{x+i}"] == 'float'
                                    @cell["#{y},#{x+i}"] = v.to_f
                                  elsif @cell_type["#{y},#{x+i}"] == 'string'
-                                   tr.each_element do |str|
-                                     if str.name == 'p'
-                                       @cell["#{y},#{x+i}"] = str.text
-                                     end
-                                   end
+                                   # 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

data/lib/roo/version.rb

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

data/test/test_roo.rb

@@ -29,7 +29,7 @@ class TestRoo < Test::Unit::TestCase
   
   def test_sheets
     oo = Openoffice.new(File.join("test","numbers1.ods"))
-    assert_equal ["Tabelle1","Name of Sheet 2","Sheet3","Sheet4"], oo.sheets
+    assert_equal ["Tabelle1","Name of Sheet 2","Sheet3","Sheet4","Sheet5"], oo.sheets
     #--
     if EXCEL
 if DateTime.now > Date.new(2007,6,30)
@@ -576,6 +576,27 @@ end
      end
    end
 
+  def test_bug_italo_ve
+    if OPENOFFICE
+      oo = Openoffice.new(File.join("test","numbers1.ods"))
+      oo.default_sheet = "Sheet5"
+      assert_equal 1, oo.cell('A',1) 
+      assert_equal 5, oo.cell('b',1) 
+      assert_equal 5, oo.cell('c',1) 
+      assert_equal 2, oo.cell('a',2) 
+      assert_equal 3, oo.cell('a',3) 
+    end
+    if EXCEL
+      oo = Excel.new(File.join("test","numbers1.xls"))
+      oo.default_sheet = 5
+      assert_equal 1, oo.cell('A',1) 
+      assert_equal 5, oo.cell('b',1) 
+      assert_equal 5, oo.cell('c',1) 
+      assert_equal 2, oo.cell('a',2) 
+      assert_equal 3, oo.cell('a',3) 
+    end
+  end
+
   def DONT_test_large_file
     if OPENOFFICE
       count = 0
@@ -595,5 +616,66 @@ end
     end
 
   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)
+    assert_equal  '1', oo.cell('B',1)
+    assert_equal  '1', oo.cell('C',1)
+
+    # assert_equal  1, oo.cell('A',2)
+    # assert_equal  2, oo.cell('B',2)
+    # assert_equal  1, oo.cell('C',2)
+    # are stored as strings, not numbers
+
+    assert_equal  1, oo.cell('A',2).to_i
+    assert_equal  2, oo.cell('B',2).to_i
+    assert_equal  1, oo.cell('C',2).to_i
+
+    assert_equal  1, oo.cell('A',3)
+    assert_equal  3, oo.cell('B',3)
+    assert_equal  1, oo.cell('C',3)
+
+    assert_equal  'A', oo.cell('A',4)
+    assert_equal  'A', oo.cell('B',4)
+    assert_equal  'A', oo.cell('C',4)
+
+    assert_equal  '0.01', oo.cell('A',5)
+    assert_equal  '0.01', oo.cell('B',5)
+    assert_equal  '0.01', oo.cell('C',5)
+
+
+ #   1.0
+
+# Cells values in row 1:
+    assert_equal "1:string", oo.cell(1, 1)+":"+oo.celltype(1, 1)
+    assert_equal "1:string",oo.cell(1, 2)+":"+oo.celltype(1, 2)
+    assert_equal "1:string",oo.cell(1, 3)+":"+oo.celltype(1, 3)
+
+# Cells values in row 2:
+    assert_equal "1:string",oo.cell(2, 1)+":"+oo.celltype(2, 1)
+    assert_equal "2:string",oo.cell(2, 2)+":"+oo.celltype(2, 2)
+    assert_equal "1:string",oo.cell(2, 3)+":"+oo.celltype(2, 3)
+
+# Cells values in row 3:
+    assert_equal "1.0:float",oo.cell(3, 1).to_s+":"+oo.celltype(3, 1)
+    assert_equal "3.0:float",oo.cell(3, 2).to_s+":"+oo.celltype(3, 2)
+    assert_equal "1.0:float",oo.cell(3, 3).to_s+":"+oo.celltype(3, 3)
+
+# Cells values in row 4:
+    assert_equal "A:string",oo.cell(4, 1)+":"+oo.celltype(4, 1)
+    assert_equal "A:string",oo.cell(4, 2)+":"+oo.celltype(4, 2)
+    assert_equal "A:string",oo.cell(4, 3)+":"+oo.celltype(4, 3)
+
+# Cells values in row 5:
+    assert_equal "0.01:percentage",oo.cell(5, 1)+":"+oo.celltype(5, 1)
+    assert_equal "0.01:percentage",oo.cell(5, 2)+":"+oo.celltype(5, 2)
+    assert_equal "0.01:percentage",oo.cell(5, 3)+":"+oo.celltype(5, 3)
+
+
+  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.5</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.2.6</a>
     </div>
     <h2>What</h2>
 
@@ -199,7 +199,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>, 5th June 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 18th June 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
-date: 2007-06-17 00:00:00 +02:00
+  version: 0.2.6
+date: 2007-06-19 00:00:00 +02:00
 summary: roo can access the contents of OpenOffice-Spreadsheets
 require_paths: 
 - lib