workbook 0.4.9 → 0.4.10

data/test/test_row.rb

@@ -167,7 +167,7 @@ class TestRow < Minitest::Test
   end
 
   def test_to_s
-    r1 = Workbook::Row.new  ["test", "asdf-asd"]
+    r1 = Workbook::Row.new ["test", "asdf-asd"]
     assert_equal("test,asdf-asd\n",r1.to_csv)
   end
 

data/test/test_sheet.rb

@@ -82,4 +82,5 @@ class TestWorkbook < Minitest::Test
     # puts b.index b.last
     assert_equal(["Sheet 1", "Sheet 2", "Sheet 3"], b.collect{|a| a.name})
   end
+
 end

data/test/test_table.rb

@@ -169,8 +169,8 @@ class TestTable< Minitest::Test
   end
   def test_performance
     table = Workbook::Table.new
-    headers = 1000.times.collect{|a| "header#{a}"}
-    first_row = 1000.times.collect{|a| Time.now}
+    headers = 100.times.collect{|a| "header#{a}"}
+    first_row = 100.times.collect{|a| Time.now}
     table << headers.shuffle
     table << first_row
     100.times do |times|
@@ -186,6 +186,17 @@ class TestTable< Minitest::Test
     # puts [first_few_lines,last_few_lines].join(" vs ")
     assert_equal(true, first_few_lines*1.20 > last_few_lines) # 10% slower is acceptable
   end
+  def test_columns
+    table = Workbook::Table.new([[]])
+    assert_equal(table.columns,[])
+    table = Workbook::Table.new([[:a,:b],[1,2]])
+    assert_equal(table.columns.count,2)
+  end
+  def test_dimensions
+    table = Workbook::Table.new([[]])
+    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

@@ -21,5 +21,10 @@ class TestTemplate < Minitest::Test
     t.add_raw "asdfsadf"
     assert_equal({String=>"asdfsadf"}, t.raws)
   end
+  def test_set_default_formats!
+    t = Workbook::Template.new
+    t.set_default_formats!
+    assert_equal({font_weight: "bold"},t.formats[:header][:default])
+  end
 
 end

data/test/test_types_date.rb

@@ -0,0 +1,11 @@
+# -*- encoding : utf-8 -*-
+require File.join(File.dirname(__FILE__), 'helper')
+
+class TestTypesDate < Minitest::Test
+  def test_init
+    w = Workbook::Types::Date.new(2001,2,2)
+    assert_equal(Workbook::Types::Date, w.class)
+    assert_equal(Date.new(2001,2,2),w)
+    assert_equal(Date.new(2001,2,2),w.value)
+  end
+end

data/test/test_writers_xlsx_writer.rb

@@ -5,22 +5,13 @@ module Writers
   class TestXlsxWriter < Minitest::Test
     def test_empty_to_xlsx
       b = Workbook::Book.new [['a','b','c'],[1,2,3],[3,2,3]]
-      b.to_xlsx.is_a? RubyXL::Workbook
+      assert_equal(true, b.to_xlsx.is_a?(Axlsx::Package))
+      dimensions = b.sheet.table.dimensions
       assert_equal('untitled document.xlsx', b.write_to_xlsx)
-
+      b = Workbook::Book.open 'untitled document.xlsx'
+      assert_equal(dimensions, b.sheet.table.dimensions)
     end
 
-    # def test_to_xlsx
-  #     b = Workbook::Book.new [['a','b','c'],[1,2,3],[3,2,3]]
-  #     raw = RubyXL::Parser.parse File.join(File.dirname(__FILE__), 'artifacts/simple_sheet.xlsx')
-  #     t = Workbook::Template.new
-  #     t.add_raw raw
-  #     b.template = t
-  #     assert_equal(true, b.to_xlsx.is_a?(RubyXL::Workbook))
-  #
-  #     assert_equal('untitled document.xlsx', b.write_to_xlsx)
-  #   end
-
     def test_roundtrip
       b = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/simple_sheet.xlsx')
       assert_equal(14,b[0][0]["A2"])
@@ -28,18 +19,17 @@ module Writers
       # puts b.sheet.table.to_csv
       filename = b.write_to_xlsx
       b = Workbook::Book.open filename
-      assert_equal(14,b[0][0]["A2"])
-      # assert_equal(DateTime.new(2011,11,15),b[0][0]["D3"].value) TODO: Dates don't work with RubyXL
+      assert_equal(14,b[0][0]["A2"].value)
+      assert_equal(DateTime.new(2011,11,15),b[0][0]["D3"].value)
     end
     def test_roundtrip_with_modification
       b = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/simple_sheet.xlsx')
       b[0][0]["A2"]= 12
       assert_equal(DateTime.new(2011,11,15),b[0][0]["D3"].value)
-      # puts b.sheet.table.to_csv
       filename = b.write_to_xlsx
       b = Workbook::Book.open filename
       assert_equal(12,b[0][0]["A2"].value)
-      # assert_equal(DateTime.new(2011,11,15),b[0][0]["D3"].value) TODO: Dates don't work with RubyXL
+      assert_equal(DateTime.new(2011,11,15),b[0][0]["D3"].value)
     end
     def test_delete_row
       b = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/simple_sheet.xlsx')
@@ -67,87 +57,52 @@ module Writers
       # 33  90490  d  13 mrt 12  15 mrt 12
       t = b.sheet.table
       assert_equal(33, t.last.first.value)
-      t.pop(2)
+      t.pop(1)
       filename = b.write_to_xlsx
       b = Workbook::Book.open filename
       t = b.sheet.table
-      assert_equal(33, t[3].first.value)
+      assert_equal(25, t[3].first.value)
       assert_equal(nil, t[4])
       assert_equal(15, t[2].first.value)
-
     end
-    # def test_pop_bigtable
-    #   b = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/bigtable.xlsx')
-    #   # a  b  c  d  e
-    #   # 14  90589  a  19 apr 12  23 apr 12
-    #   # 15  90588  b  15 nov 11  16 jul 12
-    #   # 25  90463  c  15 nov 11  17 nov 11
-    #   # 33  90490  d  13 mrt 12  15 mrt 12
-    #   t = b.sheet.table
-    #   assert_equal(554, t.count)
-    #   t.pop(300) #delete last two row
-    #   assert_equal(254, t.trim.count)
-    #   filename = b.write_to_xlsx
-    #   b = Workbook::Book.open filename
-    #   t = b.sheet.table
-    #   assert_equal(254, t.trim.count)
-    #
-    #
-    # end
+    def test_pop_bigtable
+      b = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/bigtable.xlsx')
+      t = b.sheet.table
+      assert_equal(553, t.count)
+      t.pop(300)
+      assert_equal(253, t.trim.count)
+      filename = b.write_to_xlsx
+      b = Workbook::Book.open filename
+      t = b.sheet.table
+      assert_equal(253, t.trim.count)
+    end
+
+    # Uncommented colour testing, this is broken since the switch to roo/axlsx
     def test_cloning_roundtrip
       b = Workbook::Book.open File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.xlsx')
       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])
+      # assert_equal("#FFFF00",b.sheet.table[2][:c].format[:background_color])
+      # assert_equal("#FFFF00",b.sheet.table[5][:c].format[:background_color])
       filename = b.write_to_xls
       b = Workbook::Book.open filename
       assert_equal(90588,b.sheet.table[5][:b].value)
-      assert_equal("#FF00FF",b.sheet.table[5][:c].format[:background_color])
+      # assert_equal("#FF00FF",b.sheet.table[5][:c].format[:background_color])
     end
- #    def test_parse_font_family
- #      b = Workbook::Book.new
- #      assert_equal(:none,b.parse_font_family({:font_family=>"asdfsdf"}))
- #      assert_equal(:swiss,b.parse_font_family({:font_family=>"ArIAL"}))
- #      assert_equal(:swiss,b.parse_font_family({:font_family=>:swiss}))
- #      assert_equal(:roman,b.parse_font_family({:font_family=>"Times"}))
- #      assert_equal(:roman,b.parse_font_family({:font_family=>"roman"}))
- #    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
- #      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))
- #    end
- #    def test_xls_sheet_writer
- #      b = Workbook::Book.new
- #      b << Workbook::Sheet.new
- #      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})
- #      filename = b.write_to_xls
- #      b = Workbook::Book.open filename
- #      assert_equal(["A","B","C"], 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')
- #      assert_equal(10, b.count)
- #      b.pop(4)
- #      assert_equal(6, b.count)
- #      filename = b.write_to_xls
- #      b = Workbook::Book.open filename
- #      assert_equal(6, b.count)
- #
- #    end
+
+    def test_format_to_xlsx_format
+      b = Workbook::Book.new
+      xlsx_format = b.format_to_xlsx_format(Workbook::Format.new({font_weight: "bold", color: "#FF0000"}))
+      assert_equal(true,xlsx_format[:b])
+      assert_equal("#FF000000",xlsx_format[:fg_color])
+    end
+
+    def test_formats_to_xlsx_format
+      b = Workbook::Book.new
+      b.template.set_default_formats!
+      b.formats_to_xlsx_format
+      assert_equal(false,b.template.create_or_find_format_by(:header).raws[Fixnum].nil?)
+    end
+
   end
 end

data/workbook.gemspec

@@ -3,13 +3,14 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require "workbook/version"
+require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'workbook'
   s.rubyforge_project = 'workbook'
   s.license = "MIT"
   s.version     = Workbook::VERSION
-  s.date        = '2013-04-05'
+  s.date        = Time.new.to_date.to_s
   s.summary     = "Workbook is a datastructure to contain books of tables (an anlogy used in e.g. Excel)"
   s.description = "Workbook contains workbooks, as in a table, contains rows, contains cells, reads/writes excel, ods and csv and tab separated files, and offers basic diffing and sorting capabilities."
   s.authors     = ["Maarten Brouwers"]
@@ -22,7 +23,9 @@ Gem::Specification.new do |s|
   s.add_dependency("rake", '~> 10.0')
   s.add_dependency("json", '~> 1.8')
   s.add_dependency("zip-zip", '~> 0.2') #actually a hack...
-  s.add_dependency('rubyXL', '~> 3.3')
+  #s.add_dependency('rubyXL', '~> 3.3')
+  s.add_dependency('roo', '~> 1.13')
+  s.add_dependency('axlsx', '~> 2.0.1')
   if RUBY_VERSION < "1.9"
     s.add_dependency('nokogiri', "~> 1.5.10")
   else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workbook
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Maarten Brouwers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-prof
@@ -123,19 +123,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rubyXL
+  name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: axlsx
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +233,7 @@ files:
 - lib/workbook/format.rb
 - lib/workbook/generatetypes.rb
 - lib/workbook/modules/cache.rb
+- lib/workbook/modules/cell.rb
 - lib/workbook/modules/diff_sort.rb
 - lib/workbook/modules/raw_objects_storage.rb
 - lib/workbook/modules/type_parser.rb
@@ -279,11 +294,11 @@ files:
 - test/artifacts/zip_in_xls.xls
 - test/helper.rb
 - test/test_book.rb
-- test/test_cell.rb
 - test/test_column.rb
 - test/test_format.rb
 - test/test_functional.rb
 - test/test_modules_cache.rb
+- test/test_modules_cell.rb
 - test/test_modules_table_diff_sort.rb
 - test/test_modules_type_parser.rb
 - test/test_readers_csv_reader.rb
@@ -295,6 +310,7 @@ files:
 - test/test_sheet.rb
 - test/test_table.rb
 - test/test_template.rb
+- test/test_types_date.rb
 - test/test_writers_html_writer.rb
 - test/test_writers_json_writer.rb
 - test/test_writers_xls_writer.rb
@@ -355,11 +371,11 @@ test_files:
 - test/artifacts/zip_in_xls.xls
 - test/helper.rb
 - test/test_book.rb
-- test/test_cell.rb
 - test/test_column.rb
 - test/test_format.rb
 - test/test_functional.rb
 - test/test_modules_cache.rb
+- test/test_modules_cell.rb
 - test/test_modules_table_diff_sort.rb
 - test/test_modules_type_parser.rb
 - test/test_readers_csv_reader.rb
@@ -371,6 +387,7 @@ test_files:
 - test/test_sheet.rb
 - test/test_table.rb
 - test/test_template.rb
+- test/test_types_date.rb
 - test/test_writers_html_writer.rb
 - test/test_writers_json_writer.rb
 - test/test_writers_xls_writer.rb