write_xlsx 0.85.4 → 0.85.9

data/test/regression/test_shape_scale01.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_shape_scale01
     @xlsx = 'shape_scale01.xlsx'
-    workbook    = WriteXLSX.new(@xlsx)
+    workbook    = WriteXLSX.new(@io)
     worksheet   = workbook.add_worksheet
     format      = workbook.add_format(:font => 'Arial', :size => 8)
 
@@ -31,17 +31,15 @@ def test_shape_scale01
     worksheet.insert_shape('A1', normal, 250, 50, 3, 2)
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx,
-                                %w[
-      xl/printerSettings/printerSettings1.bin
-      xl/worksheets/_rels/sheet1.xml.rels
-                                ],
-                                {
-    '[Content_Types].xml'      => ['<Default Extension="bin"'],
-    'xl/worksheets/sheet1.xml' => ['<pageMargins']
-                                }
-                                )
+    compare_for_regression(
+      %w[
+        xl/printerSettings/printerSettings1.bin
+        xl/worksheets/_rels/sheet1.xml.rels
+      ],
+      {
+        '[Content_Types].xml'      => ['<Default Extension="bin"'],
+        'xl/worksheets/sheet1.xml' => ['<pageMargins']
+      }
+    )
   end
 end

data/test/regression/test_shape_stencil01.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_shape_stencil01
     @xlsx = 'shape_stencil01.xlsx'
-    workbook    = WriteXLSX.new(@xlsx)
+    workbook    = WriteXLSX.new(@io)
     worksheet   = workbook.add_worksheet
     worksheet.hide_gridlines(2)
 
@@ -34,11 +34,6 @@ def test_shape_stencil01
     end
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx,
-                                nil,
-                                nil
-                                )
+    compare_for_regression
   end
 end

data/test/regression/test_shared_strings01.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_shared_strings01
     @xlsx = 'shared_strings01.xlsx'
-    workbook    = WriteXLSX.new(@xlsx)
+    workbook    = WriteXLSX.new(@io)
     worksheet   = workbook.add_worksheet
 
     # Test that control characters and any other single byte characters are
@@ -24,11 +24,9 @@ def test_shared_strings01
     end
 
     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_shared_strings02.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_shared_strings02
     @xlsx = 'shared_strings02.xlsx'
-    workbook    = WriteXLSX.new(@xlsx)
+    workbook    = WriteXLSX.new(@io)
     worksheet   = workbook.add_worksheet
 
     # Test that the Excel/Unicode escape for control characters, _xHHHH_ is
@@ -37,11 +37,9 @@ def test_shared_strings02
     worksheet.write_col(0, 0, strings)
 
     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_shared_strings_encoding.rb

@@ -1,103 +0,0 @@
-# -*- coding: iso-8859-8 -*-
-
-require 'helper'
-
-class TestRegressionSharedStringsEncoding < Test::Unit::TestCase
-  def setup
-    setup_dir_var
-    @f = File.open(File.join(@test_dir, 'regression', 'klt.csv'), "r:iso-8859-8")
-  end
-
-  def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
-  end
-
-  def test_shared_strings_encoding
-    sizes = [10, 10, 18, 10, 18, 18, 12, 16, 16, 25,
-             18, 36, 60, 16, 16, 16, 18, 16, 16, 22,
-             14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-             14, 14, 14, 14, 14, 14]
-
-#    input_file = ARGV[0]
-#    output_file = ARGV[1]
-
-    # coding: ISO-8859-8
-#    Encoding.default_external = Encoding.find("ISO-8859-8")
-
-    # define an array to hold the Sikum records
-
-    # loop through each record in the csv file, adding
-    # each record to our array.
-    #f = File.open(input_file, "r")
-    @xlsx = 'shared_strings_encoding.xlsx'
-    workbook = WriteXLSX.new(@xlsx)
-    heading1 = workbook.add_format(:align => 'center', :bold => 1 , :size => 12 , :color => 'blue', :bg_color => 27)
-    heading2 = workbook.add_format(:align => 'center', :bold => 1 , :size => 12 , :color => 'blue', :bg_color => 'silver')
-    format1 = workbook.add_format(:align => 'right', :color => 'blue', :bg_color => 9 )
-    format11 = workbook.add_format(:align => 'right', :color => 'blue', :bg_color => 9 )
-    format11.set_num_format('0.00')
-    format3 = workbook.add_format(:align => 'right', :color => 'red', :bg_color => 9 )
-    worksheet = workbook.add_worksheet
-    worksheet.right_to_left
-
-    i=0
-
-    @f.each_line { |line|
-      words = line.split(',')
-      if i == 0 then
-        for j in 0..words.size-1
-
-          word = words[j].to_s.gsub(/"/," ")
-          word = word.gsub(/\n/, "" )
-          word = word.gsub(/\r/, "" )
-
-#          worksheet.merge_range( 'A1:L1', word.force_encoding('iso-8859-8').encode("UTF-8"), heading1)
-          worksheet.merge_range( 'A1:L1', word, heading1)
-        end
-      elsif i == 1 then
-        for j in 0..words.size-1
-
-          word = words[j].to_s.gsub(/"/," ")
-          word = word.gsub(/\n/, "" )
-          word = word.gsub(/\r/, "" )
-
-          worksheet.set_column(j,0,sizes[j])
-#          worksheet.write( i, j, word.force_encoding('iso-8859-8').encode("UTF-8"), heading2)
-          worksheet.write( i, j, word, heading2)
-        end
-      else
-
-        heara = words[11].to_s
-        for j in 0..words.size-1
-
-          jj=j
-          word = words[j].to_s.gsub("_"," ")
-          word = word.gsub(/\n/, "" )
-          word = word.gsub(/\r/, "" )
-          word = word.lstrip.rstrip
-
-          if heara.include?('abcdefghijklml') then
-#            worksheet.write( i, jj, word.force_encoding('iso-8859-8').encode("UTF-8"), format3)
-            worksheet.write( i, jj, word, format3)
-          else
-#            worksheet.write( i, jj, word.force_encoding('iso-8859-8').encode("UTF-8"), format1)
-            worksheet.write( i, jj, word, format1)
-          end
-        end
-      end
-      i = i+1
-    }
-
-    workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
-  end
-
-  def input_file
-    <<EOS
-����� ������� ������ ������
-����� ����,��� ����,�� ����,���� ����,���� ����,��,���� ������,����,����,����,�����,����
-01/11/2012,09:04:20,_����                                             ,      131, 39977777,�����������         ,00171044973,                    ,                    ,�� �����                 ,                         ,����� ����/����� �� ���� ������
-01/11/2012,09:04:24,_����                                             ,      131, 36888865,�������             ,00171081635,���� ������         ,���� ������         ,�� �����                 ,                         ,
-EOS
-  end
-end

data/test/regression/test_simple01.rb

@@ -7,18 +7,18 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_simple01
     @xlsx = 'simple01.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     worksheet.write('A1', 'Hello')
     worksheet.write('A2', 123)
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    compare_for_regression
   end
 end

data/test/regression/test_simple02.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_simple02
     @xlsx = 'simple02.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet1 = workbook.add_worksheet
     worksheet2 = workbook.add_worksheet('Data Sheet')
     worksheet3 = workbook.add_worksheet
@@ -27,6 +27,6 @@ def test_simple02
     worksheet3.write('C4', 234)
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    compare_for_regression
   end
 end

data/test/regression/test_simple03.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_simple03
     @xlsx = 'simple03.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet1 = workbook.add_worksheet
     worksheet2 = workbook.add_worksheet('Data Sheet')
     worksheet3 = workbook.add_worksheet
@@ -34,6 +34,6 @@ def test_simple03
     worksheet3.activate
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    compare_for_regression
   end
 end

data/test/regression/test_simple04.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_simple04
     @xlsx = 'simple04.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     worksheet.set_column(0, 0, 12)
@@ -24,6 +24,6 @@ def test_simple04
     worksheet.write_date_time(1, 0, '2013-01-27T', format2)
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    compare_for_regression
   end
 end

data/test/regression/test_simple05.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_simple05
     @xlsx = 'simple05.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     worksheet.set_row(5, 18)
@@ -35,6 +35,6 @@ def test_simple05
     worksheet.write_string(6, 0, 'Foo', format7)
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    compare_for_regression
   end
 end

data/test/regression/test_tab_color01.rb

@@ -6,24 +6,15 @@ def setup
     setup_dir_var
   end
 
-  def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
-  end
-
   def test_tab_color01
     @xlsx = 'tab_color01.xlsx'
-    workbook    = WriteXLSX.new(@xlsx)
+    workbook    = WriteXLSX.new(@io)
     worksheet   = workbook.add_worksheet
 
     worksheet.write('A1', 'Foo')
     worksheet.tab_color = 'red'
 
     workbook.close
-    compare_xlsx_for_regression(
-                                File.join(@regression_output, @xlsx),
-                                @xlsx,
-                                nil,
-                                nil
-                                )
+    compare_for_regression
   end
 end

data/test/regression/test_table01.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_table01
     @xlsx = 'table01.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     # Set the column width to match the taget worksheet.
@@ -22,6 +22,6 @@ def test_table01
     worksheet.add_table('C3:F13')
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    compare_for_regression
   end
 end

data/test/regression/test_table02.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_table02
     @xlsx = 'table02.xlsx'
-    workbook   = WriteXLSX.new(@xlsx)
+    workbook   = WriteXLSX.new(@io)
     worksheet1 = workbook.add_worksheet
     worksheet2 = workbook.add_worksheet
 
@@ -29,7 +29,7 @@ def test_table02
     worksheet2.add_table('C16:H23')
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx,
+    compare_for_regression(
                                 {},
                                 { 'xl/workbook.xml' => ['<workbookView'] }
                                 )

data/test/regression/test_table03.rb

@@ -7,12 +7,12 @@ def setup
   end
 
   def teardown
-    File.delete(@xlsx) if File.exist?(@xlsx)
+    @tempfile.close(true)
   end
 
   def test_table03
     @xlsx = 'table03.xlsx'
-    workbook  = WriteXLSX.new(@xlsx)
+    workbook  = WriteXLSX.new(@io)
     worksheet = workbook.add_worksheet
 
     # Set the column width to match the taget worksheet.
@@ -25,6 +25,6 @@ def test_table03
     worksheet.write('A1', 'http://perl.com/')
 
     workbook.close
-    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+    compare_for_regression
   end
 end