write_xlsx 1.11.0 → 1.11.2

data/lib/write_xlsx/worksheet/hyperlink.rb

@@ -28,7 +28,7 @@ module Writexlsx
         normalized_str = str.sub(/^mailto:/, '')
 
         # Split url into the link and optional anchor/location.
-        url, @url_str = url.split(/#/, 2)
+        url, @url_str = url.split("#", 2)
 
         # Escape URL unless it looks already escaped.
         url = escape_url(url)
@@ -106,7 +106,7 @@ module Writexlsx
         str = str.sub(/^mailto:/, '')
 
         # Split url into the link and optional anchor/location.
-        url, url_str = url.split(/#/, 2)
+        url, url_str = url.split("#", 2)
 
         # Escape URL unless it looks already escaped.
         url = escape_url(url)

data/lib/write_xlsx/worksheet.rb

@@ -23,6 +23,7 @@ module Writexlsx
 
     MAX_DIGIT_WIDTH = 7    # For Calabri 11.  # :nodoc:
     PADDING         = 5                       # :nodoc:
+    COLINFO         = Struct.new('ColInfo', :width, :format, :hidden, :level, :collapsed, :autofit)
 
     attr_reader :index                                            # :nodoc:
     attr_reader :charts, :images, :tables, :shapes, :drawings     # :nodoc:
@@ -227,15 +228,26 @@ module Writexlsx
     #
     # Hide this worksheet.
     #
-    def hide
-      @hidden = true
+    def hide(hidden = :hidden)
+      @hidden = hidden
       @selected = false
       @workbook.activesheet = 0 if @workbook.activesheet == @index
       @workbook.firstsheet  = 0 if @workbook.firstsheet  == @index
     end
 
+    #
+    # Hide this worksheet. This can only be unhidden from VBA.
+    #
+    def very_hidden
+      hide(:very_hidden)
+    end
+
     def hidden? # :nodoc:
-      @hidden
+      @hidden == :hidden
+    end
+
+    def very_hidden? # :nodoc:
+      @hidden == :very_hidden
     end
 
     #
@@ -270,7 +282,7 @@ module Writexlsx
       if range.nil?
         raise "The range must be defined in unprotect_range())\n"
       else
-        range = range.gsub(/\$/, "")
+        range = range.gsub("$", "")
         range = range.sub(/^=/, "")
         @num_protected_ranges += 1
       end
@@ -357,8 +369,7 @@ module Writexlsx
       # Store the column data based on the first column. Padded for sorting.
       (firstcol..lastcol).each do |col|
         @col_info[col] =
-          Struct.new('ColInfo', :width, :format, :hidden, :level, :collapsed, :autofit)
-            .new(width, format, hidden, level, collapsed, autofit)
+          COLINFO.new(width, format, hidden, level, collapsed, autofit)
       end
 
       # Store the column change to allow optimisations.
@@ -497,8 +508,7 @@ module Writexlsx
           @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)
+            COLINFO.new(width, nil, 0, 0, 0, 1)
         end
       end
     end
@@ -613,8 +623,17 @@ module Writexlsx
     #
     # This method is used to display the worksheet in "Page View/Layout" mode.
     #
-    def set_page_view(flag = true)
-      @page_view = !!flag
+    def set_page_view(flag = 1)
+      @page_view = flag
+    end
+
+    #
+    # set_pagebreak_view
+    #
+    # Set the page view mode.
+    #
+    def set_pagebreak_view
+      @page_view = 2
     end
 
     #
@@ -649,7 +668,7 @@ module Writexlsx
       raise 'Header string must be less than 255 characters' if string.length > 255
 
       # Replace the Excel placeholder &[Picture] with the internal &G.
-      @page_setup.header = string.gsub(/&\[Picture\]/, '&G')
+      @page_setup.header = string.gsub("&[Picture]", '&G')
 
       @page_setup.header_footer_aligns = options[:align_with_margins] if options[:align_with_margins]
 
@@ -665,7 +684,7 @@ module Writexlsx
       end
 
       # placeholeder /&G/ の数
-      placeholder_count = @page_setup.header.scan(/&G/).count
+      placeholder_count = @page_setup.header.scan("&G").count
 
       image_count = @header_images.count
 
@@ -686,7 +705,7 @@ module Writexlsx
       @page_setup.footer = string.dup
 
       # Replace the Excel placeholder &[Picture] with the internal &G.
-      @page_setup.footer = string.gsub(/&\[Picture\]/, '&G')
+      @page_setup.footer = string.gsub("&[Picture]", '&G')
 
       @page_setup.header_footer_aligns = options[:align_with_margins] if options[:align_with_margins]
 
@@ -702,7 +721,7 @@ module Writexlsx
       end
 
       # placeholeder /&G/ の数
-      placeholder_count = @page_setup.footer.scan(/&G/).count
+      placeholder_count = @page_setup.footer.scan("&G").count
 
       image_count = @footer_images.count
 
@@ -1321,7 +1340,7 @@ module Writexlsx
     # 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)
+    def prepare_formula(given_formula, expand_future_functions = nil)
       # Ignore empty/null formulas.
       return given_formula unless ptrue?(given_formula)
 
@@ -1332,26 +1351,46 @@ module Writexlsx
       return formula if formula =~ /_xlfn\./
 
       # Expand dynamic array formulas.
-      formula = expand_formula(formula, 'LET\(')
+      formula = expand_formula(formula, 'ANCHORARRAY\(')
+      formula = expand_formula(formula, 'BYCOL\(')
+      formula = expand_formula(formula, 'BYROW\(')
+      formula = expand_formula(formula, 'CHOOSECOLS\(')
+      formula = expand_formula(formula, 'CHOOSEROWS\(')
+      formula = expand_formula(formula, 'DROP\(')
+      formula = expand_formula(formula, 'EXPAND\(')
+      formula = expand_formula(formula, 'FILTER\(', '._xlws')
+      formula = expand_formula(formula, 'HSTACK\(')
       formula = expand_formula(formula, 'LAMBDA\(')
+      formula = expand_formula(formula, 'MAKEARRAY\(')
+      formula = expand_formula(formula, 'MAP\(')
+      formula = expand_formula(formula, 'RANDARRAY\(')
+      formula = expand_formula(formula, 'REDUCE\(')
+      formula = expand_formula(formula, 'SCAN\(')
+      formula = expand_formula(formula, 'SEQUENCE\(')
       formula = expand_formula(formula, 'SINGLE\(')
+      formula = expand_formula(formula, 'SORT\(', '._xlws')
       formula = expand_formula(formula, 'SORTBY\(')
+      formula = expand_formula(formula, 'SWITCH\(')
+      formula = expand_formula(formula, 'TAKE\(')
+      formula = expand_formula(formula, 'TEXTSPLIT\(')
+      formula = expand_formula(formula, 'TOCOL\(')
+      formula = expand_formula(formula, 'TOROW\(')
       formula = expand_formula(formula, 'UNIQUE\(')
-      formula = expand_formula(formula, 'XMATCH\(')
+      formula = expand_formula(formula, 'VSTACK\(')
+      formula = expand_formula(formula, 'WRAPCOLS\(')
+      formula = expand_formula(formula, 'WRAPROWS\(')
       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
+      if !@use_future_functions && !ptrue?(expand_future_functions)
+        return formula
+      end
 
       # 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, 'ARRAYTOTEXT\(')
       formula = expand_formula(formula, 'BASE\(')
       formula = expand_formula(formula, 'BETA.DIST\(')
       formula = expand_formula(formula, 'BETA.INV\(')
@@ -1416,7 +1455,9 @@ module Writexlsx
       formula = expand_formula(formula, 'IMSINH\(')
       formula = expand_formula(formula, 'IMTAN\(')
       formula = expand_formula(formula, 'ISFORMULA\(')
+      formula = expand_formula(formula, 'ISOMITTED\(')
       formula = expand_formula(formula, 'ISOWEEKNUM\(')
+      formula = expand_formula(formula, 'LET\(')
       formula = expand_formula(formula, 'LOGNORM.DIST\(')
       formula = expand_formula(formula, 'LOGNORM.INV\(')
       formula = expand_formula(formula, 'MAXIFS\(')
@@ -1451,24 +1492,26 @@ module Writexlsx
       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, 'TEXTAFTER\(')
+      formula = expand_formula(formula, 'TEXTBEFORE\(')
       formula = expand_formula(formula, 'TEXTJOIN\(')
       formula = expand_formula(formula, 'UNICHAR\(')
       formula = expand_formula(formula, 'UNICODE\(')
+      formula = expand_formula(formula, 'VALUETOTEXT\(')
       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, 'XMATCH\(')
       formula = expand_formula(formula, 'XOR\(')
       expand_formula(formula, 'Z.TEST\(')
     end
-    private :prepare_formula
 
     #
     # :call-seq:
@@ -1552,7 +1595,7 @@ module Writexlsx
               end
 
       # Modify the formula string, as needed.
-      formula = prepare_formula(formula)
+      formula = prepare_formula(formula, 1)
 
       store_data_to_table(
         if type == 'a'
@@ -2927,7 +2970,7 @@ module Writexlsx
       tokens.map! do |token|
         token.sub!(/^"/, '')
         token.sub!(/"$/, '')
-        token.gsub!(/""/, '"')
+        token.gsub!('""', '"')
 
         # if token is number, convert to numeric.
         if token =~ /^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/
@@ -3209,13 +3252,13 @@ module Writexlsx
           target = escape_url(url.sub(/^external:/, ''))
 
           # Additional escape not required in worksheet hyperlinks
-          target = target.gsub(/#/, '%23')
+          target = target.gsub("#", '%23')
 
           # Prefix absolute paths (not relative) with file:///
           target = if target =~ /^\w:/ || target =~ /^\\\\/
                      "file:///#{target}"
                    else
-                     target.gsub(/\\/, '/')
+                     target.gsub("\\", '/')
                    end
         end
 
@@ -3438,7 +3481,7 @@ EOS
     def encode_password(password) # :nodoc:
       hash = 0
 
-      password.reverse.split(//).each do |char|
+      password.reverse.split("").each do |char|
         hash = ((hash >> 14) & 0x01) | ((hash << 1) & 0x7fff)
         hash ^= char.ord
       end
@@ -3560,16 +3603,27 @@ EOS
       attributes << ["showOutlineSymbols", 0] if @outline_on
 
       # Set the page view/layout mode if required.
-      # TODO. Add pageBreakPreview mode when requested.
-      attributes << %w[view pageLayout] if page_view?
+      case @page_view
+      when 1
+        attributes << %w[view pageLayout]
+      when 2
+        attributes << %w[view pageBreakPreview]
+      end
 
       # 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?
-        attributes << ['zoomScaleNormal', @zoom] if zoom_scale_normal?
+        attributes << ['zoomScale', @zoom]
+
+        if @page_view == 1
+          attributes << ['zoomScalePageLayoutView', @zoom]
+        elsif @page_view == 2
+          attributes << ['zoomScaleSheetLayoutView', @zoom]
+        elsif ptrue?(@zoom_scale_normal)
+          attributes << ['zoomScaleNormal', @zoom]
+        end
       end
 
       attributes << ['workbookViewId', 0]
@@ -3755,9 +3809,10 @@ EOS
 
     def write_cell_column_dimension(row_num)  # :nodoc:
       row = @cell_data_table[row_num]
+      row_name = (row_num + 1).to_s
       (@dim_colmin..@dim_colmax).each do |col_num|
         if (cell = row[col_num])
-          cell.write_cell(self, row_num, col_num)
+          cell.write_cell(self, row_num, row_name, col_num)
         end
       end
     end
@@ -4756,10 +4811,6 @@ EOS
       ptrue?(@zoom_scale_normal)
     end
 
-    def page_view? # :nodoc:
-      !!@page_view
-    end
-
     def right_to_left? # :nodoc:
       !!@right_to_left
     end

data/write_xlsx.gemspec

@@ -20,9 +20,11 @@ Gem::Specification.new do |gem|
   end
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.require_paths = ['lib']
+  gem.add_runtime_dependency 'nkf'
   gem.add_runtime_dependency 'rubyzip', '>= 1.0.0'
   gem.add_development_dependency 'byebug'
   gem.add_development_dependency 'minitest'
+  gem.add_development_dependency 'mutex_m'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rubocop'
   gem.add_development_dependency 'rubocop-minitest'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.11.2
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-06 00:00:00.000000000 Z
+date: 2023-12-26 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: nkf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.