write_xlsx 1.09.5 → 1.10.0

data/lib/write_xlsx/worksheet.rb

@@ -44,7 +44,7 @@ module Writexlsx
       @index = index
       @name = name
       @colinfo = {}
-      @cell_data_table = {}
+      @cell_data_table = []
       @excel_version = 2007
       @palette = workbook.palette
       @default_url_format = workbook.default_url_format
@@ -61,6 +61,7 @@ module Writexlsx
       @selections           = []
       @panes                = []
       @hide_row_col_headers = 0
+      @top_left_cell        = ''
 
       @tab_color  = 0
 
@@ -103,6 +104,9 @@ module Writexlsx
       @vml_drawing_rels       = {}
       @vml_drawing_rels_id    = 0
       @has_dynamic_arrays     = false
+
+      @use_future_functions  = false
+
       @header_images          = []
       @footer_images          = []
       @background_image       = ''
@@ -256,8 +260,8 @@ module Writexlsx
       if range.nil?
         raise "The range must be defined in unprotect_range())\n"
       else
-        range.gsub!(/\$/, "")
-        range.sub!(/^=/, "")
+        range = range.gsub(/\$/, "")
+        range = range.sub(/^=/, "")
         @num_protected_ranges += 1
       end
 
@@ -410,6 +414,18 @@ module Writexlsx
       @selections = [[nil, active_cell, sqref]]
     end
 
+    ###############################################################################
+    #
+    # set_top_left_cell()
+    #
+    # Set the first visible cell at the top left of the worksheet.
+    #
+    def set_top_left_cell(*args)
+      row, col = row_col_notation(args)
+
+      @top_left_cell = xl_rowcol_to_cell(row, col)
+    end
+
     #
     # :call-seq:
     #   freeze_panes(row, col [ , top_row, left_col ] )
@@ -813,7 +829,8 @@ module Writexlsx
     # Set the option to print the worksheet in black and white.
     #
     def print_black_and_white
-      @page_setup.black_white = true
+      @page_setup.black_white        = true
+      @page_setup.page_setup_changed = true
     end
 
     #
@@ -878,8 +895,11 @@ module Writexlsx
       token = row_col_args[2] || ''
       token = token.to_s if token.instance_of?(Time)
 
+      fmt = row_col_args[3]
+      if fmt.respond_to?(:force_text_format?) && fmt.force_text_format?
+        write_string(*args) # Force text format
       # Match an array ref.
-      if token.respond_to?(:to_ary)
+      elsif token.respond_to?(:to_ary)
         write_row(*args)
       elsif token.respond_to?(:coerce)  # Numeric
         write_number(*args)
@@ -918,7 +938,7 @@ module Writexlsx
 
     #
     # :call-seq:
-    #   write_row(row, col, array [ , format ] )
+    #   write_row(row, col, array [ , format ])
     #
     # Write a row of data starting from (row, col). Call write_col() if any of
     # the elements of the array are in turn array. This allows the writing
@@ -942,7 +962,7 @@ module Writexlsx
 
     #
     # :call-seq:
-    #   write_col(row, col, array [ , format ] )
+    #   write_col(row, col, array [ , format ])
     #
     # Write a column of data starting from (row, col). Call write_row() if any of
     # the elements of the array are in turn array. This allows the writing
@@ -981,7 +1001,7 @@ module Writexlsx
 
     #
     # :call-seq:
-    #   write_number(row, column, number [ , format ] )
+    #   write_number(row, column, number [ , format ])
     #
     # Write an integer or a float to the cell specified by row and column:
     #
@@ -994,12 +1014,12 @@ module Writexlsx
       check_dimensions(row, col)
       store_row_col_max_min_values(row, col)
 
-      store_data_to_table(NumberCellData.new(self, row, col, num, xf))
+      store_data_to_table(NumberCellData.new(num, xf), row, col)
     end
 
     #
     # :call-seq:
-    #   write_string(row, column, string [, format ] )
+    #   write_string(row, column, string [, format ])
     #
     # Write a string to the specified row and column (zero indexed).
     # +format+ is optional.
@@ -1016,12 +1036,12 @@ module Writexlsx
 
       index = shared_string_index(str.length > STR_MAX ? str[0, STR_MAX] : str)
 
-      store_data_to_table(StringCellData.new(self, row, col, index, xf))
+      store_data_to_table(StringCellData.new(index, xf), row, col)
     end
 
     #
     # :call-seq:
-    #    write_rich_string(row, column, (string | format, string)+,  [,cell_format] )
+    #    write_rich_string(row, column, (string | format, string)+,  [,cell_format])
     #
     # The write_rich_string() method is used to write strings with multiple formats.
     # The method receives string fragments prefixed by format objects. The final
@@ -1044,7 +1064,7 @@ module Writexlsx
 
       index = shared_string_index(xml_str_of_rich_string(fragments))
 
-      store_data_to_table(StringCellData.new(self, row, col, index, xf))
+      store_data_to_table(StringCellData.new(index, xf), row, col)
     end
 
     #
@@ -1067,12 +1087,177 @@ module Writexlsx
       check_dimensions(row, col)
       store_row_col_max_min_values(row, col)
 
-      store_data_to_table(BlankCellData.new(self, row, col, xf))
+      store_data_to_table(BlankCellData.new(xf), row, col)
     end
 
+    def expand_formula(formula, function, addition = '')
+      if formula =~ /\b(#{function})/
+        formula.gsub(
+          ::Regexp.last_match(1),
+          "_xlfn#{addition}.#{::Regexp.last_match(1)}"
+        )
+      else
+        formula
+      end
+    end
+    private :expand_formula
+
+    #
+    # Utility method to strip equal sign and array braces from a formula
+    # and also expand out future and dynamic array formulas.
+    #
+    def prepare_formula(given_formula)
+      # Ignore empty/null formulas.
+      return given_formula unless ptrue?(given_formula)
+
+      # Remove array formula braces and the leading =.
+      formula = given_formula.sub(/^\{(.*)\}$/, '\1').sub(/^=/, '')
+
+      # # Don't expand formulas that the user has already expanded.
+      return formula if formula =~ /_xlfn\./
+
+      # Expand dynamic array formulas.
+      formula = expand_formula(formula, 'LET\(')
+      formula = expand_formula(formula, 'LAMBDA\(')
+      formula = expand_formula(formula, 'SINGLE\(')
+      formula = expand_formula(formula, 'SORTBY\(')
+      formula = expand_formula(formula, 'UNIQUE\(')
+      formula = expand_formula(formula, 'XMATCH\(')
+      formula = expand_formula(formula, 'XLOOKUP\(')
+      formula = expand_formula(formula, 'SEQUENCE\(')
+      formula = expand_formula(formula, 'RANDARRAY\(')
+      formula = expand_formula(formula, 'SORT\(', '._xlws')
+      formula = expand_formula(formula, 'ANCHORARRAY\(')
+      formula = expand_formula(formula, 'FILTER\(', '._xlws')
+
+      return formula unless @use_future_functions
+
+      # Future functions.
+      formula = expand_formula(formula, 'ACOTH\(')
+      formula = expand_formula(formula, 'ACOT\(')
+      formula = expand_formula(formula, 'AGGREGATE\(')
+      formula = expand_formula(formula, 'ARABIC\(')
+      formula = expand_formula(formula, 'BASE\(')
+      formula = expand_formula(formula, 'BETA.DIST\(')
+      formula = expand_formula(formula, 'BETA.INV\(')
+      formula = expand_formula(formula, 'BINOM.DIST.RANGE\(')
+      formula = expand_formula(formula, 'BINOM.DIST\(')
+      formula = expand_formula(formula, 'BINOM.INV\(')
+      formula = expand_formula(formula, 'BITAND\(')
+      formula = expand_formula(formula, 'BITLSHIFT\(')
+      formula = expand_formula(formula, 'BITOR\(')
+      formula = expand_formula(formula, 'BITRSHIFT\(')
+      formula = expand_formula(formula, 'BITXOR\(')
+      formula = expand_formula(formula, 'CEILING.MATH\(')
+      formula = expand_formula(formula, 'CEILING.PRECISE\(')
+      formula = expand_formula(formula, 'CHISQ.DIST.RT\(')
+      formula = expand_formula(formula, 'CHISQ.DIST\(')
+      formula = expand_formula(formula, 'CHISQ.INV.RT\(')
+      formula = expand_formula(formula, 'CHISQ.INV\(')
+      formula = expand_formula(formula, 'CHISQ.TEST\(')
+      formula = expand_formula(formula, 'COMBINA\(')
+      formula = expand_formula(formula, 'CONCAT\(')
+      formula = expand_formula(formula, 'CONFIDENCE.NORM\(')
+      formula = expand_formula(formula, 'CONFIDENCE.T\(')
+      formula = expand_formula(formula, 'COTH\(')
+      formula = expand_formula(formula, 'COT\(')
+      formula = expand_formula(formula, 'COVARIANCE.P\(')
+      formula = expand_formula(formula, 'COVARIANCE.S\(')
+      formula = expand_formula(formula, 'CSCH\(')
+      formula = expand_formula(formula, 'CSC\(')
+      formula = expand_formula(formula, 'DAYS\(')
+      formula = expand_formula(formula, 'DECIMAL\(')
+      formula = expand_formula(formula, 'ERF.PRECISE\(')
+      formula = expand_formula(formula, 'ERFC.PRECISE\(')
+      formula = expand_formula(formula, 'EXPON.DIST\(')
+      formula = expand_formula(formula, 'F.DIST.RT\(')
+      formula = expand_formula(formula, 'F.DIST\(')
+      formula = expand_formula(formula, 'F.INV.RT\(')
+      formula = expand_formula(formula, 'F.INV\(')
+      formula = expand_formula(formula, 'F.TEST\(')
+      formula = expand_formula(formula, 'FILTERXML\(')
+      formula = expand_formula(formula, 'FLOOR.MATH\(')
+      formula = expand_formula(formula, 'FLOOR.PRECISE\(')
+      formula = expand_formula(formula, 'FORECAST.ETS.CONFINT\(')
+      formula = expand_formula(formula, 'FORECAST.ETS.SEASONALITY\(')
+      formula = expand_formula(formula, 'FORECAST.ETS.STAT\(')
+      formula = expand_formula(formula, 'FORECAST.ETS\(')
+      formula = expand_formula(formula, 'FORECAST.LINEAR\(')
+      formula = expand_formula(formula, 'FORMULATEXT\(')
+      formula = expand_formula(formula, 'GAMMA.DIST\(')
+      formula = expand_formula(formula, 'GAMMA.INV\(')
+      formula = expand_formula(formula, 'GAMMALN.PRECISE\(')
+      formula = expand_formula(formula, 'GAMMA\(')
+      formula = expand_formula(formula, 'GAUSS\(')
+      formula = expand_formula(formula, 'HYPGEOM.DIST\(')
+      formula = expand_formula(formula, 'IFNA\(')
+      formula = expand_formula(formula, 'IFS\(')
+      formula = expand_formula(formula, 'IMCOSH\(')
+      formula = expand_formula(formula, 'IMCOT\(')
+      formula = expand_formula(formula, 'IMCSCH\(')
+      formula = expand_formula(formula, 'IMCSC\(')
+      formula = expand_formula(formula, 'IMSECH\(')
+      formula = expand_formula(formula, 'IMSEC\(')
+      formula = expand_formula(formula, 'IMSINH\(')
+      formula = expand_formula(formula, 'IMTAN\(')
+      formula = expand_formula(formula, 'ISFORMULA\(')
+      formula = expand_formula(formula, 'ISOWEEKNUM\(')
+      formula = expand_formula(formula, 'LOGNORM.DIST\(')
+      formula = expand_formula(formula, 'LOGNORM.INV\(')
+      formula = expand_formula(formula, 'MAXIFS\(')
+      formula = expand_formula(formula, 'MINIFS\(')
+      formula = expand_formula(formula, 'MODE.MULT\(')
+      formula = expand_formula(formula, 'MODE.SNGL\(')
+      formula = expand_formula(formula, 'MUNIT\(')
+      formula = expand_formula(formula, 'NEGBINOM.DIST\(')
+      formula = expand_formula(formula, 'NORM.DIST\(')
+      formula = expand_formula(formula, 'NORM.INV\(')
+      formula = expand_formula(formula, 'NORM.S.DIST\(')
+      formula = expand_formula(formula, 'NORM.S.INV\(')
+      formula = expand_formula(formula, 'NUMBERVALUE\(')
+      formula = expand_formula(formula, 'PDURATION\(')
+      formula = expand_formula(formula, 'PERCENTILE.EXC\(')
+      formula = expand_formula(formula, 'PERCENTILE.INC\(')
+      formula = expand_formula(formula, 'PERCENTRANK.EXC\(')
+      formula = expand_formula(formula, 'PERCENTRANK.INC\(')
+      formula = expand_formula(formula, 'PERMUTATIONA\(')
+      formula = expand_formula(formula, 'PHI\(')
+      formula = expand_formula(formula, 'POISSON.DIST\(')
+      formula = expand_formula(formula, 'QUARTILE.EXC\(')
+      formula = expand_formula(formula, 'QUARTILE.INC\(')
+      formula = expand_formula(formula, 'QUERYSTRING\(')
+      formula = expand_formula(formula, 'RANK.AVG\(')
+      formula = expand_formula(formula, 'RANK.EQ\(')
+      formula = expand_formula(formula, 'RRI\(')
+      formula = expand_formula(formula, 'SECH\(')
+      formula = expand_formula(formula, 'SEC\(')
+      formula = expand_formula(formula, 'SHEETS\(')
+      formula = expand_formula(formula, 'SHEET\(')
+      formula = expand_formula(formula, 'SKEW.P\(')
+      formula = expand_formula(formula, 'STDEV.P\(')
+      formula = expand_formula(formula, 'STDEV.S\(')
+      formula = expand_formula(formula, 'SWITCH\(')
+      formula = expand_formula(formula, 'T.DIST.2T\(')
+      formula = expand_formula(formula, 'T.DIST.RT\(')
+      formula = expand_formula(formula, 'T.DIST\(')
+      formula = expand_formula(formula, 'T.INV.2T\(')
+      formula = expand_formula(formula, 'T.INV\(')
+      formula = expand_formula(formula, 'T.TEST\(')
+      formula = expand_formula(formula, 'TEXTJOIN\(')
+      formula = expand_formula(formula, 'UNICHAR\(')
+      formula = expand_formula(formula, 'UNICODE\(')
+      formula = expand_formula(formula, 'VAR.P\(')
+      formula = expand_formula(formula, 'VAR.S\(')
+      formula = expand_formula(formula, 'WEBSERVICE\(')
+      formula = expand_formula(formula, 'WEIBULL.DIST\(')
+      formula = expand_formula(formula, 'XOR\(')
+      expand_formula(formula, 'Z.TEST\(')
+    end
+    private :prepare_formula
+
     #
     # :call-seq:
-    #   write_formula(row, column, formula [ , format [ , value ] ] )
+    #   write_formula(row, column, formula [ , format [ , value ] ])
     #
     # Write a formula or function to the cell specified by +row+ and +column+:
     #
@@ -1081,6 +1266,15 @@ module Writexlsx
       row, col, formula, format, value = row_col_notation(args)
       raise WriteXLSXInsufficientArgumentError if [row, col, formula].include?(nil)
 
+      # Check for dynamic array functions.
+      regex = /\bLET\(|\bSORT\(|\bLAMBDA\(|\bSINGLE\(|\bSORTBY\(|\bUNIQUE\(|\bXMATCH\(|\bFILTER\(|\bXLOOKUP\(|\bSEQUENCE\(|\bRANDARRAY\(|\bANCHORARRAY\(/
+      if formula =~ regex
+        return write_dynamic_array_formula(
+          row, col, row, col, formula, format, value
+        )
+      end
+
+      # Hand off array formulas.
       if formula =~ /^\{=.*\}$/
         write_array_formula(row, col, row, col, formula, format, value)
       else
@@ -1088,7 +1282,7 @@ module Writexlsx
         store_row_col_max_min_values(row, col)
         formula = formula.sub(/^=/, '')
 
-        store_data_to_table(FormulaCellData.new(self, row, col, formula, format, value))
+        store_data_to_table(FormulaCellData.new(formula, format, value), row, col)
       end
     end
 
@@ -1098,7 +1292,15 @@ module Writexlsx
     #
     def write_array_formula_base(type, *args)
       # Check for a cell reference in A1 notation and substitute row and column
-      row1, col1, row2, col2, formula, xf, value = row_col_notation(args)
+      # Convert single cell to range
+      if args.first.to_s =~ /^([A-Za-z]+[0-9]+)$/
+        range = "#{::Regexp.last_match(1)}:#{::Regexp.last_match(1)}"
+        params = [range] + args[1..]
+      else
+        params = args
+      end
+
+      row1, col1, row2, col2, formula, xf, value = row_col_notation(params)
       raise WriteXLSXInsufficientArgumentError if [row1, col1, row2, col2, formula].include?(nil)
 
       # Swap last row/col with first row/col as necessary
@@ -1118,17 +1320,18 @@ module Writexlsx
                 "#{xl_rowcol_to_cell(row1, col1)}:#{xl_rowcol_to_cell(row2, col2)}"
               end
 
-      # Remove array formula braces and the leading =.
-      formula = formula.sub(/^\{(.*)\}$/, '\1').sub(/^=/, '')
+      # Modify the formula string, as needed.
+      formula = prepare_formula(formula)
 
       store_data_to_table(
         if type == 'a'
-          FormulaArrayCellData.new(self, row1, col1, formula, xf, range, value)
+          FormulaArrayCellData.new(formula, xf, range, value)
         elsif type == 'd'
-          DynamicFormulaArrayCellData.new(self, row1, col1, formula, xf, range, value)
+          DynamicFormulaArrayCellData.new(formula, xf, range, value)
         else
           raise "invalid type in write_array_formula_base()."
-        end
+        end,
+        row1, col1
       )
 
       # Pad out the rest of the area with formatted zeroes.
@@ -1176,7 +1379,7 @@ module Writexlsx
       check_dimensions(row, col)
       store_row_col_max_min_values(row, col)
 
-      store_data_to_table(BooleanCellData.new(self, row, col, val, xf))
+      store_data_to_table(BooleanCellData.new(val, xf), row, col)
     end
 
     #
@@ -1271,7 +1474,7 @@ module Writexlsx
 
     #
     # :call-seq:
-    #   write_url(row, column, url [ , format, label, tip ] )
+    #   write_url(row, column, url [ , format, label, tip ])
     #
     # Write a hyperlink to a URL in the cell specified by +row+ and +column+.
     # The hyperlink is comprised of two elements: the visible label and
@@ -1304,7 +1507,7 @@ module Writexlsx
 
     #
     # :call-seq:
-    #   write_date_time (row, col, date_string [ , format ] )
+    #   write_date_time (row, col, date_string [ , format ])
     #
     # Write a datetime string in ISO8601 "yyyy-mm-ddThh:mm:ss.ss" format as a
     # number representing an Excel date. format is optional.
@@ -1321,7 +1524,7 @@ module Writexlsx
       date_time = convert_date_time(str)
 
       if date_time
-        store_data_to_table(NumberCellData.new(self, row, col, date_time, xf))
+        store_data_to_table(NumberCellData.new(date_time, xf), row, col)
       else
         # If the date isn't valid then write it as a string.
         write_string(*args)
@@ -1330,7 +1533,7 @@ module Writexlsx
 
     #
     # :call-seq:
-    #   insert_chart(row, column, chart [ , x, y, x_scale, y_scale ] )
+    #   insert_chart(row, column, chart [ , x, y, x_scale, y_scale ])
     #
     # This method can be used to insert a Chart object into a worksheet.
     # The Chart must be created by the add_chart() Workbook method and
@@ -1343,12 +1546,13 @@ module Writexlsx
 
       if options.first.instance_of?(Hash)
         params = options.first
-        x_offset = params[:x_offset]
-        y_offset = params[:y_offset]
-        x_scale  = params[:x_scale]
-        y_scale  = params[:y_scale]
-        anchor   = params[:object_position]
-
+        x_offset    = params[:x_offset]
+        y_offset    = params[:y_offset]
+        x_scale     = params[:x_scale]
+        y_scale     = params[:y_scale]
+        anchor      = params[:object_position]
+        description = params[:description]
+        decorative  = params[:decorative]
       else
         x_offset, y_offset, x_scale, y_scale, anchor = options
       end
@@ -1374,7 +1578,10 @@ module Writexlsx
       x_offset = chart.x_offset if ptrue?(chart.x_offset)
       y_offset = chart.y_offset if ptrue?(chart.y_offset)
 
-      @charts << [row, col, chart, x_offset, y_offset, x_scale, y_scale, anchor]
+      @charts << [
+        row,     col,     chart,  x_offset,    y_offset,
+        x_scale, y_scale, anchor, description, decorative
+      ]
     end
 
     #
@@ -1415,7 +1622,7 @@ module Writexlsx
 
     #
     # :call-seq:
-    #   repeat_formula(row, column, formula [ , format ] )
+    #   repeat_formula(row, column, formula [ , format ])
     #
     # Deprecated. This is a writeexcel gem's method that is no longer
     # required by WriteXLSX.
@@ -1450,7 +1657,7 @@ module Writexlsx
 
     #
     # :call-seq:
-    #   set_row(row [ , height, format, hidden, level, collapsed ] )
+    #   set_row(row [ , height, format, hidden, level, collapsed ])
     #
     # This method can be used to change the default properties of a row.
     # All parameters apart from +row+ are optional.
@@ -1866,7 +2073,9 @@ module Writexlsx
     def prepare_chart(index, chart_id, drawing_id) # :nodoc:
       drawing_type = 1
 
-      row, col, chart, x_offset, y_offset, x_scale, y_scale, anchor = @charts[index]
+      row,     col,     chart,  x_offset,    y_offset,
+      x_scale, y_scale, anchor, description, decorative = @charts[index]
+
       chart.id = chart_id - 1
       x_scale ||= 0
       y_scale ||= 0
@@ -1884,7 +2093,7 @@ module Writexlsx
       name = chart.name
 
       # Create a Drawing object to use with worksheet unless one already exists.
-      drawing = Drawing.new(drawing_type, dimensions, 0, 0, name, nil, anchor, drawing_rel_index, 0, nil, 0)
+      drawing = Drawing.new(drawing_type, dimensions, 0, 0, nil, anchor, drawing_rel_index, 0, nil, name, description, decorative)
       if drawings?
         @drawings.add_drawing_object(drawing)
       else
@@ -2603,7 +2812,7 @@ module Writexlsx
       height = (0.5 + (height * 9_525)).to_i
 
       # Create a Drawing object to use with worksheet unless one already exists.
-      drawing = Drawing.new(drawing_type, dimensions, width, height, name, nil, anchor, 0, 0, tip, decorative)
+      drawing = Drawing.new(drawing_type, dimensions, width, height, nil, anchor, 0, 0, tip, name, description, decorative)
       if drawings?
         drawings = @drawings
       else
@@ -2616,7 +2825,7 @@ module Writexlsx
       end
       drawings.add_drawing_object(drawing)
 
-      drawing.description = description if description
+      drawing.description = name unless description
 
       if url
         rel_type = '/hyperlink'
@@ -2689,7 +2898,7 @@ EOS
 
     #
     # :call-seq:
-    #   insert_shape(row, col, shape [ , x, y, x_scale, y_scale ] )
+    #   insert_shape(row, col, shape [ , x, y, x_scale, y_scale ])
     #
     # Insert a shape into the worksheet.
     #
@@ -2760,7 +2969,7 @@ EOS
       drawing_type = 3
       drawing = Drawing.new(
         drawing_type, shape.dimensions, shape.width_emu, shape.height_emu,
-        shape.name, shape, shape.anchor, drawing_rel_index, 0, nil, 0
+        shape, shape.anchor, drawing_rel_index, 0, shape.name, nil, 0
       )
       drawings.add_drawing_object(drawing)
     end
@@ -2787,6 +2996,9 @@ EOS
                        "[0]!Button#{button_number}_Click"
                      end
 
+      # Set the alt text for the button.
+      button.description = params[:description]
+
       # Ensure that a width and height have been set.
       default_width  = @default_col_pixels
       default_height = @default_row_pixels
@@ -2964,6 +3176,9 @@ EOS
       # TODO. Add pageBreakPreview mode when requested.
       attributes << %w[view pageLayout] if page_view?
 
+      # Set the first visible cell.
+      attributes << ['topLeftCell', @top_left_cell] if ptrue?(@top_left_cell)
+
       # Set the zoom level.
       if @zoom != 100
         attributes << ['zoomScale', @zoom] unless page_view?
@@ -3119,7 +3334,7 @@ EOS
 
     def write_cell_column_dimension(row_num)  # :nodoc:
       (@dim_colmin..@dim_colmax).each do |col_num|
-        @cell_data_table[row_num][col_num].write_cell if @cell_data_table[row_num][col_num]
+        @cell_data_table[row_num][col_num].write_cell(self, row_num, col_num) if @cell_data_table[row_num][col_num]
       end
     end
 
@@ -3984,13 +4199,11 @@ EOS
       end
     end
 
-    def store_data_to_table(cell_data) # :nodoc:
-      row = cell_data.row
-      col = cell_data.col
+    def store_data_to_table(cell_data, row, col) # :nodoc:
       if @cell_data_table[row]
         @cell_data_table[row][col] = cell_data
       else
-        @cell_data_table[row] = {}
+        @cell_data_table[row] = []
         @cell_data_table[row][col] = cell_data
       end
     end

data/lib/write_xlsx/zip_file_utils.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 #
 # from http://d.hatena.ne.jp/alunko/20071021

data/lib/write_xlsx.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/workbook'
 

data/write_xlsx.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |gem|
   gem.summary       = 'write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.'
   gem.homepage      = 'https://github.com/cxn03651/write_xlsx#readme'
   gem.license       = 'MIT'
+  gem.required_ruby_version = '>= 2.5.0'
 
   gem.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 1.09.5
+  version: 1.10.0
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -158,6 +158,7 @@ files:
 - examples/defined_name.rb
 - examples/demo.rb
 - examples/diag_border.rb
+- examples/dynamic_arrays.rb
 - examples/formats.rb
 - examples/headers.rb
 - examples/hide_row_col.rb
@@ -166,6 +167,7 @@ files:
 - examples/ignore_errors.rb
 - examples/indent.rb
 - examples/keep_leading_zeros.rb
+- examples/lambda.rb
 - examples/macros.rb
 - examples/merge1.rb
 - examples/merge2.rb
@@ -200,6 +202,8 @@ files:
 - examples/tables.rb
 - examples/update_range_format_with_params.rb
 - examples/vbaProject.bin
+- examples/watermark.png
+- examples/watermark.rb
 - lib/write_xlsx.rb
 - lib/write_xlsx/chart.rb
 - lib/write_xlsx/chart/area.rb
@@ -264,14 +268,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.