workbook 0.4.2 → 0.4.3

data/test/test_sheet.rb

@@ -11,19 +11,19 @@ class TestWorkbook < Test::Unit::TestCase
     assert_equal(w.count,1)
     t = Workbook::Table.new []
     w = Workbook::Sheet.new t
-    assert_equal([t],w)    
+    assert_equal([t],w)
     assert_equal(w.count,1)
   end
-  
+
   def test_table
     w = Workbook::Sheet.new nil
     assert_equal([],w.table)
     t = Workbook::Table.new []
     w = Workbook::Sheet.new t
     assert_equal(w.table,t)
-    
+
   end
-  
+
   def test_book
     s = Workbook::Sheet.new
     b = s.book
@@ -31,7 +31,7 @@ class TestWorkbook < Test::Unit::TestCase
     assert_equal(s, b.sheet)
     assert_equal(s.book.sheet, b.sheet.table.sheet)
   end
-  
+
   def test_clone
     w = Workbook::Book.new [["a","b"],[1,2],[3,4]]
     s = w.sheet
@@ -41,7 +41,7 @@ class TestWorkbook < Test::Unit::TestCase
     assert_equal(3,s.table[2][:a])
     assert_equal(5,s2.table[2][:a])
   end
- 
+
   def test_create_or_open_table_at
     s = Workbook::Sheet.new
     table0=s.create_or_open_table_at(0)
@@ -50,8 +50,8 @@ class TestWorkbook < Test::Unit::TestCase
     table1=s.create_or_open_table_at(1)
     assert_equal(Workbook::Table, table1.class)
     assert_equal(s, table1.sheet)
-    table1<<Workbook::Row.new([1,2,3,4])    
-    assert_equal(false, table1 == table0)    
-    
+    table1<<Workbook::Row.new([1,2,3,4])
+    assert_equal(false, table1 == table0)
+
   end
 end

data/test/test_table.rb

@@ -7,7 +7,7 @@ class TestTable< Test::Unit::TestCase
     assert_equal(t,[])
     c = Workbook::Cell.new("celllll")
     t = Workbook::Table.new [[c]]
-     
+
     assert_equal([[c]],t)
   end
   def test_header
@@ -17,28 +17,28 @@ class TestTable< Test::Unit::TestCase
     assert_equal(t.header,[1])
     assert_equal(t.header.class,Workbook::Row)
   end
-  
+
   def test_new_row
     t = Workbook::Table.new
     assert_equal(t.count, 0)
-    
+
     r = t.new_row [1,2,3,4]
     assert_equal(r, [1,2,3,4])
-    assert_equal(r.class, Workbook::Row)    
+    assert_equal(r.class, Workbook::Row)
     assert_equal(1,t.count)
-    
+
     r = t.new_row
     assert_equal(r.empty?, true)
     assert_equal(r.class, Workbook::Row)
-    
+
     assert_equal(2, t.count)
     assert_equal(r, t.last)
-    
+
     r << 2
 
     assert_equal(t.last.empty?, false)
   end
-  
+
   def test_append_row
     t = Workbook::Table.new
     row = t.new_row(["a","b"])
@@ -49,23 +49,26 @@ class TestTable< Test::Unit::TestCase
     assert_equal(t, row.table)
     row = Workbook::Row.new([3,4])
     assert_equal(nil, row.table)
-    t << row 
+    t << row
     assert_equal(t, row.table)
+    t = Workbook::Table.new
+    t << [1,2,3,4]
+    assert_equal(Workbook::Row,t.first.class)
   end
-  
+
   def test_sheet
     t = Workbook::Table.new
     s = t.sheet
     assert_equal(t, s.table)
     assert_equal(t.sheet, s)
   end
-  
+
   def test_name
     t = Workbook::Table.new
     t.name = "test naam"
     assert_equal("test naam", t.name)
   end
-  
+
   def test_delete_all
     w = Workbook::Book.new [["a","b"],[1,2],[3,4]]
     t = w.sheet.table
@@ -83,7 +86,7 @@ class TestTable< Test::Unit::TestCase
     assert_equal(3,t[2][:a])
     assert_equal(5,t2[2][:a])
   end
-  
+
   def test_clone_custom_header
     w = Workbook::Book.new [[nil, nil],["a","b"],[1,2],[3,4]]
     t = w.sheet.table
@@ -94,7 +97,7 @@ class TestTable< Test::Unit::TestCase
     assert_equal(3,t[3][:a])
     assert_equal(5,t2[3][:a])
   end
-  
+
   def test_spreadsheet_style_cell_addressing
     w = Workbook::Book.new [[nil, nil],["a","b"],[1,2],[3,4]]
     t = w.sheet.table
@@ -106,20 +109,33 @@ class TestTable< Test::Unit::TestCase
     assert_equal(2,t["B3"].value)
     assert_equal(3,t["A4"].value)
     assert_equal(4,t["B4"].value)
-    # t["B4"]="asdf"
-    # assert_equal("asdf",t["B4"].value)
-    
   end
 
   def test_alpha_index_to_number_index
-     w = Workbook::Book.new
-     t = w.sheet.table
-     assert_equal(0,t.alpha_index_to_number_index("A"))
-     assert_equal(2,t.alpha_index_to_number_index("C"))
-     assert_equal(25,t.alpha_index_to_number_index("Z"))
-     assert_equal(26,t.alpha_index_to_number_index("AA"))
-     assert_equal(27,t.alpha_index_to_number_index("AB"))
-     assert_equal(51,t.alpha_index_to_number_index("AZ"))
-     assert_equal(52,t.alpha_index_to_number_index("BA"))
+    w = Workbook::Book.new
+    t = w.sheet.table
+    assert_equal(0,t.alpha_index_to_number_index("A"))
+    assert_equal(2,t.alpha_index_to_number_index("C"))
+    assert_equal(25,t.alpha_index_to_number_index("Z"))
+    assert_equal(26,t.alpha_index_to_number_index("AA"))
+    assert_equal(27,t.alpha_index_to_number_index("AB"))
+    assert_equal(51,t.alpha_index_to_number_index("AZ"))
+    assert_equal(52,t.alpha_index_to_number_index("BA"))
+  end
+
+  def test_trim!
+    t = Workbook::Table.new
+    t << [1,2,3]
+    t << [1,2,nil,nil]
+    t.trim!
+    assert_equal("1,2,3\n1,2,\n",t.to_csv)
+    t = Workbook::Table.new
+    t << [1,2,3]
+    t << [nil]
+    t << [1,2,nil,nil]
+    t << [nil,nil,nil,nil]
+    t << [nil,nil,nil,nil]
+    t.trim!
+    assert_equal("1,2,3\n,,\n1,2,\n",t.to_csv)
   end
 end

data/test/test_template.rb

@@ -2,14 +2,14 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 class TestTemplate < Test::Unit::TestCase
-  
+
   def test_initalize
     t = Workbook::Template.new
     assert_equal(true,(t.methods.include?(:add_raw) or t.methods.include?("add_raw")))
     assert_equal(true,(t.methods.include?(:has_raw_for?) or t.methods.include?("has_raw_for?")))
     assert_equal(true,(t.methods.include?(:raws) or t.methods.include?("raws")))
   end
-  
+
   def test_add_raw_and_has_raw_for
     t = Workbook::Template.new
     t.add_raw "asdfsadf"
@@ -21,5 +21,5 @@ class TestTemplate < Test::Unit::TestCase
     t.add_raw "asdfsadf"
     assert_equal({String=>"asdfsadf"}, t.raws)
   end
-  
+
 end

data/test/test_writers_html_writer.rb

@@ -2,9 +2,11 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 module Writers
-  class TestXlsWriter < Test::Unit::TestCase
+  class TestHtmlWriter < Test::Unit::TestCase
     def test_to_html
-      match = Workbook::Book.new.to_html.match(/<table><\/table>/) ? true : false
+      #jruby and ruby's output differ a bit... both produce valid results though
+      match = Workbook::Book.new.to_html.match(/<table \/>/) ? true : false #jruby
+      match = (Workbook::Book.new.to_html.match(/<table><\/table>/) ? true : false) if match == false #ruby
       assert_equal(true, match)
       html = Workbook::Book.new([['a','b'],[1,2],[3,4]]).to_html
       match = html.match(/<table><\/table>/) ? true : false
@@ -43,11 +45,11 @@ module Writers
     end
     def test_col_and_rowspans
       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')
       html = w.to_html
       assert_equal(true, (html.match(/rowspan="2">15 nov 11 15 nov 11/) ? true : false) )
       assert_equal(true, (html.match(/colspan="2" rowspan="2">13 mrt 12 15 mrt 12 13 mrt 12 15 mrt 12/) ? true : false) )
       assert_equal(true, (html.match(/colspan="2">14 90589/) ? true : false) )
     end
   end
-end
+end

data/test/test_writers_xls_writer.rb

@@ -5,24 +5,24 @@ module Writers
   class TestXlsWriter < Test::Unit::TestCase
     def test_to_xls
       b = Workbook::Book.new [['a','b','c'],[1,2,3],[3,2,3]]
-      raw = Spreadsheet.open('test/artifacts/simple_sheet.xls')
+      raw = Spreadsheet.open File.join(File.dirname(__FILE__), 'artifacts/simple_sheet.xls')
       t = Workbook::Template.new
       t.add_raw raw
       b.template = t
       assert_equal(true, b.to_xls.is_a?(Spreadsheet::Workbook))
-      
+
       assert_equal('untitled document.xls', b.write_to_xls)
     end
-    
+
     def test_roundtrip
-      b = Workbook::Book.open('test/artifacts/simple_sheet.xls')
+      b = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/simple_sheet.xls')
       assert_equal(3.85546875,b.sheet.table.first[:a].format[:width])
       filename = b.write_to_xls
       b = Workbook::Book.open filename
       assert_equal(3.85546875,b.sheet.table.first[:a].format[:width])
     end
     def test_cloning_roundtrip
-      b = Workbook::Book.open('test/artifacts/book_with_tabs_and_colours.xls')
+      b = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.xls')
       b.sheet.table << b.sheet.table[2]
       assert_equal(90588,b.sheet.table[5][:b].value)
       assert_equal("#FFFF00",b.sheet.table[5][:c].format[:background_color])
@@ -31,13 +31,13 @@ module Writers
       assert_equal(90588,b.sheet.table[5][:b].value)
       assert_equal("#FFFF00",b.sheet.table[5][:c].format[:background_color])
     end
-    
+
     def test_init_spreadsheet_template
       b = Workbook::Book.new
       b.init_spreadsheet_template
       assert_equal(Spreadsheet::Workbook,b.xls_template.class)
     end
-    
+
     def test_xls_sheet
       b = Workbook::Book.new
       b.init_spreadsheet_template

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workbook
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -138,6 +138,7 @@ files:
 - doc/Workbook/Modules/RawObjectsStorage.html
 - doc/Workbook/Modules/TableDiffSort.html
 - doc/Workbook/Modules/TypeParser.html
+- doc/Workbook/NilValue.html
 - doc/Workbook/Readers.html
 - doc/Workbook/Readers/CsvReader.html
 - doc/Workbook/Readers/OdsReader.html
@@ -189,6 +190,8 @@ files:
 - lib/workbook/writers/csv_table_writer.rb
 - lib/workbook/writers/html_writer.rb
 - lib/workbook/writers/xls_writer.rb
+- rbeautify.rb
+- test/artifacts/book_with_colspans.ods
 - test/artifacts/book_with_tabs_and_colours.ods
 - test/artifacts/book_with_tabs_and_colours.xls
 - test/artifacts/book_with_tabs_and_colours.xlsx
@@ -255,6 +258,7 @@ specification_version: 3
 summary: Workbook is a datastructure to contain books of tables (an anlogy used in
   e.g. Excel)
 test_files:
+- test/artifacts/book_with_colspans.ods
 - test/artifacts/book_with_tabs_and_colours.ods
 - test/artifacts/book_with_tabs_and_colours.xls
 - test/artifacts/book_with_tabs_and_colours.xlsx