workbook 0.4.2 → 0.4.3

data/test/test_readers_ods_reader.rb

@@ -3,16 +3,16 @@ require File.join(File.dirname(__FILE__), 'helper')
 module Readers
   class TestXlsWriter < Test::Unit::TestCase
     def test_open
-      
+
       w = Workbook::Book.new
-      w.open 'test/artifacts/book_with_tabs_and_colours.ods'
+      w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.ods')
       assert_equal([:a, :b, :c, :d, :e],w.sheet.table.header.to_symbols)
       assert_equal(90588,w.sheet.table[2][:b].value)
     end
 
     def test_styling
       w = Workbook::Book.new
-      w.open 'test/artifacts/book_with_tabs_and_colours.ods'
+      w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.ods')
       assert_equal("#ffff99",w.sheet.table[3][:c].format[:background_color])
       assert_equal(true,w.sheet.table[0][:e].format.all_names.include?("Heading1"))
       # TODO: column styles
@@ -20,25 +20,19 @@ module Readers
       # assert_equal(3.85546875,w.sheet.table.first[:a].format[:width])
       # assert_equal(25.14453125,w.sheet.table.first[:c].format[:width])
     end
-    
+
     def test_complex_types
       w = Workbook::Book.new
-      w.open 'test/artifacts/complex_types.ods'
+      w.open File.join(File.dirname(__FILE__), 'artifacts/complex_types.ods')
       assert_equal(Date.new(2011,11,15), w.sheet.table[2][3].value)
       assert_equal("http://murb.nl", w.sheet.table[3][2].value)
       assert_equal("Sadfasdfsd > 2", w.sheet.table[4][2].value)
       assert_equal(1.2, w.sheet.table[3][1].value)
     end
-    
+
     def test_excel_standardized_open
       w = Workbook::Book.new
-      w.open("test/artifacts/excel_different_types.ods")
-      # reads
-      #   a,b,c,d
-      # 2012-02-22,2014-12-27,2012-11-23,2012-11-12T04:20:00+00:00
-      # c,222.0,,0027-12-14T05:21:00+00:00
-      # 2012-01-22T11:00:00+00:00,42000.0,"goh, idd",ls
-      # 
+      w.open File.join(File.dirname(__FILE__), 'artifacts/excel_different_types.ods')
       assert_equal([:a,:b,:c, :d],w.sheet.table.header.to_symbols[0..3])
       assert_equal(Date.new(2012,2,22),w.sheet.table[1][:a].value)
       assert_equal("c",w.sheet.table[2][:a].value)
@@ -46,9 +40,10 @@ module Readers
       assert_equal(42000,w.sheet.table[3][:b].value)
       assert_equal(nil,w.sheet.table[2][:c].value)
     end
+
     def test_sheet_with_combined_cells
       w = Workbook::Book.new
-      w.open("test/artifacts/sheet_with_combined_cells.ods")
+      w.open File.join(File.dirname(__FILE__), 'artifacts/sheet_with_combined_cells.ods')
       t = w.sheet.table
       assert_equal("14 90589",t[1][:a].value)
       assert_equal(Workbook::NilValue,t[1][:b].value.class)
@@ -58,6 +53,18 @@ module Readers
       assert_equal(2,t["D3"].rowspan)
       assert_equal(2,t["D5"].rowspan)
       assert_equal(2,t["D5"].colspan)
-    end    
+    end
+
+    def test_duca_sheet
+      w = Workbook::Book.new
+      w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_colspans.ods')
+      t = w.sheet.table
+      assert_equal(2,t["B1"].colspan)
+      assert_equal(2,t["D1"].colspan)
+      assert_equal(nil,t["D3"].value)
+      assert_equal("g",t["A19"].value)
+      assert_equal(0.03,t["D17"].value)
+    end
+
   end
 end

data/test/test_readers_txt_reader.rb

@@ -5,19 +5,19 @@ module Readers
     # Should one day throw an error..
     # def test_failure_excel_as_txt_open
     #   w = Workbook::Book.new
-    #   w.open("test/artifacts/xls_with_txt_extension.txt")
+    #   w.open(File.join(File.dirname(__FILE__), "artifacts/xls_with_txt_extension.txt")
     #   puts w.sheet.table
     # end
 
     def test_excel_standardized_open
       w = Workbook::Book.new
-      w.open("test/artifacts/excel_different_types.txt")
+      w.open(File.join(File.dirname(__FILE__), "artifacts/excel_different_types.txt"))
       # reads
       #   a,b,c,d
       # 2012-02-22,2014-12-27,2012-11-23,2012-11-12T04:20:00+00:00
       # c,222.0,,0027-12-14T05:21:00+00:00
       # 2012-01-22T11:00:00+00:00,42000.0,"goh, idd",ls
-      
+
       assert_equal([:a,:b,:c, :d],w.sheet.table.header.to_symbols)
       assert_equal(Date.new(2012,2,22),w.sheet.table[1][:a].value)
       assert_equal("c",w.sheet.table[2][:a].value)
@@ -25,16 +25,16 @@ module Readers
       assert_equal(42000,w.sheet.table[3][:b].value)
       assert_equal(nil,w.sheet.table[2][:c].value)
     end
-    
+
     def test_excel_class_read_string
-      s = File.read("test/artifacts/excel_different_types.txt")
+      s = File.read(File.join(File.dirname(__FILE__), "artifacts/excel_different_types.txt"))
       w = Workbook::Book.read(s, :txt)
       # reads
       #   a,b,c,d
       # 2012-02-22,2014-12-27,2012-11-23,2012-11-12T04:20:00+00:00
       # c,222.0,,0027-12-14T05:21:00+00:00
       # 2012-01-22T11:00:00+00:00,42000.0,"goh, idd",ls
-      
+
       assert_equal([:a,:b,:c, :d],w.sheet.table.header.to_symbols)
       assert_equal(Date.new(2012,2,22),w.sheet.table[1][:a].value)
       assert_equal("c",w.sheet.table[2][:a].value)
@@ -42,9 +42,9 @@ module Readers
       assert_equal(42000,w.sheet.table[3][:b].value)
       assert_equal(nil,w.sheet.table[2][:c].value)
     end
-    
+
     def test_excel_instance_read_string
-      s = File.read("test/artifacts/excel_different_types.txt")
+      s = File.read(File.join(File.dirname(__FILE__), "artifacts/excel_different_types.txt"))
       w = Workbook::Book.new
       w.read(s, :txt)
       # reads
@@ -52,7 +52,7 @@ module Readers
       # 2012-02-22,2014-12-27,2012-11-23,2012-11-12T04:20:00+00:00
       # c,222.0,,0027-12-14T05:21:00+00:00
       # 2012-01-22T11:00:00+00:00,42000.0,"goh, idd",ls
-      
+
       assert_equal([:a,:b,:c, :d],w.sheet.table.header.to_symbols)
       assert_equal(Date.new(2012,2,22),w.sheet.table[1][:a].value)
       assert_equal("c",w.sheet.table[2][:a].value)
@@ -60,9 +60,9 @@ module Readers
       assert_equal(42000,w.sheet.table[3][:b].value)
       assert_equal(nil,w.sheet.table[2][:c].value)
     end
-    
+
     def test_excel_instance_read_stringio
-      sio = StringIO.new(File.read("test/artifacts/excel_different_types.txt"))
+      sio = StringIO.new(File.read(File.join(File.dirname(__FILE__), "artifacts/excel_different_types.txt")))
       w = Workbook::Book.new
       w.read(sio, :txt)
       # reads
@@ -70,7 +70,7 @@ module Readers
       # 2012-02-22,2014-12-27,2012-11-23,2012-11-12T04:20:00+00:00
       # c,222.0,,0027-12-14T05:21:00+00:00
       # 2012-01-22T11:00:00+00:00,42000.0,"goh, idd",ls
-      
+
       assert_equal([:a,:b,:c, :d],w.sheet.table.header.to_symbols)
       assert_equal(Date.new(2012,2,22),w.sheet.table[1][:a].value)
       assert_equal("c",w.sheet.table[2][:a].value)
@@ -78,6 +78,6 @@ module Readers
       assert_equal(42000,w.sheet.table[3][:b].value)
       assert_equal(nil,w.sheet.table[2][:c].value)
     end
-    
+
   end
 end

data/test/test_readers_xls_reader.rb

@@ -4,35 +4,35 @@ module Readers
   class TestXlsWriter < Test::Unit::TestCase
     def test_open
       w = Workbook::Book.new
-      w.open 'test/artifacts/book_with_tabs_and_colours.xls'
+      w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.xls')
       assert_equal([:a, :b, :c, :d, :e],w.sheet.table.header.to_symbols)
       assert_equal(90588,w.sheet.table[2][:b].value)
       assert_equal("#CCFFCC",w.sheet.table[3][:c].format[:background_color])
       assert_equal(8.13671875,w.sheet.table.first[:b].format[:width])
       assert_equal(3.85546875,w.sheet.table.first[:a].format[:width])
       assert_equal(25.14453125,w.sheet.table.first[:c].format[:width])
-      
-      
+
+
     end
-    
+
     def test_complex_types
       w = Workbook::Book.new
-      w.open 'test/artifacts/complex_types.xls'
+      w.open File.join(File.dirname(__FILE__), 'artifacts/complex_types.xls')
       assert_equal(Date.new(2011,11,15), w.sheet.table[2][3].value)
       assert_equal("http://murb.nl", w.sheet.table[3][2].value)
       assert_equal("sadfasdfsd", w.sheet.table[4][2].value)
       assert_equal(1.2, w.sheet.table[3][1].value)
     end
-    
+
     def test_excel_standardized_open
       w = Workbook::Book.new
-      w.open("test/artifacts/excel_different_types.xls")
+      w.open(File.join(File.dirname(__FILE__), "artifacts/excel_different_types.xls"))
       # reads
       #   a,b,c,d
       # 2012-02-22,2014-12-27,2012-11-23,2012-11-12T04:20:00+00:00
       # c,222.0,,0027-12-14T05:21:00+00:00
       # 2012-01-22T11:00:00+00:00,42000.0,"goh, idd",ls
-      
+
       assert_equal([:a,:b,:c, :d],w.sheet.table.header.to_symbols)
       assert_equal(Date.new(2012,2,22),w.sheet.table[1][:a].value)
       assert_equal("c",w.sheet.table[2][:a].value)
@@ -40,10 +40,10 @@ module Readers
       assert_equal(42000,w.sheet.table[3][:b].value)
       assert_equal(nil,w.sheet.table[2][:c].value)
     end
-    
+
     def test_txt_in_xls_open
       w = Workbook::Book.new
-      w.open("test/artifacts/txt_in_xls.xls")
+      w.open(File.join(File.dirname(__FILE__), "artifacts/txt_in_xls.xls"))
       assert_equal([:naam,:nummer,:ilt,:corporate_key,:naam_medewerker, nil, nil, :telefoon, :openingsdatum],w.sheet.table.header.to_symbols)
       assert_equal(["dddd",2222,"i9000","asd","Anita",nil,"Betera","012-3456789",Date.new(2011,10,5)],w.sheet.table[1].collect{|a| a.value})
     end
@@ -51,7 +51,7 @@ module Readers
       w = Workbook::Book.new
       failed_properly = false
       begin
-        w.open("test/artifacts/zip_in_xls.xls")
+        w.open(File.join(File.dirname(__FILE__), "artifacts/zip_in_xls.xls"))
         w.sheet.table.to_csv
       rescue Ole::Storage::FormatError
         failed_properly = true

data/test/test_readers_xlsx_reader.rb

@@ -4,21 +4,21 @@ module Readers
   class TestXlsxWriter < Test::Unit::TestCase
     def test_open
       w = Workbook::Book.new
-      w.open 'test/artifacts/book_with_tabs_and_colours.xlsx'
+      w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.xlsx')
       assert_equal([:a, :b, :c, :d, :e],w.sheet.table.header.to_symbols)
       assert_equal(90588,w.sheet.table[2][:b].value)
       assert_equal(DateTime.new(2011,11,15),w.sheet.table[3][:d].value)
-     # assert_equal("#CCFFCC",w.sheet.table[3][:c].format[:background_color]) #colour compatibility turned off for now...
+      # assert_equal("#CCFFCC",w.sheet.table[3][:c].format[:background_color]) #colour compatibility turned off for now...
       assert_equal(8,w.sheet.table.first[:b].format[:width].round)
       assert_equal(4,w.sheet.table.first[:a].format[:width].round)
       assert_equal(25,w.sheet.table.first[:c].format[:width].round)
     end
     def test_open_native_xlsx
       w = Workbook::Book.new
-      w.open 'test/artifacts/native_xlsx.xlsx'
-      
+      w.open File.join(File.dirname(__FILE__), 'artifacts/native_xlsx.xlsx')
+
       assert_equal([:datum_gemeld, :adm_gereed, :callnr],w.sheet.table.header.to_symbols)
-      
+
       assert_equal("Callnr.",w.sheet.table[0][:callnr].value)
       assert_equal("2475617.00",w.sheet.table[3][:callnr].value)
       assert_equal("2012-12-03T12:30:00+00:00",w.sheet.table[7][:datum_gemeld].value.to_s)

data/test/test_row.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'helper')
 
 class TestRow < Test::Unit::TestCase
 
-  
+
   def test_init
     t = Workbook::Table.new
     r = Workbook::Row.new([1,2,3],t)
@@ -11,25 +11,25 @@ class TestRow < Test::Unit::TestCase
     c2 = Workbook::Cell.new(2)
     c3 = Workbook::Cell.new(3)
     assert_equal([c1,c2,c3].collect{|c| c.value},r.collect{|c| c.value})
-    
+
     #t = Workbook::Table.new
     c1 = Workbook::Cell.new(1)
     c2 = Workbook::Cell.new(2)
     c3 = Workbook::Cell.new(3)
-    
+
     r = Workbook::Row.new([c1,c2,c3])
 
     assert_equal([c1,c2,c3],r)
-    
+
   end
-  
+
   def test_table=
     r = Workbook::Row.new
     assert_raise(ArgumentError, 'table should be a Workbook::Table (you passed a String)') { r.table = "asdf" }
     r.table = nil
     assert_equal(r.table, nil)
     r = Workbook::Row.new
-    
+
     t = Workbook::Table.new
     r.table = t
     assert_equal(r.table, t)
@@ -50,10 +50,10 @@ class TestRow < Test::Unit::TestCase
     t.header = r2
     assert_equal(true, r2.header?)
     assert_equal(false, t.first.header?)
-    
-    assert_equal(r1, t.first)    
-  end 
-  
+
+    assert_equal(r1, t.first)
+  end
+
   def test_first?
     t = Workbook::Table.new
     r1 = Workbook::Row.new
@@ -63,10 +63,10 @@ class TestRow < Test::Unit::TestCase
     r2.table = t
     assert_equal(false, r2.first?)
     assert_equal(true, t.first.first?)
-    
-    assert_equal(r1, t.first) 
+
+    assert_equal(r1, t.first)
   end
-  
+
   def test_no_values?
     t = Workbook::Table.new
     r1 = Workbook::Row.new
@@ -78,7 +78,7 @@ class TestRow < Test::Unit::TestCase
     r2.table = t
     assert_equal(true, r2.no_values?)
   end
-  
+
   def test_to_symbols
     r1 = Workbook::Row.new ["test", "asdf-asd", "asdf - asdf", "asdf2"]
     assert_equal([:test, :asdfasd, :asdf_asdf, :asdf2], r1.to_symbols)
@@ -86,11 +86,11 @@ class TestRow < Test::Unit::TestCase
     assert_equal([:init, :eee], r1.to_symbols)
 
   end
-  
+
   def test_to_hash
     r1 = Workbook::Row.new ["test", "asdf-asd", "asdf - asdf", "asdf2"]
     assert_raise(NoMethodError, 'undefined method `header\' for nil:NilClass') { r1.to_hash }
-    
+
     t = Workbook::Table.new
     r1 = Workbook::Row.new  ["test", "asdf-asd"]
     r1.table = t
@@ -104,7 +104,7 @@ class TestRow < Test::Unit::TestCase
     assert_equal(date, r2[:asdfasd].value)
     assert_equal(date, r2[1].value)
   end
-  
+
   def test_compare
     r1 = Workbook::Row.new  ["test", "asdf-asd"]
     r2 = Workbook::Row.new  [nil, "asdf-asd"]
@@ -124,9 +124,9 @@ class TestRow < Test::Unit::TestCase
     r1 = Workbook::Row.new  [-10, 3]
     r2 = Workbook::Row.new  [nil, 5]
     assert_equal(-1,r1<=>r2)
-    
+
   end
-  
+
   def test_find_cells_by_background_color
     r = Workbook::Row.new  ["test", "asdf-asd"]
     assert_equal([],r.find_cells_by_background_color)
@@ -136,7 +136,7 @@ class TestRow < Test::Unit::TestCase
     assert_equal([:test],r.find_cells_by_background_color)
     assert_equal([],r.find_cells_by_background_color('#ff0000'))
   end
-  
+
   def test_to_s
     r1 = Workbook::Row.new  ["test", "asdf-asd"]
     assert_equal("test,asdf-asd\n",r1.to_csv)
@@ -145,8 +145,8 @@ class TestRow < Test::Unit::TestCase
   def test_clone
     b = Workbook::Book.new
     table = b.sheet.table
-    table << Workbook::Row.new(["a","b"])    
-    row = Workbook::Row.new(["1","2"]) 
+    table << Workbook::Row.new(["a","b"])
+    row = Workbook::Row.new(["1","2"])
     table << row
     table << row
     row[1] = Workbook::Cell.new(3)
@@ -154,20 +154,20 @@ class TestRow < Test::Unit::TestCase
     table.last[1].value = 5
     assert_equal("a,b\n1,3\n1,3\n1,5\n", table.to_csv)
   end
-  
+
   def test_clone_has_no_table
     # actually not desired, but for now enforced.
     b = Workbook::Book.new
     table = b.sheet.table
-    table << Workbook::Row.new(["a","b"])    
-    table << Workbook::Row.new([1,2]) 
+    table << Workbook::Row.new(["a","b"])
+    table << Workbook::Row.new([1,2])
     row = table[1].clone
     assert_equal(nil,row[:a])
     assert_equal(nil,row[:b])
     assert_equal(1,row[0].value)
     assert_equal(2,row[1].value)
   end
-  
+
   def test_row_hash_index_assignment
     b = Workbook::Book.new
     table = b.sheet.table
@@ -178,4 +178,74 @@ class TestRow < Test::Unit::TestCase
     row[:b]= 15
     assert_equal(15, table.last.last.value)
   end
+  
+  def test_trim!
+    a = Workbook::Row.new
+    a[0] = 1
+    a[1] = 2
+    a[2] = nil
+    b = Workbook::Row.new
+    b[0] = 1
+    b[1] = 2
+    a.trim!
+    assert_equal(b, a)
+    a = Workbook::Row.new
+    a[0] = nil
+    a[1] = 2
+    a[2] = nil
+    b = Workbook::Row.new
+    b[0] = nil
+    b[1] = 2
+    a.trim!
+    assert_equal(b, a)
+    a = Workbook::Row.new
+    a[0] = 1
+    a[1] = 2
+    a[2] = nil
+    b = Workbook::Row.new
+    b[0] = 1
+    b[1] = 2
+    b[2] = nil
+    a.trim!(3)
+    assert_equal(b, a)
+    a = Workbook::Row.new
+    a[0] = 1
+    a[1] = 2
+    a[2] = nil
+    b = Workbook::Row.new
+    b[0] = 1
+    b[1] = 2
+    b[2] = nil
+    b[3] = nil
+    b[4] = nil
+    b[5] = nil
+    a.trim!(6)
+    assert_equal(b, a)
+    a = Workbook::Row.new
+    a[0] = 1
+    a[1] = 2
+    a[2] = 3
+    b = Workbook::Row.new
+    b[0] = 1
+    a.trim!(1)
+    assert_equal(b, a)
+  end
+  
+  def test_trim
+    a = Workbook::Row.new
+    a[0] = nil
+    a[1] = 2
+    a[2] = nil
+    b = Workbook::Row.new
+    b[0] = nil
+    b[1] = 2
+    b[2] = nil
+    c = Workbook::Row.new
+    c[0] = nil
+    c[1] = 2
+    d = a.trim
+    assert_equal(b, a)
+    assert_equal(c, d)
+
+  end
 end