caxlsx 4.4.1 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcbb7e84632bd4649224e5d86f862f8f72a4782213f26a93b8b526e6fd303c23
-  data.tar.gz: bba54de54404af1abad6be6a853a69d8702222dbe1e7f7abfffdd397ade6afeb
+  metadata.gz: 4788f1b6fd206e4e4727a10114249a6ddd0eb8e3d3eed2d1f74e43e6c415b1fc
+  data.tar.gz: c8883c5e7ed0f029cb3b09f3741f724bb2ebe823c6084524e9ba72468f6291ef
 SHA512:
-  metadata.gz: b1d3e462d9cc08999723034b1b75553f2e05da0a98c802adf6a90378761d8b2bbe4eb25d2092452678a359bcc5b67aa54d3b3638c368a82d2b6a1b898bd2310d
-  data.tar.gz: ac43a99324114c37ba093a19212685f206f844d8991d4d0da48e9421d0efedcb00ef1799e74bafc66be400c32fd9bd5684ae8b6a9694b9fad81bdb60bfd51be9
+  metadata.gz: d8c5703e775090e2b1a9fec353f67e713d83ac21d6bfe980d45fc876b5506ca849ee37d8e6588b759c7434c66d444f15f90c9da6e4026042a43fc7a5910de831
+  data.tar.gz: 79e6e3341fdff59db93bc8534d77edaf2817305ab3053d0daaa66a2b3a8323f60ef07a8b49a6301d2985dc818795233c7879500f45b61b2296a454adb7df9e47

data/CHANGELOG.md

@@ -2,6 +2,21 @@ CHANGELOG
 ---------
 - **Unreleased**
 
+- **June.09.26**: 4.5.0
+  - [PR #527](https://github.com/caxlsx/caxlsx/pull/527) Fix PivotTable countNums subtotal label never applied. Solves [Issue #526](https://github.com/caxlsx/caxlsx/issues/526)
+  - [PR #522](https://github.com/caxlsx/caxlsx/pull/522) Allow custom name for pivot table data fields via :name option
+  - [PR #520](https://github.com/caxlsx/caxlsx/pull/520) Add `use_auto_formatting` and `apply_width_height_formats` accessors to `PivotTable`
+  - [PR #517](https://github.com/caxlsx/caxlsx/pull/517) Fix invalid XML when pivot table has both `columns` and multiple `data` fields configured. Solves [Issue #414](https://github.com/caxlsx/caxlsx/issues/414)
+
+- **March.23.26**: 4.4.2
+  - [PR #510](https://github.com/caxlsx/caxlsx/pull/510) Add configurable `major_tick_mark` and `minor_tick_mark` attributes to chart axes
+  - [PR #495](https://github.com/caxlsx/caxlsx/pull/495) Make worksheet name length validation optional
+  - [PR #496](https://github.com/caxlsx/caxlsx/pull/496) Fix FrozenError when passing in a frozen hash to add_style
+  - [PR #500](https://github.com/caxlsx/caxlsx/pull/500) Full Ruby 4.0 compatibility
+  - [PR #504](https://github.com/caxlsx/caxlsx/pull/504) Support automatic tick label intervals on chart axes
+  - [PR #508](https://github.com/caxlsx/caxlsx/pull/508) Auto-insert missing rows or columns to make autofilter works when using not yet existing ranges
+  - [PR #512](https://github.com/caxlsx/caxlsx/pull/512) Freeze valid tick mark values constant
+
 - **December.03.25**: 4.4.1
   - [PR #482](https://github.com/caxlsx/caxlsx/pull/482) Suppress Zip64 when it't not necessary
 

data/lib/axlsx/drawing/axis.rb

@@ -19,6 +19,8 @@ module Axlsx
       @title = @color = nil
       self.ax_pos = :b
       self.tick_lbl_pos = :nextTo
+      self.major_tick_mark = :cross
+      self.minor_tick_mark = :none
       self.format_code = "General"
       self.crosses = :autoZero
       self.gridlines = true
@@ -57,6 +59,18 @@ module Axlsx
     attr_reader :tick_lbl_pos
     alias :tickLblPos :tick_lbl_pos
 
+    # the type of major tick mark
+    # must be one of [:cross, :in, :none, :out]
+    # @return [Symbol]
+    attr_reader :major_tick_mark
+    alias :majorTickMark :major_tick_mark
+
+    # the type of minor tick mark
+    # must be one of [:cross, :in, :none, :out]
+    # @return [Symbol]
+    attr_reader :minor_tick_mark
+    alias :minorTickMark :minor_tick_mark
+
     # The number format format code for this axis
     # default :General
     # @return [String]
@@ -113,6 +127,24 @@ module Axlsx
     end
     alias :tickLblPos= :tick_lbl_pos=
 
+    VALID_TICK_MARK_VALUES = [:cross, :in, :none, :out].freeze
+
+    # the type of major tick mark
+    # must be one of [:cross, :in, :none, :out]
+    def major_tick_mark=(v)
+      RestrictionValidator.validate "#{self.class}.major_tick_mark", VALID_TICK_MARK_VALUES, v
+      @major_tick_mark = v
+    end
+    alias :majorTickMark= :major_tick_mark=
+
+    # the type of minor tick mark
+    # must be one of [:cross, :in, :none, :out]
+    def minor_tick_mark=(v)
+      RestrictionValidator.validate "#{self.class}.minor_tick_mark", VALID_TICK_MARK_VALUES, v
+      @minor_tick_mark = v
+    end
+    alias :minorTickMark= :minor_tick_mark=
+
     # The number format format code for this axis
     # default :General
     def format_code=(v)
@@ -186,8 +218,8 @@ module Axlsx
       # otherwise it will never take, as it will always prefer the 'General' formatting
       # of the cells themselves
       str << '<c:numFmt formatCode="' << @format_code << '" sourceLinked="' << (@format_code.eql?('General') ? '1' : '0') << '"/>'
-      str << '<c:majorTickMark val="none"/>'
-      str << '<c:minorTickMark val="none"/>'
+      str << '<c:majorTickMark val="' << @major_tick_mark.to_s << '"/>'
+      str << '<c:minorTickMark val="' << @minor_tick_mark.to_s << '"/>'
       str << '<c:tickLblPos val="' << @tick_lbl_pos.to_s << '"/>'
       # TODO: this is also being used for series colors
       # time to extract this into a class spPr - Shape Properties

data/lib/axlsx/drawing/cat_axis.rb

@@ -4,11 +4,9 @@ module Axlsx
   # A CatAxis object defines a chart category axis
   class CatAxis < Axis
     # Creates a new CatAxis object
-    # @option options [Integer] tick_lbl_skip
-    # @option options [Integer] tick_mark_skip
+    # @option options [Integer, nil] tick_lbl_skip
+    # @option options [Integer, nil] tick_mark_skip
     def initialize(options = {})
-      @tick_lbl_skip = 1
-      @tick_mark_skip = 1
       self.auto = 1
       self.lbl_algn = :ctr
       self.lbl_offset = "100"
@@ -32,12 +30,12 @@ module Axlsx
     alias :lblOffset :lbl_offset
 
     # The number of tick labels to skip between labels
-    # @return [Integer]
+    # @return [Integer, nil]
     attr_reader :tick_lbl_skip
     alias :tickLblSkip :tick_lbl_skip
 
     # The number of tickmarks to be skipped before the next one is rendered.
-    # @return [Boolean]
+    # @return [Integer, nil]
     attr_reader :tick_mark_skip
     alias :tickMarkSkip :tick_mark_skip
 
@@ -46,14 +44,14 @@ module Axlsx
 
     # @see tick_lbl_skip
     def tick_lbl_skip=(v)
-      Axlsx.validate_unsigned_int(v)
+      Axlsx.validate_unsigned_int(v) unless v.nil?
       @tick_lbl_skip = v
     end
     alias :tickLblSkip= :tick_lbl_skip=
 
     # @see tick_mark_skip
     def tick_mark_skip=(v)
-      Axlsx.validate_unsigned_int(v)
+      Axlsx.validate_unsigned_int(v) unless v.nil?
       @tick_mark_skip = v
     end
     alias :tickMarkSkip= :tick_mark_skip=
@@ -89,8 +87,8 @@ module Axlsx
       str << '<c:auto val="' << @auto.to_s << '"/>'
       str << '<c:lblAlgn val="' << @lbl_algn.to_s << '"/>'
       str << '<c:lblOffset val="' << @lbl_offset.to_i.to_s << '"/>'
-      str << '<c:tickLblSkip val="' << @tick_lbl_skip.to_s << '"/>'
-      str << '<c:tickMarkSkip val="' << @tick_mark_skip.to_s << '"/>'
+      str << '<c:tickLblSkip val="' << @tick_lbl_skip.to_s << '"/>' unless @tick_lbl_skip.nil?
+      str << '<c:tickMarkSkip val="' << @tick_mark_skip.to_s << '"/>' unless @tick_mark_skip.nil?
       str << '</c:catAx>'
     end
   end

data/lib/axlsx/drawing/drawing.rb

@@ -1,56 +1,56 @@
 # frozen_string_literal: true
 
 module Axlsx
-  require_relative 'd_lbls'
-  require_relative 'title'
-  require_relative 'series_title'
-  require_relative 'series'
-  require_relative 'pie_series'
-  require_relative 'bar_series'
-  require_relative 'line_series'
-  require_relative 'scatter_series'
-  require_relative 'bubble_series'
-  require_relative 'area_series'
-
-  require_relative 'scaling'
-  require_relative 'axis'
-
-  require_relative 'str_val'
-  require_relative 'num_val'
-  require_relative 'str_data'
-  require_relative 'num_data'
-  require_relative 'num_data_source'
-  require_relative 'ax_data_source'
-
-  require_relative 'ser_axis'
-  require_relative 'cat_axis'
-  require_relative 'val_axis'
-  require_relative 'axes'
-
-  require_relative 'marker'
-
-  require_relative 'one_cell_anchor'
-  require_relative 'two_cell_anchor'
-  require_relative 'graphic_frame'
-
-  require_relative 'view_3D'
-  require_relative 'chart'
-  require_relative 'pie_3D_chart'
-  require_relative 'pie_chart'
-  require_relative 'bar_3D_chart'
-  require_relative 'bar_chart'
-  require_relative 'line_chart'
-  require_relative 'line_3D_chart'
-  require_relative 'scatter_chart'
-  require_relative 'bubble_chart'
-  require_relative 'area_chart'
-
-  require_relative 'picture_locking'
-  require_relative 'pic'
-  require_relative 'hyperlink'
-
-  require_relative 'vml_drawing'
-  require_relative 'vml_shape'
+  autoload :DLbls,            'axlsx/drawing/d_lbls'
+  autoload :Title,            'axlsx/drawing/title'
+  autoload :SeriesTitle,      'axlsx/drawing/series_title'
+  autoload :Series,           'axlsx/drawing/series'
+  autoload :PieSeries,        'axlsx/drawing/pie_series'
+  autoload :BarSeries,        'axlsx/drawing/bar_series'
+  autoload :LineSeries,       'axlsx/drawing/line_series'
+  autoload :ScatterSeries,    'axlsx/drawing/scatter_series'
+  autoload :BubbleSeries,     'axlsx/drawing/bubble_series'
+  autoload :AreaSeries,       'axlsx/drawing/area_series'
+
+  autoload :Scaling,          'axlsx/drawing/scaling'
+  autoload :Axis,             'axlsx/drawing/axis'
+
+  autoload :StrVal,           'axlsx/drawing/str_val'
+  autoload :NumVal,           'axlsx/drawing/num_val'
+  autoload :StrData,          'axlsx/drawing/str_data'
+  autoload :NumData,          'axlsx/drawing/num_data'
+  autoload :NumDataSource,    'axlsx/drawing/num_data_source'
+  autoload :AxDataSource,     'axlsx/drawing/ax_data_source'
+
+  autoload :SerAxis,          'axlsx/drawing/ser_axis'
+  autoload :CatAxis,          'axlsx/drawing/cat_axis'
+  autoload :ValAxis,          'axlsx/drawing/val_axis'
+  autoload :Axes,             'axlsx/drawing/axes'
+
+  autoload :Marker,           'axlsx/drawing/marker'
+
+  autoload :OneCellAnchor,    'axlsx/drawing/one_cell_anchor'
+  autoload :TwoCellAnchor,    'axlsx/drawing/two_cell_anchor'
+  autoload :GraphicFrame,     'axlsx/drawing/graphic_frame'
+
+  autoload :View3D,           'axlsx/drawing/view_3D'
+  autoload :Chart,            'axlsx/drawing/chart'
+  autoload :Pie3DChart,       'axlsx/drawing/pie_3D_chart'
+  autoload :PieChart,         'axlsx/drawing/pie_chart'
+  autoload :Bar3DChart,       'axlsx/drawing/bar_3D_chart'
+  autoload :BarChart,         'axlsx/drawing/bar_chart'
+  autoload :LineChart,        'axlsx/drawing/line_chart'
+  autoload :Line3DChart,      'axlsx/drawing/line_3D_chart'
+  autoload :ScatterChart,     'axlsx/drawing/scatter_chart'
+  autoload :BubbleChart,      'axlsx/drawing/bubble_chart'
+  autoload :AreaChart,        'axlsx/drawing/area_chart'
+
+  autoload :PictureLocking,   'axlsx/drawing/picture_locking'
+  autoload :Pic,              'axlsx/drawing/pic'
+  autoload :Hyperlink,        'axlsx/drawing/hyperlink'
+
+  autoload :VmlDrawing,       'axlsx/drawing/vml_drawing'
+  autoload :VmlShape,         'axlsx/drawing/vml_shape'
 
   # A Drawing is a canvas for charts and images. Each worksheet has a single drawing that manages anchors.
   # The anchors reference the charts or images via graphical frames. This is not a trivial relationship so please do follow the advice in the note.

data/lib/axlsx/drawing/ser_axis.rb

@@ -4,33 +4,32 @@ module Axlsx
   # A SerAxis object defines a series axis
   class SerAxis < Axis
     # The number of tick labels to skip between labels
-    # @return [Integer]
+    # @return [Integer, nil]
     attr_reader :tick_lbl_skip
     alias :tickLblSkip :tick_lbl_skip
 
     # The number of tickmarks to be skipped before the next one is rendered.
-    # @return [Boolean]
+    # @return [Integer, nil]
     attr_reader :tick_mark_skip
     alias :tickMarkSkip :tick_mark_skip
 
     # Creates a new SerAxis object
-    # @option options [Integer] tick_lbl_skip
-    # @option options [Integer] tick_mark_skip
+    # @option options [Integer, nil] tick_lbl_skip
+    # @option options [Integer, nil] tick_mark_skip
     def initialize(options = {})
-      @tick_lbl_skip, @tick_mark_skip = 1, 1
       super
     end
 
     # @see tickLblSkip
     def tick_lbl_skip=(v)
-      Axlsx.validate_unsigned_int(v)
+      Axlsx.validate_unsigned_int(v) unless v.nil?
       @tick_lbl_skip = v
     end
     alias :tickLblSkip= :tick_lbl_skip=
 
     # @see tickMarkSkip
     def tick_mark_skip=(v)
-      Axlsx.validate_unsigned_int(v)
+      Axlsx.validate_unsigned_int(v) unless v.nil?
       @tick_mark_skip = v
     end
     alias :tickMarkSkip= :tick_mark_skip=

data/lib/axlsx/stylesheet/styles.rb

@@ -1,24 +1,24 @@
 # frozen_string_literal: true
 
 module Axlsx
-  require_relative 'border'
-  require_relative 'border_pr'
-  require_relative 'cell_alignment'
-  require_relative 'cell_style'
-  require_relative 'color'
-  require_relative 'fill'
-  require_relative 'font'
-  require_relative 'gradient_fill'
-  require_relative 'gradient_stop'
-  require_relative 'num_fmt'
-  require_relative 'pattern_fill'
-  require_relative 'table_style'
-  require_relative 'table_styles'
-  require_relative 'table_style_element'
-  require_relative 'theme'
-  require_relative 'dxf'
-  require_relative 'xf'
-  require_relative 'cell_protection'
+  autoload :Border,           'axlsx/stylesheet/border'
+  autoload :BorderPr,         'axlsx/stylesheet/border_pr'
+  autoload :CellAlignment,    'axlsx/stylesheet/cell_alignment'
+  autoload :CellStyle,        'axlsx/stylesheet/cell_style'
+  autoload :Color,            'axlsx/stylesheet/color'
+  autoload :Fill,             'axlsx/stylesheet/fill'
+  autoload :Font,             'axlsx/stylesheet/font'
+  autoload :GradientFill,     'axlsx/stylesheet/gradient_fill'
+  autoload :GradientStop,     'axlsx/stylesheet/gradient_stop'
+  autoload :NumFmt,           'axlsx/stylesheet/num_fmt'
+  autoload :PatternFill,      'axlsx/stylesheet/pattern_fill'
+  autoload :TableStyle,       'axlsx/stylesheet/table_style'
+  autoload :TableStyles,      'axlsx/stylesheet/table_styles'
+  autoload :TableStyleElement, 'axlsx/stylesheet/table_style_element'
+  autoload :Theme,            'axlsx/stylesheet/theme'
+  autoload :Dxf,              'axlsx/stylesheet/dxf'
+  autoload :Xf,               'axlsx/stylesheet/xf'
+  autoload :CellProtection,   'axlsx/stylesheet/cell_protection'
 
   # The Styles class manages worksheet styles
   # In addition to creating the require style objects for a valid xlsx package, this class provides the key mechanism for adding styles to your workbook, and safely applying them to the cells of your worksheet.
@@ -228,6 +228,8 @@ module Axlsx
     # An index for cell styles where keys are styles codes as per Axlsx::Style and values are Cell#raw_style
     # The reason for the backward key/value ordering is that style lookup must be most efficient, while `add_style` can be less efficient
     def add_style(options = {})
+      options = options.dup
+
       # Default to :xf
       options[:type] ||= :xf
 

data/lib/axlsx/version.rb

@@ -2,5 +2,5 @@
 
 module Axlsx
   # The current version
-  VERSION = "4.4.1"
+  VERSION = "4.5.0"
 end

data/lib/axlsx/workbook/workbook.rb

@@ -1,64 +1,69 @@
 # frozen_string_literal: true
 
 module Axlsx
-  require_relative 'worksheet/sheet_calc_pr'
-  require_relative 'worksheet/auto_filter/auto_filter'
-  require_relative 'worksheet/date_time_converter'
-  require_relative 'worksheet/protected_range'
-  require_relative 'worksheet/protected_ranges'
-  require_relative 'worksheet/rich_text_run'
-  require_relative 'worksheet/rich_text'
-  require_relative 'worksheet/cell_serializer'
-  require_relative 'worksheet/cell'
-  require_relative 'worksheet/page_margins'
-  require_relative 'worksheet/page_set_up_pr'
-  require_relative 'worksheet/outline_pr'
-  require_relative 'worksheet/page_setup'
-  require_relative 'worksheet/header_footer'
-  require_relative 'worksheet/print_options'
-  require_relative 'worksheet/cfvo'
-  require_relative 'worksheet/cfvos'
-  require_relative 'worksheet/color_scale'
-  require_relative 'worksheet/data_bar'
-  require_relative 'worksheet/icon_set'
-  require_relative 'worksheet/conditional_formatting'
-  require_relative 'worksheet/conditional_formatting_rule'
-  require_relative 'worksheet/conditional_formattings'
-  require_relative 'worksheet/row'
-  require_relative 'worksheet/col'
-  require_relative 'worksheet/cols'
-  require_relative 'worksheet/comments'
-  require_relative 'worksheet/comment'
-  require_relative 'worksheet/merged_cells'
-  require_relative 'worksheet/sheet_protection'
-  require_relative 'worksheet/sheet_pr'
-  require_relative 'worksheet/dimension'
-  require_relative 'worksheet/sheet_data'
-  require_relative 'worksheet/worksheet_drawing'
-  require_relative 'worksheet/worksheet_comments'
-  require_relative 'worksheet/worksheet_hyperlink'
-  require_relative 'worksheet/worksheet_hyperlinks'
-  require_relative 'worksheet/break'
-  require_relative 'worksheet/row_breaks'
-  require_relative 'worksheet/col_breaks'
-  require_relative 'workbook_view'
-  require_relative 'workbook_views'
-  require_relative 'worksheet/worksheet'
-  require_relative 'shared_strings_table'
-  require_relative 'defined_name'
-  require_relative 'defined_names'
-  require_relative 'worksheet/table_style_info'
-  require_relative 'worksheet/table'
-  require_relative 'worksheet/tables'
-  require_relative 'worksheet/pivot_table_cache_definition'
-  require_relative 'worksheet/pivot_table'
-  require_relative 'worksheet/pivot_tables'
-  require_relative 'worksheet/data_validation'
-  require_relative 'worksheet/data_validations'
-  require_relative 'worksheet/sheet_view'
-  require_relative 'worksheet/sheet_format_pr'
-  require_relative 'worksheet/pane'
-  require_relative 'worksheet/selection'
+  autoload :SheetCalcPr,              'axlsx/workbook/worksheet/sheet_calc_pr'
+  autoload :AutoFilter,               'axlsx/workbook/worksheet/auto_filter/auto_filter'
+  autoload :FilterColumn,             'axlsx/workbook/worksheet/auto_filter/filter_column'
+  autoload :Filters,                  'axlsx/workbook/worksheet/auto_filter/filters'
+  autoload :SortState,                'axlsx/workbook/worksheet/auto_filter/sort_state'
+  autoload :SortCondition,            'axlsx/workbook/worksheet/auto_filter/sort_condition'
+  autoload :DateTimeConverter,        'axlsx/workbook/worksheet/date_time_converter'
+  autoload :ProtectedRange,           'axlsx/workbook/worksheet/protected_range'
+  autoload :ProtectedRanges,          'axlsx/workbook/worksheet/protected_ranges'
+  autoload :RichTextRun,              'axlsx/workbook/worksheet/rich_text_run'
+  autoload :RichText,                 'axlsx/workbook/worksheet/rich_text'
+  autoload :CellSerializer,           'axlsx/workbook/worksheet/cell_serializer'
+  autoload :Cell,                     'axlsx/workbook/worksheet/cell'
+  autoload :PageMargins,              'axlsx/workbook/worksheet/page_margins'
+  autoload :PageSetUpPr,              'axlsx/workbook/worksheet/page_set_up_pr'
+  autoload :OutlinePr,                'axlsx/workbook/worksheet/outline_pr'
+  autoload :PageSetup,                'axlsx/workbook/worksheet/page_setup'
+  autoload :HeaderFooter,             'axlsx/workbook/worksheet/header_footer'
+  autoload :PrintOptions,             'axlsx/workbook/worksheet/print_options'
+  autoload :Cfvo,                     'axlsx/workbook/worksheet/cfvo'
+  autoload :Cfvos,                    'axlsx/workbook/worksheet/cfvos'
+  autoload :ColorScale,               'axlsx/workbook/worksheet/color_scale'
+  autoload :DataBar,                  'axlsx/workbook/worksheet/data_bar'
+  autoload :IconSet,                  'axlsx/workbook/worksheet/icon_set'
+  autoload :ConditionalFormatting,    'axlsx/workbook/worksheet/conditional_formatting'
+  autoload :ConditionalFormattingRule, 'axlsx/workbook/worksheet/conditional_formatting_rule'
+  autoload :ConditionalFormattings,   'axlsx/workbook/worksheet/conditional_formattings'
+  autoload :Row,                      'axlsx/workbook/worksheet/row'
+  autoload :Col,                      'axlsx/workbook/worksheet/col'
+  autoload :Cols,                     'axlsx/workbook/worksheet/cols'
+  autoload :Comments,                 'axlsx/workbook/worksheet/comments'
+  autoload :Comment,                  'axlsx/workbook/worksheet/comment'
+  autoload :MergedCells,              'axlsx/workbook/worksheet/merged_cells'
+  autoload :SheetProtection,          'axlsx/workbook/worksheet/sheet_protection'
+  autoload :SheetPr,                  'axlsx/workbook/worksheet/sheet_pr'
+  autoload :Dimension,                'axlsx/workbook/worksheet/dimension'
+  autoload :SheetData,                'axlsx/workbook/worksheet/sheet_data'
+  autoload :WorksheetDrawing,         'axlsx/workbook/worksheet/worksheet_drawing'
+  autoload :WorksheetComments,        'axlsx/workbook/worksheet/worksheet_comments'
+  autoload :WorksheetHyperlink,       'axlsx/workbook/worksheet/worksheet_hyperlink'
+  autoload :WorksheetHyperlinks,      'axlsx/workbook/worksheet/worksheet_hyperlinks'
+  autoload :Break,                    'axlsx/workbook/worksheet/break'
+  autoload :RowBreaks,                'axlsx/workbook/worksheet/row_breaks'
+  autoload :ColBreaks,                'axlsx/workbook/worksheet/col_breaks'
+  autoload :WorkbookView,             'axlsx/workbook/workbook_view'
+  autoload :WorkbookViews,            'axlsx/workbook/workbook_views'
+  autoload :Worksheet,                'axlsx/workbook/worksheet/worksheet'
+  autoload :BorderCreator,            'axlsx/workbook/worksheet/border_creator'
+  autoload :SharedStringsTable,       'axlsx/workbook/shared_strings_table'
+  autoload :DefinedName,              'axlsx/workbook/defined_name'
+  autoload :DefinedNames,             'axlsx/workbook/defined_names'
+  autoload :TableStyleInfo,           'axlsx/workbook/worksheet/table_style_info'
+  autoload :Table,                    'axlsx/workbook/worksheet/table'
+  autoload :Tables,                   'axlsx/workbook/worksheet/tables'
+  autoload :PivotTableCacheDefinition, 'axlsx/workbook/worksheet/pivot_table_cache_definition'
+  autoload :PivotTable,               'axlsx/workbook/worksheet/pivot_table'
+  autoload :PivotTables,              'axlsx/workbook/worksheet/pivot_tables'
+  autoload :DataValidation,           'axlsx/workbook/worksheet/data_validation'
+  autoload :DataValidations,          'axlsx/workbook/worksheet/data_validations'
+  autoload :SheetView,                'axlsx/workbook/worksheet/sheet_view'
+  autoload :SheetFormatPr,            'axlsx/workbook/worksheet/sheet_format_pr'
+  autoload :Pane,                     'axlsx/workbook/worksheet/pane'
+  autoload :Selection,                'axlsx/workbook/worksheet/selection'
 
   # The Workbook class is an xlsx workbook that manages worksheets, charts, drawings and styles.
   # The following parts of the Office Open XML spreadsheet specification are not implemented in this version.

data/lib/axlsx/workbook/worksheet/auto_filter/auto_filter.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'filter_column'
-require_relative 'filters'
-require_relative 'sort_state'
-
 module Axlsx
   # This class represents an auto filter range in a worksheet
   class AutoFilter
@@ -30,7 +26,25 @@ module Axlsx
     def defined_name
       return unless range
 
-      Axlsx.cell_range(range.split(':').collect { |name| worksheet.name_to_cell(name) })
+      cells = range.split(':').collect do |name|
+        cell = worksheet.name_to_cell(name)
+        next cell if cell
+
+        # We're calculating the defined_name for the AutoFilter just before serializing,
+        # so in theory adding new rows or columns should not cause weird offset issues
+        col_index, row_index = *Axlsx.name_to_indices(name)
+        while (row = worksheet.rows[row_index]).nil?
+          worksheet.add_row
+        end
+
+        while (cell = row[col_index]).nil?
+          row.add_cell
+        end
+
+        cell
+      end
+
+      Axlsx.cell_range(cells)
     end
 
     # A collection of filterColumns for this auto_filter

data/lib/axlsx/workbook/worksheet/auto_filter/sort_state.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative 'sort_condition'
-
 module Axlsx
   # This class performs sorting on a range in a worksheet
   class SortState

data/lib/axlsx/workbook/worksheet/pivot_table.rb

@@ -29,6 +29,8 @@ module Axlsx
       @grand_totals = :both
       @sort_on_headers = {}
       @style_info = {}
+      @use_auto_formatting = true
+      @apply_width_height_formats = true
       parse_options options
       yield self if block_given?
     end
@@ -85,6 +87,14 @@ module Axlsx
     # @return [Worksheet]
     attr_writer :data_sheet
 
+    # Whether to apply auto formatting to the pivot table.
+    # @return [Boolean]
+    attr_accessor :use_auto_formatting
+
+    # Whether to apply width/height formats to the pivot table.
+    # @return [Boolean]
+    attr_accessor :apply_width_height_formats
+
     # @see #data_sheet
     def data_sheet
       @data_sheet || @sheet
@@ -207,7 +217,11 @@ module Axlsx
       str << ' dataOnRows="1"' if data.size <= 1
       str << ' rowGrandTotals="0"' if grand_totals == :col_only || grand_totals == :none
       str << ' colGrandTotals="0"' if grand_totals == :row_only || grand_totals == :none
-      str << ' applyNumberFormats="0" applyBorderFormats="0" applyFontFormats="0" applyPatternFormats="0" applyAlignmentFormats="0" applyWidthHeightFormats="1" dataCaption="Data" showMultipleLabel="0" showMemberPropertyTips="0" useAutoFormatting="1" indent="0" compact="0" compactData="0" gridDropZones="1" multipleFieldFilters="0">'
+      str << ' applyNumberFormats="0" applyBorderFormats="0" applyFontFormats="0" applyPatternFormats="0" applyAlignmentFormats="0"'
+      str << ' applyWidthHeightFormats="' << (@apply_width_height_formats ? '1' : '0') << '"'
+      str << ' dataCaption="Data" showMultipleLabel="0" showMemberPropertyTips="0"'
+      str << ' useAutoFormatting="' << (@use_auto_formatting ? '1' : '0') << '"'
+      str << ' indent="0" compact="0" compactData="0" gridDropZones="1" multipleFieldFilters="0">'
 
       str << '<location firstDataCol="1" firstDataRow="1" firstHeaderRow="1" ref="' << ref << '"/>'
       str << '<pivotFields count="' << header_cells_count.to_s << '">'
@@ -246,6 +260,18 @@ module Axlsx
         else
           str << '<colItems count="1"><i/></colItems>'
         end
+      elsif data.size > 1
+        str << '<colFields count="' << (columns.size + 1).to_s << '">'
+        columns.each do |column_value|
+          str << '<field x="' << header_index_of(column_value).to_s << '"/>'
+        end
+        str << '<field x="-2"/></colFields>'
+        str << "<colItems count=\"#{data.size}\">"
+        str << '<i><x/></i>'
+        (data.size - 1).times do |i|
+          str << "<i i=\"#{i + 1}\"><x v=\"#{i + 1}\"/></i>"
+        end
+        str << '</colItems>'
       else
         str << '<colFields count="' << columns.size.to_s << '">'
         columns.each do |column_value|
@@ -264,8 +290,9 @@ module Axlsx
         str << "<dataFields count=\"#{data.size}\">"
         data.each do |datum_value|
           subtotal_name = datum_value[:subtotal] || 'sum'
-          subtotal_name = 'count' if name == 'countNums' # both count & countNums are labelled as count
-          str << "<dataField name='#{subtotal_name.capitalize} of #{datum_value[:ref]}' fld='#{header_index_of(datum_value[:ref])}' baseField='0' baseItem='0'"
+          subtotal_name = 'count' if datum_value[:subtotal] == 'countNums' # both count & countNums are labelled as count
+          field_name = datum_value[:name] || "#{subtotal_name.capitalize} of #{datum_value[:ref]}"
+          str << "<dataField name='#{field_name}' fld='#{header_index_of(datum_value[:ref])}' baseField='0' baseItem='0'"
           str << " numFmtId='#{datum_value[:num_fmt]}'" if datum_value[:num_fmt]
           str << " subtotal='#{datum_value[:subtotal]}' " if datum_value[:subtotal]
           str << "/>"

data/lib/axlsx/workbook/worksheet/worksheet.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "border_creator"
-
 module Axlsx
   # The Worksheet class represents a worksheet in the workbook.
   class Worksheet
@@ -768,7 +766,7 @@ module Axlsx
       raise ArgumentError, ERR_SHEET_NAME_EMPTY if name.empty?
 
       character_length = name.encode("utf-16")[1..-1].encode("utf-16").bytesize / 2
-      raise ArgumentError, format(ERR_SHEET_NAME_TOO_LONG, name) if character_length > WORKSHEET_MAX_NAME_LENGTH
+      raise ArgumentError, format(ERR_SHEET_NAME_TOO_LONG, name) if character_length > WORKSHEET_MAX_NAME_LENGTH && Axlsx.validate_sheet_name_length
       raise ArgumentError, format(ERR_SHEET_NAME_CHARACTER_FORBIDDEN, name) if WORKSHEET_NAME_FORBIDDEN_CHARS.any? { |char| name.include? char }
 
       name = Axlsx.coder.encode(name)

data/lib/axlsx.rb

@@ -9,7 +9,7 @@ require 'nokogiri'
 require 'zip'
 
 # Ruby core dependencies
-require 'cgi'
+require 'cgi/escape'
 require 'set'
 require 'time'
 require 'uri'
@@ -231,6 +231,22 @@ module Axlsx
     @escape_formulas = value
   end
 
+  # Whether to validate the sheet name length.
+  # @return [Boolean]
+  def self.validate_sheet_name_length
+    !defined?(@validate_sheet_name_length) || @validate_sheet_name_length.then { |v| v.nil? || v }
+  end
+
+  # Sets whether to validate sheet name length.
+  # By default it validates the max length for sheet names to make it compatible with Microsoft Excel
+  # On paper, and by real world examples this is still a valid limitation, but some implementations (e.g. Libre Office) might not break on longer names.
+  # Use it if you are sure that the end users could still open the files.
+  # @param [Boolean] value The value to set.
+  def self.validate_sheet_name_length=(value)
+    Axlsx.validate_boolean(value)
+    @validate_sheet_name_length = value
+  end
+
   # Returns a URI parser instance, preferring RFC2396_PARSER if available,
   # otherwise falling back to DEFAULT_PARSER. This method ensures consistent
   # URI parsing across different Ruby versions.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caxlsx
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.5.0
 platform: ruby
 authors:
 - Randy Morgan
@@ -312,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Excel OOXML (xlsx) with charts, styles, images and autowidth columns.
 test_files: []