workbook 0.5 → 0.6

data/test/test_readers_txt_reader.rb

@@ -11,7 +11,7 @@ module Readers
 
     def test_excel_standardized_open
       w = Workbook::Book.new
-      w.open(File.join(File.dirname(__FILE__), "artifacts/excel_different_types.txt"))
+      w.import(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
@@ -23,7 +23,7 @@ module Readers
       assert_equal("c",w.sheet.table[2][:a].value)
       assert_equal(DateTime.new(2012,1,22,11),w.sheet.table[3][:a].value)
       assert_equal(42000,w.sheet.table[3][:b].value)
-      assert_equal(nil,w.sheet.table[2][:c].value)
+      assert_nil(w.sheet.table[2][:c].value)
     end
 
     def test_excel_class_read_string
@@ -40,7 +40,7 @@ module Readers
       assert_equal("c",w.sheet.table[2][:a].value)
       assert_equal(DateTime.new(2012,1,22,11),w.sheet.table[3][:a].value)
       assert_equal(42000,w.sheet.table[3][:b].value)
-      assert_equal(nil,w.sheet.table[2][:c].value)
+      assert_nil(w.sheet.table[2][:c].value)
     end
 
     def test_excel_instance_read_string
@@ -58,7 +58,7 @@ module Readers
       assert_equal("c",w.sheet.table[2][:a].value)
       assert_equal(DateTime.new(2012,1,22,11),w.sheet.table[3][:a].value)
       assert_equal(42000,w.sheet.table[3][:b].value)
-      assert_equal(nil,w.sheet.table[2][:c].value)
+      assert_nil(w.sheet.table[2][:c].value)
     end
 
     def test_excel_instance_read_stringio
@@ -76,7 +76,7 @@ module Readers
       assert_equal("c",w.sheet.table[2][:a].value)
       assert_equal(DateTime.new(2012,1,22,11),w.sheet.table[3][:a].value)
       assert_equal(42000,w.sheet.table[3][:b].value)
-      assert_equal(nil,w.sheet.table[2][:c].value)
+      assert_nil(w.sheet.table[2][:c].value)
     end
 
   end

data/test/test_readers_xls_reader.rb

@@ -4,7 +4,7 @@ module Readers
   class TestXlsWriter < Minitest::Test
     def test_xls_open
       w = Workbook::Book.new
-      w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.xls')
+      w.import 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])
@@ -17,7 +17,7 @@ module Readers
 
     def test_xls_complex_types
       w = Workbook::Book.new
-      w.open File.join(File.dirname(__FILE__), 'artifacts/complex_types.xls')
+      w.import 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)
@@ -27,7 +27,7 @@ module Readers
 
     def test_xls_excel_standardized_open
       w = Workbook::Book.new
-      w.open(File.join(File.dirname(__FILE__), "artifacts/excel_different_types.xls"))
+      w.import(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
@@ -39,36 +39,32 @@ module Readers
       assert_equal("c",w.sheet.table[2][:a].value)
       assert_equal(DateTime.new(2012,1,22,11),w.sheet.table[3][:a].value)
       assert_equal(42000,w.sheet.table[3][:b].value)
-      assert_equal(nil,w.sheet.table[2][:c].value)
+      assert_nil(w.sheet.table[2][:c].value)
     end
 
     def test_txt_in_xls_open
       w = Workbook::Book.new
-      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})
+      w.import(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
+
     def test_zip_in_xls_open
       w = Workbook::Book.new
       failed_properly = false
       begin
-        w.open(File.join(File.dirname(__FILE__), "artifacts/zip_in_xls.xls"))
+        w.import(File.join(File.dirname(__FILE__), "artifacts/zip_in_xls.xls"))
         w.sheet.table.to_csv
-      rescue Ole::Storage::FormatError
+      rescue CSV::MalformedCSVError
         failed_properly = true
       end
       assert_equal(true,failed_properly)
     end
+
     def test_multi_sheet_opening
       b = Workbook::Book.open(File.join(File.dirname(__FILE__), 'artifacts/simple_sheet_many_sheets.xls'))
-      raw_xls = b.template.raws[Spreadsheet::Excel::Workbook]
       assert_equal(["Diff_10", "Diff_9", "Diff_8", "Diff_7", "Diff_6", "Diff_5", "Diff_4", "Diff_3", "Diff_2", "Diff_1"], b.collect{|a| a.name})
       assert_equal([10, 9, 8, 7, 6, 5, 4, 3, 2, 1], b.collect{|a| a.table[1][0].value})
     end
-    def test_float_problem
-      w = Workbook::Book.new
-      # w.open File.join(File.dirname(__FILE__), 'artifacts/floats_problem.xls')
-      # puts w.first.first.to_csv
-    end
   end
 end

data/test/test_readers_xls_shared.rb

@@ -0,0 +1,10 @@
+# -*- encoding : utf-8 -*-
+require File.join(File.dirname(__FILE__), 'helper')
+module Readers
+  class TestXlsShared < Minitest::Test
+    def test_xls_number_to_time
+      w = Workbook::Book.new
+      assert_equal(DateTime.new(2011,11,15),w.xls_number_to_time(40862))
+    end
+  end
+end

data/test/test_readers_xlsx_reader.rb

@@ -1,11 +1,12 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Readers
-  class TestXlsxWriter < Minitest::Test
+  class TestXlsxReader < Minitest::Test
     def test_xlsx_open
       w = Workbook::Book.new
-      w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.xlsx')
+      w.import 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([:anders,:dit],w[1].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...
@@ -15,10 +16,8 @@ module Readers
     end
     def test_open_native_xlsx
       w = Workbook::Book.new
-      w.open File.join(File.dirname(__FILE__), 'artifacts/native_xlsx.xlsx')
-
-      assert_equal([:datum_gemeld, :adm_gereed, :callnr],w.sheet.table.header.to_symbols)
-
+      w.import File.join(File.dirname(__FILE__), 'artifacts/native_xlsx.xlsx')
+      assert_equal([:datum_gemeld, :adm_gereed, :callnr],w.last.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)
@@ -26,13 +25,17 @@ module Readers
     end
     def test_ms_formatting_to_strftime
       w = Workbook::Book.new
-      assert_equal(nil,w.ms_formatting_to_strftime(nil));
-      assert_equal(nil,w.ms_formatting_to_strftime(""));
+      assert_nil(w.ms_formatting_to_strftime(nil));
+      assert_nil(w.ms_formatting_to_strftime(""));
     end
     def test_open_integer_xlsx
       w = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/integer_test.xlsx')
-
       assert_equal("2",w.sheet.table[1][1].value.to_s)
+      assert_equal(2,w.sheet.table[1][1].value)
+    end
+    def test_bit_table_xlsx
+      b = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/bigtable.xlsx')
+      assert_equal(553, b.sheet.table.count)
     end
   end
 end

data/test/test_row.rb

@@ -27,7 +27,7 @@ class TestRow < Minitest::Test
     r = Workbook::Row.new
     assert_raises(ArgumentError, 'table should be a Workbook::Table (you passed a String)') { r.table = "asdf" }
     r.table = nil
-    assert_equal(r.table, nil)
+    assert_nil(r.table)
     r = Workbook::Row.new
 
     t = Workbook::Table.new
@@ -129,7 +129,7 @@ class TestRow < Minitest::Test
     assert_equal(3, r[:test].value)
     assert_equal(3, r[:test].value)
     t.last[:test] = nil
-    assert_equal(nil, r[:test].value)
+    assert_nil(r[:test].value)
     r[:test] = 5
     assert_equal(5, r[:test].value)
   end
@@ -190,8 +190,8 @@ class TestRow < Minitest::Test
     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_nil(row[:a])
+    assert_nil(row[:b])
     assert_equal(1,row[0].value)
     assert_equal(2,row[1].value)
   end
@@ -243,7 +243,7 @@ class TestRow < Minitest::Test
     row = Workbook::Row.new([],table)
     row[1]= 12
     assert_equal(12, table.last["b"])
-    assert_equal(nil, table.last["a"])
+    assert_nil(table.last["a"])
 
   end
 
@@ -357,7 +357,7 @@ class TestRow < Minitest::Test
     a += [1,1]
     assert_equal([1,1],a.to_a )
     assert_equal(Workbook::Row, a.class )
-    assert_equal(nil, a.table)
+    assert_nil(a.table)
     assert_equal(Workbook::Cell,a[0].class)
   end
 

data/test/test_table.rb

@@ -12,7 +12,7 @@ class TestTable< Minitest::Test
   end
   def test_header
     t = Workbook::Table.new
-    assert_equal(t.header,nil)
+    assert_nil(t.header)
     t = Workbook::Table.new [[1]]
     assert_equal(t.header,[1])
     assert_equal(t.header.class,Workbook::Row)
@@ -44,11 +44,11 @@ class TestTable< Minitest::Test
     row = t.new_row(["a","b"])
     assert_equal(row, t.header)
     row = Workbook::Row.new([1,2])
-    assert_equal(nil, row.table)
+    assert_nil(row.table)
     t.push(row)
     assert_equal(t, row.table)
     row = Workbook::Row.new([3,4])
-    assert_equal(nil, row.table)
+    assert_nil(row.table)
     t << row
     assert_equal(t, row.table)
     t = Workbook::Table.new
@@ -101,8 +101,8 @@ class TestTable< Minitest::Test
   def test_spreadsheet_style_cell_addressing
     w = Workbook::Book.new [[nil, nil],["a","b"],[1,2],[3,4]]
     t = w.sheet.table
-    assert_equal(nil,t["A1"].value)
-    assert_equal(nil,t["B1"].value)
+    assert_nil(t["A1"].value)
+    assert_nil(t["B1"].value)
     assert_equal("a",t["A2"].value)
     assert_equal("b",t["B2"].value)
     assert_equal(1,t["A3"].value)
@@ -142,7 +142,7 @@ class TestTable< Minitest::Test
     w = Workbook::Book.new [["a","b"],[1,2],[3,4]]
     t = w.sheet.table
     r = t[1].clone
-    assert_equal(nil, r.table)
+    assert_nil(r.table)
     t[2] = r
     assert_equal(t, r.table)
   end
@@ -173,7 +173,7 @@ class TestTable< Minitest::Test
     first_row = 100.times.collect{|a| Time.now}
     table << headers.shuffle
     table << first_row
-    100.times do |times|
+    1000.times do |times|
       row = table[1].clone
       table << row
       headers.each do |a|
@@ -181,9 +181,12 @@ class TestTable< Minitest::Test
       end
     end
     last_line = table.count-1
-    first_few_lines = table[12][0].value - table[2][0].value
-    last_few_lines = table[last_line][0].value - table[last_line-10][0].value
-    assert_equal(true, first_few_lines*1.20 > last_few_lines) # 10% slower is acceptable
+    delta_start = table[12][0].value - table[2][0].value
+    delta_end = table[last_line][0].value - table[last_line-10][0].value
+    average_run_time = (delta_start+delta_end / 20)
+    if (delta_end - delta_start) > average_run_time
+      puts "Performance issue"
+    end
   end
   def test_columns
     table = Workbook::Table.new([[]])
@@ -196,6 +199,5 @@ class TestTable< Minitest::Test
     assert_equal([0,1],table.dimensions)
     table = Workbook::Table.new([[:a,:b],[1,2,3,4]])
     assert_equal([4,2],table.dimensions)
-
   end
 end

data/test/test_template.rb

@@ -26,5 +26,14 @@ class TestTemplate < Minitest::Test
     t.set_default_formats!
     assert_equal({font_weight: "bold"},t.formats[:header][:default])
   end
-
+  def test_add_formats
+    t = Workbook::Template.new
+    t.add_format Workbook::Format.new({font:"Arial"})
+    t.add_format Workbook::Format.new({font:"Times"})
+    assert_equal(2,t.formats.keys.count)
+    named_format = Workbook::Format.new({font:"Times"})
+    named_format.name = 1
+    t.add_format named_format
+    assert_equal(2,t.formats.keys.count)
+  end
 end

data/test/test_types_date.rb

@@ -7,5 +7,8 @@ class TestTypesDate < Minitest::Test
     assert_equal(Workbook::Types::Date, w.class)
     assert_equal(Date.new(2001,2,2),w)
     assert_equal(Date.new(2001,2,2),w.value)
+    assert_equal(true, w.is_a?(Date))
+    assert_equal(true, w.is_a?(Workbook::Modules::Cell))
+
   end
 end

data/test/test_writers_html_writer.rb

@@ -61,7 +61,7 @@ module Writers
     end
     def test_col_and_rowspans
       w = Workbook::Book.new
-      w.open File.join(File.dirname(__FILE__), 'artifacts/sheet_with_combined_cells.ods')
+      w.import 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) )
       if RUBY_VERSION >= "1.9"

data/test/test_writers_xls_writer.rb

@@ -37,8 +37,8 @@ module Writers
       # puts t.to_csv
       #TODO: NOT true delete... need to work on this...
       assert_equal(25, t[3].first.value)
-      assert_equal(nil, t[4].first.value)
-      assert_equal(nil, t[4].last.value)
+      assert_nil(t[4].first.value)
+      assert_nil(t[4].last.value)
     end
     def test_pop_row
       b = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/simple_sheet.xls')
@@ -56,11 +56,11 @@ module Writers
       t = b.sheet.table
       # puts t.to_csv
       #TODO: NOT true delete... need to work on this...
-      assert_equal(nil, t[3].first.value)
-      assert_equal(nil, t[4].first.value)
-      assert_equal(nil, t[4].last.value)
+      assert_nil(t[3].first.value)
+      assert_nil(t[4].first.value)
+      assert_nil(t[4].last.value)
       assert_equal(15, t[2].first.value)
-      assert_equal(nil, t.last.first.value)
+      assert_nil(t.last.first.value)
 
     end
     def test_pop_bigtable
@@ -112,7 +112,7 @@ module Writers
       assert_equal(Spreadsheet::Worksheet,b.xls_sheet(100).class)
     end
     def test_strftime_to_ms_format_nil
-      assert_equal(nil, Workbook::Book.new.strftime_to_ms_format(nil))
+      assert_nil(Workbook::Book.new.strftime_to_ms_format(nil))
     end
     def test_xls_sheet_writer
       b = Workbook::Book.new
@@ -120,11 +120,10 @@ module Writers
       b << Workbook::Sheet.new
       b[0].name = "A"
       b[1].name = "B"
-      b[2].name = "C"
-      assert_equal(["A","B","C"], b.collect{|a| a.name})
+      assert_equal(["A","B"], b.collect{|a| a.name})
       filename = b.write_to_xls
       b = Workbook::Book.open filename
-      assert_equal(["A","B","C"], b.collect{|a| a.name})
+      assert_equal(["A","B"], b.collect{|a| a.name})
     end
     def test_removal_of_sheets_in_excel_when_using_template
       b = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/simple_sheet_many_sheets.xls')

data/test/test_writers_xlsx_writer.rb

@@ -46,7 +46,7 @@ module Writers
       t = b.sheet.table
       #TODO: NOT true delete... need to work on this...
       assert_equal(25, t[3].first.value)
-      assert_equal(nil, t[4])
+      assert_nil(t[4])
     end
     def test_pop_row
       b = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/simple_sheet.xlsx')
@@ -62,7 +62,7 @@ module Writers
       b = Workbook::Book.open filename
       t = b.sheet.table
       assert_equal(25, t[3].first.value)
-      assert_equal(nil, t[4])
+      assert_nil(t[4])
       assert_equal(15, t[2].first.value)
     end
     def test_pop_bigtable

data/workbook.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency("rchardet", "~> 1.3")
   s.add_dependency("rake", '~> 10.0')
   s.add_dependency("json", '~> 1.8')
-  s.add_dependency('roo', '~> 2.3')
   s.add_dependency('axlsx', '~> 2.1.0.pre')
   if RUBY_VERSION < "1.9"
     s.add_dependency('nokogiri', "~> 1.5.10")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workbook
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Maarten Brouwers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-prof
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: roo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: axlsx
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +182,6 @@ files:
 - lib/workbook/writers/json_table_writer.rb
 - lib/workbook/writers/xls_writer.rb
 - lib/workbook/writers/xlsx_writer.rb
-- rbeautify.rb
 - test/artifacts/bigtable.xls
 - test/artifacts/bigtable.xlsx
 - test/artifacts/book_with_colspans.ods
@@ -238,6 +223,7 @@ files:
 - test/test_readers_ods_reader.rb
 - test/test_readers_txt_reader.rb
 - test/test_readers_xls_reader.rb
+- test/test_readers_xls_shared.rb
 - test/test_readers_xlsx_reader.rb
 - test/test_row.rb
 - test/test_sheet.rb
@@ -316,6 +302,7 @@ test_files:
 - test/test_readers_ods_reader.rb
 - test/test_readers_txt_reader.rb
 - test/test_readers_xls_reader.rb
+- test/test_readers_xls_shared.rb
 - test/test_readers_xlsx_reader.rb
 - test/test_row.rb
 - test/test_sheet.rb
@@ -326,4 +313,3 @@ test_files:
 - test/test_writers_json_writer.rb
 - test/test_writers_xls_writer.rb
 - test/test_writers_xlsx_writer.rb
-has_rdoc: