roo 0.2.4 → 0.2.5

data/History.txt

@@ -1,3 +1,11 @@
+== 0.2.5 2007-06-17
+
+* 2 enhancements:
+  * Excel: row method implemented
+  * more tests
+* 1 bugfix:
+  * Openoffice: row method fixed
+
 == 0.2.4 2007-06-16
 * 1 bugfix:
   * ID 11605	Two cols with same value: crash roo (openoffice version only)

data/lib/roo/excel.rb

@@ -16,7 +16,7 @@ class Excel < Openoffice
     else
       #worksheet = @workbook.worksheet(0)
       #  p @workbook
-      p @workbook.worksheet(0)
+      # p @workbook.worksheet(0)
       ["aaa","bbb","ccc"]
     end
   end
@@ -80,8 +80,20 @@ class Excel < Openoffice
 
   def row(rownumber)
     worksheet = @workbook.worksheet(@default_sheet)
-    row = worksheet.row(rownumber)
-    row
+    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 :date then result << cell.date
+      else
+        return result << cell.to_s
+      end
+
+      #result << cell.value
+    }
+    return result
   end
 
   def first_column

data/lib/roo/openoffice.rb

@@ -126,14 +126,20 @@ class Openoffice
   def row(rownumber)
     read_cells unless @cells_read
     result = []
+    tmp_arr = []
     @cell.each_pair {|key,value|
+  
       y,x = key.split(',')
       x = x.to_i
       y = y.to_i
       if y == rownumber
-        result[x-1,rownumber] = value
+        tmp_arr[x] = value
       end
     }
+    result = tmp_arr[1..-1]
+    while result[-1] == nil
+      result = result[0..-2]
+    end
     result
   end
   

data/lib/roo/version.rb

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

data/test/test_roo.rb

@@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestRoo < Test::Unit::TestCase
   
-  OPENOFFICE = true # toggle Openoffice-Spreadsheet Test on/off
-  EXCEL = true # do Excel Tests?
-  GOOGLE = false # toggle Google-Spreadsheet Test on/off
+  OPENOFFICE = true  # do Openoffice-Spreadsheet Tests?
+  EXCEL      = true  # do Excel Tests?
+  GOOGLE     = false # do Google-Spreadsheet Tests?
 
-  OPENOFFICEWRITE = false # Tests fuer schreibenden Zugriff auf OO-Dokumente
+  OPENOFFICEWRITE = false # experimental: write access with OO-Dokuments
   
   def setup
     if GOOGLE
@@ -244,18 +244,32 @@ end
       assert_equal 44, oo.cell('d',12)
       assert_equal 45, oo.cell('e',12)
       assert_equal [41.0,42.0,43.0,44.0,45.0], oo.row(12)
+      assert_equal "einundvierzig", oo.cell('a',16)
+      assert_equal "zweiundvierzig", oo.cell('b',16)
+      assert_equal "dreiundvierzig", oo.cell('c',16)
+      assert_equal "vierundvierzig", oo.cell('d',16)
+      assert_equal "fuenfundvierzig", oo.cell('e',16)
+      assert_equal ["einundvierzig", "zweiundvierzig", "dreiundvierzig", "vierundvierzig", "fuenfundvierzig"], oo.row(16)
       if EXCEL
-        if DateTime.now > Date.new(2007,6,17)
-          #-- Excel
-          oo = Excel.new(File.join("test","numbers1.xls"))
-          oo.default_sheet = 1 # oo.sheets.first
-          assert_equal 41, oo.cell('a',12)
-          assert_equal 42, oo.cell('b',12)
-          assert_equal 43, oo.cell('c',12)
-          assert_equal 44, oo.cell('d',12)
-          assert_equal 45, oo.cell('e',12)
-          assert_equal [41.0,42.0,43.0,44.0,45.0], oo.row(12)
-        end
+        #-- Excel
+        oo = Excel.new(File.join("test","numbers1.xls"))
+        oo.default_sheet = 1 # oo.sheets.first
+        assert_equal 41, oo.cell('a',12)
+        assert_equal 42, oo.cell('b',12)
+        assert_equal 43, oo.cell('c',12)
+        assert_equal 44, oo.cell('d',12)
+        assert_equal 45, oo.cell('e',12)
+        assert_equal [41,42,43,44,45], oo.row(12)
+        assert_equal "einundvierzig", oo.cell('a',16)
+        assert_equal "zweiundvierzig", oo.cell('b',16)
+        assert_equal "dreiundvierzig", oo.cell('c',16)
+        assert_equal "vierundvierzig", oo.cell('d',16)
+        assert_equal "fuenfundvierzig", oo.cell('e',16)
+        assert_equal ["einundvierzig",
+                      "zweiundvierzig",
+                      "dreiundvierzig",
+                      "vierundvierzig",
+                      "fuenfundvierzig"], oo.row(16)
       end
       if DateTime.now > Date.new(2007,6,17)
         #-- GOOGLE
@@ -268,6 +282,17 @@ end
           assert_equal 44, oo.cell('d',12)
           assert_equal 45, oo.cell('e',12)
           assert_equal [41.0,42.0,43.0,44.0,45.0], oo.row(12)
+      assert_equal "einundvierzig", oo.cell('a',16)
+      assert_equal "zweiundvierzig", oo.cell('b',16)
+      assert_equal "dreiundvierzig", oo.cell('c',16)
+      assert_equal "vierundvierzig", oo.cell('d',16)
+      assert_equal "fuenfundvierzig", oo.cell('e',16)
+      assert_equal "xxxfuenfundvierzig", oo.cell('e',16)
+      assert_equal ["einundvierzig",
+                    "zweiundvierzig",
+                    "dreiundvierzig",
+                    "vierundvierzig",
+                    "fuenfundvierzig"], oo.row(16)
         end
       end
     end
@@ -524,15 +549,51 @@ end
 
     def test_bug_contiguous_cells
       if OPENOFFICE
-      oo = Openoffice.new(File.join("test","numbers1.ods"))
-      oo.default_sheet = "Sheet4"
-      assert_equal Date.new(2007,06,16), oo.cell('a',1) 
-      assert_equal 10, oo.cell('b',1)
-      assert_equal 10, oo.cell('c',1)
-      assert_equal 10, oo.cell('d',1)
-      assert_equal 10, oo.cell('e',1)
+        oo = Openoffice.new(File.join("test","numbers1.ods"))
+        oo.default_sheet = "Sheet4"
+        assert_equal Date.new(2007,06,16), oo.cell('a',1) 
+        assert_equal 10, oo.cell('b',1)
+        assert_equal 10, oo.cell('c',1)
+        assert_equal 10, oo.cell('d',1)
+        assert_equal 10, oo.cell('e',1)
+      end
+      if EXCEL
+        oo = Excel.new(File.join("test","numbers1.xls"))
+        oo.default_sheet = 4
+        assert_equal Date.new(2007,06,16), oo.cell('a',1) 
+        assert_equal 10, oo.cell('b',1)
+        assert_equal 10, oo.cell('c',1)
+        assert_equal 10, oo.cell('d',1)
+        assert_equal 10, oo.cell('e',1)
+      end
+      if GOOGLE
+        @goo.default_sheet = "Sheet4"
+        assert_equal Date.new(2007,06,16), @goo.cell('a',1) 
+        assert_equal 10, @goo.cell('b',1)
+        assert_equal 10, @goo.cell('c',1)
+        assert_equal 10, @goo.cell('d',1)
+        assert_equal 10, @goo.cell('e',1)
      end
+   end
 
+  def DONT_test_large_file
+    if OPENOFFICE
+      count = 0
+      oo = Openoffice.new(File.join("test","Bibelbund.ods"))
+      oo.default_sheet = oo.sheets.first
+      oo.first_row.upto(oo.last_row) do |row|
+        oo.first_column.upto(oo.last_column) do |col|
+          unless oo.empty?(row,col)
+            count += 1
+            a = oo.cell(row,col)
+#            puts a
+#            b = gets
+          end
+        end
+      end
+      puts count.to_s+" cells with content"
     end
 
-  end # class
+  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.4</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.2.5</a>
     </div>
     <h2>What</h2>
 

metadata

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