caxlsx 4.0.0 → 4.2.0

data/lib/axlsx/stylesheet/xf.rb

@@ -62,7 +62,7 @@ module Axlsx
     # @return [Integer]
     attr_reader :xfId
 
-    # indecates if text should be prefixed by a single quote in the cell
+    # indicates if text should be prefixed by a single quote in the cell
     # @return [Boolean]
     attr_reader :quotePrefix
 
@@ -95,41 +95,94 @@ module Axlsx
     attr_reader :applyProtection
 
     # @see Xf#alignment
-    def alignment=(v) DataTypeValidator.validate "Xf.alignment", CellAlignment, v; @alignment = v end
+    def alignment=(v)
+      DataTypeValidator.validate "Xf.alignment", CellAlignment, v
+      @alignment = v
+    end
 
     # @see protection
-    def protection=(v) DataTypeValidator.validate "Xf.protection", CellProtection, v; @protection = v end
+    def protection=(v)
+      DataTypeValidator.validate "Xf.protection", CellProtection, v
+      @protection = v
+    end
 
     # @see numFmtId
-    def numFmtId=(v) Axlsx.validate_unsigned_int v; @numFmtId = v end
+    def numFmtId=(v)
+      Axlsx.validate_unsigned_int v
+      @numFmtId = v
+    end
 
     # @see fontId
-    def fontId=(v) Axlsx.validate_unsigned_int v; @fontId = v end
+    def fontId=(v)
+      Axlsx.validate_unsigned_int v
+      @fontId = v
+    end
+
     # @see fillId
-    def fillId=(v) Axlsx.validate_unsigned_int v; @fillId = v end
+    def fillId=(v)
+      Axlsx.validate_unsigned_int v
+      @fillId = v
+    end
+
     # @see borderId
-    def borderId=(v) Axlsx.validate_unsigned_int v; @borderId = v end
+    def borderId=(v)
+      Axlsx.validate_unsigned_int v
+      @borderId = v
+    end
+
     # @see xfId
-    def xfId=(v) Axlsx.validate_unsigned_int v; @xfId = v end
+    def xfId=(v)
+      Axlsx.validate_unsigned_int v
+      @xfId = v
+    end
+
     # @see quotePrefix
-    def quotePrefix=(v) Axlsx.validate_boolean v; @quotePrefix = v end
+    def quotePrefix=(v)
+      Axlsx.validate_boolean v
+      @quotePrefix = v
+    end
+
     # @see pivotButton
-    def pivotButton=(v) Axlsx.validate_boolean v; @pivotButton = v end
+    def pivotButton=(v)
+      Axlsx.validate_boolean v
+      @pivotButton = v
+    end
+
     # @see applyNumberFormat
-    def applyNumberFormat=(v) Axlsx.validate_boolean v; @applyNumberFormat = v end
+    def applyNumberFormat=(v)
+      Axlsx.validate_boolean v
+      @applyNumberFormat = v
+    end
+
     # @see applyFont
-    def applyFont=(v) Axlsx.validate_boolean v; @applyFont = v end
+    def applyFont=(v)
+      Axlsx.validate_boolean v
+      @applyFont = v
+    end
+
     # @see applyFill
-    def applyFill=(v) Axlsx.validate_boolean v; @applyFill = v end
+    def applyFill=(v)
+      Axlsx.validate_boolean v
+      @applyFill = v
+    end
 
     # @see applyBorder
-    def applyBorder=(v) Axlsx.validate_boolean v; @applyBorder = v end
+    def applyBorder=(v)
+      Axlsx.validate_boolean v
+      @applyBorder = v
+    end
 
     # @see applyAlignment
-    def applyAlignment=(v) Axlsx.validate_boolean v; @applyAlignment = v end
+    def applyAlignment=(v)
+      Axlsx.validate_boolean v
+      @applyAlignment = v
+    end
 
     # @see applyProtection
-    def applyProtection=(v) Axlsx.validate_boolean v; @applyProtection = v end
+    def applyProtection=(v)
+      Axlsx.validate_boolean v
+      @applyProtection = v
+    end
 
     # Serializes the object
     # @param [String] str

data/lib/axlsx/util/accessors.rb

@@ -23,7 +23,7 @@ module Axlsx
         validated_attr_accessor(symbols, :validate_string)
       end
 
-      # Creates one or more usigned integer attr_accessors
+      # Creates one or more unsigned integer attr_accessors
       # @param [Array] symbols An array of symbols representing the
       # names of the attributes you will add to your class
       def unsigned_int_attr_accessor(*symbols)
@@ -44,19 +44,21 @@ module Axlsx
         validated_attr_accessor(symbols, :validate_boolean)
       end
 
-      # Template for defining validated write accessors
-      SETTER = "def %s=(value) Axlsx::%s(value); @%s = value; end"
-
       # Creates the reader and writer access methods
-      # @param [Array] symbols The names of the attributes to create
-      # @param [String] validator The axlsx validation method to use when
+      # @param [Array<Symbol, String>] symbols The names of the attributes to create
+      # @param [Symbol|String] validator The axlsx validation method to use when
       # validating assignation.
       # @see lib/axlsx/util/validators.rb
       def validated_attr_accessor(symbols, validator)
         symbols.each do |symbol|
           attr_reader symbol
 
-          module_eval(format(SETTER, symbol, validator, symbol), __FILE__, __LINE__)
+          module_eval <<-RUBY_EVAL, __FILE__, __LINE__ + 1
+            def #{symbol}=(value)      # def name=(value)
+              Axlsx.#{validator} value #   Axlsx.validate_string value
+              @#{symbol} = value       #   @name = value
+            end                        # end
+          RUBY_EVAL
         end
       end
     end

data/lib/axlsx/util/constants.rb

@@ -259,7 +259,7 @@ module Axlsx
   # drawing validation schema
   DRAWING_XSD = "#{SCHEMA_BASE}dml-spreadsheetDrawing.xsd"
 
-  # number format id for pecentage formatting using the default formatting id.
+  # number format id for percentage formatting using the default formatting id.
   NUM_FMT_PERCENT = 9
 
   # number format id for date format like 2011/11/13
@@ -404,7 +404,7 @@ module Axlsx
   CONTROL_CHARS = pattern.freeze
 
   # ISO 8601 date recognition
-  ISO_8601_REGEX = /\A(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|0[1-9]|[1-2][0-9])T(2[0-3]|[0-1][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?(Z|[+-](?:2[0-3]|[0-1][0-9]):[0-5][0-9])?\Z/.freeze
+  ISO_8601_REGEX = /\A(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[0-1]|0[1-9]|[1-2][0-9])T(2[0-3]|[0-1][0-9]):([0-5][0-9]):([0-5][0-9])(\.[0-9]+)?\Z/.freeze
 
   # FLOAT recognition
   SAFE_FLOAT_REGEX = /\A[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]{1,2})?\Z/.freeze

data/lib/axlsx/util/serialized_attributes.rb

@@ -91,8 +91,8 @@ module Axlsx
 
     # serialized instance values at text nodes on a camelized element of the
     # attribute name. You may pass in a block for evaluation against non nil
-    # values. We use an array for element attributes becuase misordering will
-    # break the xml and 1.8.7 does not support ordered hashes.
+    # values. We use an array for element attributes because misordering will
+    # break the xml.
     # @param [String] str The string instance to which serialized data is appended
     # @param [Array] additional_attributes An array of additional attribute names.
     # @return [String] The serialized output.

data/lib/axlsx/util/simple_typed_list.rb

@@ -21,7 +21,7 @@ module Axlsx
     alias :== :equal?
     alias :eql? :equal?
 
-    # Creats a new typed list
+    # Creates a new typed list
     # @param [Array, Class] type An array of Class objects or a single Class object
     # @param [String] serialize_as The tag name to use in serialization
     # @raise [ArgumentError] if all members of type are not Class objects
@@ -57,7 +57,7 @@ module Axlsx
     # Transposes the list (without blowing up like ruby does)
     # any non populated cell in the matrix will be a nil value
     def transpose
-      return clone if size.zero?
+      return clone if size == 0
 
       row_count = size
       max_column_count = map { |row| row.cells.size }.max
@@ -90,21 +90,24 @@ module Axlsx
       self
     end
 
-    # join operator
-    # @param [Array] other the array to join
+    # Appends the elements of +others+ to self.
+    # @param [Array<Array>] others one or more arrays to join
     # @raise [ArgumentError] if any of the values being joined are not
     # one of the allowed types
     # @return [SimpleTypedList]
-    def +(other)
-      other.each do |item|
-        self << item
+    def concat(*others)
+      others.each do |other|
+        other.each do |item|
+          self << item
+        end
       end
-      super
+      self
     end
 
-    # Concat operator
+    # Pushes the given object on to the end of this array and returns the index
+    # of the item added.
     # @param [Any] v the data to be added
-    # @raise [ArgumentError] if the value being added is not one fo the allowed types
+    # @raise [ArgumentError] if the value being added is not one of the allowed types
     # @return [Integer] returns the index of the item added.
     def <<(v)
       DataTypeValidator.validate :SimpleTypedList_push, @allowed_types, v
@@ -112,7 +115,17 @@ module Axlsx
       size - 1
     end
 
-    alias :push :<<
+    # Pushes the given object(s) on to the end of this array. This expression
+    # returns the array itself, so several appends may be chained together.
+    # @param [Any] values the data to be added
+    # @raise [ArgumentError] if any of the values being joined are not
+    # @return [SimpleTypedList]
+    def push(*values)
+      values.each do |value|
+        self << value
+      end
+      self
+    end
 
     # delete the item from the list
     # @param [Any] v The item to be deleted.
@@ -147,7 +160,7 @@ module Axlsx
       super
     end
 
-    # inserts an item at the index specfied
+    # inserts an item at the index specified
     # @param [Integer] index
     # @param [Any] v
     # @raise [ArgumentError] if the index is protected by locking

data/lib/axlsx/util/storage.rb

@@ -85,16 +85,16 @@ module Axlsx
     # @return [Integer] sector
     attr_accessor :sector
 
-    # The 0 based index in the directoies chain for this the left sibling of this storage.
+    # The 0 based index in the directories chain for this the left sibling of this storage.
 
     # @return [Integer] left
     attr_accessor :left
 
-    # The 0 based index in the directoies chain for this the right sibling of this storage.
+    # The 0 based index in the directories chain for this the right sibling of this storage.
     # @return [Integer] right
     attr_accessor :right
 
-    # The 0 based index in the directoies chain for the child of this storage.
+    # The 0 based index in the directories chain for the child of this storage.
     # @return [Integer] child
     attr_accessor :child
 
@@ -133,7 +133,7 @@ module Axlsx
       @left = @right = @child = -1
       @sector = @size = @created = @modified = 0
       options.each do |o|
-        send("#{o[0]}=", o[1]) if respond_to? "#{o[0]}="
+        send(:"#{o[0]}=", o[1]) if respond_to? :"#{o[0]}="
       end
       @color ||= COLORS[:black]
       @type ||= (data.nil? ? TYPES[:storage] : TYPES[:stream])

data/lib/axlsx/util/validators.rb

@@ -81,7 +81,7 @@ module Axlsx
     raise ArgumentError, format(ERR_ANGLE, v.inspect) unless v.to_i >= -5400000 && v.to_i <= 5400000
   end
 
-  # Validates an unsigned intger
+  # Validates an unsigned integer
   UINT_VALIDATOR = ->(arg) { arg.respond_to?(:>=) && arg >= 0 }
 
   # Requires that the value is a Integer and is greater or equal to 0

data/lib/axlsx/version.rb

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

data/lib/axlsx/workbook/defined_name.rb

@@ -22,7 +22,7 @@
 # <xsd:attribute name="shortcutKey" type="s:ST_Xstring" use="optional"/>
 # <xsd:attribute name="publishToServer" type="xsd:boolean" use="optional" default="false"/>
 # <xsd:attribute name="workbookParameter" type="xsd:boolean" use="optional" default="false"/>
-# </xsd:extenstion>
+# </xsd:extension>
 # </xsd:simpleContent>
 
 module Axlsx

data/lib/axlsx/workbook/defined_names.rb

@@ -5,7 +5,7 @@ module Axlsx
   class DefinedNames < SimpleTypedList
     # creates the DefinedNames object
     def initialize
-      super DefinedName
+      super(DefinedName)
     end
 
     # Serialize to xml

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)
@@ -249,18 +249,28 @@ module Axlsx
 
     # Instance level access to the class variable 1904
     # @return [Boolean]
-    def date1904() @@date1904; end
+    def date1904
+      @@date1904
+    end
 
     # see @date1904
-    def date1904=(v) Axlsx.validate_boolean v; @@date1904 = v; end
+    def date1904=(v)
+      Axlsx.validate_boolean v
+      @@date1904 = v
+    end
 
     # Sets the date1904 attribute to the provided boolean
     # @return [Boolean]
-    def self.date1904=(v) Axlsx.validate_boolean v; @@date1904 = v; end
+    def self.date1904=(v)
+      Axlsx.validate_boolean v
+      @@date1904 = v
+    end
 
     # retrieves the date1904 attribute
     # @return [Boolean]
-    def self.date1904() @@date1904; end
+    def self.date1904
+      @@date1904
+    end
 
     # Whether to treat values starting with an equals sign as formulas or as literal strings.
     # Allowing user-generated data to be interpreted as formulas is a security risk.
@@ -280,10 +290,13 @@ module Axlsx
     #     calculation. Thus the performance benefits of turning this off are
     #     marginal unless you are creating a very large sheet.
     # @return [Boolean]
-    def use_autowidth() @use_autowidth; end
+    attr_reader :use_autowidth
 
     # see @use_autowidth
-    def use_autowidth=(v = true) Axlsx.validate_boolean v; @use_autowidth = v; end
+    def use_autowidth=(v = true)
+      Axlsx.validate_boolean v
+      @use_autowidth = v
+    end
 
     # Font size of bold fonts is multiplied with this
     # Used for automatic calculation of cell widths with bold text
@@ -373,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/workbook_views.rb

@@ -5,7 +5,7 @@ module Axlsx
   class WorkbookViews < SimpleTypedList
     # creates the book views object
     def initialize
-      super WorkbookView
+      super(WorkbookView)
     end
 
     # Serialize to xml

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
@@ -43,7 +43,9 @@ module Axlsx
     # the filter button can be hidden, and not drawn.
     # @return [Boolean]
     def show_button
-      @show_button ||= true
+      return @show_button if defined?(@show_button)
+
+      true
     end
 
     # Flag indicating whether the AutoFilter button for this column is hidden.
@@ -83,7 +85,7 @@ module Axlsx
     # @return [Boolean]
     def show_button=(show)
       Axlsx.validate_boolean show
-      @show_botton = show
+      @show_button = show
     end
 
     # Serialize the object to xml

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