xlsxwriter 0.2.1.pre.2 → 0.2.2

data/test/{test-data-validation.rb → test_data_validation.rb}

@@ -1,19 +1,18 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestDataValidation < XlsxWriterTestCase
   test 'data_validation01' do |wb|
     wb.add_worksheet
       .add_data_validation 'C2', validate: XlsxWriter::Worksheet::VALIDATION_TYPE_LIST,
-                                 value: %w(Foo Bar Baz)
+                                 value: %w[Foo Bar Baz]
   end
 
   test 'data_validation02' do |wb|
     wb.add_worksheet
       .add_data_validation 1, 2, validate: XlsxWriter::Worksheet::VALIDATION_TYPE_LIST,
-                                 value: %w(Foo Bar Baz),
+                                 value: %w[Foo Bar Baz],
                                  input_title: 'This is the input title',
                                  input_message: 'This is the input message'
   end
@@ -21,81 +20,81 @@ class TestDataValidation < XlsxWriterTestCase
   test 'data_validation03' do |wb|
     wb.add_worksheet
       .add_data_validation('C2', validate: XlsxWriter::Worksheet::VALIDATION_TYPE_LIST,
-                                 value: %w(Foo Bar Baz),
+                                 value: %w[Foo Bar Baz],
                                  input_title: 'This is the input title',
                                  input_message: 'This is the input message')
       .add_data_validation('D6', validate: XlsxWriter::Worksheet::VALIDATION_TYPE_LIST,
-                                 value: %w(Foobar Foobas Foobat Foobau Foobav Foobaw Foobax
+                                 value: %w[Foobar Foobas Foobat Foobau Foobav Foobaw Foobax
                                            Foobay Foobaz Foobba Foobbb Foobbc Foobbd Foobbe
                                            Foobbf Foobbg Foobbh Foobbi Foobbj Foobbk Foobbl
                                            Foobbm Foobbn Foobbo Foobbp Foobbq Foobbr Foobbs
                                            Foobbt Foobbu Foobbv Foobbw Foobbx Foobby Foobbz
-                                           Foobca End),
+                                           Foobca End],
                                  input_title: 'This is the longest input title1',
-                                 input_message: 'This is the longest input message ' + 'a' * 221)
+                                 input_message: "This is the longest input message #{'a' * 221}")
   end
 
   test 'data_validation04', ref_file_name: 'data_validation02' do |wb|
     ws = wb.add_worksheet
-      .add_data_validation('C2', validate: XlsxWriter::Worksheet::VALIDATION_TYPE_LIST,
-                                 value: %w(Foo Bar Baz),
+    ws.add_data_validation('C2', validate: XlsxWriter::Worksheet::VALIDATION_TYPE_LIST,
+                                 value: %w[Foo Bar Baz],
                                  input_title: 'This is the input title',
                                  input_message: 'This is the input message')
     assert_raise(XlsxWriter::Error.new('Parameter exceeds Excel\'s limit of 32 characters.')) do
       ws.add_data_validation('D6', validate: XlsxWriter::Worksheet::VALIDATION_TYPE_LIST,
-                                   value: %w(Foobar Foobas Foobat Foobau Foobav Foobaw Foobax
+                                   value: %w[Foobar Foobas Foobat Foobau Foobav Foobaw Foobax
                                              Foobay Foobaz Foobba Foobbb Foobbc Foobbd Foobbe
                                              Foobbf Foobbg Foobbh Foobbi Foobbj Foobbk Foobbl
                                              Foobbm Foobbn Foobbo Foobbp Foobbq Foobbr Foobbs
                                              Foobbt Foobbu Foobbv Foobbw Foobbx Foobby Foobbz
-                                             Foobca End),
+                                             Foobca End],
                                    input_title: 'This is the longest input title12',
-                                   input_message: 'This is the longest input message ' + 'a' * 221)
+                                   input_message: "This is the longest input message #{'a' * 221}")
     end
   end
 
   test 'data_validation05', ref_file_name: 'data_validation02' do |wb|
     ws = wb.add_worksheet
-      .add_data_validation('C2', validate: XlsxWriter::Worksheet::VALIDATION_TYPE_LIST,
-                                 value: %w(Foo Bar Baz),
+    ws.add_data_validation('C2', validate: XlsxWriter::Worksheet::VALIDATION_TYPE_LIST,
+                                 value: %w[Foo Bar Baz],
                                  input_title: 'This is the input title',
                                  input_message: 'This is the input message')
     assert_raise(XlsxWriter::Error.new('Parameter exceeds Excel\'s limit of 255 characters.')) do
       ws.add_data_validation('D6', validate: XlsxWriter::Worksheet::VALIDATION_TYPE_LIST,
-                                   value: %w(Foobar Foobas Foobat Foobau Foobav Foobaw Foobax
+                                   value: %w[Foobar Foobas Foobat Foobau Foobav Foobaw Foobax
                                              Foobay Foobaz Foobba Foobbb Foobbc Foobbd Foobbe
                                              Foobbf Foobbg Foobbh Foobbi Foobbj Foobbk Foobbl
                                              Foobbm Foobbn Foobbo Foobbp Foobbq Foobbr Foobbs
                                              Foobbt Foobbu Foobbv Foobbw Foobbx Foobby Foobbz
-                                             Foobca End),
+                                             Foobca End],
                                    input_title: 'This is the longest input title1',
-                                   input_message: 'This is the longest input message ' + 'a' * 222)
+                                   input_message: "This is the longest input message #{'a' * 222}")
     end
   end
 
   test 'data_validation06', ref_file_name: 'data_validation02' do |wb|
     ws = wb.add_worksheet
-      .add_data_validation('C2', validate: XlsxWriter::Worksheet::VALIDATION_TYPE_LIST,
-                                 value: %w(Foo Bar Baz),
+    ws.add_data_validation('C2', validate: XlsxWriter::Worksheet::VALIDATION_TYPE_LIST,
+                                 value: %w[Foo Bar Baz],
                                  input_title: 'This is the input title',
                                  input_message: 'This is the input message')
     assert_raise(XlsxWriter::Error.new('Parameter exceeds Excel\'s limit of 255 characters.')) do
       ws.add_data_validation('D6', validate: XlsxWriter::Worksheet::VALIDATION_TYPE_LIST,
-                                   value: %w(Foobar Foobas Foobat Foobau Foobav Foobaw Foobax
+                                   value: %w[Foobar Foobas Foobat Foobau Foobav Foobaw Foobax
                                              Foobay Foobaz Foobba Foobbb Foobbc Foobbd Foobbe
                                              Foobbf Foobbg Foobbh Foobbi Foobbj Foobbk Foobbl
                                              Foobbm Foobbn Foobbo Foobbp Foobbq Foobbr Foobbs
                                              Foobbt Foobbu Foobbv Foobbw Foobbx Foobby Foobbz
-                                             Foobca End1),
+                                             Foobca End1],
                                    input_title: 'This is the longest input title1',
-                                   input_message: 'This is the longest input message ' + 'a' * 221)
+                                   input_message: "This is the longest input message #{'a' * 221}")
     end
   end
 
   test 'data_validation07' do |wb|
     wb.add_worksheet
       .add_data_validation 'C2', validate: XlsxWriter::Worksheet::VALIDATION_TYPE_LIST,
-                                 value: %w(coffee café)
+                                 value: %w[coffee café]
   end
 
   test 'data_validation08' do |wb|

data/test/{test-default-row.rb → test_default_row.rb}

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

data/test/{test-defined-name.rb → test_defined_name.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestDefinedName < XlsxWriterTestCase
   test 'defined_name01' 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.paper = 9
       ws.vertical_dpi = 200
@@ -20,28 +20,28 @@ class TestDefinedName < XlsxWriterTestCase
     wb.add_worksheet 'Sheet 3'
 
     wb.define_name "'Sheet 3'!Bar", "='Sheet 3'!$A$1"
-    wb.define_name "Abc",           "=Sheet1!$A$1"
-    wb.define_name "Baz",           "=0.98"
-    wb.define_name "Sheet1!Bar",    "=Sheet1!$A$1"
-    wb.define_name "Sheet2!Bar",    "=Sheet2!$A$1"
-    wb.define_name "Sheet2!aaa",    "=Sheet2!$A$1"
-    wb.define_name "_Egg",          "=Sheet1!$A$1"
-    wb.define_name "_Fog",          "=Sheet1!$A$1"
+    wb.define_name 'Abc',           '=Sheet1!$A$1'
+    wb.define_name 'Baz',           '=0.98'
+    wb.define_name 'Sheet1!Bar',    '=Sheet1!$A$1'
+    wb.define_name 'Sheet2!Bar',    '=Sheet2!$A$1'
+    wb.define_name 'Sheet2!aaa',    '=Sheet2!$A$1'
+    wb.define_name '_Egg',          '=Sheet1!$A$1'
+    wb.define_name '_Fog',          '=Sheet1!$A$1'
   end
 
   test 'defined_name02' do |wb|
     wb.add_worksheet 'sheet One'
-    wb.define_name "Sales", "='sheet One'!$G$1:$H$10"
+    wb.define_name 'Sales', "='sheet One'!$G$1:$H$10"
   end
 
   test 'defined_name03' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     wb.add_worksheet('sheet One')
     wb.define_name 'Sales', '=\'sheet One\'!G1:H10'
   end
 
   test 'defined_name04' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
     wb.add_worksheet
     wb.define_name '\\__',                 '=Sheet1!$A$1'
     wb.define_name 'a3f6',                 '=Sheet1!$A$2'

data/test/{test-escapes.rb → test_escapes.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestEscapes < XlsxWriterTestCase
   test 'escapes03' do |wb|
@@ -11,15 +11,16 @@ class TestEscapes < XlsxWriterTestCase
       .write_string('A1', 'Foo', :bold)
       .write_string('A2', 'Bar', :italic)
       .write_rich_string('A3', [['a'], ["b\"<>'c", :bold], ['defg']])
-
   end
 
   test 'escapes04' do |wb|
+    wb.unset_default_url_format
     wb.add_worksheet
       .write_url(0, 'A', 'http://www.perl.com/?a=1&b=2')
   end
 
   test 'escapes05' do |wb|
+    wb.unset_default_url_format
     wb.add_worksheet('Start')
       .write_url(0, 'A', 'internal:\'A & B\'!A1', string: 'Jump to A & B')
     wb.add_worksheet('A & B')
@@ -33,6 +34,7 @@ class TestEscapes < XlsxWriterTestCase
   end
 
   test 'escapes07' do |wb|
+    wb.unset_default_url_format
     wb.add_worksheet
       .write_url(0, 'A', 'http://example.com/!"$%&\'( )*+,-./0123456789:;<=>?@' \
                          'ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`'                    \
@@ -40,6 +42,7 @@ class TestEscapes < XlsxWriterTestCase
   end
 
   test 'escapes08' do |wb|
+    wb.unset_default_url_format
     wb.add_worksheet
       .write_url 0, 'A', 'http://example.com/%5b0%5d', string: 'http://example.com/[0]'
   end

data/test/{test-fit-to-pages.rb → test_fit_to_pages.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestFitToPages < XlsxWriterTestCase
   test 'fit_to_pages01' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
 
     ws = wb.add_worksheet
     ws.fit_to_pages 1, 1
@@ -14,7 +14,7 @@ class TestFitToPages < XlsxWriterTestCase
   end
 
   test 'fit_to_pages02' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
 
     ws = wb.add_worksheet
     ws.fit_to_pages 2, 1
@@ -24,7 +24,7 @@ class TestFitToPages < XlsxWriterTestCase
   end
 
   test 'fit_to_pages03' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
 
     ws = wb.add_worksheet
     ws.fit_to_pages 1, 2
@@ -34,7 +34,7 @@ class TestFitToPages < XlsxWriterTestCase
   end
 
   test 'fit_to_pages04' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
 
     ws = wb.add_worksheet
     ws.fit_to_pages(3, 2)
@@ -44,7 +44,7 @@ class TestFitToPages < XlsxWriterTestCase
   end
 
   test 'fit_to_pages05' do |wb, t|
-    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => [ '<pageMargins' ] }
+    t.ignore_elements = { 'xl/worksheets/sheet1.xml' => ['<pageMargins'] }
 
     ws = wb.add_worksheet
     ws.fit_to_pages(1, 0)

data/test/{test-formatting.rb → test_formatting.rb}

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestFormatting < XlsxWriterTestCase
   test 'format01' do |wb|
     ws1 = wb.add_worksheet
-    ws2 = wb.add_worksheet 'Data Sheet'
+    wb.add_worksheet 'Data Sheet'
     ws3 = wb.add_worksheet
 
     wb.add_format :unused, {}
@@ -32,8 +32,8 @@ class TestFormatting < XlsxWriterTestCase
     wb.add_format(:format2, font_name: 'Arial',
                             bold: true,
                             rotation: 90,
-                            align:  XlsxWriter::Format::ALIGN_CENTER,
-                            vertical_align:  XlsxWriter::Format::ALIGN_VERTICAL_BOTTOM)
+                            align: XlsxWriter::Format::ALIGN_CENTER,
+                            vertical_align: XlsxWriter::Format::ALIGN_VERTICAL_BOTTOM)
 
     ws.write_string(0, 0, 'Foo', :format1)
     ws.write_string(0, 1, 'Bar', :format2)
@@ -124,13 +124,13 @@ class TestFormatting < XlsxWriterTestCase
     ws = wb.add_worksheet
 
     wb.add_format :top_left_bottom, bottom: XlsxWriter::Format::BORDER_THIN,
-                                    left:   XlsxWriter::Format::BORDER_THIN,
-                                    top:    XlsxWriter::Format::BORDER_THIN
+                                    left: XlsxWriter::Format::BORDER_THIN,
+                                    top: XlsxWriter::Format::BORDER_THIN
     wb.add_format :top_bottom,      bottom: XlsxWriter::Format::BORDER_THIN,
-                                    top:    XlsxWriter::Format::BORDER_THIN
-    wb.add_format :top_left,        left:   XlsxWriter::Format::BORDER_THIN,
-                                    top:    XlsxWriter::Format::BORDER_THIN
-    wb.add_format :unused,          left:   XlsxWriter::Format::BORDER_THIN
+                                    top: XlsxWriter::Format::BORDER_THIN
+    wb.add_format :top_left,        left: XlsxWriter::Format::BORDER_THIN,
+                                    top: XlsxWriter::Format::BORDER_THIN
+    wb.add_format :unused,          left: XlsxWriter::Format::BORDER_THIN
 
     ws.write_string(1, 'B', 'test', :top_left_bottom)
     ws.write_string(1, 'D', 'test', :top_left)

data/test/{test-gridlines.rb → test_gridlines.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestGridlines < XlsxWriterTestCase
   test 'gridlines01' 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
@@ -12,6 +12,6 @@ class TestGridlines < XlsxWriterTestCase
 
     ws.gridlines = XlsxWriter::Worksheet::GRIDLINES_HIDE_ALL
 
-    ws.write_string(0, 'A', 'Foo' , nil)
+    ws.write_string(0, 'A', 'Foo', nil)
   end
 end

data/test/{test-hyperlink.rb → test_hyperlink.rb}

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestHyperlink < XlsxWriterTestCase
   test 'hyperlink03' do |wb|
+    wb.unset_default_url_format
     ws1 = wb.add_worksheet
     ws2 = wb.add_worksheet
 
@@ -21,6 +22,7 @@ class TestHyperlink < XlsxWriterTestCase
   end
 
   test 'hyperlink05' do |wb|
+    wb.unset_default_url_format
     wb.add_worksheet
       .write_url(0, 'A', 'http://www.perl.org/')
       .write_url(2, 'A', 'http://www.perl.org/', nil, string: 'Perl home')
@@ -29,15 +31,16 @@ class TestHyperlink < XlsxWriterTestCase
   end
 
   test 'hyperlink09' do |wb|
+    wb.unset_default_url_format
     wb.add_worksheet
-      .write_url(0, 'A', 'external:..\\foo.xlsx')
-      .write_url(2, 'A', 'external:..\\foo.xlsx#Sheet1!A1')
-      .write_url(4, 'A', 'external:\\\\VBOXSVR\\share\\foo.xlsx#Sheet1!B2',
+      .write_url('A1', 'external:..\\foo.xlsx')
+      .write_url('A3', 'external:..\\foo.xlsx#Sheet1!A1')
+      .write_url('A5', 'external:\\\\VBOXSVR\\share\\foo.xlsx#Sheet1!B2',
                  string: 'J:\\foo.xlsx#Sheet1!B2')
   end
 
   test 'hyperlink14' do |wb, t|
-    t.ignore_files = %w(xl/sharedStrings.xml)
+    t.ignore_files = %w[xl/sharedStrings.xml]
 
     wb.add_format(:f, align: XlsxWriter::Format::ALIGN_CENTER)
     ws = wb.add_worksheet
@@ -48,22 +51,30 @@ class TestHyperlink < XlsxWriterTestCase
   end
 
   test 'hyperlink18' do |wb|
+    wb.max_url_length = 255
+    ws = wb.add_worksheet
+    wb.unset_default_url_format
+    ws.write_url(0, 0, 'http://google.com/00000000001111111111222222222233333333334444444444555555555566666666666777777777778888888888999999999990000000000111111111122222222223333333333444444444455555555556666666666677777777777888888888899999999999000000000011111111112222222222x')
+  end
+
+  test 'hyperlink19' do |wb|
+    pend
     wb.add_worksheet
-      .write_url(0, 0, 'http://google.com/00000000001111111111222222222233333333334444444444555555555566666666666777777777778888888888999999999990000000000111111111122222222223333333333444444444455555555556666666666677777777777888888888899999999999000000000011111111112222222222x')
-      .write_url(0, 0, 'http://google.com/00000000001111111111222222222233333333334444444444555555555566666666666777777777778888888888999999999990000000000111111111122222222223333333333444444444455555555556666666666677777777777888888888899999999999000000000011111111112222222222xy')
+      .write_url('A1', 'http://www.perl.com/')
+      .write_formula_num('A1', '=1+1', 2)
+    wb.sst.string_count = 0
   end
 
   test 'hyperlink20' do |wb, t|
-    t.ignore_files = %w(xl/styles.xml)
+    t.ignore_files = %w[xl/styles.xml]
 
     wb
-      .add_format(:f1, underline:  XlsxWriter::Format::UNDERLINE_SINGLE,
+      .add_format(:f1, underline: XlsxWriter::Format::UNDERLINE_SINGLE,
                        font_color: XlsxWriter::Format::COLOR_BLUE)
-      .add_format(:f2, underline:  XlsxWriter::Format::UNDERLINE_SINGLE,
+      .add_format(:f2, underline: XlsxWriter::Format::UNDERLINE_SINGLE,
                        font_color: XlsxWriter::Format::COLOR_RED)
       .add_worksheet
       .write_url(0, 0, 'http://www.python.org/1', :f1)
       .write_url(1, 0, 'http://www.python.org/2', :f2)
-
   end
 end

data/test/{test-image.rb → test_image.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './xlsx-func-testcase'
+require_relative './xlsx_func_testcase'
 
 class TestImage < XlsxWriterTestCase
   test 'image01' do |wb|
@@ -96,13 +96,13 @@ class TestImage < XlsxWriterTestCase
 
   test 'image45' do |wb|
     wb.add_worksheet
-      .insert_image('E9', image_path('red.png'))
+      .insert_image('E9', image_path('red.png'), object_position: XlsxWriter::Worksheet::OBJECT_MOVE_AND_SIZE_AFTER)
       .set_row(8, height: 30, hide: true)
   end
 
   test 'image46' do |wb|
     wb.add_worksheet
-      .insert_image('E9', image_path('red.png'), x_offset: 0, y_offset: 4)
+      .insert_image('E9', image_path('red.png'), y_offset: 4, object_position: XlsxWriter::Worksheet::OBJECT_MOVE_AND_SIZE_AFTER)
       .set_row(8, height: 30, hide: true)
   end
 
@@ -124,6 +124,8 @@ class TestImage < XlsxWriterTestCase
 
   test('image83', ref_file_name: 'image02') do |wb|
     wb.add_worksheet
-      .insert_image_buffer('D7', File.binread(image_path('yellow.png')), x_offset: 1, y_offset: 2, description: 'yellow.png')
+      .insert_image_buffer('D7', File.binread(image_path('yellow.png')), x_offset: 1,
+                                                                         y_offset: 2,
+                                                                         description: 'yellow.png')
   end
 end

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|