write_xlsx 1.13.0 → 1.15.1

data/lib/write_xlsx/worksheet/autofilter.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
+require 'write_xlsx/constants'
+
 module Writexlsx
   class Worksheet
     # Autofilter-related operations extracted from Worksheet to slim the main class.
     module Autofilter
-      include Utility
+      include Constants
 
       #
       # :call-seq:

data/lib/write_xlsx/worksheet/cell_data.rb

@@ -1,10 +1,14 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 
+require 'write_xlsx/utility/common'
+require 'write_xlsx/utility/cell_reference'
+
 module Writexlsx
   class Worksheet
     class CellData   # :nodoc:
-      include Writexlsx::Utility
+      include Writexlsx::Utility::Common
+      include Writexlsx::Utility::CellReference
 
       attr_reader :xf
 

data/lib/write_xlsx/worksheet/columns.rb

@@ -95,9 +95,14 @@ module Writexlsx
       # 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
+      def autofit(max_width = 255.0)
         col_width = {}
 
+        # Convert the autofit maximum pixel width to a column/character width, but
+        # limit it to the Excel max limit.
+        max_width = pixels_to_width(max_width)
+        max_width = 255.0 if max_width > 255.0
+
         # 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.
@@ -181,8 +186,8 @@ module Writexlsx
           # 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
+          # Limit the width to the maximum user or Excel value.
+          width = max_width if width > max_width
 
           # Add the width to an existing col info structure or add a new one.
           if @col_info[col_num]

data/lib/write_xlsx/worksheet/data_validation.rb

@@ -1,10 +1,18 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 
+require 'write_xlsx/utility/common'
+require 'write_xlsx/utility/cell_reference'
+require 'write_xlsx/utility/dimensions'
+require 'write_xlsx/utility/date_time'
+
 module Writexlsx
   class Worksheet
     class DataValidation   # :nodoc:
-      include Writexlsx::Utility
+      include Writexlsx::Utility::Common
+      include Writexlsx::Utility::CellReference
+      include Writexlsx::Utility::Dimensions
+      include Writexlsx::Utility::DateTime
 
       attr_reader :value, :source, :minimum, :maximum, :validate, :criteria
       attr_reader :error_type, :cells, :other_cells

data/lib/write_xlsx/worksheet/data_writing.rb

@@ -10,11 +10,14 @@
 # Copyright 2000-2011, John McNamara, jmcnamara@cpan.org
 # Convert to ruby by Hideo NAKAMURA, nakamura.hideo@gmail.com
 #
+require 'write_xlsx/constants'
+require 'write_xlsx/utility/common'
 
 module Writexlsx
   class Worksheet
     module DataWriting
-      include Writexlsx::Utility
+      include Constants
+      include Writexlsx::Utility::Common
 
       #
       # :call-seq:
@@ -53,15 +56,15 @@ module Writexlsx
           write_number(_row, _col, _token, _format)
         elsif _token.respond_to?(:=~)  # String
           # Match integer with leading zero(s)
-          if @leading_zeros && _token =~ /^0\d*$/
+          if @leading_zeros && _token =~ /\A0\d*\Z/
             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 =~ /^=/
+          elsif _token =~ /\A=/
             write_formula(_row, _col, _token, _format, _value1)
           # Match array formula
-          elsif _token =~ /^\{=.*\}$/
+          elsif _token =~ /\A\{=.*\}\Z/
             write_formula(_row, _col, _token, _format, _value1)
           # Match blank
           elsif _token == ''
@@ -309,7 +312,7 @@ module Writexlsx
         return given_formula unless ptrue?(given_formula)
 
         # Remove array formula braces and the leading =.
-        formula = given_formula.sub(/^\{(.*)\}$/, '\1').sub(/^=/, '')
+        formula = given_formula.sub(/\A\{(.*)\}\Z/, '\1').sub(/\A=/, '')
 
         # # Don't expand formulas that the user has already expanded.
         return formula if formula =~ /_xlfn\./
@@ -509,7 +512,7 @@ module Writexlsx
         end
 
         # Hand off array formulas.
-        if _formula =~ /^\{=.*\}$/
+        if _formula =~ /\A\{=.*\}\Z/
           write_array_formula(_row, _col, _row, _col, _formula, _format, _value)
         else
           check_dimensions(_row, _col)
@@ -639,7 +642,7 @@ module Writexlsx
       def update_format_with_params(row, col, params = nil)
         if (row_col_array = row_col_notation(row))
           _row, _col = row_col_array
-          _params = args[1]
+          _params = col
         else
           _row = row
           _col = col
@@ -934,25 +937,49 @@ module Writexlsx
       #
       # Update formatting of cells in range to the specified row and column (zero indexed).
       #
+      # def update_range_format_with_params(row_first, col_first, row_last = nil, col_last = nil, params = nil)
+      #   if (row_col_array = row_col_notation(row_first))
+      #     _row_first, _col_first, _row_last, _col_last = row_col_array
+      #     params = args[1..-1]
+      #   else
+      #     _row_first = row_first
+      #     _col_first = col_first
+      #     _row_last  = row_last
+      #     _col_last  = col_last
+      #     _params    = params
+      #   end
+
+      #   raise WriteXLSXInsufficientArgumentError if [_row_first, _col_first, _row_last, _col_last, _params].include?(nil)
+
+      #   # Swap last row/col with first row/col as necessary
+      #   _row_first, _row_last = _row_last, _row_first if _row_first > _row_last
+      #   _col_first, _col_last = _col_last, _col_first if _col_first > _col_last
+
+      #   # Check that column number is valid and store the max value
+      #   check_dimensions(_row_last, _col_last)
+      #   store_row_col_max_min_values(_row_last, _col_last)
+
+      #   (_row_first.._row_last).each do |row|
+      #     (_col_first.._col_last).each do |col|
+      #       update_format_with_params(row, col, _params)
+      #     end
+      #   end
+      # end
       def update_range_format_with_params(row_first, col_first, row_last = nil, col_last = nil, params = nil)
         if (row_col_array = row_col_notation(row_first))
           _row_first, _col_first, _row_last, _col_last = row_col_array
-          params = args[1..-1]
+          _params = col_first
         else
-          _row_first = row_first
-          _col_first = col_first
-          _row_last  = row_last
-          _col_last  = col_last
-          _params    = params
+          _row_first, _col_first = row_first, col_first
+          _row_last,  _col_last  = row_last, col_last
+          _params = params
         end
 
         raise WriteXLSXInsufficientArgumentError if [_row_first, _col_first, _row_last, _col_last, _params].include?(nil)
 
-        # Swap last row/col with first row/col as necessary
         _row_first, _row_last = _row_last, _row_first if _row_first > _row_last
         _col_first, _col_last = _col_last, _col_first if _col_first > _col_last
 
-        # Check that column number is valid and store the max value
         check_dimensions(_row_last, _col_last)
         store_row_col_max_min_values(_row_last, _col_last)
 

data/lib/write_xlsx/worksheet/drawing_preparation.rb

@@ -159,7 +159,7 @@ module Writexlsx
           end
 
           if target.length > 255
-            raise <<"EOS"
+            raise <<EOS
 Ignoring URL #{target} where link or anchor > 255 characters since it exceeds Excel's limit for URLS. See LIMITATIONS section of the WriteXLSX documentation.
 EOS
           end

data/lib/write_xlsx/worksheet/formatting.rb

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 # frozen_string_literal: true
 
+require 'write_xlsx/constants'
+
 ###############################################################################
 #
 # Formatting - A module for worksheet layout and print/appearance settings.
@@ -13,7 +15,7 @@
 module Writexlsx
   class Worksheet
     module Formatting
-      include Utility
+      include Constants
 
       #
       # Header/footer

data/lib/write_xlsx/worksheet/hyperlink.rb

@@ -1,10 +1,18 @@
 # -*- encoding: utf-8 -*-
 # frozen_string_literal: true
 
+require 'write_xlsx/utility/common'
+require 'write_xlsx/utility/cell_reference'
+require 'write_xlsx/utility/url'
+require 'write_xlsx/utility/xml_primitives'
+
 module Writexlsx
   class Worksheet
     class Hyperlink   # :nodoc:
-      include Writexlsx::Utility
+      include Writexlsx::Utility::Common
+      include Writexlsx::Utility::CellReference
+      include Writexlsx::Utility::Url
+      include Writexlsx::Utility::XmlPrimitives
 
       attr_reader :str, :tip
 

data/lib/write_xlsx/worksheet/row_col_sizing.rb

@@ -1,10 +1,12 @@
 # -*- coding: utf-8 -*-
 # frozen_string_literal: true
 
+require 'write_xlsx/utility/string_width'
+
 module Writexlsx
   class Worksheet
     module RowColSizing
-      include Utility
+      include Writexlsx::Utility::StringWidth
 
       #
       # Convert the width of a cell from user's units to pixels. Excel rounds

data/lib/write_xlsx/worksheet/xml_writer.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
+require 'write_xlsx/utility/string_width'
+
 module Writexlsx
   class Worksheet
     module XmlWriter
-      include Utility
+      include Writexlsx::Utility::StringWidth
 
       def assemble_xml_file # :nodoc:
         write_xml_declaration do
@@ -440,13 +442,16 @@ module Writexlsx
         xf_index = format ? format.get_xf_index : 0
 
         attributes = [['r',  r + 1]]
-
         attributes << ['spans',        spans]    if spans
         attributes << ['s',            xf_index] if ptrue?(xf_index)
         attributes << ['customFormat', 1]        if ptrue?(format)
-        attributes << ['ht',           height]   if height != @original_row_height
+        if height != @original_row_height || height != @default_row_height
+          attributes << ['ht',           height]
+        end
         attributes << ['hidden',       1]        if ptrue?(hidden)
-        attributes << ['customHeight', 1]        if height != @original_row_height
+        if height != @original_row_height || height != @default_row_height
+          attributes << ['customHeight', 1]
+        end
         attributes << ['outlineLevel', level]    if ptrue?(level)
         attributes << ['collapsed',    1]        if ptrue?(collapsed)
 

data/lib/write_xlsx/worksheet.rb

@@ -1,8 +1,26 @@
 # -*- coding: utf-8 -*-
 # frozen_string_literal: true
 
+###############################################################################
+#
+# Workbook
+#
+# The Workbook class acts as a facade coordinating workbook state,
+# package preparation and XML generation.
+#
+# Responsibilities are delegated to specialized modules:
+#
+#   Initialization      - workbook setup and default state
+#   WorkbookWriter      - workbook XML generation
+#   PackagePreparation  - package assembly and workbook preparation
+#   FormatPreparation   - format, font, border and fill preparation
+#   ChartData           - chart cache data extraction and defined name helpers
+#
+###############################################################################
+
 require 'write_xlsx/colors'
 require 'write_xlsx/compatibility'
+require 'write_xlsx/constants'
 require 'write_xlsx/drawing'
 require 'write_xlsx/format'
 require 'write_xlsx/image'
@@ -14,7 +32,6 @@ require 'write_xlsx/package/conditional_format'
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/page_setup'
 require 'write_xlsx/sparkline'
-require 'write_xlsx/utility'
 require 'write_xlsx/worksheet/asset_manager'
 require 'write_xlsx/worksheet/autofilter'
 require 'write_xlsx/worksheet/cell_data'
@@ -48,7 +65,7 @@ module Writexlsx
   class Worksheet
     extend Forwardable
 
-    include Writexlsx::Utility
+    include Constants
 
     # storage / initialization
     include Initialization

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.15.1
 platform: ruby
 authors:
 - Hideo NAKAMURA
@@ -242,23 +242,47 @@ files:
 - lib/write_xlsx/chart.rb
 - lib/write_xlsx/chart/area.rb
 - lib/write_xlsx/chart/axis.rb
+- lib/write_xlsx/chart/axis_writer.rb
 - lib/write_xlsx/chart/bar.rb
 - lib/write_xlsx/chart/caption.rb
+- lib/write_xlsx/chart/chart_area.rb
 - lib/write_xlsx/chart/column.rb
+- lib/write_xlsx/chart/d_pt_point_writer.rb
 - lib/write_xlsx/chart/doughnut.rb
+- lib/write_xlsx/chart/formatting_writer.rb
+- lib/write_xlsx/chart/initialization.rb
 - lib/write_xlsx/chart/legend.rb
 - lib/write_xlsx/chart/line.rb
 - lib/write_xlsx/chart/pie.rb
 - lib/write_xlsx/chart/radar.rb
 - lib/write_xlsx/chart/scatter.rb
 - lib/write_xlsx/chart/series.rb
+- lib/write_xlsx/chart/series_data.rb
+- lib/write_xlsx/chart/series_writer.rb
+- lib/write_xlsx/chart/settings.rb
 - lib/write_xlsx/chart/stock.rb
+- lib/write_xlsx/chart/table.rb
+- lib/write_xlsx/chart/xml_writer.rb
 - lib/write_xlsx/chartsheet.rb
 - lib/write_xlsx/col_name.rb
 - lib/write_xlsx/colors.rb
 - lib/write_xlsx/compatibility.rb
+- lib/write_xlsx/constants.rb
 - lib/write_xlsx/drawing.rb
 - lib/write_xlsx/format.rb
+- lib/write_xlsx/format/alignment_state.rb
+- lib/write_xlsx/format/alignment_style.rb
+- lib/write_xlsx/format/border_state.rb
+- lib/write_xlsx/format/border_style.rb
+- lib/write_xlsx/format/fill_state.rb
+- lib/write_xlsx/format/fill_style.rb
+- lib/write_xlsx/format/font_state.rb
+- lib/write_xlsx/format/font_style.rb
+- lib/write_xlsx/format/format_state.rb
+- lib/write_xlsx/format/number_format_state.rb
+- lib/write_xlsx/format/number_format_style.rb
+- lib/write_xlsx/format/protection_state.rb
+- lib/write_xlsx/format/protection_style.rb
 - lib/write_xlsx/formats.rb
 - lib/write_xlsx/gradient.rb
 - lib/write_xlsx/image.rb
@@ -289,9 +313,24 @@ files:
 - lib/write_xlsx/shape.rb
 - lib/write_xlsx/sheets.rb
 - lib/write_xlsx/sparkline.rb
-- lib/write_xlsx/utility.rb
+- lib/write_xlsx/utility/cell_reference.rb
+- lib/write_xlsx/utility/chart_formatting.rb
+- lib/write_xlsx/utility/common.rb
+- lib/write_xlsx/utility/date_time.rb
+- lib/write_xlsx/utility/dimensions.rb
+- lib/write_xlsx/utility/drawing.rb
+- lib/write_xlsx/utility/rich_text.rb
+- lib/write_xlsx/utility/sheetname_quoting.rb
+- lib/write_xlsx/utility/string_width.rb
+- lib/write_xlsx/utility/url.rb
+- lib/write_xlsx/utility/xml_primitives.rb
 - lib/write_xlsx/version.rb
 - lib/write_xlsx/workbook.rb
+- lib/write_xlsx/workbook/chart_data.rb
+- lib/write_xlsx/workbook/format_preparation.rb
+- lib/write_xlsx/workbook/initialization.rb
+- lib/write_xlsx/workbook/package_preparation.rb
+- lib/write_xlsx/workbook/workbook_writer.rb
 - lib/write_xlsx/worksheet.rb
 - lib/write_xlsx/worksheet/asset_manager.rb
 - lib/write_xlsx/worksheet/autofilter.rb
@@ -338,7 +377,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.16
 specification_version: 4
 summary: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.
 test_files: []