xlsxwriter 0.2.1.pre → 0.2.2

data/test/{test-macro.rb → test_macro.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestMacro < XlsxWriterTestCase
   test 'macro01.xlsm' do |wb|

data/test/{test-merge-range.rb → test_merge_range.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestMergeRange < XlsxWriterTestCase
   test 'merge_range03' do |wb|

data/test/{test-misc.rb → test_misc.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestMisc < XlsxWriterTestCase
   test 'tab_color01' do |wb|
@@ -24,7 +24,7 @@ class TestMisc < XlsxWriterTestCase
   test 'shared_strings01' do |wb|
     ws = wb.add_worksheet
     ws.write_string(0, 0, '_x0000_')
-    (1...127).each_with_object(String.new("")) do |i, s|
+    (1...127).each_with_object(String.new('')) do |i, s|
       s[0] = i.chr
       ws.write_string(i, 0, s) unless i == 34
     end

data/test/{test-optimize.rb → test_optimize.rb}

@@ -1,7 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestOptimize < XlsxWriterTestCase
   test('optimize01', constant_memory: true) do |wb|
@@ -34,7 +33,7 @@ class TestOptimize < XlsxWriterTestCase
       ['a', ['bc', :bold], 'defg'],
       ['a', ['bcdef', :bold], 'g'],
       ['abc', ['de', :italic], 'fg'],
-      [['abcd', :italic], ['efg', nil]],
+      [['abcd', :italic], ['efg', nil]]
     ].map { |parts| XlsxWriter::RichString.new(wb, parts) }
     wb
       .add_format(:bold, bold: true)
@@ -56,7 +55,6 @@ class TestOptimize < XlsxWriterTestCase
     (1..127).each { |i| ws.write_string(i, 0, i.chr, nil) unless i == 34 }
   end
 
-
   test('optimize08', constant_memory: true) do |wb|
     wb
       .add_format(:bold, bold: true)

data/test/{test-outline.rb → test_outline.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestOutline < XlsxWriterTestCase
   test 'outline01' do |wb, t|
@@ -10,7 +10,7 @@ class TestOutline < XlsxWriterTestCase
     ws = wb.add_worksheet 'Outlined Rows'
     ws.set_column('A', 'A', width: 20)
     (1..10).each do |i|
-      ws.set_row i, level: (i % 5 == 0 ? 1 : 2)
+      ws.set_row i, level: ((i % 5).zero? ? 1 : 2)
     end
 
     write_common_data(ws)
@@ -22,7 +22,7 @@ class TestOutline < XlsxWriterTestCase
     wb.add_format(:bold, bold: true)
     ws = wb.add_worksheet 'Collapsed Rows'
     (1..10).each do |i|
-      ws.set_row i, level: (i % 5 == 0 ? 1 : 2), hide: true
+      ws.set_row i, level: ((i % 5).zero? ? 1 : 2), hide: true
     end
     ws.set_row 11, collapse: true
 
@@ -38,18 +38,18 @@ class TestOutline < XlsxWriterTestCase
     wb.add_format(:bold, bold: true)
     ws = wb.add_worksheet 'Outline Columns'
 
-    %w(Month Jan Feb Mar Apr May Jun Total).each_with_index { |s, i| ws.write_string 0, i, s }
+    %w[Month Jan Feb Mar Apr May Jun Total].each_with_index { |s, i| ws.write_string 0, i, s }
     [
       ['North', [50, 20, 15, 25, 65, 80]],
       ['South', [10, 20, 30, 50, 50, 50]],
       ['East',  [45, 75, 50, 15, 75, 100]],
-      ['West',  [15, 15, 55, 35, 20, 50]],
+      ['West',  [15, 15, 55, 35, 20, 50]]
     ].each_with_index do |(d, vals), i|
-      ws.write_string(i+1, 0, d)
-      vals.each_with_index { |v, j| ws.write_number(i+1, j+1, v) }
-      ws.write_formula_num(i+1, vals.size + 1, "=SUM(B#{i+2}:G#{i+2})", vals.reduce(:+))
+      ws.write_string(i + 1, 0, d)
+      vals.each_with_index { |v, j| ws.write_number(i + 1, j + 1, v) }
+      ws.write_formula_num(i + 1, vals.size + 1, "=SUM(B#{i + 2}:G#{i + 2})", vals.reduce(:+))
     end
-    ws.write_formula_num('H6', "=SUM(H2:H5)", 1015, :bold)
+    ws.write_formula_num('H6', '=SUM(H2:H5)', 1015, :bold)
     ws.set_row 0, format: :bold
     ws.set_column 'A', 'A', width: 10, format: :bold
     ws.set_column 'H', 'H', width: 10
@@ -60,7 +60,7 @@ class TestOutline < XlsxWriterTestCase
     t.ignore_files << 'xl/calcChain.xml' << '[Content_Types].xml' << 'xl/_rels/workbook.xml.rels'
 
     ws = wb.add_worksheet 'Outline levels'
-    13.times { |i| ws.write_string i, 0, "Level #{(i > 6 ? 13 - i : i + 1)}" }
+    13.times { |i| ws.write_string i, 0, "Level #{i > 6 ? 13 - i : i + 1}" }
     13.times { |i| ws.set_row i, level: (i > 6 ? 13 - i : i + 1) }
   end
 
@@ -72,7 +72,7 @@ class TestOutline < XlsxWriterTestCase
     ws.set_column('A', 'A', width: 20)
     ws.set_selection 'A14:A14'
     (1..10).each do |i|
-      ws.set_row i, level: (i % 5 == 0 ? 1 : 2), hide: true, collapse: (i % 5 == 0)
+      ws.set_row i, level: ((i % 5).zero? ? 1 : 2), hide: true, collapse: (i % 5).zero?
     end
     ws.set_row 11, collapse: true
 
@@ -87,7 +87,7 @@ class TestOutline < XlsxWriterTestCase
     ws.outline_settings = { visible: false, symbols_below: false, symbols_right: false, auto_style: true }
     ws.set_column('A', 'A', width: 20)
     (1..10).each do |i|
-      ws.set_row i, level: (i % 5 == 0 ? 1 : 2)
+      ws.set_row i, level: ((i % 5).zero? ? 1 : 2)
     end
 
     write_common_data(ws)
@@ -95,8 +95,8 @@ class TestOutline < XlsxWriterTestCase
 
   private
 
-  def write_common_data(ws)
-    ws
+  def write_common_data(worksheet)
+    worksheet
       .write_string('A1', 'Region', :bold)
       .write_string('A2', 'North')
       .write_string('A3', 'North')

data/test/{test-page-breaks.rb → test_page_breaks.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestpageBreaks < XlsxWriterTestCase
   test 'page_breaks06' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     ws = wb.add_worksheet
     ws.paper = 9
     ws.vertical_dpi = 200

data/test/{test-page-setup.rb → test_page_setup.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestPageSetup < XlsxWriterTestCase
   test 'page_view01' do |wb|
@@ -20,7 +20,7 @@ class TestPageSetup < XlsxWriterTestCase
   end
 
   test 'print_across01' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins'] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     ws = wb.add_worksheet
     ws.print_across
     ws.paper = 9

data/test/{test-panes.rb → test_panes.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestPanes < XlsxWriterTestCase
   test 'panes01' do |wb|

data/test/{test-print-area.rb → test_print_area.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestPrintArea < XlsxWriterTestCase
   test 'print_area06' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     ws = wb.add_worksheet
     ws.paper = 9
     ws.vertical_dpi = 200
@@ -13,7 +13,7 @@ class TestPrintArea < XlsxWriterTestCase
   end
 
   test 'print_area07' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     ws = wb.add_worksheet
     ws.print_area('A1:XFD1048576')
     ws.write_string('A1', 'Foo', nil)

data/test/{test-print-options.rb → test_print_options.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestPrintOptions < XlsxWriterTestCase
   test 'print_options01' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     ws = wb.add_worksheet
     ws.paper = 9
     ws.vertical_dpi = 200
@@ -13,7 +13,7 @@ class TestPrintOptions < XlsxWriterTestCase
   end
 
   test 'print_options02' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     ws = wb.add_worksheet
     ws.paper = 9
     ws.vertical_dpi = 200
@@ -22,7 +22,7 @@ class TestPrintOptions < XlsxWriterTestCase
   end
 
   test 'print_options03' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     ws = wb.add_worksheet
     ws.paper = 9
     ws.vertical_dpi = 200
@@ -31,7 +31,7 @@ class TestPrintOptions < XlsxWriterTestCase
   end
 
   test 'print_options04' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     ws = wb.add_worksheet
     ws.paper = 9
     ws.vertical_dpi = 200
@@ -40,7 +40,7 @@ class TestPrintOptions < XlsxWriterTestCase
   end
 
   test 'print_options05' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     ws = wb.add_worksheet
     ws.paper = 9
     ws.vertical_dpi = 200
@@ -52,7 +52,7 @@ class TestPrintOptions < XlsxWriterTestCase
   end
 
   test 'print_options06' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     ws = wb.add_worksheet
     ws.paper = 9
     ws.vertical_dpi = 200

data/test/{test-print-scale.rb → test_print_scale.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestPrintScale < XlsxWriterTestCase
   test 'print_scale01' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     ws = wb.add_worksheet
     ws.print_scale = 75
     ws.paper = 9

data/test/{test-properties.rb → test_properties.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestProperties < XlsxWriterTestCase
   test 'properties01' do |wb|
@@ -30,7 +30,7 @@ class TestProperties < XlsxWriterTestCase
   test 'properties04' do |wb|
     wb.properties['Checked by'] = 'Adam'
     wb.properties['Date completed'] = Time.new(2016, 12, 12, 23)
-    wb.properties['Document number'] = 12345
+    wb.properties['Document number'] = 12_345
     wb.properties['Reference'] = 1.2345
     wb.properties['Source'] = true
     wb.properties['Status'] = false

data/test/{test-protect.rb → test_protect.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestProtect < XlsxWriterTestCase
   test 'protect02' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     wb.add_format :unlocked, unlocked: true
     wb.add_format :hidden, unlocked: true, hidden: true
     wb.add_worksheet do |ws|
@@ -16,7 +16,7 @@ class TestProtect < XlsxWriterTestCase
   end
 
   test 'protect03' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     wb.add_format :unlocked, unlocked: true
     wb.add_format :hidden, unlocked: true, hidden: true
     wb.add_worksheet do |ws|

data/test/{test-repeat.rb → test_repeat.rb}

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestRepeat < XlsxWriterTestCase
   test 'repeat05' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ],
-                          'xl/worksheets/sheet3.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'],
+                          'xl/worksheets/sheet3.xml' => ['<pageMargins'] }
     wb.add_worksheet do |ws|
       ws.paper = 9
       ws.vertical_dpi = 200

data/test/{test-rich-string.rb → test_rich_string.rb}

@@ -1,7 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestRichString < XlsxWriterTestCase
   test('rich_string01') do |wb|
@@ -53,12 +52,10 @@ class TestRichString < XlsxWriterTestCase
       .write_string('A1', 'Foo', :bold)
       .write_string('A2', 'Bar', :italic)
       .write_rich_string('A3',
-        XlsxWriter::RichString.new(wb) <<
-          'This is ' << ['bold', :bold] << ' and this is ' << ['italic', :italic]
-      )
+                         XlsxWriter::RichString.new(wb) <<
+                           'This is ' << ['bold', :bold] << ' and this is ' << ['italic', :italic])
   end
 
-
   test('rich_string06') do |wb|
     wb
       .add_format(:red, font_color: XlsxWriter::Format::COLOR_RED)
@@ -73,7 +70,7 @@ class TestRichString < XlsxWriterTestCase
       ['a', ['bc', :bold], 'defg'],
       ['a', ['bcdef', :bold], 'g'],
       ['abc', ['de', :italic], 'fg'],
-      [['abcd', :italic], ['efg', nil]],
+      [['abcd', :italic], ['efg', nil]]
     ].map { |parts| XlsxWriter::RichString.new(wb, parts) }
     wb
       .add_format(:bold, bold: true)
@@ -153,7 +150,6 @@ class TestRichString < XlsxWriterTestCase
       .write_string('A2', 'Bar', :italic)
       .write_rich_string('A3', XlsxWriter::RichString.new(wb) <<
           "This is\n" << ["bold\n", :bold] << "and this is\n" << ['italic', :italic],
-        :wrap
-      )
+                         :wrap)
   end
 end

data/test/{test-row-col-format.rb → test_row_col_format.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestRowColFormat < XlsxWriterTestCase
   test 'row_col_format02' do |wb|

data/test/{test-ruby-worksheet.rb → test_ruby_worksheet.rb}

@@ -9,7 +9,7 @@ class TestRubyWorksheet < Test::Unit::TestCase
     with_xlsx_file do |wb|
       ws = wb.add_worksheet
 
-      ws.add_row ['asd', 'asdf', 'asdfg', 'asdfgh', 'asdfghj', 'd'*250]
+      ws.add_row ['asd', 'asdf', 'asdfg', 'asdfgh', 'asdfghj', 'd' * 250]
       assert_in_epsilon(4.4, ws.get_column_auto_width('A'))
       assert_in_epsilon(4.4, ws.get_column_auto_width('B'))
       assert_in_epsilon(5.5, ws.get_column_auto_width('C'))
@@ -18,7 +18,7 @@ class TestRubyWorksheet < Test::Unit::TestCase
       assert_in_epsilon(255, ws.get_column_auto_width('F'))
 
       wb.add_format :f, font_size: 14
-      ws.add_row ['asd', 'asdf', 'asdfg', 'asdfgh', 'asdfghj'], style: :f
+      ws.add_row %w[asd asdf asdfg asdfgh asdfghj], style: :f
       assert_in_epsilon(5.6, ws.get_column_auto_width('A'))
       assert_in_epsilon(5.6, ws.get_column_auto_width('B'))
       assert_in_epsilon(7.0, ws.get_column_auto_width('C'))

data/test/{test-set-selection.rb → test_set_selection.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestSetSelection < XlsxWriterTestCase
   test 'set_selection02' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     wb.add_worksheet { |ws| ws.set_selection(3,   2, 3,   2) }
     wb.add_worksheet { |ws| ws.set_selection(3,   2, 6,   6) }
     wb.add_worksheet { |ws| ws.set_selection(6,   6, 3,   2) }

data/test/{test-set-start-page.rb → test_set_start_page.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestSetStartPage < XlsxWriterTestCase
   test 'set_start_page02' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     wb.add_worksheet do |ws|
       ws.start_page = 2
       ws.paper = 9

data/test/{test-simple.rb → test_simple.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestSimple < XlsxWriterTestCase
   test 'simple01' do |wb|
@@ -12,7 +12,7 @@ class TestSimple < XlsxWriterTestCase
 
   test 'simple02' do |wb|
     ws1 = wb.add_worksheet
-    ws2 = wb.add_worksheet('Data Sheet')
+    wb.add_worksheet('Data Sheet')
     ws3 = wb.add_worksheet
 
     wb.add_format(:bold, bold: true)
@@ -27,10 +27,10 @@ class TestSimple < XlsxWriterTestCase
 
   test 'simple03' do |wb|
     ws1 = wb.add_worksheet
-    ws2 = wb.add_worksheet("Data Sheet")
+    ws2 = wb.add_worksheet('Data Sheet')
     ws3 = wb.add_worksheet
 
-    wb.add_format(:bold, bold: true);
+    wb.add_format(:bold, bold: true)
 
     ws1.write_string(0, 'A', 'Foo')
     ws1.write_number(1, 'A', 123)
@@ -40,16 +40,16 @@ class TestSimple < XlsxWriterTestCase
     ws3.write_number('C4', 234)
 
     # Ensure the active worksheet is overwritten, below.
-    x = ws2.activate
+    ws2.activate
 
-    y = ws2.select
-    y = ws3.select
-    y = ws3.activate
+    ws2.select
+    ws3.select
+    ws3.activate
   end
 
   test 'simple04' do |wb|
-    datetime1 = Time.new(0,    1,  1, 12)
-    datetime2 = Time.new(2013, 1, 27,  0)
+    datetime1 = Time.new(0,    1, 1, 12)
+    datetime2 = Time.new(2013, 1, 27, 0)
 
     ws = wb.add_worksheet
 

data/test/{test-types.rb → test_types.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestTypes < XlsxWriterTestCase
   test 'types02' do |wb|

data/test/{xlsx-func-testcase.rb → xlsx_func_testcase.rb}

@@ -6,6 +6,7 @@ require_relative './support/with_xlsx_file'
 
 class XlsxWriterTestCaseConfig
   attr_accessor :ignore_elements, :ignore_files
+
   def initialize
     @ignore_elements = {}
     @ignore_files = []