roo 0.5.3 → 0.5.4

data/History.txt

@@ -1,4 +1,8 @@
+== 0.5.4 2007-08-27
+* 1 bugfix
+  * Openoffice: fixed a bug with internal representation of a spreadsheet (thanks to Ric Kamicar for the patch)
 == 0.5.3 2007-08-26
+* 2 enhancements:
   * Excel: can now read zip-ed files
   * Excel: can now read files from http://-URL over the net
 == 0.5.2 2007-08-26

data/lib/roo/excel.rb

@@ -1,7 +1,6 @@
 require 'rubygems'
 gem 'parseexcel', '>= 0.5.2'
 require 'parseexcel'
-require 'pp'
 
 class Excel < Openoffice
 

data/lib/roo/openoffice.rb

@@ -469,9 +469,7 @@ private
                               end
                             end
                             if skip
-                              if v == nil
-                                x += (skip.to_i - 1)
-                              else
+                              if v != nil
                                 0.upto(skip.to_i-1) do |i|
                                   @cell_type["#{y},#{x+i}"] = Openoffice.oo_type_2_roo_type(vt)
                                   @formula["#{y},#{x+i}"] = formula if formula
@@ -485,8 +483,8 @@ private
                                     @cell["#{y},#{x+i}"] = v
                                   end
                                 end
-                                x += 1
                               end
+                              x += (skip.to_i - 1)
                             end # if skip
                             @formula["#{y},#{x}"] = formula if formula
                             @cell_type["#{y},#{x}"] = Openoffice.oo_type_2_roo_type(vt)

data/lib/roo/version.rb

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

data/test/test_roo.rb

@@ -1076,7 +1076,7 @@ class TestRoo < Test::Unit::TestCase
   end
 
   def test_excel_zipped
-    after Date.new(2007,8,30) do
+    after Date.new(2007,8,10) do
       excel = Excel.new(File.join("test","bode-v1.xls.zip"), :zip)
       assert excel
       assert_equal 'ist "e" im Nenner von H(s)', excel.cell('b', 5)
@@ -1093,4 +1093,59 @@ class TestRoo < Test::Unit::TestCase
       oo.remove_tmp # don't forget to remove the temporary files
     end
   end
+
+  def test_bug_ric
+      oo = Openoffice.new("/home/tp/Desktop/xxx.ods")
+      oo.default_sheet = oo.sheets.first
+      assert oo.empty?('A',1)
+      assert oo.empty?('B',1)
+      assert oo.empty?('C',1)
+      assert oo.empty?('D',1)
+      assert_equal 1, oo.cell('e',1)
+      assert_equal 2, oo.cell('f',1)
+      assert_equal 3, oo.cell('g',1)
+      assert_equal 4, oo.cell('h',1)
+      assert_equal 5, oo.cell('i',1)
+      assert_equal 6, oo.cell('j',1)
+      assert_equal 7, oo.cell('k',1)
+      assert_equal 8, oo.cell('l',1)
+      assert_equal 9, oo.cell('m',1)
+      assert_equal 10, oo.cell('n',1)
+      assert_equal 11, oo.cell('o',1)
+      assert_equal 12, oo.cell('p',1)
+      assert_equal 13, oo.cell('q',1)
+      assert_equal 14, oo.cell('r',1)
+      assert_equal 15, oo.cell('s',1)
+      assert_equal 16, oo.cell('t',1)
+      assert_equal 17, oo.cell('u',1)
+      assert_equal 'J', oo.cell('v',1)
+      assert_equal 'P', oo.cell('w',1)
+      assert_equal 'B', oo.cell('x',1)
+      assert_equal 'All', oo.cell('y',1)
+      assert_equal 0, oo.cell('a',2)
+      assert oo.empty?('b',2)
+      assert oo.empty?('c',2)
+      assert oo.empty?('d',2)
+      assert_equal 'B', oo.cell('e',2)
+      assert_equal 'B', oo.cell('f',2)
+      assert_equal 'B', oo.cell('g',2)
+      assert_equal 'B', oo.cell('h',2)
+      assert_equal 'B', oo.cell('i',2)
+      assert_equal 'B', oo.cell('j',2)
+      assert_equal 'B', oo.cell('k',2)
+      assert_equal 'B', oo.cell('l',2)
+      assert_equal 'B', oo.cell('m',2)
+      assert_equal 'B', oo.cell('n',2)
+      assert_equal 'B', oo.cell('o',2)
+      assert_equal 'B', oo.cell('p',2)
+      assert_equal 'B', oo.cell('q',2)
+      assert_equal 'B', oo.cell('r',2)
+      assert_equal 'B', oo.cell('s',2)
+      assert oo.empty?('t',2)
+      assert oo.empty?('u',2)
+      assert_equal 0  , oo.cell('v',2)
+      assert_equal 0  , oo.cell('w',2)
+      assert_equal 15 , oo.cell('x',2)
+      assert_equal 15 , oo.cell('y',2)
+  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.5.3</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.5.4</a>
     </div>
     <h2>What</h2>
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
-date: 2007-08-26 00:00:00 +02:00
+  version: 0.5.4
+date: 2007-08-27 00:00:00 +02:00
 summary: roo can access the contents of OpenOffice-Spreadsheets and Excel-Spreadsheets
 require_paths: 
 - lib