write_xlsx 0.85.5 → 0.85.6

data/test/regression/test_default_row03.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_default_row03
     @xlsx = 'default_row03.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     worksheet.set_default_row(24, 1)
@@ -23,6 +23,6 @@ def test_default_row03
     (1..8).each { |row| worksheet.set_row(row, 24) }
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    compare_for_regression
   end
 end

data/test/regression/test_default_row04.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_default_row04
     @xlsx = 'default_row04.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     worksheet.set_default_row(24)
@@ -26,6 +26,6 @@ def test_default_row04
     worksheet.comments_author = 'John'
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    compare_for_regression
   end
 end

data/test/regression/test_defined_name01.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_defined_name01
     @xlsx = 'defined_name01.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet1 = workbook.add_worksheet
     worksheet2 = workbook.add_worksheet
     worksheet3 = workbook.add_worksheet('Sheet 3')
@@ -33,15 +33,13 @@ def test_defined_name01
     workbook.define_name("_Fog",          "=Sheet1!$A$1")
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx,
-                                ["xl/printerSettings/printerSettings1.bin",
-                                 "xl/worksheets/_rels/sheet1.xml.rels"],
-                                {
-                                  '[Content_Types].xml' => ['<Default Extension="bin"'],
-                                  'xl/worksheets/sheet1.xml' => ['<pageMargins', '<pageSetup']
-                                }
-                                )
+    compare_for_regression(
+      ["xl/printerSettings/printerSettings1.bin",
+       "xl/worksheets/_rels/sheet1.xml.rels"],
+      {
+        '[Content_Types].xml' => ['<Default Extension="bin"'],
+        'xl/worksheets/sheet1.xml' => ['<pageMargins', '<pageSetup']
+      }
+    )
   end
 end

data/test/regression/test_defined_name02.rb

@@ -7,26 +7,24 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_defined_name02
     @xlsx = 'defined_name02.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet1 = workbook.add_worksheet('sheet One')
 
     workbook.define_name("Sales", "='sheet One'!$G$1:$H$10")
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx,
-                                ["xl/printerSettings/printerSettings1.bin",
-                                 "xl/worksheets/_rels/sheet1.xml.rels"],
-                                {
-                                  '[Content_Types].xml' => ['<Default Extension="bin"'],
-                                  'xl/worksheets/sheet1.xml' => ['<pageMargins', '<pageSetup']
-                                }
-                                )
+    compare_for_regression(
+      ["xl/printerSettings/printerSettings1.bin",
+       "xl/worksheets/_rels/sheet1.xml.rels"],
+      {
+        '[Content_Types].xml' => ['<Default Extension="bin"'],
+        'xl/worksheets/sheet1.xml' => ['<pageMargins', '<pageSetup']
+      }
+    )
   end
 end

data/test/regression/test_defined_name03.rb

@@ -7,26 +7,24 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_defined_name03
     @xlsx = 'defined_name03.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet1 = workbook.add_worksheet('sheet One')
 
     workbook.define_name("Sales", "='sheet One'!G1:H10")
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx,
-                                ["xl/printerSettings/printerSettings1.bin",
-                                 "xl/worksheets/_rels/sheet1.xml.rels"],
-                                {
-                                  '[Content_Types].xml' => ['<Default Extension="bin"'],
-                                  'xl/worksheets/sheet1.xml' => ['<pageMargins', '<pageSetup']
-                                }
-                                )
+    compare_for_regression(
+      ["xl/printerSettings/printerSettings1.bin",
+       "xl/worksheets/_rels/sheet1.xml.rels"],
+      {
+        '[Content_Types].xml' => ['<Default Extension="bin"'],
+        'xl/worksheets/sheet1.xml' => ['<pageMargins', '<pageSetup']
+      }
+    )
   end
 end

data/test/regression/test_defined_name04.rb

@@ -33,7 +33,7 @@ def test_defined_name_raise
 
   def test_defined_name04
     @xlsx = 'defined_name04.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet1 = workbook.add_worksheet
 
     # Test for valid Excel defined names.
@@ -45,11 +45,6 @@ def test_defined_name04
     workbook.define_name( %q(a),        %q(=Sheet1!$A$6) )
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx,
-                                nil,
-                                nil
-                                )
+    compare_for_regression
   end
 end

data/test/regression/test_escapes01.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_escapes01
     @xlsx = 'escapes01.xlsx'
-    workbook    = WriteXLSX.new(@xlsx)
+    workbook    = WriteXLSX.new(@io)
     worksheet   = workbook.add_worksheet('5&4')
 
     worksheet.write_formula('A1', %q{=IF(1>2,0,1)},            nil, 1)
@@ -25,13 +25,11 @@ def test_escapes01
     worksheet.write_string('A8', %q{"&<>})
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx,
-                                [ 'xl/calcChain.xml', '[Content_Types].xml', 'xl/_rels/workbook.xml.rels' ],
-                                {
-                                  'xl/workbook.xml' => ['<workbookView']
-                                }
-                                )
+    compare_for_regression(
+      [ 'xl/calcChain.xml', '[Content_Types].xml', 'xl/_rels/workbook.xml.rels' ],
+      {
+        'xl/workbook.xml' => ['<workbookView']
+      }
+    )
   end
 end

data/test/regression/test_escapes02.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_escapes02
     @xlsx = 'escapes02.xlsx'
-    workbook    = WriteXLSX.new(@xlsx)
+    workbook    = WriteXLSX.new(@io)
     worksheet   = workbook.add_worksheet
 
     worksheet.write('A1', %q{"<>'&})
@@ -22,12 +22,11 @@ def test_escapes02
     worksheet.comments_author = %q{I am '"<>&}
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx,
-                                {
-                                  'xl/workbook.xml' => ['<workbookView']
-                                }
-                                )
+    compare_for_regression(
+      nil,
+      {
+        'xl/workbook.xml' => ['<workbookView']
+      }
+    )
   end
 end

data/test/regression/test_escapes03.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_escapes03
     @xlsx = 'escapes03.xlsx'
-    workbook    = WriteXLSX.new(@xlsx)
+    workbook    = WriteXLSX.new(@io)
     worksheet   = workbook.add_worksheet
 
     bold   = workbook.add_format(:bold   => 1)
@@ -23,12 +23,11 @@ def test_escapes03
     worksheet.write_rich_string('A3', 'a', bold, %q{b"<>'c}, 'defg')
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx,
-                                {
-                                  'xl/workbook.xml' => ['<workbookView']
-                                }
-                                )
+    compare_for_regression(
+      nil,
+      {
+        'xl/workbook.xml' => ['<workbookView']
+      }
+    )
   end
 end

data/test/regression/test_escapes04.rb

@@ -7,24 +7,22 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_escapes04
     @xlsx = 'escapes04.xlsx'
-    workbook    = WriteXLSX.new(@xlsx)
+    workbook    = WriteXLSX.new(@io)
     worksheet   = workbook.add_worksheet
 
     worksheet.write_url('A1', 'http://www.perl.com/?a=1&b=2')
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx,
-                                nil,
-                                {
-                                  'xl/workbook.xml' => ['<workbookView']
-                                }
-                                )
+    compare_for_regression(
+      nil,
+      {
+        'xl/workbook.xml' => ['<workbookView']
+      }
+    )
   end
 end

data/test/regression/test_escapes05.rb

@@ -7,25 +7,23 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_escapes05
     @xlsx = 'escapes05.xlsx'
-    workbook    = WriteXLSX.new(@xlsx)
+    workbook    = WriteXLSX.new(@io)
     worksheet1  = workbook.add_worksheet('Start')
     worksheet2  = workbook.add_worksheet('A & B')
 
     worksheet1.write_url('A1', "internal:'A & B'!A1", 'Jump to A & B')
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx,
-                                nil,
-                                {
-                                  'xl/workbook.xml' => ['<workbookView']
-                                }
-                                )
+    compare_for_regression(
+      nil,
+      {
+        'xl/workbook.xml' => ['<workbookView']
+      }
+    )
   end
 end

data/test/regression/test_escapes06.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_escapes06
     @xlsx = 'escapes06.xlsx'
-    workbook   = WriteXLSX.new(@xlsx)
+    workbook   = WriteXLSX.new(@io)
     worksheet  = workbook.add_worksheet
     num_format = workbook.add_format(:num_format => '[Red]0.0%\\ "a"')
 
@@ -21,9 +21,6 @@ def test_escapes06
     worksheet.write('A1', 123, num_format)
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx
-                                )
+    compare_for_regression
   end
 end

data/test/regression/test_escapes07.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_escapes07
     @xlsx = 'escapes07.xlsx'
-    workbook   = WriteXLSX.new(@xlsx)
+    workbook   = WriteXLSX.new(@io)
     worksheet  = workbook.add_worksheet
 
     worksheet.write_url(
@@ -21,9 +21,6 @@ def test_escapes07
                         )
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx
-                                )
+    compare_for_regression
   end
 end

data/test/regression/test_escapes08.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_escapes08
     @xlsx = 'escapes08.xlsx'
-    workbook   = WriteXLSX.new(@xlsx)
+    workbook   = WriteXLSX.new(@io)
     worksheet  = workbook.add_worksheet
 
     # Test an already escaped string.
@@ -22,9 +22,6 @@ def test_escapes08
                         )
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx
-                                )
+    compare_for_regression
   end
 end

data/test/regression/test_excel2003_style01.rb

@@ -7,15 +7,15 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_excel2003_style01
     @xlsx = 'excel2003_style01.xlsx'
-    workbook    = WriteXLSX.new(@xlsx, :excel2003_style => true)
+    workbook    = WriteXLSX.new(@io, :excel2003_style => true)
     worksheet   = workbook.add_worksheet
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    compare_for_regression
   end
 end