workbook 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9cf45e1ff6addbcf502334bf786df43a7c7714a
-  data.tar.gz: 6f219b42f0c6b17f8ed9ac32c57b3032efe74f12
+  metadata.gz: c4b33014d1a79259654ae669373a886007f494f5
+  data.tar.gz: 6385dfbbe2965a2d4b59aa597ad9875040aa5226
 SHA512:
-  metadata.gz: 8ca18e838d71e6bee71a343728f9d0e7cd5843511e7e2e13c9d5a6432e2ecad2d78dc37913d87b4744f86f4ab46e386449fbf2f9488a143329514704c1221726
-  data.tar.gz: db7378ab0541f0f6ecdc0fa66f707f5c58e908da0086d57eac010d8b4057534ac4cb7c3d809520a6702ada150a3f88c141913b4e5bbdf9096d7e3d21db733faa
+  metadata.gz: e2f9ee0754579c29154b399ab4e868bc1a784b71f8cb61487606210ee3fb2b948b72d1182576071945e14574b7b99b087ef36f927d577a2add013546f280991f
+  data.tar.gz: 5797ba6fa5d14e6259a6a33ab45d1b228afae3eb9c99a8a2633856821978846f3e93f6e98173a085ee00bdf66b8ffff00b9f5411510f2aca981fede53ba1a3bc

data/lib/workbook/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Workbook
-  VERSION = '0.4.8'
+  VERSION = '0.4.9'
 end

data/lib/workbook/writers/xlsx_writer.rb

@@ -6,7 +6,7 @@ module Workbook
   module Writers
     module XlsxWriter
 
-      # Generates an Spreadsheet (from the spreadsheet gem) in order to build an XlS
+      # Generates an RubyXL doc, ready for export to XLSX
       #
       # @param [Hash] options A hash with options (unused so far)
       # @return [Spreadsheet] A Spreadsheet object, ready for writing or more lower level operations
@@ -37,59 +37,18 @@ module Workbook
         book
       end
 
-      # # Generates an Spreadsheet (from the spreadsheet gem) in order to build an XlS
-      # #
-      # # @param [Workbook::Format, Hash] f A Workbook::Format or hash with format-options (:font_weight, :rotation, :background_color, :number_format, :text_direction, :color, :font_family)
-      # # @return [Spreadsheet::Format] A Spreadsheet format-object, ready for writing or more lower level operations
-      # def format_to_xlsx_format f
-      #   xlsfmt = nil
-      #   unless f.is_a? Workbook::Format
-      #     f = Workbook::Format.new f
-      #   end
-      #   xlsfmt = f.return_raw_for Spreadsheet::Format
-      #   unless xlsfmt
-      #     xlsfmt=Spreadsheet::Format.new :weight=>f[:font_weight]
-      #     xlsfmt.rotation = f[:rotation] if f[:rotation]
-      #     xlsfmt.pattern_fg_color = html_color_to_xls_color(f[:background_color]) if html_color_to_xls_color(f[:background_color])
-      #     xlsfmt.pattern = 1 if html_color_to_xls_color(f[:background_color])
-      #     xlsfmt.number_format = strftime_to_ms_format(f[:number_format]) if f[:number_format]
-      #     xlsfmt.text_direction = f[:text_direction] if f[:text_direction]
-      #     xlsfmt.font.name = f[:font_family].split.first if f[:font_family]
-      #     xlsfmt.font.family = parse_font_family(f) if f[:font_family]
-      #     color = html_color_to_xls_color(f[:color])
-      #     xlsfmt.font.color = color if color
-      #     f.add_raw xlsfmt
-      #   end
-      #   return xlsfmt
-      # end
-      #
-      # # Parses right font-family name
-      # #
-      # # @param [Workbook::Format, hash] format to parse
-      # def parse_font_family(format)
-      #   font = format[:font_family].to_s.split.last
-      #   valid_values = [:none,:roman,:swiss,:modern,:script,:decorative]
-      #   if valid_values.include?(font)
-      #     return font
-      #   elsif valid_values.include?(font.to_s.downcase.to_sym)
-      #     return font.to_s.downcase.to_sym
-      #   else
-      #     font = font.to_s.downcase.strip
-      #     translation = {
-      #       "arial"=>:swiss,
-      #       "times"=>:roman,
-      #       "times new roman"=>:roman
-      #     }
-      #     tfont = translation[font]
-      #     return tfont ? tfont : :none
-      #   end
-      # end
+      # Generates an RubyXL doc, ready for export to XLSX
       #
+      # @param [Hash] options A hash with options (unused so far)
+      # @return [String] A string, ready for streaming, e.g. `send_data workbook.stream_xlsx`
+      def stream_xlsx options = {}
+        to_xlsx(options).stream.string
+      end
 
-      # Write the current workbook to Microsoft Excel format (using the spreadsheet gem)
+      # Write the current workbook to Microsoft Excel's new format (using the RubyXL gem)
       #
       # @param [String] filename
-      # @param [Hash] options   see #to_xls
+      # @param [Hash] options   see #to_xlsx
       def write_to_xlsx filename="#{title}.xlsx", options={}
         if to_xlsx(options).write(filename)
           return filename

data/test/helper.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
-require 'test/unit'
+require 'minitest/autorun'
+# require 'test/unit'
 require 'rubygems'
 require File.join(File.dirname(__FILE__), '../lib/workbook')

data/test/test_book.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
-class TestWorkbook < Test::Unit::TestCase
+class TestWorkbook < Minitest::Test
   def test_sheets
     w = Workbook::Book.new nil
     w.push
@@ -31,7 +31,7 @@ class TestWorkbook < Test::Unit::TestCase
     w = Workbook::Book.new nil
     s = Workbook::Sheet.new [Workbook::Row.new(Workbook::Table.new)]
     assert_equal(w.sheet.class,Workbook::Sheet)
-    assert_not_equal(w.sheet, s)
+    refute_equal(w.sheet, s)
     w = Workbook::Book.new s
     assert_equal(w.sheet, s)
   end
@@ -41,7 +41,7 @@ class TestWorkbook < Test::Unit::TestCase
   def test_template
     b = Workbook::Book.new
     raw = "asdf"
-    assert_raise(ArgumentError) { b.template = raw }
+    assert_raises(ArgumentError) { b.template = raw }
     raw = Workbook::Template.new
     b.template = raw
 

data/test/test_cell.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
-class TestCell < Test::Unit::TestCase
+class TestCell < Minitest::Test
 
 
   def test_init
@@ -10,7 +10,7 @@ class TestCell < Test::Unit::TestCase
     w = Workbook::Cell.new "asdf"
     assert_equal("asdf",w.value)
 
-    assert_raise(ArgumentError) { w = Workbook::Cell.new Workbook::Row }
+    assert_raises(ArgumentError) { w = Workbook::Cell.new Workbook::Row }
 
     t = Time.now
     w = Workbook::Cell.new t

data/test/test_column.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
-class TestColumn < Test::Unit::TestCase
+class TestColumn < Minitest::Test
 
   def test_init
     c = Workbook::Column.new
@@ -11,14 +11,14 @@ class TestColumn < Test::Unit::TestCase
     assert_equal(20, c.limit)
     assert_equal(Workbook::Cell.new("asdf"), c.default)
     assert_equal(:boolean, c.column_type)
-    assert_raise(ArgumentError) { Workbook::Column.new(true) }
-    assert_raise(ArgumentError) { Workbook::Column.new(nil, {:limit=>20,:default=>"asdf", :column_type=>:bodfolean}) }
+    assert_raises(ArgumentError) { Workbook::Column.new(true) }
+    assert_raises(ArgumentError) { Workbook::Column.new(nil, {:limit=>20,:default=>"asdf", :column_type=>:bodfolean}) }
   end
 
   def test_table
     c = Workbook::Column.new
     c.table = Workbook::Table.new
     assert_equal(Workbook::Table.new, c.table)
-    assert_raise(ArgumentError) { c.table = false }
+    assert_raises(ArgumentError) { c.table = false }
   end
 end

data/test/test_format.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
-class TestFormat < Test::Unit::TestCase
+class TestFormat < Minitest::Test
 
 
   def test_initialize

data/test/test_functional.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
-class TestFunctional < Test::Unit::TestCase
+class TestFunctional < Minitest::Test
   def test_chapter_Initializing
     b = Workbook::Book.new
     assert_equal(Workbook::Book, b.class)

data/test/test_modules_cache.rb

@@ -18,7 +18,7 @@ class TestToCacheClass
 end
 
 module Modules
-  class TestTableDiffSort < Test::Unit::TestCase
+  class TestTableDiffSort < Minitest::Test
     def test_basic_fetch
       c = TestToCacheClass.new
       c.debug_cache = false

data/test/test_modules_table_diff_sort.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Modules
-  class TestTableDiffSort < Test::Unit::TestCase
+  class TestTableDiffSort < Minitest::Test
     def test_sort
       time = Time.now
       b = Workbook::Book.new [[1,2,3],[2,2,3],[true,false,true],["asdf","sdf","as"],[time,2,3],[2,2,2],[22,2,3],[1,2,233]]
@@ -20,7 +20,7 @@ module Modules
 
       ba = Workbook::Book.new [['a','b','c','d'],[1,2,3,4],[4,2,3,4],[3,2,3,4]]
       sba = ba.sheet.table.sort
-      assert_not_equal(Workbook::Table.new([['a','b','c','d'],[1,2,3,4],[4,2,3,4],[3,2,3,4]]),sba)
+      refute_equal(Workbook::Table.new([['a','b','c','d'],[1,2,3,4],[4,2,3,4],[3,2,3,4]]),sba)
       assert_equal(Workbook::Table.new([['a','b','c','d'],[1,2,3,4],[3,2,3,4],[4,2,3,4]]),sba)
 
     end

data/test/test_modules_type_parser.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Modules
-  class TestTypeParser < Test::Unit::TestCase
+  class TestTypeParser < Minitest::Test
     def examples
       {"2312"=>2312,
         "12-12-2012"=>Date.new(2012,12,12),
@@ -35,7 +35,7 @@ module Modules
       examples.each do |k,v|
         c = Workbook::Cell.new(k)
         c.string_parsers = customparsers
-        assert_not_equal(v,c.parse)
+        refute_equal(v,c.parse)
       end
       c = Workbook::Cell.new("233")
       c.string_parsers = customparsers

data/test/test_readers_csv_reader.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Readers
-  class TestCsvWriter < Test::Unit::TestCase
+  class TestCsvWriter < Minitest::Test
     def test_open
       w = Workbook::Book.new
       w.open File.join(File.dirname(__FILE__), 'artifacts/simple_csv.csv')

data/test/test_readers_ods_reader.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Readers
-  class TestOdsWriter < Test::Unit::TestCase
+  class TestOdsWriter < Minitest::Test
     def test_ods_open
 
       w = Workbook::Book.new

data/test/test_readers_txt_reader.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Readers
-  class TestTxtReader < Test::Unit::TestCase
+  class TestTxtReader < Minitest::Test
     # Should one day throw an error..
     # def test_failure_excel_as_txt_open
     #   w = Workbook::Book.new

data/test/test_readers_xls_reader.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Readers
-  class TestXlsWriter < Test::Unit::TestCase
+  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')

data/test/test_readers_xlsx_reader.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 module Readers
-  class TestXlsxWriter < Test::Unit::TestCase
+  class TestXlsxWriter < Minitest::Test
     def test_xlsx_open
       w = Workbook::Book.new
       w.open File.join(File.dirname(__FILE__), 'artifacts/book_with_tabs_and_colours.xlsx')

data/test/test_row.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
-class TestRow < Test::Unit::TestCase
+class TestRow < Minitest::Test
 
 
   def test_init
@@ -25,7 +25,7 @@ class TestRow < Test::Unit::TestCase
 
   def test_table=
     r = Workbook::Row.new
-    assert_raise(ArgumentError, 'table should be a Workbook::Table (you passed a String)') { r.table = "asdf" }
+    assert_raises(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
@@ -89,7 +89,7 @@ class TestRow < Test::Unit::TestCase
 
   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 }
+    assert_raises(NoMethodError, 'undefined method `header\' for nil:NilClass') { r1.to_hash }
 
     t = Workbook::Table.new
     r1 = Workbook::Row.new  ["test", "asdf-asd"]

data/test/test_sheet.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
-class TestWorkbook < Test::Unit::TestCase
+class TestWorkbook < Minitest::Test
   def test_init
     w = Workbook::Sheet.new nil
     assert_equal([[]],w)

data/test/test_table.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
-class TestTable< Test::Unit::TestCase
+class TestTable< Minitest::Test
   def test_initialize
     t = Workbook::Table.new
     assert_equal(t,[])
@@ -184,7 +184,7 @@ class TestTable< Test::Unit::TestCase
     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
     # puts [first_few_lines,last_few_lines].join(" vs ")
-    assert_equal(true, first_few_lines*1.10 > last_few_lines) # 10% slower is acceptable
+    assert_equal(true, first_few_lines*1.20 > last_few_lines) # 10% slower is acceptable
   end
 
 

data/test/test_template.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 require File.join(File.dirname(__FILE__), 'helper')
 
-class TestTemplate < Test::Unit::TestCase
+class TestTemplate < Minitest::Test
 
   def test_initalize
     t = Workbook::Template.new

data/test/test_writers_html_writer.rb

@@ -2,7 +2,7 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 module Writers
-  class TestHtmlWriter < Test::Unit::TestCase
+  class TestHtmlWriter < Minitest::Test
     def test_to_html
       #jruby and ruby's output differ a bit... both produce valid results though
       # match = Workbook::Book.new.to_html.match(/<table \/>/) ? true : false #jruby

data/test/test_writers_json_writer.rb

@@ -2,7 +2,7 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 module Writers
-  class TestJsonWriter < Test::Unit::TestCase
+  class TestJsonWriter < Minitest::Test
     def test_to_array_of_hashes_with_values
       assert_equal([],Workbook::Table.new.to_array_of_hashes_with_values)
       assert_equal([],Workbook::Table.new([["a","b"]]).to_array_of_hashes_with_values)

data/test/test_writers_xls_writer.rb

@@ -2,7 +2,7 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 module Writers
-  class TestXlsWriter < Test::Unit::TestCase
+  class TestXlsWriter < Minitest::Test
     def test_to_xls
       b = Workbook::Book.new [['a','b','c'],[1,2,3],[3,2,3]]
       raw = Spreadsheet.open File.join(File.dirname(__FILE__), 'artifacts/simple_sheet.xls')

data/test/test_writers_xlsx_writer.rb

@@ -2,7 +2,7 @@
 require File.join(File.dirname(__FILE__), 'helper')
 
 module Writers
-  class TestXlsxWriter < Test::Unit::TestCase
+  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

data/workbook.gemspec

@@ -16,12 +16,13 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'ruby-prof', '~> 0.14'
   s.add_dependency('rubyzip', '~>1')
   s.add_dependency('spreadsheet', '~> 1.0')
+  s.add_development_dependency('minitest', '~> 5.4')
   s.add_dependency('fastercsv') if RUBY_VERSION < "1.9"
   s.add_dependency("rchardet", "~> 1.3")
   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', '~> 2.5')
+  s.add_dependency('rubyXL', '~> 3.3')
   if RUBY_VERSION < "1.9"
     s.add_dependency('nokogiri', "~> 1.5.10")
   else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workbook
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - Maarten Brouwers
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.4'
 - !ruby/object:Gem::Dependency
   name: rchardet
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement