writeexcel 1.0.4 → 1.0.6

data/lib/writeexcel/worksheet.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 ###############################################################################
 #
 # Worksheet - A writer class for Excel Worksheets.
@@ -536,7 +537,7 @@ class Worksheet < BIFFWriter
     # not be obtained exactly due to rounding in Excel.
     #
     if height
-      miyRw = height *20
+      miyRw = height * 20
     else
       miyRw = 0xff # The default row height
       height = 0
@@ -672,8 +673,11 @@ class Worksheet < BIFFWriter
   #
   def set_column(*args)
     # Check for a cell reference in A1 notation and substitute row and column
-    if args[0] =~ /^\D/
-      row1, firstcol, row2, lastcol, *data = substitute_cellref(*args)
+    if args[0].respond_to?(:=~) && args[0] =~ /^\D/
+      array = substitute_cellref(*args)
+      firstcol = array[1]
+      lastcol = array[3]
+      *data = array[4, array.length - 4]
     else
       firstcol, lastcol, *data = args
     end
@@ -1211,7 +1215,7 @@ class Worksheet < BIFFWriter
 
     # Check for a column reference in A1 notation and substitute.
     # Convert col ref to a cell ref and then to a col number.
-    dummy, col = substitute_cellref("#{col}1") if col =~ /^\D/
+    col = substitute_cellref("#{col}1")[1] if col.to_s =~ /^\D/
 
     # Reject column if it is outside filter range.
     unless @filter_area.inside?(col)
@@ -1615,8 +1619,10 @@ class Worksheet < BIFFWriter
   #
   def repeat_columns(*args)
     # Check for a cell reference in A1 notation and substitute row and column
-    if args[0] =~ /^\D/
-      row1, firstcol, row2, lastcol = substitute_cellref(*args)
+    if args[0].to_s =~ /^\D/
+      array = substitute_cellref(*args)
+      firstcol = array[1]
+      lastcol = array[3]
     else
       firstcol, lastcol = args
     end
@@ -2209,10 +2215,8 @@ class Worksheet < BIFFWriter
     # Check for a cell reference in A1 notation and substitute row and column
     args = row_col_notation(args)
 
-    token = args[2]
-
     # Handle undefs as blanks
-    token ||= ''
+    token = args[2] || ''
 
     # First try user defined matches.
     @write_match.each do |aref|
@@ -2223,7 +2227,7 @@ class Worksheet < BIFFWriter
         match = eval("#{sub} self, args")
         return match if match
       end
-    end
+    end if token.respond_to?(:=~)
 
     # Match an array ref.
     if token.respond_to?(:to_ary)
@@ -2231,16 +2235,16 @@ class Worksheet < BIFFWriter
     elsif token.respond_to?(:coerce)  # Numeric
       write_number(*args)
       # Match http, https or ftp URL
-    elsif token =~ %r|^[fh]tt?ps?://|
+    elsif token.respond_to?(:=~) && token =~ %r|^[fh]tt?ps?://|
       write_url(*args)
       # Match mailto:
-    elsif token =~ %r|^mailto:|
+    elsif token.respond_to?(:=~) && token =~ %r|^mailto:|
       write_url(*args)
       # Match internal or external sheet link
-    elsif token =~ %r!^(?:in|ex)ternal:!
+    elsif token.respond_to?(:=~) && token =~ %r!^(?:in|ex)ternal:!
       write_url(*args)
       # Match formula
-    elsif token =~ /^=/
+    elsif token.respond_to?(:=~) && token =~ /^=/
       write_formula(*args)
       # Match blank
     elsif token == ''
@@ -3495,7 +3499,8 @@ class Worksheet < BIFFWriter
 
     return -1 if args.size < 3   # Check the number of args
 
-    row, col, comment, params = args
+    row, col = args
+    params = args[3]
 
     # Check for pairs of optional arguments, i.e. an odd number of args.
     # raise "Uneven number of additional arguments" if args.size % 2 == 0
@@ -4457,10 +4462,10 @@ class Worksheet < BIFFWriter
     y2 =  256.0 * height / size_row(row_end)
 
     # Simulate ceil() without calling POSIX::ceil().
-    x1 = (x1 +0.5).to_i
-    y1 = (y1 +0.5).to_i
-    x2 = (x2 +0.5).to_i
-    y2 = (y2 +0.5).to_i
+    x1 = (x1 + 0.5).to_i
+    y1 = (y1 + 0.5).to_i
+    x2 = (x2 + 0.5).to_i
+    y2 = (y2 + 0.5).to_i
 
     [
       col_start, x1,
@@ -4615,7 +4620,7 @@ class Worksheet < BIFFWriter
     drawings_saved += 1
 
     # For each sheet start the spids at the next 1024 interval.
-    max_spid   = 1024 * (1 + Integer((max_spid -1)/1024.0))
+    max_spid   = 1024 * (1 + Integer((max_spid - 1) / 1024.0))
     start_spid = max_spid
 
     # Max spid for each sheet and eventually for the workbook.
@@ -4626,7 +4631,7 @@ class Worksheet < BIFFWriter
     push_cluster(num_shapes, drawings_saved, clusters)
 
     # Pass calculated values back to the worksheet
-    @object_ids = ObjectIds.new(start_spid, drawings_saved, num_shapes, max_spid -1)
+    @object_ids = ObjectIds.new(start_spid, drawings_saved, num_shapes, max_spid - 1)
 
     [mso_size, drawings_saved, max_spid, start_spid]
   end
@@ -4666,7 +4671,7 @@ class Worksheet < BIFFWriter
   def set_header_footer_common(type, string, margin, encoding)  # :nodoc:
     ruby_19 { string = convert_to_ascii_if_ascii(string) }
 
-    limit    = encoding != 0 ? 255 *2 : 255
+    limit    = encoding != 0 ? 255 * 2 : 255
 
     # Handle utf8 strings
     if is_utf8?(string)
@@ -4821,7 +4826,7 @@ class Worksheet < BIFFWriter
     # Special handling of "Top" filter expressions.
     if tokens[0] =~ /^top|bottom$/i
       value = tokens[1]
-      if (value =~ /\D/ or value.to_i < 1 or value.to_i > 500)
+      if (value.to_s =~ /\D/ or value.to_i < 1 or value.to_i > 500)
         raise "The value '#{value}' in expression '#{expression}' " +
         "must be in the range 1 to 500"
       end
@@ -4850,7 +4855,7 @@ class Worksheet < BIFFWriter
     end
 
     # Special handling for Blanks/NonBlanks.
-    if (token =~ /^blanks|nonblanks$/i)
+    if (token.to_s =~ /^blanks|nonblanks$/i)
       # Only allow Equals or NotEqual in this context.
       if (operator != 2 and operator != 5)
         raise "The operator '#{tokens[1]}' in expression '#{expression}' " +
@@ -4876,7 +4881,7 @@ class Worksheet < BIFFWriter
 
     # if the string token contains an Excel match character then change the
     # operator type to indicate a non "simple" equality.
-    if (operator == 2 and token =~ /[*?]/)
+    if (operator == 2 and token.to_s =~ /[*?]/)
       operator = 22
     end
 
@@ -4941,8 +4946,8 @@ class Worksheet < BIFFWriter
     # Convert a column range: 'A:A' or 'B:G'.
     # A range such as A:A is equivalent to A1:65536, so add rows as required
     if cell =~ /\$?([A-I]?[A-Z]):\$?([A-I]?[A-Z])/
-      row1, col1 =  cell_to_rowcol($1 +'1')
-      row2, col2 =  cell_to_rowcol($2 +'65536')
+      row1, col1 =  cell_to_rowcol($1 + '1')
+      row2, col2 =  cell_to_rowcol($2 + '65536')
       return [row1, col1, row2, col2, *args]
     end
 
@@ -5177,8 +5182,8 @@ class Worksheet < BIFFWriter
     # Convert an Ascii URL type and to a null terminated wchar string.
     if encoding == 0
       url  =
-        ruby_18 { url + "\0" } ||
-        ruby_19 { url.force_encoding('BINARY') + "\0".force_encoding('BINARY') }
+        ruby_18 { url.dup + "\0" } ||
+        ruby_19 { url.dup.force_encoding('BINARY') + "\0" }
       url  = url.unpack('c*').pack('v*')
     end
 
@@ -5266,12 +5271,12 @@ class Worksheet < BIFFWriter
   end
 
   def sheetname_from_url(url)
-    sheetname, cell = url.split('!')
+    sheetname = url.split('!')[0]
     sheetname
   end
 
   def cell_from_url(url)
-    sheetname, cell = url.split('!')
+    cell = url.split('!')[1]
     cell
   end
 
@@ -6368,9 +6373,9 @@ class Worksheet < BIFFWriter
 
       # The relationship is different for user units less than 1.
       if width < 1
-        (width *12).to_i
+        (width * 12).to_i
       else
-        (width *7 +5 ).to_i
+        (width * 7 + 5 ).to_i
       end
     else
       64
@@ -6427,7 +6432,7 @@ class Worksheet < BIFFWriter
 
     col1.upto(col2) do |i|
       # Reverse order since records are being pre-pended.
-      col = col2 -i
+      col = col2 - i
 
       # Skip if column doesn't have an active filter.
       next unless @filter_cols[col]
@@ -6546,7 +6551,7 @@ class Worksheet < BIFFWriter
       # Handle utf8 strings
       if is_utf8?(string)
         string = utf8_to_16be(string)
-        encodign = 1
+        encoding = 1
       end
 
       string =
@@ -6950,6 +6955,9 @@ class Worksheet < BIFFWriter
 
   # Check for a cell reference in A1 notation and substitute row and column
   def row_col_notation(args)   # :nodoc:
+    # ruby 3.2 no longer handles =~ for various types
+    return args unless args[0].respond_to?(:=~)
+
     if args[0] =~ /^\D/
       substitute_cellref(*args)
     else

data/test/helper.rb

@@ -1,15 +1,22 @@
 # -*- coding: utf-8 -*-
-require 'rubygems'
-require 'simplecov'
-require 'test/unit'
+# frozen_string_literal: true
 
-SimpleCov.start
+require 'bundler'
+
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  warn e.message
+  warn "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'minitest/autorun'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'writeexcel'
 
-class Test::Unit::TestCase
+class Minitest::Test
   ###############################################################################
   #
   # Unpack the binary data into a format suitable for printing in tests.

data/test/test_00_IEEE_double.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'helper'
 
-class TC_BIFFWriter < Test::Unit::TestCase
+class TC_BIFFWriter < Minitest::Test
 
   def test_IEEE_double
     teststr = [1.2345].pack("d")

data/test/test_04_dimensions.rb

@@ -14,7 +14,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_dimensions < Test::Unit::TestCase
+class TC_dimensions < Minitest::Test
 
   def setup
     @workbook            = WriteExcel.new(StringIO.new)
@@ -386,7 +386,7 @@ class TC_dimensions < Test::Unit::TestCase
   end
 
   def test_merge_range
-    formula = @worksheet.__send__("store_formula", '=A1 * 3 + 50')
+    @worksheet.__send__("store_formula", '=A1 * 3 + 50')
     @worksheet.merge_range('C6:E8', 'Test', @format)
 
     data     = @worksheet.__send__("store_dimensions")

data/test/test_05_rows.rb

@@ -14,7 +14,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_rows < Test::Unit::TestCase
+class TC_rows < Minitest::Test
 
   def setup
   end

data/test/test_06_extsst.rb

@@ -18,7 +18,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_extsst < Test::Unit::TestCase
+class TC_extsst < Minitest::Test
 
   def setup
     @tests = [

data/test/test_11_date_time.rb

@@ -14,7 +14,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_data_time < Test::Unit::TestCase
+class TC_data_time < Minitest::Test
 
   def setup
     @workbook  = WriteExcel.new(StringIO.new)

data/test/test_12_date_only.rb

@@ -18,7 +18,7 @@ class ForTest
   include ConvertDateTime
 end
 
-class TC_data_only < Test::Unit::TestCase
+class TC_data_only < Minitest::Test
 
   def setup
     @obj = ForTest.new

data/test/test_13_date_seconds.rb

@@ -14,7 +14,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_data_seconds < Test::Unit::TestCase
+class TC_data_seconds < Minitest::Test
 
   def setup
     @workbook  = WriteExcel.new(StringIO.new)

data/test/test_21_escher.rb

@@ -22,7 +22,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_escher < Test::Unit::TestCase
+class TC_escher < Minitest::Test
 
   def setup
     @workbook  = WriteExcel.new(StringIO.new)

data/test/test_22_mso_drawing_group.rb

@@ -19,7 +19,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_mso_drawing_group < Test::Unit::TestCase
+class TC_mso_drawing_group < Minitest::Test
 
   def test_dummy
     assert(true)

data/test/test_23_note.rb

@@ -14,7 +14,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_note < Test::Unit::TestCase
+class TC_note < Minitest::Test
 
   def setup
     @workbook   = WriteExcel.new(StringIO.new)

data/test/test_24_txo.rb

@@ -14,7 +14,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_txo < Test::Unit::TestCase
+class TC_txo < Minitest::Test
 
   def setup
     @workbook   = WriteExcel.new(StringIO.new)

data/test/test_25_position_object.rb

@@ -17,7 +17,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_position_object < Test::Unit::TestCase
+class TC_position_object < Minitest::Test
 
   def setup
     @test_file  = StringIO.new

data/test/test_26_autofilter.rb

@@ -13,7 +13,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_26_autofilter < Test::Unit::TestCase
+class TC_26_autofilter < Minitest::Test
 
   def test_26_autofilter
     @tests.each do |test|

data/test/test_27_autofilter.rb

@@ -13,7 +13,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_27_autofilter < Test::Unit::TestCase
+class TC_27_autofilter < Minitest::Test
 
   def test_27_autofilter
     @tests.each do |test|

data/test/test_28_autofilter.rb

@@ -13,7 +13,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_28_autofilter < Test::Unit::TestCase
+class TC_28_autofilter < Minitest::Test
 
   def test_28_autofilter
     @tests.each do |test|

data/test/test_29_process_jpg.rb

@@ -13,7 +13,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_29_process_jpg < Test::Unit::TestCase
+class TC_29_process_jpg < Minitest::Test
 
   def setup
     @image = Writeexcel::Image.new(nil, nil, nil, nil)
@@ -21,7 +21,6 @@ class TC_29_process_jpg < Test::Unit::TestCase
   end
 
   def test_valid_jpg_image_1
-    testname = '3w x 5h jpeg image.'
 
     data = %w(
       FF D8 FF E0 00 10 4A 46 49 46 00 01 01 01 00 60
@@ -50,8 +49,6 @@ class TC_29_process_jpg < Test::Unit::TestCase
   end
 
   def test_valid_jpg_image_2
-    testname = '5w x 3h jpeg image.'
-
     data = %w(
       FF D8 FF E0 00 10 4A 46 49 46 00 01 01 01 00 60
       00 60 00 00 FF DB 00 43 00 06 04 05 06 05 04 06
@@ -79,50 +76,11 @@ class TC_29_process_jpg < Test::Unit::TestCase
     assert_equal(3, @image.height)
   end
 
-  def test_valid_jpg_image_3_ffco_marker_missing
-    testname = 'FFCO marker missing in image.'
-
-    data = %w(
-      FF D8 FF E0 00 10 4A 46 49 46 00 01 01 01 00 60
-      00 60 00 00 FF DB 00 43 00 06 04 05 06 05 04 06
-      06 05 06 07 07 06 08 0A 10 0A 0A 09 09 0A 14 0E
-      0F 0C 10 17 14 18 18 17 14 16 16 1A 1D 25 1F 1A
-      1B 23 1C 16 16 20 2C 20 23 26 27 29 2A 29 19 1F
-      2D 30 2D 28 30 25 28 29 28 FF DB 00 43 01 07 07
-      07 0A 08 0A 13 0A 0A 13 28 1A 16 1A 28 28 28 28
-      28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28
-      28 28 28 28 28 28 28 28 28 28 28 28 28 28 28 28
-      28 28 28 28 28 28 28 28 28 28 28 28 28 28 FF C1
-      00 11 08 00 03 00 05 03 01 22 00 02 11 01 03 11
-      01 FF C4 00 15 00 01 01 00 00 00 00 00 00 00 00
-      00 00 00 00 00 00 00 07 FF C4 00 14 10 01 00 00
-      00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF C4
-      00 15 01 01 01 00 00 00 00 00 00 00 00 00 00 00
-      00 00 00 06 08 FF C4 00 14 11 01 00 00 00 00 00
-      00 00 00 00 00 00 00 00 00 00 00 FF DA 00 0C 03
-      01 00 02 11 03 11 00 3F 00 9D 00 1C A4 5F FF D9
-    )
-
-    assert_raise(RuntimeError, " \t" + testname) {
-      @image.__send__("process_jpg", [data.join('')].pack('H*'))
-    }
-  end
-
-  def test_invalid_jpeg_image
-    testname = 'empty image'
-    image    = ''
-
-    assert_raise(RuntimeError, " \t" + testname) {
-      @image.__send__("process_jpg", image)
-    }
-  end
-
   ###############################################################################
   #
   # Test 5. Progressive DCT-based JPEG image.
   #
   def test_progressive_dct_based_jpeg_image
-    testname = '35w x 35h progressive jpeg image.'
     data = %w(
       FF D8 FF E0 00 10 4A 46 49 46 00 01 02 01 00 96
       00 96 00 00 FF E1 04 E7 45 78 69 66 00 00 4D 4D

data/test/test_30_validation_dval.rb

@@ -13,7 +13,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_validation_dval < Test::Unit::TestCase
+class TC_validation_dval < Minitest::Test
 
   def setup
     @workbook   = WriteExcel.new(StringIO.new)

data/test/test_31_validation_dv_strings.rb

@@ -14,7 +14,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_validation_dv_strings < Test::Unit::TestCase
+class TC_validation_dv_strings < Minitest::Test
 
   def setup
     workbook   = WriteExcel.new(StringIO.new)

data/test/test_32_validation_dv_formula.rb

@@ -13,7 +13,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_validation_dv_formula < Test::Unit::TestCase
+class TC_validation_dv_formula < Minitest::Test
 
   def setup
     @workbook   = WriteExcel.new(StringIO.new)

data/test/test_40_property_types.rb

@@ -12,7 +12,7 @@
 #########################################################################
 require 'helper'
 
-class TC_property_types < Test::Unit::TestCase
+class TC_property_types < Minitest::Test
 
   def setup
     @smiley = '☺'   # chr 0x263A;    in perl

data/test/test_41_properties.rb

@@ -12,7 +12,7 @@
 #########################################################################
 require 'helper'
 
-class TC_properties < Test::Unit::TestCase
+class TC_properties < Minitest::Test
 
   def setup
     @smiley = '☺'   # chr 0x263A;    in perl

data/test/test_42_set_properties.rb

@@ -19,7 +19,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_set_properties < Test::Unit::TestCase
+class TC_set_properties < Minitest::Test
 
   def test_dummy
     assert(true)
@@ -42,7 +42,7 @@ class TC_set_properties < Test::Unit::TestCase
     smiley = '☺'   # chr 0x263A;    in perl
 
     workbook  = WriteExcel.new(@test_file)
-    worksheet = workbook.add_worksheet
+    workbook.add_worksheet
 
 =begin
     ###############################################################################

data/test/test_50_name_stored.rb

@@ -13,7 +13,7 @@
 require 'helper'
 require 'stringio'
 
-class TC_Name_Stored < Test::Unit::TestCase
+class TC_Name_Stored < Minitest::Test
   def setup
     @test_file = StringIO.new
     @workbook   = WriteExcel.new(@test_file)
@@ -21,7 +21,6 @@ class TC_Name_Stored < Test::Unit::TestCase
   end
 
   def test_print_area_name_with_simple_range
-    caption        = " \tNAME for worksheet1.print_area('A1:B12')"
     name           = [0x06].pack('C')
     encoding       = 0
     sheet_index    = 1
@@ -44,7 +43,6 @@ class TC_Name_Stored < Test::Unit::TestCase
   end
 
   def test_print_area_name_with_simple_range_in_sheet_3
-    caption        = " \tNAME for worksheet3.print_area('G7:H8')"
     name           = [0x06].pack('C')
     encoding       = 0
     sheet_index    = 3
@@ -68,7 +66,6 @@ class TC_Name_Stored < Test::Unit::TestCase
   end
 
   def test_for_repeat_rows_name
-    caption        = " \tNAME for worksheet1.repeat_rows(0, 9)"
     name           = [0x07].pack('C')
     encoding       = 0
     sheet_index    = 1
@@ -92,7 +89,6 @@ class TC_Name_Stored < Test::Unit::TestCase
   end
 
   def test_for_repeat_rows_name_on_sheet_3
-    caption        = " \tNAME for worksheet3.repeat_rows(6, 7)"
     name           = [0x07].pack('C')
     encoding       = 0
     sheet_index    = 1
@@ -116,7 +112,6 @@ class TC_Name_Stored < Test::Unit::TestCase
   end
 
   def test_for_repeat_columns_name
-    caption        = " \tNAME for worksheet1.repeat_columns('A:J')"
     name           = [0x07].pack('C')
     encoding       = 0
     sheet_index    = 1
@@ -140,7 +135,6 @@ class TC_Name_Stored < Test::Unit::TestCase
   end
 
   def test_for_repeat_rows_and_repeat_columns_together_name
-    caption        = " \tNAME for repeat_rows(1, 2) repeat_columns(3, 4)"
     name           = [0x07].pack('C')
     encoding       = 0
     sheet_index    = 1
@@ -165,7 +159,6 @@ class TC_Name_Stored < Test::Unit::TestCase
   end
 
   def test_for_print_area_name_with_simple_range
-    caption        = " \tNAME for worksheet1.autofilter('A1:C5')"
     name           = [0x0D].pack('C')
     encoding       = 0
     sheet_index    = 1
@@ -189,7 +182,6 @@ class TC_Name_Stored < Test::Unit::TestCase
   end
 
   def test_for_define_name_global_name
-    caption        = " \tNAME for worksheet1.define_name('Foo', ...)"
     name           = 'Foo'
     encoding       = 0
     sheet_index    = 0