caxlsx 4.4.2 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 033d0bf9c5c5bbc7f229a6b0f7e1096c18228c2a45e52f986b20b0e9be727e7d
-  data.tar.gz: 0e1f11c9d82aa7022fde87ce6e46d2a2df6fb0bb628e6a3cb32c2bfa0b154974
+  metadata.gz: 4788f1b6fd206e4e4727a10114249a6ddd0eb8e3d3eed2d1f74e43e6c415b1fc
+  data.tar.gz: c8883c5e7ed0f029cb3b09f3741f724bb2ebe823c6084524e9ba72468f6291ef
 SHA512:
-  metadata.gz: 505d76a46958eb1f87ca56e68dab1d7a9c4b9a29669176a57e1090b0badb30572aba05dab0dc4cc9f6c3568d98ac282370f9c5fadace96f513ab98dc28e235ce
-  data.tar.gz: dec00692600e59ec8bf1dfecb7aea03e535c12030d0a658f26313576dd3d62513c8b6f447af26846667e80b0f3482e7de69b67f30d7a4eb80b1ad14d84b9bf35
+  metadata.gz: d8c5703e775090e2b1a9fec353f67e713d83ac21d6bfe980d45fc876b5506ca849ee37d8e6588b759c7434c66d444f15f90c9da6e4026042a43fc7a5910de831
+  data.tar.gz: 79e6e3341fdff59db93bc8534d77edaf2817305ab3053d0daaa66a2b3a8323f60ef07a8b49a6301d2985dc818795233c7879500f45b61b2296a454adb7df9e47

data/CHANGELOG.md

@@ -2,6 +2,12 @@ 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

data/lib/axlsx/util/zip_command.rb

@@ -40,7 +40,7 @@ module Axlsx
       @current_file = "#{@dir}/#{entry.name}"
       @files << entry.name
       FileUtils.mkdir_p(File.dirname(@current_file))
-      @io = File.open(@current_file, "wb") # rubocop:disable Style/FileOpen -- we're passing over the file descriptor intentionally
+      @io = File.open(@current_file, "wb")
     end
 
     # Write to a buffer that will be written to the current entry

data/lib/axlsx/version.rb

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

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 << "/>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caxlsx
 version: !ruby/object:Gem::Version
-  version: 4.4.2
+  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: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Excel OOXML (xlsx) with charts, styles, images and autowidth columns.
 test_files: []