write_xlsx 1.10.2 → 1.11.1

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
 
     #
@@ -308,7 +341,7 @@ module Writexlsx
     #
     # Write the <color> element.
     #
-    def write_color(writer, name, value) # :nodoc:
+    def write_color(name, value, writer = @writer) # :nodoc:
       attributes = [[name, value]]
 
       writer.empty_tag('color', attributes)
@@ -718,8 +751,8 @@ module Writexlsx
       # Adjust the colour index.
       idx = index - 8
 
-      rgb = @palette[idx]
-      sprintf("%02X%02X%02X", *rgb)
+      r, g, b = @palette[idx]
+      sprintf("%02X%02X%02X", r, g, b)
     end
 
     #

data/lib/write_xlsx/version.rb

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

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,9 @@ 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
 
       (@xf_formats + @dxf_formats).each do |format|
         num_format = format.num_format
@@ -1000,21 +1008,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

@@ -24,8 +24,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 +56,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 +82,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