writeexcel 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aef741d4929e644f22197dc922a779d1049e686bcda4458f8fdd07a1dc6d45a0
-  data.tar.gz: 7431195b6609b5220f0a72cab8df664594c2ad1a1f2124187fe13515c2dd9d16
+  metadata.gz: 210718d145e6c74ec1b4ff8242a80937d3fe3de27815decd8a79856fa2f6ae73
+  data.tar.gz: 3ba1e17f91c2093e715cdb14964814cf67adad44890dd8286aac3e1568a09a6b
 SHA512:
-  metadata.gz: ced7ba9cea632a819acd69fd242a03939abd331eca99f3ff2604ea8429998fd467ee795bbbbef5a6ce1b3f66ed970b57583f6d0c85f9aefc311247aaba39c5ae
-  data.tar.gz: 38955288d47faa5dc1ec3b8aad5960b0bcac352b61c8503b975eb1c0446ae41785a306b84952797883621cc38f241a9e3343b364f5b8060abee869221fbff1aa
+  metadata.gz: 28357fc96e5c28bf45924743c758111deb2e8ca5386dcd8efcbd1fdabcae277a8d3756c21d2e9b6b454f10558f9615d28c1b77ef25c8cda3d9335bd24d027c9a
+  data.tar.gz: 36c16f58a152fbfd64d1cd4af38bbdf5a9bccf77962da6cc5436fb70a080bc164e1178ebf0a70296c96232c3143ce775cb74ed31698e4ca2f49d8fc4e884335d

data/.github/workflows/test-suite.yml

@@ -0,0 +1,26 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: test-suite
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [3.3, 3.2, 3.1, '3.0', 2.7, 2.6, 2.5, 2.4]
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

data/README.rdoc

@@ -85,6 +85,10 @@ Example Code:
 * and ......
 
 == Recent Change
+v1.0.7
+* support Ruby 3.3
+* support Ruby 2.4 or later
+
 v1.0.6
 * support Ruby 3.2
 * use minitest gem instead of test-unit.
@@ -112,8 +116,8 @@ v1.0.0
 
 Original was written in Perl by John McNamara (jmcnamara@cpan.org).
 
-Convert to ruby by Hideo Nakamura (cxn03651@msj.biglobe.ne.jp)
-Copyright (c) 2009-2014 Hideo NAKAMURA. See LICENSE.txt for details.
+Convert to ruby by Hideo Nakamura (nakamura.hideo@gmail.com)
+Copyright (c) 2009-2024 Hideo NAKAMURA. See LICENSE.txt for details.
 
 == License
 

data/lib/writeexcel/cell_range.rb

@@ -6,6 +6,7 @@ class Worksheet < BIFFWriter
 
     def initialize(worksheet)
       @worksheet = worksheet
+      @row_min = @row_max = @col_min = @col_max = nil
     end
 
     def increment_row_max

data/lib/writeexcel/comments.rb

@@ -6,6 +6,7 @@ class Worksheet < BIFFWriter
   class Collection
     def initialize
       @items = {}
+      @array = nil
     end
 
     def <<(item)

data/lib/writeexcel/excelformulaparser.rb

@@ -6,7 +6,7 @@
 # from Racc grammer file "".
 #
 
-require 'racc/parser.rb'
+require 'racc/parser'
 class ExcelFormulaParser < Racc::Parser  # :nodoc:
 ##### State transition tables begin ###
 

data/lib/writeexcel/version.rb

@@ -1,5 +1,3 @@
-require 'writeexcel'
-
-class WriteExcel < Workbook
-  VERSION = "1.0.6"
+module Writeexcel
+  VERSION = "1.0.7"
 end

data/lib/writeexcel/workbook.rb

@@ -14,20 +14,9 @@
 #
 require 'nkf'
 require 'forwardable'
-require 'writeexcel/biffwriter'
-require 'writeexcel/worksheet'
-require 'writeexcel/chart'
-require 'writeexcel/format'
-require 'writeexcel/formula'
-require 'writeexcel/olewriter'
-require 'writeexcel/storage_lite'
-require 'writeexcel/compatibility'
 require 'writeexcel/shared_string_table'
-require 'writeexcel/worksheets'
 
 class Workbook < BIFFWriter
-  require 'writeexcel/properties'
-  require 'writeexcel/helper'
 
   extend Forwardable
 
@@ -116,6 +105,7 @@ class Workbook < BIFFWriter
     @localtime             = Time.now
 
     @defined_names         = []
+    @fileclosed            = nil
 
     setup_built_in_formats(default_formats)
 

data/lib/writeexcel/worksheet.rb

@@ -103,6 +103,7 @@ class Worksheet < BIFFWriter
     @title_range         = TitleRange.new(self)
     @print_range         = PrintRange.new(self)
 
+    @print_headers       = 0
     @print_gridlines     = 1
     @screen_gridlines    = 1
 
@@ -155,6 +156,18 @@ class Worksheet < BIFFWriter
 
     @table               = []
     @row_data            = {}
+    @header              = ''
+    @header_encoding     = nil
+    @footer              = ''
+    @footer_encoding     = nil
+    @hidden              = nil
+    @selected            = nil
+    @protect             = nil
+    @hcenter             = nil
+    @vcenter             = nil
+    @display_arabic      = nil
+    @frozen              = nil
+    @hide_zeros          = nil
   end
 
   #
@@ -353,8 +366,8 @@ class Worksheet < BIFFWriter
   #     worksheet2.activate
   #     worksheet1.hide
   #
-  def hide
-    @hidden = true
+  def hide(hidden = :hidden)
+    @hidden = hidden
 
     # A hidden worksheet shouldn't be active or selected.
     @selected  = false
@@ -673,7 +686,7 @@ class Worksheet < BIFFWriter
   #
   def set_column(*args)
     # Check for a cell reference in A1 notation and substitute row and column
-    if args[0].respond_to?(:=~) && args[0] =~ /^\D/
+    if args[0].respond_to?(:match) && args[0] =~ /^\D/
       array = substitute_cellref(*args)
       firstcol = array[1]
       lastcol = array[3]
@@ -963,11 +976,11 @@ class Worksheet < BIFFWriter
     format   = args[5]
     encoding = args[6] ? 1 : 0
 
-    merge_range_core(rwFirst, colFirst, rwLast, colLast, string, format, encoding) do |rwFirst, colFirst, string, format, encoding|
-      if encoding != 0
-        write_utf16be_string(rwFirst, colFirst, string, format)
+    merge_range_core(rwFirst, colFirst, rwLast, colLast, string, format, encoding) do |_rwFirst, _colFirst, _string, _format, _encoding|
+      if _encoding != 0
+        write_utf16be_string(_rwFirst, _colFirst, _string, _format)
       else
-        write(rwFirst, colFirst, string, format)
+        write(_rwFirst, _colFirst, _string, _format)
       end
     end
   end
@@ -994,8 +1007,8 @@ class Worksheet < BIFFWriter
     format   = args[5]
     encoding = nil
 
-    merge_range_core(rwFirst, colFirst, rwLast, colLast, string, format, encoding) do |rwFirst, colFirst, string, format, encoding|
-      write_date_time(rwFirst, colFirst, string, format)
+    merge_range_core(rwFirst, colFirst, rwLast, colLast, string, format, encoding) do |_rwFirst, _colFirst, _string, _format, _encoding|
+      write_date_time(_rwFirst, _colFirst, _string, _format)
     end
   end
 
@@ -2227,7 +2240,7 @@ class Worksheet < BIFFWriter
         match = eval("#{sub} self, args")
         return match if match
       end
-    end if token.respond_to?(:=~)
+    end if token.respond_to?(:match)
 
     # Match an array ref.
     if token.respond_to?(:to_ary)
@@ -2235,16 +2248,16 @@ class Worksheet < BIFFWriter
     elsif token.respond_to?(:coerce)  # Numeric
       write_number(*args)
       # Match http, https or ftp URL
-    elsif token.respond_to?(:=~) && token =~ %r|^[fh]tt?ps?://|
+    elsif token.respond_to?(:match) && token =~ %r|^[fh]tt?ps?://|
       write_url(*args)
       # Match mailto:
-    elsif token.respond_to?(:=~) && token =~ %r|^mailto:|
+    elsif token.respond_to?(:match) && token =~ %r|^mailto:|
       write_url(*args)
       # Match internal or external sheet link
-    elsif token.respond_to?(:=~) && token =~ %r!^(?:in|ex)ternal:!
+    elsif token.respond_to?(:match) && token =~ %r!^(?:in|ex)ternal:!
       write_url(*args)
       # Match formula
-    elsif token.respond_to?(:=~) && token =~ /^=/
+    elsif token.respond_to?(:match) && token =~ /^=/
       write_formula(*args)
       # Match blank
     elsif token == ''
@@ -4313,7 +4326,7 @@ class Worksheet < BIFFWriter
   end
 
   def hidden?  # :nodoc:
-    @hidden
+    @hidden == :hidden
   end
 
   def hidden=(val)  # :nodoc:
@@ -4941,31 +4954,27 @@ class Worksheet < BIFFWriter
   def substitute_cellref(cell, *args)       #:nodoc:
     return [cell, *args] if cell.respond_to?(:coerce) # Numeric
 
-    cell.upcase!
+    normalized_cell = cell.upcase
 
+    case normalized_cell
     # 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])/
+    when /\$?([A-I]?[A-Z]):\$?([A-I]?[A-Z])/
       row1, col1 =  cell_to_rowcol($1 + '1')
       row2, col2 =  cell_to_rowcol($2 + '65536')
       return [row1, col1, row2, col2, *args]
-    end
-
     # Convert a cell range: 'A1:B7'
-    if cell =~ /\$?([A-I]?[A-Z]\$?\d+):\$?([A-I]?[A-Z]\$?\d+)/
+    when /\$?([A-I]?[A-Z]\$?\d+):\$?([A-I]?[A-Z]\$?\d+)/
       row1, col1 =  cell_to_rowcol($1)
       row2, col2 =  cell_to_rowcol($2)
       return [row1, col1, row2, col2, *args]
-    end
-
     # Convert a cell reference: 'A1' or 'AD2000'
-    if (cell =~ /\$?([A-I]?[A-Z]\$?\d+)/)
+    when /\$?([A-I]?[A-Z]\$?\d+)/
       row1, col1 =  cell_to_rowcol($1)
       return [row1, col1, *args]
-
+    else
+      raise("Unknown cell reference #{normalized_cell}")
     end
-
-    raise("Unknown cell reference #{cell}")
   end
 
   #
@@ -6958,7 +6967,7 @@ class Worksheet < BIFFWriter
     # ruby 3.2 no longer handles =~ for various types
     return args unless args[0].respond_to?(:=~)
 
-    if args[0] =~ /^\D/
+    if args[0].respond_to?(:match) && args[0] =~ /^\D/
       substitute_cellref(*args)
     else
       args

data/lib/writeexcel/worksheets.rb

@@ -1,6 +1,4 @@
 class Workbook < BIFFWriter
-  require 'writeexcel/properties'
-  require 'writeexcel/helper'
 
   class Worksheets < Array
     attr_accessor :activesheet
@@ -8,6 +6,7 @@ class Workbook < BIFFWriter
 
     def initialize
       @activesheet = nil
+      @firstsheet  = nil
     end
 
     def activesheet_index

data/lib/writeexcel.rb

@@ -10,12 +10,13 @@
 # original written in Perl by John McNamara
 # converted to Ruby by Hideo Nakamura, cxn03651@msj.biglobe.ne.jp
 #
+require 'writeexcel/version'
 require 'writeexcel/biffwriter'
 require 'writeexcel/olewriter'
 require 'writeexcel/formula'
 require 'writeexcel/format'
-require 'writeexcel/worksheet'
-require "writeexcel/workbook"
+require 'writeexcel/worksheets'
+require 'writeexcel/workbook'
 require 'writeexcel/chart'
 require 'writeexcel/charts/area'
 require 'writeexcel/charts/bar'
@@ -1153,7 +1154,4 @@ require 'writeexcel/debug_info'
 #       12 until another chart with the title set is viewed.
 #
 class WriteExcel < Workbook
-  if RUBY_VERSION < '1.9'
-    $KCODE = 'u'
-  end
 end

data/test/test_04_dimensions.rb

@@ -25,11 +25,11 @@ class TC_dimensions < Minitest::Test
   end
 
   def teardown
-    if @workbook.instance_variable_get(:@filehandle)
-      @workbook.instance_variable_get(:@filehandle).close(true)
+    if @workbook.instance_variable_get("@filehandle")
+      @workbook.instance_variable_get("@filehandle").close(true)
     end
-    if @worksheet.instance_variable_get(:@filehandle)
-      @worksheet.instance_variable_get(:@filehandle).close(true)
+    if @worksheet.instance_variable_get("@filehandle")
+      @worksheet.instance_variable_get("@filehandle").close(true)
     end
   end
 

data/test/test_05_rows.rb

@@ -20,25 +20,22 @@ class TC_rows < Minitest::Test
   end
 
   def teardown
-    if @workbook.instance_variable_get(:@filehandle)
-      @workbook.instance_variable_get(:@filehandle).close(true)
-    end
-    if @worksheet.instance_variable_get(:@filehandle)
-      @worksheet.instance_variable_get(:@filehandle).close(true)
+    if @workbook.instance_variable_get("@filehandle")
+      @workbook.instance_variable_get("@filehandle").close(true)
     end
   end
 
   def test_1
     file  = StringIO.new
-    workbook = WriteExcel.new(file)
-    workbook.compatibility_mode(1)
+    @workbook = WriteExcel.new(file)
+    @workbook.compatibility_mode(1)
     @tests               = []
 
     # for test case 1
     row  = 1
     col1 = 0
     col2 = 0
-    worksheet = workbook.add_worksheet
+    worksheet = @workbook.add_worksheet
     worksheet.set_row(row, 15)
     @tests.push(
                  [
@@ -54,7 +51,7 @@ class TC_rows < Minitest::Test
     row  = 2
     col1 = 0
     col2 = 0
-    worksheet = workbook.add_worksheet
+    worksheet = @workbook.add_worksheet
     worksheet.write(row, col1, 'Test')
     worksheet.write(row, col2, 'Test')
     @tests.push(
@@ -72,7 +69,7 @@ class TC_rows < Minitest::Test
     row  = 3
     col1 = 0
     col2 = 1
-    worksheet = workbook.add_worksheet
+    worksheet = @workbook.add_worksheet
     worksheet.write(row, col1, 'Test')
     worksheet.write(row, col2, 'Test')
     @tests.push(
@@ -89,7 +86,7 @@ class TC_rows < Minitest::Test
     row  = 4
     col1 = 1
     col2 = 1
-    worksheet = workbook.add_worksheet
+    worksheet = @workbook.add_worksheet
     worksheet.write(row, col1, 'Test')
     worksheet.write(row, col2, 'Test')
     @tests.push(
@@ -106,7 +103,7 @@ class TC_rows < Minitest::Test
     row  = 5
     col1 = 1
     col2 = 255
-    worksheet = workbook.add_worksheet
+    worksheet = @workbook.add_worksheet
     worksheet.write(row, col1, 'Test')
     worksheet.write(row, col2, 'Test')
     @tests.push(
@@ -123,7 +120,7 @@ class TC_rows < Minitest::Test
     row  = 6
     col1 = 255
     col2 = 255
-    worksheet = workbook.add_worksheet
+    worksheet = @workbook.add_worksheet
     worksheet.write(row, col1, 'Test')
     worksheet.write(row, col2, 'Test')
     @tests.push(
@@ -140,7 +137,7 @@ class TC_rows < Minitest::Test
     row  = 7
     col1 = 2
     col2 = 9
-    worksheet = workbook.add_worksheet
+    worksheet = @workbook.add_worksheet
     worksheet.set_row(row, 15)
     worksheet.write(row, col1, 'Test')
     worksheet.write(row, col2, 'Test')
@@ -154,8 +151,8 @@ class TC_rows < Minitest::Test
                 ]
             )
 
-    workbook.biff_only  = 1
-    workbook.close
+    @workbook.biff_only  = 1
+    @workbook.close
     # Read in the row records
     rows = []
 

data/test/test_06_extsst.rb

@@ -56,27 +56,24 @@ class TC_extsst < Minitest::Test
   end
 
   def teardown
-    if @workbook.instance_variable_get(:@filehandle)
-      @workbook.instance_variable_get(:@filehandle).close(true)
-    end
-    if @worksheet.instance_variable_get(:@filehandle)
-      @worksheet.instance_variable_get(:@filehandle).close(true)
+    if @workbook.instance_variable_get("@filehandle")
+      @workbook.instance_variable_get("@filehandle").close(true)
     end
   end
 
   def test_to_tests
     @tests.each do |test|
       io = StringIO.new
-      workbook    = WriteExcel.new(io)
-      workbook.not_using_tmpfile
+      @workbook    = WriteExcel.new(io)
+      @workbook.not_using_tmpfile
 
       str_unique = test[0]
 
-      workbook.__send__("calculate_extsst_size", str_unique)
+      @workbook.__send__("calculate_extsst_size", str_unique)
 
-      assert_equal(test[1], workbook.extsst_buckets,
+      assert_equal(test[1], @workbook.extsst_buckets,
         " \tBucket number for #{str_unique}  strings")
-      assert_equal(test[2], workbook.extsst_bucket_size,
+      assert_equal(test[2], @workbook.extsst_bucket_size,
         " \tBucket size for #{str_unique}  strings")
     end
   end

data/test/test_21_escher.rb

@@ -30,11 +30,11 @@ class TC_escher < Minitest::Test
   end
 
   def teardown
-    if @workbook.instance_variable_get(:@filehandle)
-      @workbook.instance_variable_get(:@filehandle).close(true)
+    if @workbook.instance_variable_get("@filehandle")
+      @workbook.instance_variable_get("@filehandle").close(true)
     end
-    if @worksheet.instance_variable_get(:@filehandle)
-      @worksheet.instance_variable_get(:@filehandle).close(true)
+    if @worksheet.instance_variable_get("@filehandle")
+      @worksheet.instance_variable_get("@filehandle").close(true)
     end
   end
 

data/test/test_22_mso_drawing_group.rb

@@ -33,11 +33,8 @@ class TC_mso_drawing_group < Minitest::Test
   end
 
   def teardown
-    if @workbook.instance_variable_get(:@filehandle)
-      @workbook.instance_variable_get(:@filehandle).close(true)
-    end
-    if @worksheet.instance_variable_get(:@filehandle)
-      @worksheet.instance_variable_get(:@filehandle).close(true)
+    if @workbook.instance_variable_get("@filehandle")
+      @workbook.instance_variable_get("@filehandle").close(true)
     end
   end
 
@@ -49,7 +46,7 @@ class TC_mso_drawing_group < Minitest::Test
     end
     @workbook.calc_mso_sizes
 
-    caption = sprintf(" \tSheet1: %4d comments.", count)
+    #caption = sprintf(" \tSheet1: %4d comments.", count)
     target  = %w(
         EB 00 5A 00 0F 00 00 F0 52 00 00 00 00 00 06 F0
         18 00 00 00 02 04 00 00 02 00 00 00 02 00 00 00
@@ -63,7 +60,7 @@ class TC_mso_drawing_group < Minitest::Test
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 2, 1025,
@@ -92,13 +89,13 @@ class TC_mso_drawing_group < Minitest::Test
         C0 01 40 00 00 08 40 00 1E F1 10 00 00 00 0D 00
         00 08 0C 00 00 08 17 00 00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments.", count)
+    #caption    = sprintf( " \tSheet1: %4d comments.", count)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 3, 1026,
@@ -126,13 +123,13 @@ class TC_mso_drawing_group < Minitest::Test
         C0 01 40 00 00 08 40 00 1E F1 10 00 00 00 0D 00
         00 08 0C 00 00 08 17 00 00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments.", count)
+    #caption    = sprintf( " \tSheet1: %4d comments.", count)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 4, 1027
@@ -160,13 +157,13 @@ class TC_mso_drawing_group < Minitest::Test
         C0 01 40 00 00 08 40 00 1E F1 10 00 00 00 0D 00
         00 08 0C 00 00 08 17 00 00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments.", count)
+    #caption    = sprintf( " \tSheet1: %4d comments.", count)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 1024, 2047
@@ -195,13 +192,13 @@ class TC_mso_drawing_group < Minitest::Test
         1E F1 10 00 00 00 0D 00 00 08 0C 00 00 08 17 00
         00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments.", count)
+    #caption    = sprintf( " \tSheet1: %4d comments.", count)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 1025, 2048
@@ -230,13 +227,13 @@ class TC_mso_drawing_group < Minitest::Test
         C0 01 40 00 00 08 40 00 1E F1 10 00 00 00 0D 00
         00 08 0C 00 00 08 17 00 00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments.", count)
+    #caption    = sprintf( " \tSheet1: %4d comments.", count)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 2049, 3072
@@ -269,14 +266,14 @@ class TC_mso_drawing_group < Minitest::Test
         1E F1 10 00 00 00 0D 00 00 08 0C 00 00 08 17 00
         00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments..",
+    #caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments..",
                                  count1, count2)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 2, 1025,
@@ -310,14 +307,14 @@ class TC_mso_drawing_group < Minitest::Test
         1E F1 10 00 00 00 0D 00 00 08 0C 00 00 08 17 00
         00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments..",
+    #caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments..",
                                  count1, count2)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 3, 1026,
@@ -351,14 +348,14 @@ class TC_mso_drawing_group < Minitest::Test
         1E F1 10 00 00 00 0D 00 00 08 0C 00 00 08 17 00
         00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments..",
+    #caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments..",
                                  count1, count2)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 1024, 2047,
@@ -392,14 +389,14 @@ class TC_mso_drawing_group < Minitest::Test
         1E F1 10 00 00 00 0D 00 00 08 0C 00 00 08 17 00
         00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments..",
+    #caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments..",
                                  count1, count2)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 1024, 2047,
@@ -434,14 +431,14 @@ class TC_mso_drawing_group < Minitest::Test
         1E F1 10 00 00 00 0D 00 00 08 0C 00 00 08 17 00
         00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments..",
+    #caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments..",
                                  count1, count2)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 1025, 2048,
@@ -475,14 +472,14 @@ class TC_mso_drawing_group < Minitest::Test
         C0 01 40 00 00 08 40 00 1E F1 10 00 00 00 0D 00
         00 08 0C 00 00 08 17 00 00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments..",
+    #caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments..",
                                  count1, count2)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 1025, 2048,
@@ -520,14 +517,14 @@ class TC_mso_drawing_group < Minitest::Test
         C0 01 40 00 00 08 40 00 1E F1 10 00 00 00 0D 00
         00 08 0C 00 00 08 17 00 00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments,"+
+    #caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments,"+
                           "Sheet3: %4d comments.", count1, count2, count3)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 1024, 2047,
@@ -566,14 +563,14 @@ class TC_mso_drawing_group < Minitest::Test
         C0 01 40 00 00 08 40 00 1E F1 10 00 00 00 0D 00
         00 08 0C 00 00 08 17 00 00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments,"+
+    #caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments,"+
                           "Sheet3: %4d comments.", count1, count2, count3)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 1024, 2047,
@@ -613,14 +610,14 @@ class TC_mso_drawing_group < Minitest::Test
         C0 01 40 00 00 08 40 00 1E F1 10 00 00 00 0D 00
         00 08 0C 00 00 08 17 00 00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments,"+
+    #caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments,"+
                           "Sheet3: %4d comments.", count1, count2, count3)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 1025, 2048,
@@ -660,14 +657,14 @@ class TC_mso_drawing_group < Minitest::Test
         C0 01 40 00 00 08 40 00 1E F1 10 00 00 00 0D 00
         00 08 0C 00 00 08 17 00 00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments,"+
+    #caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments,"+
                           "Sheet3: %4d comments.", count1, count2, count3)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 1025, 2048,
@@ -717,14 +714,14 @@ class TC_mso_drawing_group < Minitest::Test
         C0 01 40 00 00 08 40 00 1E F1 10 00 00 00 0D 00
         00 08 0C 00 00 08 17 00 00 08 F7 00 00 10
     ).join(' ')
-    caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments,"+
+    #caption    = sprintf( " \tSheet1: %4d comments, Sheet2: %4d comments,"+
                           "Sheet3: %4d comments.", count1, count2, count3)
     result     = unpack_record(@workbook.add_mso_drawing_group)
     assert_equal(target, result, caption)
 
 
     # Test the parameters pass to the worksheets
-    caption   += ' (params)'
+    #caption   += ' (params)'
     result_ids = []
     target_ids = [
                 1024, 1, 1025, 2048,

data/test/test_23_note.rb

@@ -22,11 +22,11 @@ class TC_note < Minitest::Test
   end
 
   def teardown
-    if @workbook.instance_variable_get(:@filehandle)
-      @workbook.instance_variable_get(:@filehandle).close(true)
+    if @workbook.instance_variable_get("@filehandle")
+      @workbook.instance_variable_get("@filehandle").close(true)
     end
-    if @worksheet.instance_variable_get(:@filehandle)
-      @worksheet.instance_variable_get(:@filehandle).close(true)
+    if @worksheet.instance_variable_get("@filehandle")
+      @worksheet.instance_variable_get("@filehandle").close(true)
     end
   end
 

data/test/test_24_txo.rb

@@ -22,11 +22,11 @@ class TC_txo < Minitest::Test
   end
 
   def teardown
-    if @workbook.instance_variable_get(:@filehandle)
-      @workbook.instance_variable_get(:@filehandle).close(true)
+    if @workbook.instance_variable_get("@filehandle")
+      @workbook.instance_variable_get("@filehandle").close(true)
     end
-    if @worksheet.instance_variable_get(:@filehandle)
-      @worksheet.instance_variable_get(:@filehandle).close(true)
+    if @worksheet.instance_variable_get("@filehandle")
+      @worksheet.instance_variable_get("@filehandle").close(true)
     end
   end
 

data/test/test_25_position_object.rb

@@ -26,11 +26,11 @@ class TC_position_object < Minitest::Test
   end
 
   def teardown
-    if @workbook.instance_variable_get(:@filehandle)
-      @workbook.instance_variable_get(:@filehandle).close(true)
+    if @workbook.instance_variable_get("@filehandle")
+      @workbook.instance_variable_get("@filehandle").close(true)
     end
-    if @worksheet.instance_variable_get(:@filehandle)
-      @worksheet.instance_variable_get(:@filehandle).close(true)
+    if @worksheet.instance_variable_get("@filehandle")
+      @worksheet.instance_variable_get("@filehandle").close(true)
     end
   end
 

data/test/test_30_validation_dval.rb

@@ -22,11 +22,11 @@ class TC_validation_dval < Minitest::Test
   end
 
   def teardown
-    if @workbook.instance_variable_get(:@filehandle)
-      @workbook.instance_variable_get(:@filehandle).close(true)
+    if @workbook.instance_variable_get("@filehandle")
+      @workbook.instance_variable_get("@filehandle").close(true)
     end
-    if @worksheet.instance_variable_get(:@filehandle)
-      @worksheet.instance_variable_get(:@filehandle).close(true)
+    if @worksheet.instance_variable_get("@filehandle")
+      @worksheet.instance_variable_get("@filehandle").close(true)
     end
   end
 

data/test/test_31_validation_dv_strings.rb

@@ -17,17 +17,17 @@ require 'stringio'
 class TC_validation_dv_strings < Minitest::Test
 
   def setup
-    workbook   = WriteExcel.new(StringIO.new)
-    worksheet  = workbook.add_worksheet
-    @data_validation = Writeexcel::Worksheet::DataValidation.new(worksheet.__send__("parser"), {})
+    @workbook  = WriteExcel.new(StringIO.new)
+    @worksheet = @workbook.add_worksheet
+    @data_validation = Writeexcel::Worksheet::DataValidation.new(@worksheet.__send__("parser"), {})
   end
 
   def teardown
-    if @workbook.instance_variable_get(:@filehandle)
-      @workbook.instance_variable_get(:@filehandle).close(true)
+    if @workbook.instance_variable_get("@filehandle")
+      @workbook.instance_variable_get("@filehandle").close(true)
     end
-    if @worksheet.instance_variable_get(:@filehandle)
-      @worksheet.instance_variable_get(:@filehandle).close(true)
+    if @worksheet.instance_variable_get("@filehandle")
+      @worksheet.instance_variable_get("@filehandle").close(true)
     end
   end
 

data/test/test_32_validation_dv_formula.rb

@@ -23,11 +23,11 @@ class TC_validation_dv_formula < Minitest::Test
   end
 
   def teardown
-    if @workbook.instance_variable_get(:@filehandle)
-      @workbook.instance_variable_get(:@filehandle).close(true)
+    if @workbook.instance_variable_get("@filehandle")
+      @workbook.instance_variable_get("@filehandle").close(true)
     end
-    if @worksheet.instance_variable_get(:@filehandle)
-      @worksheet.instance_variable_get(:@filehandle).close(true)
+    if @worksheet.instance_variable_get("@filehandle")
+      @worksheet.instance_variable_get("@filehandle").close(true)
     end
   end
 

data/test/test_42_set_properties.rb

@@ -21,28 +21,21 @@ require 'stringio'
 
 class TC_set_properties < Minitest::Test
 
-  def test_dummy
-    assert(true)
-  end
-
   def setup
     @test_file = StringIO.new
   end
 
   def teardown
-    if @workbook.instance_variable_get(:@filehandle)
-      @workbook.instance_variable_get(:@filehandle).close(true)
-    end
-    if @worksheet.instance_variable_get(:@filehandle)
-      @worksheet.instance_variable_get(:@filehandle).close(true)
+    if @workbook.instance_variable_get("@filehandle")
+      @workbook.instance_variable_get("@filehandle").close(true)
     end
   end
 
   def test_same_as_previous_plus_creation_date
     smiley = '☺'   # chr 0x263A;    in perl
 
-    workbook  = WriteExcel.new(@test_file)
-    workbook.add_worksheet
+    @workbook  = WriteExcel.new(@test_file)
+    @workbook.add_worksheet
 
 =begin
     ###############################################################################
@@ -122,7 +115,7 @@ class TC_set_properties < Minitest::Test
   # Test 4. Codepage only.
   #
 
-  workbook.set_properties(
+  @workbook.set_properties(
                               :created     => nil
                            )
 
@@ -135,7 +128,7 @@ class TC_set_properties < Minitest::Test
                               02 00 00 00 E4 04 00 00
                  ).join(' ')
 
-  result     = unpack_record(workbook.summary)
+  result     = unpack_record(@workbook.summary)
   assert_equal(target, result, caption)
 
   ###############################################################################
@@ -143,7 +136,7 @@ class TC_set_properties < Minitest::Test
   # Test 5. Same as previous + Title.
   #
 
-  workbook.set_properties(
+  @workbook.set_properties(
                               :title       => 'Title',
                               :created     => nil
                            )
@@ -158,7 +151,7 @@ class TC_set_properties < Minitest::Test
                               1E 00 00 00 06 00 00 00 54 69 74 6C 65 00 00 00
                 ).join(' ')
 
-  result     = unpack_record(workbook.summary)
+  result     = unpack_record(@workbook.summary)
   assert_equal(target, result, caption)
 
   ###############################################################################
@@ -166,7 +159,7 @@ class TC_set_properties < Minitest::Test
   # Test 6. Same as previous + Subject.
   #
 
-  workbook.set_properties(
+  @workbook.set_properties(
                               :title       => 'Title',
                               :subject     => 'Subject',
                               :created     => nil
@@ -184,7 +177,7 @@ class TC_set_properties < Minitest::Test
                               53 75 62 6A 65 63 74 00
                  ).join(' ')
 
-  result     = unpack_record(workbook.summary)
+  result     = unpack_record(@workbook.summary)
   assert_equal(target, result, caption)
 
   ###############################################################################
@@ -192,7 +185,7 @@ class TC_set_properties < Minitest::Test
   # Test 7. Same as previous + Author.
   #
 
-  workbook.set_properties(
+  @workbook.set_properties(
                               :title       => 'Title',
                               :subject     => 'Subject',
                               :author      => 'Author',
@@ -212,7 +205,7 @@ class TC_set_properties < Minitest::Test
                               1E 00 00 00 07 00 00 00 41 75 74 68 6F 72 00 00
                  ).join(' ')
 
-  result     = unpack_record(workbook.summary)
+  result     = unpack_record(@workbook.summary)
   assert_equal(target, result, caption)
 
   ###############################################################################
@@ -220,7 +213,7 @@ class TC_set_properties < Minitest::Test
   # Test 8. Same as previous + Keywords.
   #
 
-  workbook.set_properties(
+  @workbook.set_properties(
                               :title       => 'Title',
                               :subject     => 'Subject',
                               :author      => 'Author',
@@ -243,7 +236,7 @@ class TC_set_properties < Minitest::Test
                               4B 65 79 77 6F 72 64 73 00 00 00 00
                  ).join(' ')
 
-  result     = unpack_record(workbook.summary)
+  result     = unpack_record(@workbook.summary)
   assert_equal(target, result, caption)
 
   ###############################################################################
@@ -251,7 +244,7 @@ class TC_set_properties < Minitest::Test
   # Test 9. Same as previous + Comments.
   #
 
-  workbook.set_properties(
+  @workbook.set_properties(
                               :title       => 'Title',
                               :subject     => 'Subject',
                               :author      => 'Author',
@@ -277,7 +270,7 @@ class TC_set_properties < Minitest::Test
                               65 6E 74 73 00 00 00 00
                  ).join(' ')
 
-  result     = unpack_record(workbook.summary)
+  result     = unpack_record(@workbook.summary)
   assert_equal(target, result, caption)
 
   ###############################################################################
@@ -285,7 +278,7 @@ class TC_set_properties < Minitest::Test
   # Test 10. Same as previous + Last author.
   #
 
-  workbook.set_properties(
+  @workbook.set_properties(
                               :title       => 'Title',
                               :subject     => 'Subject',
                               :author      => 'Author',
@@ -314,7 +307,7 @@ class TC_set_properties < Minitest::Test
                             00 00 00 00
                  ).join(' ')
 
-  result     = unpack_record(workbook.summary)
+  result     = unpack_record(@workbook.summary)
   assert_equal(target, result, caption)
 
   ###############################################################################
@@ -328,7 +321,7 @@ class TC_set_properties < Minitest::Test
   # different timezones.
 
   filetime   = Time.gm(2008,8,19,23,20,13)
-  workbook.set_properties(
+  @workbook.set_properties(
                               :title       => 'Title',
                               :subject     => 'Subject',
                               :author      => 'Author',
@@ -358,7 +351,7 @@ class TC_set_properties < Minitest::Test
                             80 74 89 21 52 02 C9 01
                  ).join(' ')
 
-  result     = unpack_record(workbook.summary)
+  result     = unpack_record(@workbook.summary)
   assert_equal(target, result, caption)
 
   ###############################################################################
@@ -370,9 +363,9 @@ class TC_set_properties < Minitest::Test
   # $sec,$min,$hour,$mday,$mon,$year
   # We normalise the time using timegm() so that the tests don't fail due to
   # different timezones.
-  workbook.localtime  = Time.gm(2008,8,19,23,20,13)
+  @workbook.localtime  = Time.gm(2008,8,19,23,20,13)
 
-  workbook.set_properties(
+  @workbook.set_properties(
                               :title       => 'Title',
                               :subject     => 'Subject',
                               :author      => 'Author',
@@ -401,7 +394,7 @@ class TC_set_properties < Minitest::Test
                               80 74 89 21 52 02 C9 01
                  ).join(' ')
 
-  result     = unpack_record(workbook.summary)
+  result     = unpack_record(@workbook.summary)
   assert_equal(target, result, caption)
 
   ###############################################################################
@@ -409,10 +402,10 @@ class TC_set_properties < Minitest::Test
   # Test 14. UTF-8 string used.
   #
 
-  workbook.set_properties(
-                              :title       => 'Title' + smiley,
-                              :created     => nil
-                           )
+  @workbook.set_properties(
+    :title       => 'Title' + smiley,
+    :created     => nil
+  )
 
   caption    = " \tset_properties(utf8)"
   target     = %w(
@@ -425,10 +418,10 @@ class TC_set_properties < Minitest::Test
                               00 00 00 00
                  ).join(' ')
 
-  result     = unpack_record(workbook.summary)
+  result     = unpack_record(@workbook.summary)
   assert_equal(target, result, caption)
 
-  workbook.close
+  @workbook.close
 
   end
 end

data/test/test_50_name_stored.rb

@@ -37,8 +37,6 @@ class TC_Name_Stored < Minitest::Test
                00 00 00 06 3B 00 00 00 00 0B 00 00 00 01 00
              ).join('')].pack('H*')
 
-#    result         = _unpack_name(result)
-#    target         = _unpack_name(target)
     assert_equal(unpack_record(target), unpack_record(result))
   end
 
@@ -60,8 +58,6 @@ class TC_Name_Stored < Minitest::Test
               00 00 00 06 3B 02 00 06 00 07 00 06 00 07 00
       ).join('')].pack('H*')
 
-#    result         = _unpack_name(result)
-#    target         = _unpack_name(target)
     assert_equal(unpack_record(target), unpack_record(result))
   end
 
@@ -83,8 +79,6 @@ class TC_Name_Stored < Minitest::Test
         00 00 00 07 3B 00 00 00 00 09 00 00 00 FF 00
      ).join('')].pack('H*')
 
-#    result         = _unpack_name(result)
-#    target         = _unpack_name(target)
     assert_equal(unpack_record(target), unpack_record(result))
   end
 
@@ -129,8 +123,6 @@ class TC_Name_Stored < Minitest::Test
         00 00 00 07 3B 00 00 00 00 FF FF 00 00 09 00
      ).join('')].pack('H*')
 
-#    result         = _unpack_name(result)
-#    target         = _unpack_name(target)
     assert_equal(unpack_record(target), unpack_record(result))
   end
 
@@ -176,8 +168,6 @@ class TC_Name_Stored < Minitest::Test
         00 00 00 0D 3B 00 00 00 00 04 00 00 00 02 00
      ).join('')].pack('H*')
 
-#    result         = _unpack_name(result)
-#    target         = _unpack_name(target)
     assert_equal(unpack_record(target), unpack_record(result))
   end
 

data/writeexcel.gemspec

@@ -5,7 +5,7 @@ require 'writeexcel/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "writeexcel"
-  gem.version       = WriteExcel::VERSION
+  gem.version       = Writeexcel::VERSION
   gem.authors       = ["Hideo NAKAMURA"]
   gem.email         = ["nakamura.hideo@gmail.com"]
   gem.description   = "Multiple worksheets can be added to a workbook and formatting can be applied to cells. Text, numbers, formulas, hyperlinks and images can be written to the cells."
@@ -17,7 +17,9 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+  gem.required_ruby_version = '>= 2.4.0'
   gem.add_development_dependency 'minitest'
+  gem.add_runtime_dependency 'racc' if RUBY_VERSION >= '3.3'
   gem.add_development_dependency 'rake'
   gem.extra_rdoc_files = [
     "LICENSE.txt",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: writeexcel
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-03 00:00:00.000000000 Z
+date: 2024-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -65,8 +65,8 @@ extra_rdoc_files:
 files:
 - ".document"
 - ".gitattributes"
+- ".github/workflows/test-suite.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.rdoc
@@ -331,14 +331,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Write to a cross-platform Excel binary file.

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-- 2.2.0
-- 2.1.5
-- 2.1.2
-- 2.1.1
-- 2.0.0
-- 1.9.3