caxlsx 4.1.0 → 4.2.0

data/lib/axlsx/workbook/shared_strings_table.rb

@@ -7,7 +7,7 @@ module Axlsx
   # As a developer, you should never need to directly work against this class. Simply set 'use_shared_strings'
   # on the package or workbook to generate a package that uses the shared strings table instead of inline strings.
   # @note Serialization performance is affected by using this serialization method so if you do not need interoperability
-  # it is recomended that you use the default inline string method of serialization.
+  # it is recommended that you use the default inline string method of serialization.
   class SharedStringsTable
     # The total number of strings in the workbook including duplicates
     # Empty cells are treated as blank strings
@@ -29,7 +29,7 @@ module Axlsx
     # @see Workbook#xml_space
     attr_reader :xml_space
 
-    # Creates a new Shared Strings Table agains an array of cells
+    # Creates a new Shared Strings Table against an array of cells
     # @param [Array] cells This is an array of all of the cells in the workbook
     # @param [Symbol] xml_space The xml:space behavior for the shared string table.
     def initialize(cells, xml_space = :preserve)
@@ -54,7 +54,7 @@ module Axlsx
 
     private
 
-    # Interate over all of the cells in the array.
+    # Iterate over all of the cells in the array.
     # if our unique cells array does not contain a sharable cell,
     # add the cell to our unique cells array and set the ssti attribute on the index of this cell in the shared strings table
     # if a sharable cell already exists in our unique_cells array, set the ssti attribute of the cell and move on.

data/lib/axlsx/workbook/workbook.rb

@@ -1,67 +1,67 @@
 # frozen_string_literal: true
 
 module Axlsx
-  require 'axlsx/workbook/worksheet/sheet_calc_pr'
-  require 'axlsx/workbook/worksheet/auto_filter/auto_filter'
-  require 'axlsx/workbook/worksheet/date_time_converter'
-  require 'axlsx/workbook/worksheet/protected_range'
-  require 'axlsx/workbook/worksheet/protected_ranges'
-  require 'axlsx/workbook/worksheet/rich_text_run'
-  require 'axlsx/workbook/worksheet/rich_text'
-  require 'axlsx/workbook/worksheet/cell_serializer'
-  require 'axlsx/workbook/worksheet/cell'
-  require 'axlsx/workbook/worksheet/page_margins'
-  require 'axlsx/workbook/worksheet/page_set_up_pr'
-  require 'axlsx/workbook/worksheet/outline_pr'
-  require 'axlsx/workbook/worksheet/page_setup'
-  require 'axlsx/workbook/worksheet/header_footer'
-  require 'axlsx/workbook/worksheet/print_options'
-  require 'axlsx/workbook/worksheet/cfvo'
-  require 'axlsx/workbook/worksheet/cfvos'
-  require 'axlsx/workbook/worksheet/color_scale'
-  require 'axlsx/workbook/worksheet/data_bar'
-  require 'axlsx/workbook/worksheet/icon_set'
-  require 'axlsx/workbook/worksheet/conditional_formatting'
-  require 'axlsx/workbook/worksheet/conditional_formatting_rule'
-  require 'axlsx/workbook/worksheet/conditional_formattings'
-  require 'axlsx/workbook/worksheet/row'
-  require 'axlsx/workbook/worksheet/col'
-  require 'axlsx/workbook/worksheet/cols'
-  require 'axlsx/workbook/worksheet/comments'
-  require 'axlsx/workbook/worksheet/comment'
-  require 'axlsx/workbook/worksheet/merged_cells'
-  require 'axlsx/workbook/worksheet/sheet_protection'
-  require 'axlsx/workbook/worksheet/sheet_pr'
-  require 'axlsx/workbook/worksheet/dimension'
-  require 'axlsx/workbook/worksheet/sheet_data'
-  require 'axlsx/workbook/worksheet/worksheet_drawing'
-  require 'axlsx/workbook/worksheet/worksheet_comments'
-  require 'axlsx/workbook/worksheet/worksheet_hyperlink'
-  require 'axlsx/workbook/worksheet/worksheet_hyperlinks'
-  require 'axlsx/workbook/worksheet/break'
-  require 'axlsx/workbook/worksheet/row_breaks'
-  require 'axlsx/workbook/worksheet/col_breaks'
-  require 'axlsx/workbook/workbook_view'
-  require 'axlsx/workbook/workbook_views'
-  require 'axlsx/workbook/worksheet/worksheet'
-  require 'axlsx/workbook/shared_strings_table'
-  require 'axlsx/workbook/defined_name'
-  require 'axlsx/workbook/defined_names'
-  require 'axlsx/workbook/worksheet/table_style_info'
-  require 'axlsx/workbook/worksheet/table'
-  require 'axlsx/workbook/worksheet/tables'
-  require 'axlsx/workbook/worksheet/pivot_table_cache_definition'
-  require 'axlsx/workbook/worksheet/pivot_table'
-  require 'axlsx/workbook/worksheet/pivot_tables'
-  require 'axlsx/workbook/worksheet/data_validation'
-  require 'axlsx/workbook/worksheet/data_validations'
-  require 'axlsx/workbook/worksheet/sheet_view'
-  require 'axlsx/workbook/worksheet/sheet_format_pr'
-  require 'axlsx/workbook/worksheet/pane'
-  require 'axlsx/workbook/worksheet/selection'
+  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'
 
   # 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 implimented in this version.
+  # The following parts of the Office Open XML spreadsheet specification are not implemented in this version.
   #
   #   bookViews
   #   calcPr
@@ -217,7 +217,7 @@ module Axlsx
     # Indicates if the epoc date for serialization should be 1904. If false, 1900 is used.
     @@date1904 = false
 
-    # A quick helper to retrive a worksheet by name
+    # A quick helper to retrieve a worksheet by name
     # @param [String] name The name of the sheet you are looking for
     # @return [Worksheet] The sheet found, or nil
     def sheet_by_name(name)
@@ -386,7 +386,7 @@ module Axlsx
     end
 
     # The xml:space attribute for the worksheet.
-    # This determines how whitespace is handled withing the document.
+    # This determines how whitespace is handled within the document.
     # The most relevant part being whitespace in the cell text.
     # allowed values are :preserve and :default. Axlsx uses :preserve unless
     # you explicily set this to :default.

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'axlsx/workbook/worksheet/auto_filter/filter_column'
-require 'axlsx/workbook/worksheet/auto_filter/filters'
-require 'axlsx/workbook/worksheet/auto_filter/sort_state'
+require_relative 'filter_column'
+require_relative 'filters'
+require_relative 'sort_state'
 
 module Axlsx
   # This class represents an auto filter range in a worksheet
@@ -80,7 +80,7 @@ module Axlsx
                            condition.order == :asc ? index1 <=> index2 : index2 <=> index1
                          end
 
-            break unless comparison.zero?
+            break unless comparison == 0
           end
 
           comparison

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

@@ -10,7 +10,7 @@ module Axlsx
     include Axlsx::SerializedAttributes
 
     # Creates a new FilterColumn object
-    # @note This class yeilds its filter object as that is where the vast majority of processing will be done
+    # @note This class yields its filter object as that is where the vast majority of processing will be done
     # @param [Integer|Cell] col_id The zero based index for the column to which this filter will be applied
     # @param [Symbol] filter_type The symbolized class name of the filter to apply to this column.
     # @param [Hash] options options for this object and the filter

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

@@ -13,7 +13,7 @@ module Axlsx
     # @option [Boolean] blank @see blank
     # @option [String] calendar_type @see calendar_type
     # @option [Array] filter_items An array of values that will be used to create filter objects.
-    # @option [Array] date_group_items An array of hases defining date group item filters to apply.
+    # @option [Array] date_group_items An array of hashes defining date group item filters to apply.
     # @note The recommended way to interact with filter objects is via AutoFilter#add_column
     # @example
     #   ws.auto_filter.add_column(0, :filters, :blank => true, :calendar_type => 'japan', :filter_items => [100, 'a'])
@@ -36,7 +36,7 @@ module Axlsx
     # even when those dates are not using the same calendar system / date formatting.
     attr_reader :calendar_type
 
-    # Tells us if the row of the cell provided should be filterd as it
+    # Tells us if the row of the cell provided should be filtered as it
     # does not meet any of the specified filter_items or
     # date_group_items restrictions.
     # @param [Cell] cell The cell to test against items
@@ -138,7 +138,7 @@ module Axlsx
 
       # Creates a new DateGroupItem
       # @param [Hash] options A hash of options to use when
-      # instanciating the object
+      # instantiating the object
       # @option [String] date_time_grouping the part of the date this
       # filter should apply for grouping
       # @option [Integer|String] year @see year

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

@@ -6,7 +6,7 @@ module Axlsx
     # Creates a new SortCondition object
     # @param [Integer] column_index Zero-based index indicating the AutoFilter column to which the sorting should be applied to
     # @param [Symbol] order The order the column should be sorted on, can only be :asc or :desc
-    # @param [Array] custom_list An array containg a custom sorting list in order.
+    # @param [Array] custom_list An array containing a custom sorting list in order.
     def initialize(column_index:, order:, custom_list:)
       Axlsx.validate_int column_index
       @column_index = column_index

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'axlsx/workbook/worksheet/auto_filter/sort_condition'
+require_relative 'sort_condition'
 
 module Axlsx
   # This class performs sorting on a range in a worksheet
@@ -21,7 +21,7 @@ module Axlsx
     # It requires a column_index for the sorting, descending and the custom order are optional.
     # @param [Integer] column_index Zero-based index indicating the AutoFilter column to which the sorting should be applied to
     # @param [Symbol] order The order the column should be sorted on, can only be :asc or :desc
-    # @param [Array] custom_list An array containg a custom sorting list in order.
+    # @param [Array] custom_list An array containing a custom sorting list in order.
     # @return [SortCondition]
     def add_sort_condition(column_index:, order: :asc, custom_list: [])
       sort_conditions << SortCondition.new(column_index: column_index, order: order, custom_list: custom_list)

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

@@ -63,19 +63,19 @@ module Axlsx
     end
 
     def first_row
-      @first_row ||= first_cell.scan(/\d+/).first
+      @first_row ||= first_cell[/\d+/]
     end
 
     def first_col
-      @first_col ||= first_cell.scan(/\D+/).first
+      @first_col ||= first_cell[/\D+/]
     end
 
     def last_row
-      @last_row ||= last_cell.scan(/\d+/).first
+      @last_row ||= last_cell[/\d+/]
     end
 
     def last_col
-      @last_col ||= last_cell.scan(/\D+/).first
+      @last_col ||= last_cell[/\D+/]
     end
   end
 end

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

@@ -2,7 +2,7 @@
 
 module Axlsx
   # A cell in a worksheet.
-  # Cell stores inforamation requried to serialize a single worksheet cell to xml. You must provde the Row that the cell belongs to and the cells value. The data type will automatically be determed if you do not specify the :type option. The default style will be applied if you do not supply the :style option. Changing the cell's type will recast the value to the type specified. Altering the cell's value via the property accessor will also automatically cast the provided value to the cell's type.
+  # Cell stores information required to serialize a single worksheet cell to xml. You must provide the Row that the cell belongs to and the cells value. The data type will automatically be determed if you do not specify the :type option. The default style will be applied if you do not supply the :style option. Changing the cell's type will recast the value to the type specified. Altering the cell's value via the property accessor will also automatically cast the provided value to the cell's type.
   # @note The recommended way to generate cells is via Worksheet#add_row
   #
   # @see Worksheet#add_row
@@ -41,7 +41,7 @@ module Axlsx
       self.type = type unless type == :string
 
       val = options.delete(:style)
-      self.style = val unless val.nil? || val.zero?
+      self.style = val unless val.nil? || val == 0
       val = options.delete(:formula_value)
       self.formula_value = val unless val.nil?
       val = options.delete(:escape_formulas)
@@ -57,11 +57,11 @@ module Axlsx
     # you need to set this.
     attr_accessor :formula_value
 
-    # An array of available inline styes.
+    # An array of available inline styles.
     # TODO change this to a hash where each key defines attr name and validator (and any info the validator requires)
-    # then move it out to a module so we can re-use in in other classes.
+    # then move it out to a module so we can reuse in in other classes.
     # needs to define bla=(v) and bla methods on the class that hook into a
-    # set_attr method that kicks the suplied validator and updates the instance_variable
+    # set_attr method that kicks the supplied validator and updates the instance_variable
     # for the key
     INLINE_STYLES = [:value, :type, :font_name, :charset,
                      :family, :b, :i, :strike, :outline,
@@ -549,14 +549,14 @@ module Axlsx
 
       case type
       when :date
-        self.style = STYLE_DATE if style.zero?
+        self.style = STYLE_DATE if style == 0
         if !v.is_a?(Date) && v.respond_to?(:to_date)
           v.to_date
         else
           v
         end
       when :time
-        self.style = STYLE_DATE if style.zero?
+        self.style = STYLE_DATE if style == 0
         if !v.is_a?(Time) && v.respond_to?(:to_time)
           v.to_time
         else

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

@@ -7,7 +7,7 @@ module Axlsx
       # Calls the proper serialization method based on type.
       # @param [Integer] row_index The index of the cell's row
       # @param [Integer] column_index The index of the cell's column
-      # @param [String] str The string to apend serialization to.
+      # @param [String] str The string to append serialization to.
       # @return [String]
       def to_xml_string(row_index, column_index, cell, str = +'')
         str << '<c r="'

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

@@ -110,7 +110,7 @@ module Axlsx
     def width=(v)
       # Removing this validation make a 10% difference in performance
       # as it is called EVERY TIME A CELL IS ADDED - the proper solution
-      # is to only set this if a calculated value is greated than the
+      # is to only set this if a calculated value is greater than the
       # current @width value.
       # TODO!!!
       # Axlsx.validate_unsigned_numeric(v) unless v == nil
@@ -121,17 +121,30 @@ module Axlsx
     # updates the width for this col based on the cells autowidth and
     # an optionally specified fixed width
     # @param [Cell] cell The cell to use in updating this col's width
-    # @param [Integer] fixed_width If this is specified the width is set
-    # to this value and the cell's attributes are ignored.
+    # @param [Numeric, :auto, :ignore, nil] fixed_width Decides how the width
+    # of the cell should be updated. If this is specified as as Numeric the
+    # width is set to this value and the cell's attributes are ignored. If set
+    # to `nil` or `:auto` and `use_autowidth` is true, it uses the autowidth of
+    # the cell. If set to `:ignore`, the cell's width is not changed. In any
+    # case the col's width is set to the new value only if the current width is
+    # smaller than the new one, so that the largest width of all cells in this
+    # column is used.
     # @param [Boolean] use_autowidth If this is false, the cell's
     # autowidth value will be ignored.
     def update_width(cell, fixed_width = nil, use_autowidth = true)
-      if fixed_width.is_a? Numeric
-        self.width = fixed_width
-      elsif use_autowidth
-        cell_width = cell.autowidth
-        self.width = cell_width unless (width || 0) > (cell_width || 0)
-      end
+      cell_width =
+        case fixed_width
+        when Numeric
+          fixed_width
+        when nil, :auto
+          cell.autowidth if use_autowidth
+        when :ignore
+          nil
+        else
+          raise ArgumentError, "fixed_with must be a Numeric, :auto, :ignore or nil, but is '#{fixed_width.inspect}'"
+        end
+
+      self.width = cell_width unless (width || 0) > (cell_width || 0)
     end
 
     # Serialize this columns data to an xml string

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

@@ -11,8 +11,8 @@ module Axlsx
     # @param [Hash] options
     # @option [String] author the author of the comment
     # @option [String] text The text for the comment
-    # @option [String] ref The refence (e.g. 'A3' where this comment will be anchored.
-    # @option [Boolean] visible This controls the visiblity of the associated vml_shape.
+    # @option [String] ref The reference (e.g. 'A3' where this comment will be anchored.
+    # @option [Boolean] visible This controls the visibility of the associated vml_shape.
     def initialize(comments, options = {})
       raise ArgumentError, "A comment needs a parent comments object" unless comments.is_a?(Comments)
 

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

@@ -37,7 +37,7 @@ module Axlsx
     # @note the author, text and ref options are required
     # @option options [String] author The name of the author for this comment
     # @option options [String] text The text for this comment
-    # @option options [Stirng|Cell] ref The cell that this comment is attached to.
+    # @option options [String|Cell] ref The cell that this comment is attached to.
     def add_comment(options = {})
       raise ArgumentError, "Comment require an author" unless options[:author]
       raise ArgumentError, "Comment requires text" unless options[:text]

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

@@ -83,7 +83,7 @@ module Axlsx
     def to_xml_string(str = +'')
       str << '<conditionalFormatting sqref="' << sqref << '">'
       rules.each_with_index do |rule, index|
-        str << ' ' unless index.zero?
+        str << ' ' unless index == 0
         rule.to_xml_string(str)
       end
       str << '</conditionalFormatting>'

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

@@ -24,7 +24,7 @@ module Axlsx
     # @option options [Integer] rank If a top/bottom N rule, the value of N
     # @option options [Integer] stdDev The number of standard deviations above or below the average to match
     # @option options [Boolean] stopIfTrue Stop evaluating rules after this rule matches
-    # @option options [Symbol]  timePeriod The time period in a date occuring... rule
+    # @option options [Symbol]  timePeriod The time period in a date occurring... rule
     # @option options [String] formula The formula to match against in i.e. an equal rule. Use a [minimum, maximum] array for cellIs between/notBetween conditionals.
     def initialize(options = {})
       @color_scale = @data_bar = @icon_set = @formula = nil

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Axlsx
-  # A simple, self serializing class for storing conditional formattings
+  # A simple, self serializing class for storing conditional formatting
   class ConditionalFormattings < SimpleTypedList
     # creates a new Tables object
     def initialize(worksheet)
@@ -15,7 +15,7 @@ module Axlsx
     # @return [Worksheet]
     attr_reader :worksheet
 
-    # serialize the conditional formattings
+    # serialize the conditional formatting
     def to_xml_string(str = +'')
       return if empty?
 

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

@@ -278,7 +278,7 @@ module Axlsx
 
       str << '<dataValidation '
       h.each_with_index do |key_value, index|
-        str << ' ' unless index.zero?
+        str << ' ' unless index == 0
         str << key_value.first << '="' << Axlsx.booleanize(key_value.last).to_s << '"'
       end
       str << '>'

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Axlsx
-  # A simple, self serializing class for storing conditional formattings
+  # A simple, self serializing class for storing conditional formatting
   class DataValidations < SimpleTypedList
     # creates a new Tables object
     def initialize(worksheet)
@@ -15,7 +15,7 @@ module Axlsx
     # @return [Worksheet]
     attr_reader :worksheet
 
-    # serialize the conditional formattings
+    # serialize the conditional formatting
     def to_xml_string(str = +'')
       return if empty?
 

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

@@ -3,9 +3,9 @@
 require "date"
 
 module Axlsx
-  # The DateTimeConverter class converts both data and time types to their apprpriate Excel serializations
+  # The DateTimeConverter class converts both data and time types to their appropriate Excel serializations
   class DateTimeConverter
-    # The date_to_serial method converts Date objects to the equivelant Excel serialized forms
+    # The date_to_serial method converts Date objects to the equivalent Excel serialized forms
     # @param [Date] date the date to be serialized
     # @return [Numeric]
     def self.date_to_serial(date)

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

@@ -28,7 +28,7 @@ module Axlsx
 
     attr_reader :worksheet
 
-    # the full refernece for this dimension
+    # the full reference for this dimension
     # @return [String]
     def sqref
       "#{first_cell_reference}:#{last_cell_reference}"

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

@@ -99,7 +99,7 @@ module Axlsx
 
     private
 
-    # Initalize the simple typed list of value objects
+    # Initialize the simple typed list of value objects
     def initialize_value_objects
       @value_objects = SimpleTypedList.new Cfvo
       @interpolationPoints.each { |point| @value_objects << Cfvo.new(type: :percent, val: point) }

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

@@ -13,7 +13,7 @@ module Axlsx
                             :apply_styles
 
     # These attributes are all boolean so I'm doing a bit of a hand
-    # waving magic show to set up the attriubte accessors
+    # waving magic show to set up the attribute accessors
     boolean_attr_accessor :summary_below,
                           :summary_right,
                           :apply_styles

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

@@ -38,13 +38,13 @@ module Axlsx
     # * verticalDpi
 
     # Number of vertical pages to fit on.
-    # @note PageSetup#fit_to is the recomended way to manage page fitting as only specifying one of fit_to_width/fit_to_height will result in the counterpart
+    # @note PageSetup#fit_to is the recommended way to manage page fitting as only specifying one of fit_to_width/fit_to_height will result in the counterpart
     # being set to 1.
     # @return [Integer]
     attr_reader :fit_to_height
 
     # Number of horizontal pages to fit on.
-    # @note PageSetup#fit_to is the recomended way to manage page fitting as only specifying one of width/height will result in the counterpart
+    # @note PageSetup#fit_to is the recommended way to manage page fitting as only specifying one of width/height will result in the counterpart
     # being set to 1.
     # @return [Integer]
     attr_reader :fit_to_width

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

@@ -26,6 +26,7 @@ module Axlsx
       @pages = []
       @subtotal = nil
       @no_subtotals_on_headers = []
+      @grand_totals = :both
       @sort_on_headers = {}
       @style_info = {}
       parse_options options
@@ -51,6 +52,19 @@ module Axlsx
       @sort_on_headers = headers
     end
 
+    # Defines which Grand Totals are to be shown.
+    # @return [Symbol] The row and/or column Grand Totals that are to be shown.
+    # Defaults to `:both` to show both row & column grand totals.
+    # Set to `:row_only`, `:col_only`, or `:none` to hide one or both Grand Totals.
+    attr_reader :grand_totals
+
+    # (see #grand_totals)
+    def grand_totals=(value)
+      RestrictionValidator.validate "PivotTable.grand_totals", [:both, :row_only, :col_only, :none], value
+
+      @grand_totals = value
+    end
+
     # Style info for the pivot table
     # @return [Hash]
     attr_accessor :style_info
@@ -114,7 +128,8 @@ module Axlsx
       @columns = v
     end
 
-    # The data
+    # The data as an array of either headers (String) or hashes or mix of the two.
+    # Hash in format of { ref: header, num_fmt: numFmts, subtotal: subtotal }, where header is String, numFmts is Integer, and subtotal one of %w[sum count average max min product countNums stdDev stdDevp var varp]; leave subtotal blank to sum values
     # @return [Array]
     attr_reader :data
 
@@ -188,7 +203,11 @@ module Axlsx
     def to_xml_string(str = +'')
       str << '<?xml version="1.0" encoding="UTF-8"?>'
 
-      str << '<pivotTableDefinition xmlns="' << XML_NS << '" name="' << name << '" cacheId="' << cache_definition.cache_id.to_s << '"' << (data.size <= 1 ? ' dataOnRows="1"' : '') << ' 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 << '<pivotTableDefinition xmlns="' << XML_NS << '" name="' << name << '" cacheId="' << cache_definition.cache_id.to_s << '"'
+      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 << '<location firstDataCol="1" firstDataRow="1" firstHeaderRow="1" ref="' << ref << '"/>'
       str << '<pivotFields count="' << header_cells_count.to_s << '">'
@@ -244,8 +263,9 @@ module Axlsx
       unless data.empty?
         str << "<dataFields count=\"#{data.size}\">"
         data.each do |datum_value|
-          # The correct name prefix in ["Sum","Average", etc...]
-          str << "<dataField name='#{datum_value[:subtotal] || ''} of #{datum_value[:ref]}' fld='#{header_index_of(datum_value[:ref])}' baseField='0' baseItem='0'"
+          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'"
           str << " numFmtId='#{datum_value[:num_fmt]}'" if datum_value[:num_fmt]
           str << " subtotal='#{datum_value[:subtotal]}' " if datum_value[:subtotal]
           str << "/>"
@@ -311,7 +331,11 @@ module Axlsx
       elsif columns.include? cell_ref
         attributes << 'axis="axisCol"'
         attributes << "sortType=\"#{sorttype == :descending ? 'descending' : 'ascending'}\"" if sorttype
-        include_items_tag = true
+        if subtotal
+          include_items_tag = true
+        else
+          attributes << 'defaultSubtotal="0"'
+        end
       elsif pages.include? cell_ref
         attributes << 'axis="axisPage"'
         include_items_tag = true

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

@@ -143,7 +143,7 @@ module Axlsx
     # It must be one of :none, :single, :double, :singleAccounting, :doubleAccounting, true
     # @return [Boolean]
     # @return [String]
-    # @note true is for backwards compatability and is reassigned to :single
+    # @note true is for backwards compatibility and is reassigned to :single
     attr_reader :u
 
     # @see u