roo 0.6.0 → 0.6.1

data/History.txt

@@ -1,3 +1,9 @@
+== 0.6.1 2007-10-06
+* 2 enhancements:
+  * Openoffice: percentage-values are now treated as numbers (not strings)
+  * Openoffice: refactoring
+* 1 bugfix
+  * Openoffice: repeating date-values in a line are now handled correctly
 == 0.6.0 2007-10-06
 * 1 enhancement:
   * csv-output to stdout or file

data/lib/roo/openoffice.rb

@@ -425,16 +425,17 @@ private
   def belegen(x,y,i,v,vt,formula,tr,str_v)
     @cell_type["#{y},#{x+i}"] = Openoffice.oo_type_2_roo_type(vt)
     @formula["#{y},#{x+i}"] = formula if formula
-    if @cell_type["#{y},#{x+i}"] == :float
+    case @cell_type["#{y},#{x+i}"] 
+    when :float
       @cell["#{y},#{x+i}"] = v.to_f
-    elsif @cell_type["#{y},#{x+i}"] == :string
+    when :string
       @cell["#{y},#{x+i}"] = str_v
-    elsif @cell_type["#{y},#{x}"] == :date
-      @cell["#{y},#{x}"] = tr.attributes['date-value']
-    elsif @cell_type["#{y},#{x+i}"] == :percentage
-      @cell["#{y},#{x+i}"] = v
+    when :date
+      @cell["#{y},#{x+i}"] = tr.attributes['date-value']
+    when :percentage
+      @cell["#{y},#{x+i}"] = v.to_f
     else
-      @cell["#{y},#{x}"] = v
+      @cell["#{y},#{x+i}"] = v
     end                       
   end
 
@@ -499,7 +500,7 @@ private
                               end
                             end
                             if skip
-                              if v != nil
+                              if v != nil or tr.attributes['date-value']
                                 0.upto(skip.to_i-1) do |i|
                                   belegen(x,y,i,v,vt,formula,tr,str_v)
                                 end

data/lib/roo/version.rb

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

data/test/test_roo.rb

@@ -1,3 +1,7 @@
+# damit keine falschen Vermutungen aufkommen: Ich habe religoes rein gar nichts 
+# mit diesem Bibelbund zu tun, aber die hatten eine ziemlich grosse 
+# Spreadsheet-Datei oeffentlich im Netz, die sich ganz gut zum Testen eignete.
+#
 require File.dirname(__FILE__) + '/test_helper.rb'
 #require 'soap/rpc/driver'
 require 'fileutils'
@@ -713,31 +717,98 @@ class TestRoo < Test::Unit::TestCase
       oo = Openoffice.new(File.join("test","simple_spreadsheet_from_italo.ods"))
       oo.default_sheet = oo.sheets.first
 
-      after Date.new(2007,10,1) do
-        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',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  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  '0.01', oo.cell('A',5)
+      # assert_equal  '0.01', oo.cell('B',5)
+      # assert_equal  '0.01', oo.cell('C',5)
+      #
+      assert_equal  0.01, oo.cell('A',5)
+      assert_equal  0.01, oo.cell('B',5)
+      assert_equal  0.01, oo.cell('C',5)
+
+      assert_equal 0.03, oo.cell('a',5)+oo.cell('b',5)+oo.cell('c',5)
   
-        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)
+        #   1.0
   
-        assert_equal  '0.01', oo.cell('A',5)
-        assert_equal  '0.01', oo.cell('B',5)
-        assert_equal  '0.01', oo.cell('C',5)
+        # Cells values in row 1:
+        assert_equal "1:string", oo.cell(1, 1)+":"+oo.celltype(1, 1).to_s
+        assert_equal "1:string",oo.cell(1, 2)+":"+oo.celltype(1, 2).to_s
+        assert_equal "1:string",oo.cell(1, 3)+":"+oo.celltype(1, 3).to_s
+  
+        # Cells values in row 2:
+        assert_equal "1:string",oo.cell(2, 1)+":"+oo.celltype(2, 1).to_s
+        assert_equal "2:string",oo.cell(2, 2)+":"+oo.celltype(2, 2).to_s
+        assert_equal "1:string",oo.cell(2, 3)+":"+oo.celltype(2, 3).to_s
+  
+        # Cells values in row 3:
+        assert_equal "1.0:float",oo.cell(3, 1).to_s+":"+oo.celltype(3, 1).to_s
+        assert_equal "3.0:float",oo.cell(3, 2).to_s+":"+oo.celltype(3, 2).to_s
+        assert_equal "1.0:float",oo.cell(3, 3).to_s+":"+oo.celltype(3, 3).to_s
+  
+        # Cells values in row 4:
+        assert_equal "A:string",oo.cell(4, 1)+":"+oo.celltype(4, 1).to_s
+        assert_equal "A:string",oo.cell(4, 2)+":"+oo.celltype(4, 2).to_s
+        assert_equal "A:string",oo.cell(4, 3)+":"+oo.celltype(4, 3).to_s
+  
+        # Cells values in row 5:
+        assert_equal "0.01:percentage",oo.cell(5, 1).to_s+":"+oo.celltype(5, 1).to_s
+        assert_equal "0.01:percentage",oo.cell(5, 2).to_s+":"+oo.celltype(5, 2).to_s
+        assert_equal "0.01:percentage",oo.cell(5, 3).to_s+":"+oo.celltype(5, 3).to_s
+
+      oo = Excel.new(File.join("test","simple_spreadsheet_from_italo.xls"))
+      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)
+      #
+      assert_equal  0.01, oo.cell('A',5)
+      assert_equal  0.01, oo.cell('B',5)
+      assert_equal  0.01, oo.cell('C',5)
+
+      assert_equal 0.03, oo.cell('a',5)+oo.cell('b',5)+oo.cell('c',5)
   
   
         #   1.0
@@ -746,7 +817,6 @@ class TestRoo < Test::Unit::TestCase
         assert_equal "1:string", oo.cell(1, 1)+":"+oo.celltype(1, 1).to_s
         assert_equal "1:string",oo.cell(1, 2)+":"+oo.celltype(1, 2).to_s
         assert_equal "1:string",oo.cell(1, 3)+":"+oo.celltype(1, 3).to_s
-      end
   
         # Cells values in row 2:
         assert_equal "1:string",oo.cell(2, 1)+":"+oo.celltype(2, 1).to_s
@@ -764,9 +834,17 @@ class TestRoo < Test::Unit::TestCase
         assert_equal "A:string",oo.cell(4, 3)+":"+oo.celltype(4, 3).to_s
   
         # Cells values in row 5:
-        assert_equal "0.01:percentage",oo.cell(5, 1)+":"+oo.celltype(5, 1).to_s
-        assert_equal "0.01:percentage",oo.cell(5, 2)+":"+oo.celltype(5, 2).to_s
-        assert_equal "0.01:percentage",oo.cell(5, 3)+":"+oo.celltype(5, 3).to_s
+        #assert_equal "0.01:percentage",oo.cell(5, 1).to_s+":"+oo.celltype(5, 1).to_s
+        #assert_equal "0.01:percentage",oo.cell(5, 2).to_s+":"+oo.celltype(5, 2).to_s
+        #assert_equal "0.01:percentage",oo.cell(5, 3).to_s+":"+oo.celltype(5, 3).to_s
+        # why do we get floats here? in the spreadsheet the cells were defined
+        # to be percentage
+        # TODO: should be fixed
+        # the excel gem does not support the cell type 'percentage' these
+        # cells are returned to be of the type float.
+        assert_equal "0.01:float",oo.cell(5, 1).to_s+":"+oo.celltype(5, 1).to_s
+        assert_equal "0.01:float",oo.cell(5, 2).to_s+":"+oo.celltype(5, 2).to_s
+        assert_equal "0.01:float",oo.cell(5, 3).to_s+":"+oo.celltype(5, 3).to_s
     end
 
   end
@@ -1171,10 +1249,10 @@ class TestRoo < Test::Unit::TestCase
   end
 
   def test_to_csv
-    after Date.new(2007,10,1) do
+    after Date.new(2007,10,20) do
       if OPENOFFICE
         assert_nothing_raised(Timeout::Error) {
-          Timeout::timeout(10*60*2) do |timeout_length|
+          Timeout::timeout(40*60*2) do |timeout_length|
             #puts Time.now.to_s + "test_to_csv Openoffice gestartet"
             oo = Openoffice.new(File.join("test","Bibelbund.ods"))
             oo.default_sheet = oo.sheets.first
@@ -1198,10 +1276,10 @@ class TestRoo < Test::Unit::TestCase
       end # OPENOFFICE
     end # after
 
-    after Date.new(2007,10,1) do
+    after Date.new(2007,10,20) do
       if EXCEL
         assert_nothing_raised(Timeout::Error) {
-          Timeout::timeout(10*60*2) do |timeout_length|
+          Timeout::timeout(40*60*2) do |timeout_length|
             #puts Time.now.to_s + "test_to_csv Excel gestartet"
             oo = Excel.new(File.join("test","Bibelbund.xls"))
             oo.default_sheet = oo.sheets.first
@@ -1223,4 +1301,76 @@ class TestRoo < Test::Unit::TestCase
     end
   end # def to_csv
 
+  def test_bug_mehrere_datum
+    if OPENOFFICE
+      oo = Openoffice.new(File.join("test","numbers1.ods"))
+      oo.default_sheet = 'Sheet5'
+      assert_equal :date, oo.celltype('A',4)
+      assert_equal :date, oo.celltype('B',4)
+      assert_equal :date, oo.celltype('C',4)
+      assert_equal :date, oo.celltype('D',4)
+      assert_equal :date, oo.celltype('E',4)
+      assert_equal Date.new(2007,11,21), oo.cell('A',4)
+      assert_equal Date.new(2007,11,21), oo.cell('B',4)
+      assert_equal Date.new(2007,11,21), oo.cell('C',4)
+      assert_equal Date.new(2007,11,21), oo.cell('D',4)
+      assert_equal Date.new(2007,11,21), oo.cell('E',4)
+      assert_equal :float, oo.celltype('A',5)
+      assert_equal :float, oo.celltype('B',5)
+      assert_equal :float, oo.celltype('C',5)
+      assert_equal :float, oo.celltype('D',5)
+      assert_equal :float, oo.celltype('E',5)
+      assert_equal 42, oo.cell('A',5)
+      assert_equal 42, oo.cell('B',5)
+      assert_equal 42, oo.cell('C',5)
+      assert_equal 42, oo.cell('D',5)
+      assert_equal 42, oo.cell('E',5)
+      assert_equal :string, oo.celltype('A',6)
+      assert_equal :string, oo.celltype('B',6)
+      assert_equal :string, oo.celltype('C',6)
+      assert_equal :string, oo.celltype('D',6)
+      assert_equal :string, oo.celltype('E',6)
+      assert_equal "ABC", oo.cell('A',6)
+      assert_equal "ABC", oo.cell('B',6)
+      assert_equal "ABC", oo.cell('C',6)
+      assert_equal "ABC", oo.cell('D',6)
+      assert_equal "ABC", oo.cell('E',6)
+    end # Openoffice
+
+    if EXCEL
+      oo = Excel.new(File.join("test","numbers1.xls"))
+      oo.default_sheet = 'Sheet5'
+      assert_equal :date, oo.celltype('A',4)
+      assert_equal :date, oo.celltype('B',4)
+      assert_equal :date, oo.celltype('C',4)
+      assert_equal :date, oo.celltype('D',4)
+      assert_equal :date, oo.celltype('E',4)
+      assert_equal Date.new(2007,11,21), oo.cell('A',4)
+      assert_equal Date.new(2007,11,21), oo.cell('B',4)
+      assert_equal Date.new(2007,11,21), oo.cell('C',4)
+      assert_equal Date.new(2007,11,21), oo.cell('D',4)
+      assert_equal Date.new(2007,11,21), oo.cell('E',4)
+      assert_equal :float, oo.celltype('A',5)
+      assert_equal :float, oo.celltype('B',5)
+      assert_equal :float, oo.celltype('C',5)
+      assert_equal :float, oo.celltype('D',5)
+      assert_equal :float, oo.celltype('E',5)
+      assert_equal 42, oo.cell('A',5)
+      assert_equal 42, oo.cell('B',5)
+      assert_equal 42, oo.cell('C',5)
+      assert_equal 42, oo.cell('D',5)
+      assert_equal 42, oo.cell('E',5)
+      assert_equal :string, oo.celltype('A',6)
+      assert_equal :string, oo.celltype('B',6)
+      assert_equal :string, oo.celltype('C',6)
+      assert_equal :string, oo.celltype('D',6)
+      assert_equal :string, oo.celltype('E',6)
+      assert_equal "ABC", oo.cell('A',6)
+      assert_equal "ABC", oo.cell('B',6)
+      assert_equal "ABC", oo.cell('C',6)
+      assert_equal "ABC", oo.cell('D',6)
+      assert_equal "ABC", oo.cell('E',6)
+    end # Excel
+  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.6.0</a>
+      <a href="http://rubyforge.org/projects/roo" class="numbers">0.6.1</a>
     </div>
     <h2>What</h2>
 
@@ -225,7 +225,9 @@ oo.to_csv
 </code>
 </pre>
 
-to write to the standard output or
+	<p>to write to the standard output or</p>
+
+
 <pre>
 <code>
 oo.to_csv("somefile.txt")
@@ -248,9 +250,10 @@ Replace Openoffice with
 </code>
 </pre>
 
-	<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>
-
+All methode are the same for OpenOffice and Excel-objects.
+<strike> 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,..).
+</strike>
 
 	<p>Formulas can only be handled in OpenOffice-spreadsheets.</p>
 
@@ -274,11 +277,19 @@ is the setting of the default-worksheet. OpenOffice uses the name of the workshe
 			<td>yes</td>
 			<td>yes</td>
 		</tr>
+		<tr>
+			<td>celltype</td>
+			<td>:percentage</td>
+			<td>:float</td>
+		</tr>
 	</table>
 
 
 
 
+	<p>The parseexcel-gem does not support the celltype &#8216;percentage&#8217; but uses &#8216;float&#8217; instead. This is not a big deal as you can also use &#8216;float&#8217; to do calculate with these cells.</p>
+
+
 	<p>Old .sxc OpenOffice files are currently not supported &#8211; please load these files and save it as an &#8220;OpenDocument Spreadsheet (.ods)&#8221;.</p>
 
 
@@ -412,7 +423,7 @@ Remote access with <span class="caps">SOAP</span> is nothing specific to roo, yo
 		<li>Dirk Huth f&uuml;rs Testen unter Windows</li>
 	</ul>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 3rd October 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 8th October 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

data/website/index.txt

@@ -153,6 +153,7 @@ oo.to_csv
 </pre>
 
 to write to the standard output or
+
 <pre>
 <code>
 oo.to_csv("somefile.txt")
@@ -172,8 +173,10 @@ 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.
+<strike> 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,..).
+</strike>
 
 Formulas can only be handled in OpenOffice-spreadsheets.
 
@@ -183,6 +186,9 @@ table(border:1px solid black).
 |feature|Open Office|Excel|
 |formulas|yes|no|
 |to_yaml|yes|yes|
+|celltype|:percentage|:float|
+
+The parseexcel-gem does not support the celltype 'percentage' but uses 'float' instead. This is not a big deal as you can also use 'float' to do calculate with these cells.
 
 Old .sxc OpenOffice files are currently not supported - please load these files and save it as an "OpenDocument Spreadsheet (.ods)".
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: roo
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2007-10-06 00:00:00 +02:00
+  version: 0.6.1
+date: 2007-10-11 00:00:00 +02:00
 summary: roo can access the contents of OpenOffice-Spreadsheets and Excel-Spreadsheets
 require_paths: 
 - lib