write_xlsx 1.10.2 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74c1fe583292a7a5318db09651b114e58358646a8706b5b4d35fc01c1850ec6c
-  data.tar.gz: 424d3f3a1983e4de16de9a943c67718874e7ef7e4a78c440767ecf8c68f0ef88
+  metadata.gz: 14a7593970ecc4db14f2accbdc1634033ac9042cdd7680a20d4400ea1eda741f
+  data.tar.gz: 2ec671ba25dc571f612dc5b9d4a9c4ede2e147203d2e085313ea8b4a5f774377
 SHA512:
-  metadata.gz: 4603c1400dd60ec345b8cf4db50ae1c03e87716192a074d2a767cebc7cfc085439c733ea11167cf900efc3aae3fe555a32639731d36338100bf9fbb170f28fd5
-  data.tar.gz: 3ccbb69460382ae8074cc62fc896daa1aa608dbbb6ff894bb1fc425643c0ac3b9e91cc55b0c8e2de05a50113b179621db83fcea033b9b201bf56957f833624e3
+  metadata.gz: 255b8f5d60623d6c9966ba1209773129d3312238df315a16564d8c950fa39ac738296a9c788d4cb707abad7e659e9eaef528749fa7f1de7f93a2152e0534fbb4
+  data.tar.gz: c161bd9e8cfe47754f763a874ab83b183f76d7d290ecc53db1fa7a1ea1ec4433ee1d80efda0c139417321f02069db690fc113ab54104b5922b9c942210949e60

data/.rubocop.yml

@@ -8,6 +8,9 @@ AllCops:
   TargetRubyVersion: 2.6
   NewCops: enable
 
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
 Gemspec/RequiredRubyVersion:
   Enabled: false
 
@@ -33,6 +36,9 @@ Layout/HeredocIndentation:
 Layout/LineLength:
   Max: 7000
 
+Layout/MultilineMethodCallIndentation:
+  Enabled: false
+
 Lint/DuplicateBranch:
   IgnoreLiteralBranches: true
   Exclude:
@@ -60,6 +66,9 @@ Metrics/CyclomaticComplexity:
 Metrics/MethodLength:
   Max: 400
 
+Metrics/ModuleLength:
+  Max: 1000
+
 Metrics/ParameterLists:
   Max: 12
   MaxOptionalParameters: 6

data/Changes

@@ -1,5 +1,20 @@
 Change history of write_xlsx rubygem.
 
+2023-05-06 v1.11.0
+    Added support for simulated worksheet `autofit()`.
+
+    Refactored internal column property handling to allow column ranges
+    to be overridden (a common UX expectation).
+
+    Add `quote_prefix` format property.
+
+    Fix for duplicate number formats. Issue #283(excel-write-xlsx)
+
+    Add fix for worksheets with tables and background images.
+
+    Replace/fix the worksheet protection password algorithm
+    so that is works correctly for strings over 24 chars.
+
 2023-02-16 v1.10.2
     Fixed issue #104. Worksheet#write Ruby 3.2 removed Object#=~
     making it impossible to write Date objects

data/examples/autofit.rb

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+#
+# An example of using simulated autofit to automatically adjust the width of
+# worksheet columns based on the data in the cells.
+#
+# Copyright 2000-2023, John McNamara, jmcnamara@cpan.org
+#
+# SPDX-License-Identifier: Artistic-1.0-Perl OR GPL-1.0-or-later
+#
+# convert to Ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
+#
+require 'write_xlsx'
+
+workbook   = WriteXLSX.new('autofit.xlsx')
+worksheet  = workbook.add_worksheet
+
+# Write some worksheet data to demonstrate autofitting.
+worksheet.write(0, 0, "Foo")
+worksheet.write(1, 0, "Food")
+worksheet.write(2, 0, "Foody")
+worksheet.write(3, 0, "Froody")
+
+worksheet.write(0, 1, 12345)
+worksheet.write(1, 1, 12345678)
+worksheet.write(2, 1, 12345)
+
+worksheet.write(0, 2, "Some longer text")
+
+worksheet.write(0, 3, 'http://www.google.com')
+worksheet.write(1, 3, 'https://github.com')
+
+# Autofit the worksheet
+worksheet.autofit
+
+workbook.close

data/examples/chart_radar.rb

@@ -44,10 +44,8 @@ chart1.add_series(
   values:     ['Sheet1', 1, 6, 2, 2]
 )
 
-# Add a chart title and some axis labels.
+# Add a chart title.
 chart1.set_title(name: 'Results of sample analysis')
-chart1.set_x_axis(name: 'Test number')
-chart1.set_y_axis(name: 'Sample length (mm)')
 
 # Set an Excel chart style. Blue colors with white outline and shadow.
 chart1.set_style(11)
@@ -81,10 +79,8 @@ chart2.add_series(
   values:     ['Sheet1', 1, 6, 2, 2]
 )
 
-# Add a chart title and some axis labels.
+# Add a chart title.
 chart2.set_title(name: 'Stacked Chart')
-chart2.set_x_axis(name: 'Test number')
-chart2.set_y_axis(name: 'Sample length (mm)')
 
 # Set an Excel chart style. Blue colors with white outline and shadow.
 chart2.set_style(12)
@@ -118,10 +114,8 @@ chart3.add_series(
   values:     ['Sheet1', 1, 6, 2, 2]
 )
 
-# Add a chart title and some axis labels.
+# Add a chart title.
 chart3.set_title(name: 'Percent Stacked Chart')
-chart3.set_x_axis(name: 'Test number')
-chart3.set_y_axis(name: 'Sample length (mm)')
 
 # Set an Excel chart style. Blue colors with white outline and shadow.
 chart3.set_style(13)

data/lib/write_xlsx/chart.rb

@@ -371,7 +371,7 @@ module Writexlsx
     # Set on of the 42 built-in Excel chart styles. The default style is 2.
     #
     def set_style(style_id = 2)
-      style_id = 2 if style_id < 0 || style_id > 48
+      style_id = 2 if style_id < 1 || style_id > 48
       @style_id = style_id
     end
 

data/lib/write_xlsx/format.rb

@@ -12,7 +12,7 @@ module Writexlsx
     attr_reader :diag_type, :diag_color, :font_only, :color_indexed                        # :nodoc:
     attr_reader :left, :left_color, :right, :right_color, :top, :top_color, :bottom, :bottom_color # :nodoc:
     attr_reader :font_scheme                                                                       # :nodoc:
-    attr_accessor :num_format_index, :border_index, :font_index                                    # :nodoc:
+    attr_accessor :quote_prefix, :num_format_index, :border_index, :font_index                                    # :nodoc:
     attr_accessor :fill_index, :font_condense, :font_extend, :diag_border                          # :nodoc:
     attr_accessor :bg_color, :fg_color, :pattern                                                   # :nodoc:
 
@@ -84,6 +84,7 @@ module Writexlsx
       @just_distrib   = 0
       @color_indexed  = 0
       @font_only      = 0
+      @quote_prefix   = 0
 
       set_format_properties(params) unless params.empty?
     end
@@ -213,7 +214,7 @@ module Writexlsx
     # Returns a unique hash key for the Format object.
     #
     def get_format_key
-      [get_font_key, get_border_key, get_fill_key, get_alignment_key, @num_format, @locked, @hidden].join(':')
+      [get_font_key, get_border_key, get_fill_key, get_alignment_key, @num_format, @locked, @hidden, @quote_prefix].join(':')
     end
 
     #
@@ -642,6 +643,7 @@ module Writexlsx
         ['borderId', border_index],
         ['xfId', xf_id]
       ]
+      attributes << ['quotePrefix', 1] if ptrue?(quote_prefix)
       attributes << ['applyNumberFormat', 1] if num_format_index > 0
       # Add applyFont attribute if XF format uses a font element.
       attributes << ['applyFont', 1] if font_index > 0 && !ptrue?(@hyperlink)

data/lib/write_xlsx/package/shared_strings.rb

@@ -11,11 +11,14 @@ module Writexlsx
 
       PRESERVE_SPACE_ATTRIBUTES = ['xml:space', 'preserve'].freeze
 
+      attr_reader :strings
+
       def initialize
         @writer        = Package::XMLWriterSimple.new
         @strings       = [] # string table
         @strings_index = {} # string table index
         @count         = 0 # count
+        @str_unique    = 0
       end
 
       def index(string, params = {})
@@ -25,10 +28,9 @@ module Writexlsx
 
       def add(string)
         unless @strings_index[string]
-          # Only first time the string will be append to list
-          # next time we only check and not #dup it
           str = string.frozen? ? string : string.freeze
           @strings << str
+          @str_unique += 1
           @strings_index[str] = @strings.size - 1
         end
         @count += 1
@@ -128,7 +130,7 @@ module Writexlsx
       end
 
       def unique_count
-        @strings.size
+        @str_unique
       end
     end
   end

data/lib/write_xlsx/package/styles.rb

@@ -14,7 +14,7 @@ module Writexlsx
         @xf_formats        = nil
         @palette           = []
         @font_count        = 0
-        @num_format_count  = 0
+        @num_formats       = []
         @border_count      = 0
         @fill_count        = 0
         @custom_colors     = []
@@ -38,18 +38,18 @@ module Writexlsx
       # Pass in the Format objects and other properties used to set the styles.
       #
       def set_style_properties(
-            xf_formats, palette, font_count, num_format_count, border_count,
+            xf_formats, palette, font_count, num_formats, border_count,
             fill_count, custom_colors, dxf_formats, has_comments
           )
-        @xf_formats       = xf_formats
-        @palette          = palette
-        @font_count       = font_count
-        @num_format_count = num_format_count
-        @border_count     = border_count
-        @fill_count       = fill_count
-        @custom_colors    = custom_colors
-        @dxf_formats      = dxf_formats
-        @has_comments     = has_comments
+        @xf_formats    = xf_formats
+        @palette       = palette
+        @font_count    = font_count
+        @num_formats   = num_formats
+        @border_count  = border_count
+        @fill_count    = fill_count
+        @custom_colors = custom_colors
+        @dxf_formats   = dxf_formats
+        @has_comments  = has_comments
       end
 
       #
@@ -77,7 +77,7 @@ module Writexlsx
       # Write the <numFmts> element.
       #
       def write_num_fmts
-        count = @num_format_count
+        count = @num_formats.size
 
         return if count == 0
 
@@ -85,11 +85,10 @@ module Writexlsx
 
         @writer.tag_elements('numFmts', attributes) do
           # Write the numFmts elements.
-          @xf_formats.each do |format|
-            # Ignore built-in number formats, i.e., < 164.
-            next unless format.num_format_index >= 164
-
-            write_num_fmt(format.num_format_index, format.num_format)
+          index = 164
+          @num_formats.each do |num_format|
+            write_num_fmt(index, num_format)
+            index += 1
           end
         end
       end

data/lib/write_xlsx/package/table.rb

@@ -51,6 +51,7 @@ module Writexlsx
 
         add_the_table_columns
         write_the_cell_data_if_supplied
+        store_filter_cell_positions
       end
 
       def set_xml_writer(filename)
@@ -155,6 +156,14 @@ module Writexlsx
         end
       end
 
+      def store_filter_cell_positions
+        if ptrue?(@param[:autofilter])
+          (@col1..@col2).each do |col|
+            @worksheet.filter_cells["#{@row1}:#{col}"] = 1
+          end
+        end
+      end
+
       def prepare(id)
         @id = id
         @name ||= "Table#{id}"

data/lib/write_xlsx/utility.rb

@@ -5,10 +5,28 @@ require 'write_xlsx/col_name'
 
 module Writexlsx
   module Utility
-    ROW_MAX  = 1048576  # :nodoc:
-    COL_MAX  = 16384    # :nodoc:
-    STR_MAX  = 32767    # :nodoc:
+    ROW_MAX       = 1048576  # :nodoc:
+    COL_MAX       = 16384    # :nodoc:
+    STR_MAX       = 32767    # :nodoc:
     SHEETNAME_MAX = 31  # :nodoc:
+    CHAR_WIDTHS   = {
+      ' '  =>  3, '!' =>  5, '"' =>  6, '#' =>  7, '$' =>  7, '%' => 11,
+      '&'  => 10, "'" =>  3, '(' =>  5, ')' =>  5, '*' =>  7, '+' =>  7,
+      ','  =>  4, '-' =>  5, '.' =>  4, '/' =>  6, '0' =>  7, '1' =>  7,
+      '2'  =>  7, '3' =>  7, '4' =>  7, '5' =>  7, '6' =>  7, '7' =>  7,
+      '8'  =>  7, '9' =>  7, ':' =>  4, ';' =>  4, '<' =>  7, '=' =>  7,
+      '>'  =>  7, '?' =>  7, '@' => 13, 'A' =>  9, 'B' =>  8, 'C' =>  8,
+      'D'  =>  9, 'E' =>  7, 'F' =>  7, 'G' =>  9, 'H' =>  9, 'I' =>  4,
+      'J'  =>  5, 'K' =>  8, 'L' =>  6, 'M' => 12, 'N' => 10, 'O' => 10,
+      'P'  =>  8, 'Q' => 10, 'R' =>  8, 'S' =>  7, 'T' =>  7, 'U' =>  9,
+      'V'  =>  9, 'W' => 13, 'X' =>  8, 'Y' =>  7, 'Z' =>  7, '[' =>  5,
+      '\\' =>  6, ']' =>  5, '^' =>  7, '_' =>  7, '`' =>  4, 'a' =>  7,
+      'b'  =>  8, 'c' =>  6, 'd' =>  8, 'e' =>  8, 'f' =>  5, 'g' =>  7,
+      'h'  =>  8, 'i' =>  4, 'j' =>  4, 'k' =>  7, 'l' =>  4, 'm' => 12,
+      'n'  =>  8, 'o' =>  8, 'p' =>  8, 'q' =>  8, 'r' =>  5, 's' =>  6,
+      't'  =>  5, 'u' =>  8, 'v' =>  7, 'w' => 11, 'x' =>  7, 'y' =>  7,
+      'z'  =>  6, '{' =>  5, '|' =>  7, '}' =>  5, '~' =>  7
+    }.freeze
 
     #
     # xl_rowcol_to_cell($row, col, row_absolute, col_absolute)
@@ -84,6 +102,21 @@ module Writexlsx
       "=#{sheetname}!#{range1}:#{range2}"
     end
 
+    #
+    # xl_string_pixel_width($string)
+    #
+    # Get the pixel width of a string based on individual character widths taken
+    # from Excel. UTF8 characters are given a default width of 8.
+    #
+    # Note, Excel adds an additional 7 pixels padding to a cell.
+    #
+    def xl_string_pixel_width(string)
+      length = 0
+      string.to_s.split(//).each { |char| length += CHAR_WIDTHS[char] || 8 }
+
+      length
+    end
+
     #
     # Sheetnames used in references should be quoted if they contain any spaces,
     # special characters or if the look like something that isn't a sheet name.
@@ -258,7 +291,7 @@ module Writexlsx
 
     # Check for a cell reference in A1 notation and substitute row and column
     def row_col_notation(row_or_a1)   # :nodoc:
-      substitute_cellref(row_or_a1) if row_or_a1.to_s =~ /^\D/
+      substitute_cellref(row_or_a1) if row_or_a1.respond_to?(:match) && row_or_a1.to_s =~ /^\D/
     end
 
     #

data/lib/write_xlsx/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-WriteXLSX_VERSION = "1.10.2"
+WriteXLSX_VERSION = "1.11.0"

data/lib/write_xlsx/workbook.rb

@@ -58,7 +58,7 @@ module Writexlsx
       @xf_formats          = []
       @dxf_formats         = []
       @font_count          = 0
-      @num_format_count    = 0
+      @num_formats         = []
       @defined_names       = []
       @named_ranges        = []
       @custom_colors       = []
@@ -560,7 +560,7 @@ module Writexlsx
         @xf_formats,
         @palette,
         @font_count,
-        @num_format_count,
+        @num_formats,
         @border_count,
         @fill_count,
         @custom_colors,
@@ -869,6 +869,9 @@ module Writexlsx
       @activesheet = @worksheets.visible_first.index if @activesheet == 0
       @worksheets[@activesheet].activate
 
+      # Convert the SST strings data structure.
+      prepare_sst_string_data
+
       # Prepare the worksheet VML elements such as comments and buttons.
       prepare_vml_objects
       # Set the defined names for the worksheets such as Print Titles.
@@ -917,6 +920,11 @@ module Writexlsx
       Dir.glob(File.join(tempdir, "**", "*"), File::FNM_DOTMATCH).select { |f| File.file?(f) }
     end
 
+    #
+    # prepare_sst_string_data
+    #
+    def prepare_sst_string_data; end
+
     #
     # Prepare all of the format properties prior to passing them to Styles.rb.
     #
@@ -977,9 +985,10 @@ module Writexlsx
     # User defined records start from index 0xA4.
     #
     def prepare_num_formats # :nodoc:
-      num_formats      = {}
-      index            = 164
-      num_format_count = 0
+      num_formats        = []
+      unique_num_formats = {}
+      index              = 164
+      num_format_count   = 0
 
       (@xf_formats + @dxf_formats).each do |format|
         num_format = format.num_format
@@ -1000,21 +1009,22 @@ module Writexlsx
           next
         end
 
-        if num_formats[num_format]
+        if unique_num_formats[num_format]
           # Number format has already been used.
-          format.num_format_index = num_formats[num_format]
+          format.num_format_index = unique_num_formats[num_format]
         else
           # Add a new number format.
-          num_formats[num_format] = index
+          unique_num_formats[num_format] = index
           format.num_format_index = index
           index += 1
 
-          # Only increase font count for XF formats (not for DXF formats).
-          num_format_count += 1 if ptrue?(format.xf_index)
+          # Only store/increase number format count for XF formats
+          # (not for DXF formats).
+          num_formats << num_format if ptrue?(format.xf_index)
         end
       end
 
-      @num_format_count = num_format_count
+      @num_formats = num_formats
     end
 
     #

data/lib/write_xlsx/worksheet/cell_data.rb

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
-# frozen_string_literal: true
+
+# frozen__literal: true
 
 module Writexlsx
   class Worksheet
@@ -24,8 +25,8 @@ module Writexlsx
         elsif worksheet.set_rows[row] && worksheet.set_rows[row][1]
           row_xf = worksheet.set_rows[row][1]
           attributes << ['s', row_xf.get_xf_index]
-        elsif worksheet.col_formats[col]
-          col_xf = worksheet.col_formats[col]
+        elsif worksheet.col_info[col] && worksheet.col_info[col].format
+          col_xf = worksheet.col_info[col].format
           attributes << ['s', col_xf.get_xf_index]
         end
         attributes
@@ -56,11 +57,12 @@ module Writexlsx
     end
 
     class StringCellData < CellData # :nodoc:
-      attr_reader :token
+      attr_reader :token, :raw_string
 
-      def initialize(index, xf)
+      def initialize(index, xf, raw_string)
         @token = index
         @xf = xf
+        @raw_string = raw_string
       end
 
       def data
@@ -81,6 +83,12 @@ module Writexlsx
       end
     end
 
+    class RichStringCellData < StringCellData # :nodoc:
+    end
+
+    class DateTimeCellData < NumberCellData # :nodoc:
+    end
+
     class FormulaCellData < CellData # :nodoc:
       attr_reader :token, :result, :range, :link_type, :url
 

data/lib/write_xlsx/worksheet.rb

@@ -31,20 +31,25 @@ module Writexlsx
     attr_reader :vml_data_id                                      # :nodoc:
     attr_reader :vml_header_id                                    # :nodoc:
     attr_reader :autofilter_area                                  # :nodoc:
-    attr_reader :writer, :set_rows, :col_formats                  # :nodoc:
+    attr_reader :writer, :set_rows, :col_info                     # :nodoc:
     attr_reader :vml_shape_id                                     # :nodoc:
     attr_reader :comments, :comments_author                       # :nodoc:
     attr_accessor :data_bars_2010, :dxf_priority                  # :nodoc:
     attr_reader :vba_codename                                     # :nodoc:
-    attr_writer :excel_version
+    attr_writer :excel_version                                    # :nodoc:
+    attr_reader :filter_cells                                     # :nodoc:
 
     def initialize(workbook, index, name) # :nodoc:
+      rowmax   = 1_048_576
+      colmax   = 16_384
+      strmax   = 32_767
+
       @writer = Package::XMLWriterSimple.new
 
       @workbook = workbook
       @index = index
       @name = name
-      @colinfo = {}
+      @col_info = {}
       @cell_data_table = []
       @excel_version = 2007
       @palette = workbook.palette
@@ -55,6 +60,10 @@ module Writexlsx
 
       @screen_gridlines     = true
       @show_zeros           = true
+
+      @xls_rowmax           = rowmax
+      @xls_colmax           = colmax
+      @xls_strmax           = strmax
       @dim_rowmin           = nil
       @dim_rowmax           = nil
       @dim_colmin           = nil
@@ -77,11 +86,10 @@ module Writexlsx
       @filter_on    = false
       @filter_range = []
       @filter_cols  = {}
+      @filter_cells = {}
       @filter_type  = {}
 
-      @col_sizes = {}
       @row_sizes = {}
-      @col_formats = {}
 
       @last_shape_id          = 1
       @rel_count              = 0
@@ -90,8 +98,8 @@ module Writexlsx
       @external_drawing_links = []
       @external_comment_links = []
       @external_vml_links     = []
-      @external_table_links   = []
       @external_background_links = []
+      @external_table_links   = []
       @drawing_links          = []
       @vml_drawing_links      = []
       @charts                 = []
@@ -121,6 +129,7 @@ module Writexlsx
       @default_col_width      = 8.43
       @default_col_pixels     = 64
       @default_row_rezoed     = 0
+      @default_date_pixels    = 68
 
       @merge = []
 
@@ -305,7 +314,8 @@ module Writexlsx
     #
     def set_column(*args)
       # Check for a cell reference in A1 notation and substitute row and column
-      if args[0].to_s =~ /^\D/
+      # ruby 3.2 no longer handles =~ for various types
+      if args[0].respond_to?(:=~) && args[0].to_s =~ /^\D/
         _row1, firstcol, _row2, lastcol, *data = substitute_cellref(*args)
       else
         firstcol, lastcol, *data = args
@@ -321,6 +331,7 @@ module Writexlsx
       firstcol, lastcol = lastcol, firstcol if firstcol > lastcol
 
       width, format, hidden, level, collapsed = data
+      autofit = 0
 
       # Check that cols are valid and store max and min values with default row.
       # NOTE: The check shouldn't modify the row dimensions and should only modify
@@ -338,22 +349,20 @@ module Writexlsx
       level = 0 if level < 0
       level = 7 if level > 7
 
+      # Excel has a maximum column width of 255 characters.
+      width = 255.0 if width && width > 255.0
+
       @outline_col_level = level if level > @outline_col_level
 
       # Store the column data based on the first column. Padded for sorting.
-      @colinfo[sprintf("%05d", firstcol)] = [firstcol, lastcol, width, format, hidden, level, collapsed]
+      (firstcol..lastcol).each do |col|
+        @col_info[col] =
+          Struct.new('ColInfo', :width, :format, :hidden, :level, :collapsed, :autofit)
+            .new(width, format, hidden, level, collapsed, autofit)
+      end
 
       # Store the column change to allow optimisations.
       @col_size_changed = 1
-
-      # Store the col sizes for use when calculating image vertices taking
-      # hidden columns into account. Also store the column formats.
-      width ||= @default_col_width
-
-      (firstcol..lastcol).each do |col|
-        @col_sizes[col]   = [width, hidden]
-        @col_formats[col] = format if format
-      end
     end
 
     #
@@ -387,6 +396,113 @@ module Writexlsx
       set_column(first_col, last_col, width, format, hidden, level)
     end
 
+    #
+    # autofit()
+    #
+    # Simulate autofit based on the data, and datatypes in each column. We do this
+    # by estimating a pixel width for each cell data.
+    #
+    def autofit
+      col_width = {}
+
+      # Iterate through all the data in the worksheet.
+      (@dim_rowmin..@dim_rowmax).each do |row_num|
+        # Skip row if it doesn't contain cell data.
+        next unless @cell_data_table[row_num]
+
+        (@dim_colmin..@dim_colmax).each do |col_num|
+          length = 0
+          case (cell_data = @cell_data_table[row_num][col_num])
+          when StringCellData, RichStringCellData
+            # Handle strings and rich strings.
+            #
+            # For standard shared strings we do a reverse lookup
+            # from the shared string id to the actual string. For
+            # rich strings we use the unformatted string. We also
+            # split multiline strings and handle each part
+            # separately.
+            string = cell_data.raw_string
+
+            if string =~ /\n/
+              # Handle multiline strings.
+              length = max = string.split("\n").collect do |str|
+                xl_string_pixel_width(str)
+              end.max
+            else
+              length = xl_string_pixel_width(string)
+            end
+          when DateTimeCellData
+
+            # Handle dates.
+            #
+            # The following uses the default width for mm/dd/yyyy
+            # dates. It isn't feasible to parse the number format
+            # to get the actual string width for all format types.
+            length = @default_date_pixels
+          when NumberCellData
+
+            # Handle numbers.
+            #
+            # We use a workaround/optimization for numbers since
+            # digits all have a pixel width of 7. This gives a
+            # slightly greater width for the decimal place and
+            # minus sign but only by a few pixels and
+            # over-estimation is okay.
+            length = 7 * cell_data.token.to_s.length
+          when BooleanCellData
+
+            # Handle boolean values.
+            #
+            # Use the Excel standard widths for TRUE and FALSE.
+            if ptrue?(cell_data.token)
+              length = 31
+            else
+              length = 36
+            end
+          when FormulaCellData, FormulaArrayCellData, DynamicFormulaArrayCellData
+            # Handle formulas.
+            #
+            # We only try to autofit a formula if it has a
+            # non-zero value.
+            if ptrue?(cell_data.data)
+              length = xl_string_pixel_width(cell_data.data)
+            end
+          end
+
+          # If the cell is in an autofilter header we add an
+          # additional 16 pixels for the dropdown arrow.
+          if length > 0 &&
+             @filter_cells["#{row_num}:#{col_num}"]
+            length += 16
+          end
+
+          # Add the string lenght to the lookup hash.
+          max                = col_width[col_num] || 0
+          col_width[col_num] = length if length > max
+        end
+      end
+
+      # Apply the width to the column.
+      col_width.each do |col_num, pixel_width|
+        # Convert the string pixel width to a character width using an
+        # additional padding of 7 pixels, like Excel.
+        width = pixels_to_width(pixel_width + 7)
+
+        # The max column character width in Excel is 255.
+        width = 255.0 if width > 255.0
+
+        # Add the width to an existing col info structure or add a new one.
+        if @col_info[col_num]
+          @col_info[col_num].width   = width
+          @col_info[col_num].autofit = 1
+        else
+          @col_info[col_num] =
+            Struct.new('ColInfo', :width, :format, :hidden, :level, :collapsed, :autofit)
+              .new(width, nil, 0, 0, 0, 1)
+        end
+      end
+    end
+
     #
     # :call-seq:
     #   set_selection(cell_or_cell_range)
@@ -936,31 +1052,35 @@ module Writexlsx
         write_row(_row, _col, _token, _format, _value1, _value2)
       elsif _token.respond_to?(:coerce)  # Numeric
         write_number(_row, _col, _token, _format)
-      # Match integer with leading zero(s)
-      elsif @leading_zeros && _token =~ /^0\d*$/
-        write_string(_row, _col, _token, _format)
-      elsif _token =~ /\A([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?\Z/
-        write_number(_row, _col, _token, _format)
-      # Match formula
-      elsif _token =~ /^=/
-        write_formula(_row, _col, _token, _format, _value1)
-      # Match array formula
-      elsif _token =~ /^\{=.*\}$/
-        write_formula(_row, _col, _token, _format, _value1)
-      # Match blank
-      elsif _token == ''
-        #        row_col_args.delete_at(2)     # remove the empty string from the parameter list
-        write_blank(_row, _col, _format)
-      elsif @workbook.strings_to_urls
-        # Match http, https or ftp URL
-        if _token =~ %r{\A[fh]tt?ps?://}
-          write_url(_row, _col, _token, _format, _value1, _value2)
-        # Match mailto:
-        elsif _token =~ /\Amailto:/
-          write_url(_row, _col, _token, _format, _value1, _value2)
-        # Match internal or external sheet link
-        elsif _token =~ /\A(?:in|ex)ternal:/
-          write_url(_row, _col, _token, _format, _value1, _value2)
+      elsif _token.respond_to?(:=~)  # String
+        # Match integer with leading zero(s)
+        if @leading_zeros && _token =~ /^0\d*$/
+          write_string(_row, _col, _token, _format)
+        elsif _token =~ /\A([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?\Z/
+          write_number(_row, _col, _token, _format)
+        # Match formula
+        elsif _token =~ /^=/
+          write_formula(_row, _col, _token, _format, _value1)
+        # Match array formula
+        elsif _token =~ /^\{=.*\}$/
+          write_formula(_row, _col, _token, _format, _value1)
+        # Match blank
+        elsif _token == ''
+          #        row_col_args.delete_at(2)     # remove the empty string from the parameter list
+          write_blank(_row, _col, _format)
+        elsif @workbook.strings_to_urls
+          # Match http, https or ftp URL
+          if _token =~ %r{\A[fh]tt?ps?://}
+            write_url(_row, _col, _token, _format, _value1, _value2)
+          # Match mailto:
+          elsif _token =~ /\Amailto:/
+            write_url(_row, _col, _token, _format, _value1, _value2)
+          # Match internal or external sheet link
+          elsif _token =~ /\A(?:in|ex)ternal:/
+            write_url(_row, _col, _token, _format, _value1, _value2)
+          else
+            write_string(_row, _col, _token, _format)
+          end
         else
           write_string(_row, _col, _token, _format)
         end
@@ -1114,7 +1234,7 @@ module Writexlsx
 
       index = shared_string_index(_string.length > STR_MAX ? _string[0, STR_MAX] : _string)
 
-      store_data_to_table(StringCellData.new(index, _format), _row, _col)
+      store_data_to_table(StringCellData.new(index, _format, _string), _row, _col)
     end
 
     #
@@ -1143,13 +1263,16 @@ module Writexlsx
       check_dimensions(_row, _col)
       store_row_col_max_min_values(_row, _col)
 
-      _fragments, _length = rich_strings_fragments(_rich_strings)
+      _fragments, _raw_string = rich_strings_fragments(_rich_strings)
       # can't allow 2 formats in a row
       return -4 unless _fragments
 
+      # Check that the string si < 32767 chars.
+      return 3 if _raw_string.size > @xls_strmax
+
       index = shared_string_index(xml_str_of_rich_string(_fragments))
 
-      store_data_to_table(StringCellData.new(index, _xf), _row, _col)
+      store_data_to_table(RichStringCellData.new(index, _xf, _raw_string), _row, _col)
     end
 
     #
@@ -1679,7 +1802,7 @@ module Writexlsx
       date_time = convert_date_time(_str)
 
       if date_time
-        store_data_to_table(NumberCellData.new(date_time, _format), _row, _col)
+        store_data_to_table(DateTimeCellData.new(date_time, _format), _row, _col)
       else
         # If the date isn't valid then write it as a string.
         write_string(_row, _col, _str, _format)
@@ -2164,6 +2287,11 @@ module Writexlsx
       @autofilter_area = convert_name_area(_row1, _col1, _row2, _col2)
       @autofilter_ref  = xl_range(_row1, _row2, _col1, _col2)
       @filter_range    = [_col1, _col2]
+
+      # Store the filter cell positions for use in the autofit calculation.
+      (_col1.._col2).each do |col|
+        @filter_cells["#{_row1}:#{col}"] = 1
+      end
     end
 
     #
@@ -2506,8 +2634,8 @@ module Writexlsx
         @external_hyper_links,
         @external_drawing_links,
         @external_vml_links,
-        @external_table_links,
         @external_background_links,
+        @external_table_links,
         @external_comment_links
       ].reject { |a| a.empty? }
     end
@@ -2634,6 +2762,33 @@ module Writexlsx
 
     private
 
+    #
+    # Compare adjacent column information structures.
+    #
+    def compare_col_info(col_options, previous_options)
+      if !col_options.width.nil? != !previous_options.width.nil?
+        return nil
+      end
+      if col_options.width && previous_options.width &&
+         col_options.width != previous_options.width
+        return nil
+      end
+
+      if !col_options.format.nil? != !previous_options.format.nil?
+        return nil
+      end
+      if col_options.format && previous_options.format &&
+         col_options.format != previous_options.format
+        return nil
+      end
+
+      return nil if col_options.hidden    != previous_options.hidden
+      return nil if col_options.level     != previous_options.level
+      return nil if col_options.collapsed != previous_options.collapsed
+
+      true
+    end
+
     #
     # Get the index used to address a drawing rel link.
     #
@@ -2685,9 +2840,9 @@ module Writexlsx
       # Create a temp format with the default font for unformatted fragments.
       default = Format.new(0)
 
-      length = 0                     # String length.
       last = 'format'
       pos  = 0
+      raw_string = ''
 
       fragments = []
       rich_strings.each do |token|
@@ -2708,12 +2863,12 @@ module Writexlsx
             fragments << default << token
           end
 
-          length += token.size    # Keep track of actual string length.
+          raw_string += token    # Keep track of actual string length.
           last = 'string'
         end
         pos += 1
       end
-      [fragments, length]
+      [fragments, raw_string]
     end
 
     def xml_str_of_rich_string(fragments)
@@ -2944,8 +3099,9 @@ module Writexlsx
     #
     def size_col(col, anchor = 0) # :nodoc:
       # Look up the cell value to see if it has been changed.
-      if @col_sizes[col]
-        width, hidden = @col_sizes[col]
+      if @col_info[col]
+        width  = @col_info[col].width || @default_col_width
+        hidden = @col_info[col].hidden
 
         # Convert to pixels.
         pixels = if hidden == 1 && anchor != 4
@@ -3276,28 +3432,22 @@ EOS
     end
 
     #
-    # Based on the algorithm provided by Daniel Rentz of OpenOffice.
-    #
+    # Hash a worksheet password. Based on the algorithm in ECMA-376-4:2016,
+    # Office Open XML File Foemats -- Transitional Migration Features,
+    # Additional attributes for workbookProtection element (Part 1, §18.2.29).   #
     def encode_password(password) # :nodoc:
-      i = 0
-      chars = password.split(//)
-      count = chars.size
+      hash = 0
 
-      chars.collect! do |char|
-        i += 1
-        char     = char.ord << i
-        low_15   = char & 0x7fff
-        high_15  = char & (0x7fff << 15)
-        high_15  = high_15 >> 15
-        char     = low_15 | high_15
+      password.reverse.split(//).each do |char|
+        hash = ((hash >> 14) & 0x01) | ((hash << 1) & 0x7fff)
+        hash ^= char.ord
       end
 
-      encoded_password = 0x0000
-      chars.each { |c| encoded_password ^= c }
-      encoded_password ^= count
-      encoded_password ^= 0xCE4B
+      hash = ((hash >> 14) & 0x01) | ((hash << 1) & 0x7fff)
+      hash ^= password.length
+      hash ^= 0xCE4B
 
-      sprintf("%X", encoded_password)
+      sprintf("%X", hash)
     end
 
     #
@@ -3475,10 +3625,42 @@ EOS
     #
     def write_cols # :nodoc:
       # Exit unless some column have been formatted.
-      return if @colinfo.empty?
+      return if @col_info.empty?
 
       @writer.tag_elements('cols') do
-        @colinfo.keys.sort.each { |col| write_col_info(@colinfo[col]) }
+        # Use the first element of the column informatin structure to set
+        # the initial/previous properties.
+        first_col           = @col_info.keys.min
+        last_col            = first_col
+        previous_options    = @col_info[first_col]
+        deleted_col         = first_col
+        deleted_col_options = previous_options
+
+        @col_info.delete(first_col)
+
+        @col_info.keys.sort.each do |col|
+          col_options = @col_info[col]
+
+          # Check if the column number is contiguous with the previous
+          # column and if the properties are the same.
+          if (col == last_col + 1) &&
+             compare_col_info(col_options, previous_options)
+            last_col = col
+          else
+            # If not contiguous/equal then we write out the current range
+            # of columns and start again.
+            write_col_info([first_col, last_col, previous_options])
+            first_col = col
+            last_col  = first_col
+            previous_options = col_options
+          end
+        end
+
+        # We will exit the previous loop with one unhandled column range.
+        write_col_info([first_col, last_col, previous_options])
+
+        # Put back the deleted first column information structure:
+        @col_info[deleted_col] = deleted_col_options
       end
     end
 
@@ -3490,13 +3672,14 @@ EOS
     end
 
     def col_info_attributes(args)
-      min    = args[0] || 0     # First formatted column.
-      max    = args[1] || 0     # Last formatted column.
-      width  = args[2]          # Col width in user units.
-      format = args[3]          # Format index.
-      hidden = args[4] || 0     # Hidden flag.
-      level  = args[5] || 0     # Outline level.
-      collapsed = args[6] || 0  # Outline level.
+      min       = args[0]           || 0 # First formatted column.
+      max       = args[1]           || 0 # Last formatted column.
+      width     = args[2].width          # Col width in user units.
+      format    = args[2].format         # Format index.
+      hidden    = args[2].hidden    || 0 # Hidden flag.
+      level     = args[2].level     || 0 # Outline level.
+      collapsed = args[2].collapsed || 0 # Outline Collapsed
+      autofit   = args[2].autofit   || 0 # Best fit for autofit numbers.
       xf_index = format ? format.get_xf_index : 0
 
       custom_width = true
@@ -3519,10 +3702,11 @@ EOS
         ['width', width]
       ]
 
-      attributes << ['style',        xf_index] if xf_index != 0
-      attributes << ['hidden',       1]        if hidden != 0
+      attributes << ['style',        xf_index] if xf_index  != 0
+      attributes << ['hidden',       1]        if hidden    != 0
+      attributes << ['bestFit',      1]        if autofit   != 0
       attributes << ['customWidth',  1]        if custom_width
-      attributes << ['outlineLevel', level]    if level != 0
+      attributes << ['outlineLevel', level]    if level     != 0
       attributes << ['collapsed',    1]        if collapsed != 0
       attributes
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.11.0
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-16 00:00:00.000000000 Z
+date: 2023-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -130,6 +130,7 @@ files:
 - examples/add_vba_project.rb
 - examples/array_formula.rb
 - examples/autofilter.rb
+- examples/autofit.rb
 - examples/background.rb
 - examples/chart_area.rb
 - examples/chart_bar.rb
@@ -275,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.5
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.