caxlsx 3.3.0 → 3.4.0

data/lib/axlsx/workbook/workbook.rb

@@ -1,65 +1,63 @@
-# -*- coding: utf-8 -*-
 module Axlsx
-require 'axlsx/workbook/worksheet/sheet_calc_pr.rb'
-require 'axlsx/workbook/worksheet/auto_filter/auto_filter.rb'
-require 'axlsx/workbook/worksheet/date_time_converter.rb'
-require 'axlsx/workbook/worksheet/protected_range.rb'
-require 'axlsx/workbook/worksheet/protected_ranges.rb'
-require 'axlsx/workbook/worksheet/rich_text_run'
-require 'axlsx/workbook/worksheet/rich_text'
-require 'axlsx/workbook/worksheet/cell_serializer.rb'
-require 'axlsx/workbook/worksheet/cell.rb'
-require 'axlsx/workbook/worksheet/page_margins.rb'
-require 'axlsx/workbook/worksheet/page_set_up_pr.rb'
-require 'axlsx/workbook/worksheet/outline_pr.rb'
-require 'axlsx/workbook/worksheet/page_setup.rb'
-require 'axlsx/workbook/worksheet/header_footer.rb'
-require 'axlsx/workbook/worksheet/print_options.rb'
-require 'axlsx/workbook/worksheet/cfvo.rb'
-require 'axlsx/workbook/worksheet/cfvos.rb'
-require 'axlsx/workbook/worksheet/color_scale.rb'
-require 'axlsx/workbook/worksheet/data_bar.rb'
-require 'axlsx/workbook/worksheet/icon_set.rb'
-require 'axlsx/workbook/worksheet/conditional_formatting.rb'
-require 'axlsx/workbook/worksheet/conditional_formatting_rule.rb'
-require 'axlsx/workbook/worksheet/conditional_formattings.rb'
-require 'axlsx/workbook/worksheet/row.rb'
-require 'axlsx/workbook/worksheet/col.rb'
-require 'axlsx/workbook/worksheet/cols.rb'
-require 'axlsx/workbook/worksheet/comments.rb'
-require 'axlsx/workbook/worksheet/comment.rb'
-require 'axlsx/workbook/worksheet/merged_cells.rb'
-require 'axlsx/workbook/worksheet/sheet_protection.rb'
-require 'axlsx/workbook/worksheet/sheet_pr.rb'
-require 'axlsx/workbook/worksheet/dimension.rb'
-require 'axlsx/workbook/worksheet/sheet_data.rb'
-require 'axlsx/workbook/worksheet/worksheet_drawing.rb'
-require 'axlsx/workbook/worksheet/worksheet_comments.rb'
-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.rb'
-require 'axlsx/workbook/shared_strings_table.rb'
-require 'axlsx/workbook/defined_name.rb'
-require 'axlsx/workbook/defined_names.rb'
-require 'axlsx/workbook/worksheet/table_style_info.rb'
-require 'axlsx/workbook/worksheet/table.rb'
-require 'axlsx/workbook/worksheet/tables.rb'
-require 'axlsx/workbook/worksheet/pivot_table_cache_definition.rb'
-require 'axlsx/workbook/worksheet/pivot_table.rb'
-require 'axlsx/workbook/worksheet/pivot_tables.rb'
-require 'axlsx/workbook/worksheet/data_validation.rb'
-require 'axlsx/workbook/worksheet/data_validations.rb'
-require 'axlsx/workbook/worksheet/sheet_view.rb'
-require 'axlsx/workbook/worksheet/sheet_format_pr.rb'
-require 'axlsx/workbook/worksheet/pane.rb'
-require 'axlsx/workbook/worksheet/selection.rb'
+  require 'axlsx/workbook/worksheet/sheet_calc_pr.rb'
+  require 'axlsx/workbook/worksheet/auto_filter/auto_filter.rb'
+  require 'axlsx/workbook/worksheet/date_time_converter.rb'
+  require 'axlsx/workbook/worksheet/protected_range.rb'
+  require 'axlsx/workbook/worksheet/protected_ranges.rb'
+  require 'axlsx/workbook/worksheet/rich_text_run'
+  require 'axlsx/workbook/worksheet/rich_text'
+  require 'axlsx/workbook/worksheet/cell_serializer.rb'
+  require 'axlsx/workbook/worksheet/cell.rb'
+  require 'axlsx/workbook/worksheet/page_margins.rb'
+  require 'axlsx/workbook/worksheet/page_set_up_pr.rb'
+  require 'axlsx/workbook/worksheet/outline_pr.rb'
+  require 'axlsx/workbook/worksheet/page_setup.rb'
+  require 'axlsx/workbook/worksheet/header_footer.rb'
+  require 'axlsx/workbook/worksheet/print_options.rb'
+  require 'axlsx/workbook/worksheet/cfvo.rb'
+  require 'axlsx/workbook/worksheet/cfvos.rb'
+  require 'axlsx/workbook/worksheet/color_scale.rb'
+  require 'axlsx/workbook/worksheet/data_bar.rb'
+  require 'axlsx/workbook/worksheet/icon_set.rb'
+  require 'axlsx/workbook/worksheet/conditional_formatting.rb'
+  require 'axlsx/workbook/worksheet/conditional_formatting_rule.rb'
+  require 'axlsx/workbook/worksheet/conditional_formattings.rb'
+  require 'axlsx/workbook/worksheet/row.rb'
+  require 'axlsx/workbook/worksheet/col.rb'
+  require 'axlsx/workbook/worksheet/cols.rb'
+  require 'axlsx/workbook/worksheet/comments.rb'
+  require 'axlsx/workbook/worksheet/comment.rb'
+  require 'axlsx/workbook/worksheet/merged_cells.rb'
+  require 'axlsx/workbook/worksheet/sheet_protection.rb'
+  require 'axlsx/workbook/worksheet/sheet_pr.rb'
+  require 'axlsx/workbook/worksheet/dimension.rb'
+  require 'axlsx/workbook/worksheet/sheet_data.rb'
+  require 'axlsx/workbook/worksheet/worksheet_drawing.rb'
+  require 'axlsx/workbook/worksheet/worksheet_comments.rb'
+  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.rb'
+  require 'axlsx/workbook/shared_strings_table.rb'
+  require 'axlsx/workbook/defined_name.rb'
+  require 'axlsx/workbook/defined_names.rb'
+  require 'axlsx/workbook/worksheet/table_style_info.rb'
+  require 'axlsx/workbook/worksheet/table.rb'
+  require 'axlsx/workbook/worksheet/tables.rb'
+  require 'axlsx/workbook/worksheet/pivot_table_cache_definition.rb'
+  require 'axlsx/workbook/worksheet/pivot_table.rb'
+  require 'axlsx/workbook/worksheet/pivot_tables.rb'
+  require 'axlsx/workbook/worksheet/data_validation.rb'
+  require 'axlsx/workbook/worksheet/data_validations.rb'
+  require 'axlsx/workbook/worksheet/sheet_view.rb'
+  require 'axlsx/workbook/worksheet/sheet_format_pr.rb'
+  require 'axlsx/workbook/worksheet/pane.rb'
+  require 'axlsx/workbook/worksheet/selection.rb'
+
   # 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.
   #
@@ -84,7 +82,6 @@ require 'axlsx/workbook/worksheet/selection.rb'
   #
   #   *workbookPr is only supported to the extend of date1904
   class Workbook
-
     BOLD_FONT_MULTIPLIER = 1.5
     FONT_SCALE_DIVISOR = 10.0
 
@@ -109,29 +106,28 @@ require 'axlsx/workbook/worksheet/selection.rb'
       @is_reversed = v
     end
 
-
-   # A collection of worksheets associated with this workbook.
+    # A collection of worksheets associated with this workbook.
     # @note The recommended way to manage worksheets is add_worksheet
     # @see Workbook#add_worksheet
     # @see Worksheet
     # @return [SimpleTypedList]
     attr_reader :worksheets
 
-    # A colllection of charts associated with this workbook
+    # A collection of charts associated with this workbook
     # @note The recommended way to manage charts is Worksheet#add_chart
     # @see Worksheet#add_chart
     # @see Chart
     # @return [SimpleTypedList]
     attr_reader :charts
 
-    # A colllection of images associated with this workbook
+    # A collection of images associated with this workbook
     # @note The recommended way to manage images is Worksheet#add_image
     # @see Worksheet#add_image
     # @see Pic
     # @return [SimpleTypedList]
     attr_reader :images
 
-    # A colllection of drawings associated with this workbook
+    # A collection of drawings associated with this workbook
     # @note The recommended way to manage drawings is Worksheet#add_chart
     # @see Worksheet#add_chart
     # @see Drawing
@@ -140,15 +136,14 @@ require 'axlsx/workbook/worksheet/selection.rb'
 
     # pretty sure this two are always empty and can be removed.
 
-
-    # A colllection of tables associated with this workbook
+    # A collection of tables associated with this workbook
     # @note The recommended way to manage drawings is Worksheet#add_table
     # @see Worksheet#add_table
     # @see Table
     # @return [SimpleTypedList]
     attr_reader :tables
 
-    # A colllection of pivot tables associated with this workbook
+    # A collection of pivot tables associated with this workbook
     # @note The recommended way to manage drawings is Worksheet#add_table
     # @see Worksheet#add_table
     # @see Table
@@ -217,11 +212,9 @@ require 'axlsx/workbook/worksheet/selection.rb'
       self.styles_applied = true
     end
 
-
     # 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
     # @param [String] name The name of the sheet you are looking for
     # @return [Worksheet] The sheet found, or nil
@@ -230,10 +223,10 @@ require 'axlsx/workbook/worksheet/selection.rb'
       @worksheets[index] if index
     end
 
-    # Creates a new Workbook
-    # The recomended way to work with workbooks is via Package#workbook
-    # @option options [Boolean] date1904. If this is not specified, date1904 is set to false. Office 2011 for Mac defaults to false.
-    def initialize(options={})
+    # Creates a new Workbook.
+    # The recommended way to work with workbooks is via Package#workbook.
+    # @option options [Boolean] date1904 If this is not specified, date1904 is set to false. Office 2011 for Mac defaults to false.
+    def initialize(options = {})
       @styles = Styles.new
       @worksheets = SimpleTypedList.new Worksheet
       @drawings = SimpleTypedList.new Drawing
@@ -243,13 +236,12 @@ require 'axlsx/workbook/worksheet/selection.rb'
       @tables = SimpleTypedList.new Table
       @pivot_tables = SimpleTypedList.new PivotTable
       @comments = SimpleTypedList.new Comments
-
-
       @use_autowidth = true
       @bold_font_multiplier = BOLD_FONT_MULTIPLIER
       @font_scale_divisor = FONT_SCALE_DIVISOR
 
-      self.date1904= !options[:date1904].nil? && options[:date1904]
+      self.escape_formulas = options[:escape_formulas].nil? ? Axlsx.escape_formulas : options[:escape_formulas]
+      self.date1904 = !options[:date1904].nil? && options[:date1904]
       yield self if block_given?
     end
 
@@ -268,6 +260,19 @@ require 'axlsx/workbook/worksheet/selection.rb'
     # @return [Boolean]
     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.
+    # See https://www.owasp.org/index.php/CSV_Injection for details.
+    # @return [Boolean]
+    attr_reader :escape_formulas
+
+    # Sets whether to treat values starting with an equals sign as formulas or as literal strings.
+    # @param [Boolean] value The value to set.
+    def escape_formulas=(value)
+      Axlsx.validate_boolean(value)
+      @escape_formulas = value
+    end
+
     # Indicates if the workbook should use autowidths or not.
     # @note This gem no longer depends on RMagick for autowidth
     #     calculation. Thus the performance benefits of turning this off are
@@ -276,7 +281,7 @@ require 'axlsx/workbook/worksheet/selection.rb'
     def use_autowidth() @use_autowidth; end
 
     # 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
@@ -306,7 +311,7 @@ require 'axlsx/workbook/worksheet/selection.rb'
     # @param [Hash] options Options to pass into the worksheed during initialization.
     # @option options [String] name The name of the worksheet
     # @option options [Hash] page_margins The page margins for the worksheet
-    def insert_worksheet(index=0, options={})
+    def insert_worksheet(index = 0, options = {})
       worksheet = Worksheet.new(self, options)
       @worksheets.delete_at(@worksheets.size - 1)
       @worksheets.insert(index, worksheet)
@@ -320,7 +325,7 @@ require 'axlsx/workbook/worksheet/selection.rb'
     # @option options [String] name The name of the worksheet.
     # @option options [Hash] page_margins The page margins for the worksheet.
     # @see Worksheet#initialize
-    def add_worksheet(options={})
+    def add_worksheet(options = {})
       worksheet = Worksheet.new(self, options)
       yield worksheet if block_given?
       worksheet
@@ -330,7 +335,7 @@ require 'axlsx/workbook/worksheet/selection.rb'
     # @return WorkbookViews
     # @option options [Hash] options passed into the added WorkbookView
     # @see WorkbookView#initialize
-    def add_view(options={})
+    def add_view(options = {})
       views << WorkbookView.new(options)
     end
 
@@ -347,14 +352,14 @@ require 'axlsx/workbook/worksheet/selection.rb'
     def relationships
       r = Relationships.new
       @worksheets.each do |sheet|
-        r << Relationship.new(sheet, WORKSHEET_R, WORKSHEET_PN % (r.size+1))
+        r << Relationship.new(sheet, WORKSHEET_R, WORKSHEET_PN % (r.size + 1))
       end
       pivot_tables.each_with_index do |pivot_table, index|
-        r << Relationship.new(pivot_table.cache_definition, PIVOT_TABLE_CACHE_DEFINITION_R, PIVOT_TABLE_CACHE_DEFINITION_PN % (index+1))
+        r << Relationship.new(pivot_table.cache_definition, PIVOT_TABLE_CACHE_DEFINITION_R, PIVOT_TABLE_CACHE_DEFINITION_PN % (index + 1))
       end
-      r << Relationship.new(self, STYLES_R,  STYLES_PN)
+      r << Relationship.new(self, STYLES_R, STYLES_PN)
       if use_shared_strings
-          r << Relationship.new(self, SHARED_STRINGS_R, SHARED_STRINGS_PN)
+        r << Relationship.new(self, SHARED_STRINGS_R, SHARED_STRINGS_PN)
       end
       r
     end
@@ -380,7 +385,7 @@ require 'axlsx/workbook/worksheet/selection.rb'
     # @param [Symbol] space must be one of :preserve or :default
     def xml_space=(space)
       Axlsx::RestrictionValidator.validate(:xml_space, [:preserve, :default], space)
-      @xml_space = space;
+      @xml_space = space
     end
 
     # returns a range of cells in a worksheet
@@ -391,13 +396,14 @@ require 'axlsx/workbook/worksheet/selection.rb'
       sheet_name = cell_def.split('!')[0] if cell_def.match('!')
       worksheet =  self.worksheets.select { |s| s.name == sheet_name }.first
       raise ArgumentError, 'Unknown Sheet' unless sheet_name && worksheet.is_a?(Worksheet)
-      worksheet[cell_def.gsub(/.+!/,"")]
+
+      worksheet[cell_def.gsub(/.+!/, "")]
     end
 
     # Serialize the workbook
     # @param [String] str
     # @return [String]
-    def to_xml_string(str='')
+    def to_xml_string(str = '')
       add_worksheet(name: 'Sheet1') unless worksheets.size > 0
       str << '<?xml version="1.0" encoding="UTF-8"?>'
       str << ('<workbook xmlns="' << XML_NS << '" xmlns:r="' << XML_NS_R << '">')
@@ -420,6 +426,5 @@ require 'axlsx/workbook/worksheet/selection.rb'
       end
       str << '</workbook>'
     end
-
   end
 end

data/lib/axlsx/workbook/workbook_view.rb

@@ -19,19 +19,16 @@
 # </xsd:complexType>
 
 module Axlsx
-
   # A BookView defines the display properties for a workbook.
   # Units for window widths and other dimensions are expressed in twips.
   # Twip measurements are portable between different display resolutions.
   # The formula is (screen pixels) * (20 * 72) / (logical device dpi),
   # where the logical device dpi can be different for x and y coordinates.
   class WorkbookView
-
     include Axlsx::SerializedAttributes
     include Axlsx::OptionsParser
     include Axlsx::Accessors
 
-
     # Creates a new BookView object
     # @param [Hash] options  A hash of key/value pairs that will be mapped to this instances attributes.
     # @option [Symbol] visibility Specifies visible state of the workbook window. The default value for this attribute is :visible.
@@ -47,16 +44,15 @@ module Axlsx
     # @option [Integer] window_width Specifies the width of the workbook window. The unit of measurement for this value is twips.
     # @option [Integer] window_height Specifies the height of the workbook window. The unit of measurement for this value is twips.
     # @option [Boolean] auto_filter_date_grouping Specifies a boolean value that indicates whether to group dates when presenting the user with filtering options in the user interface.
-    def initialize(options={})
+    def initialize(options = {})
       parse_options options
       yield self if block_given?
     end
 
-
     unsigned_int_attr_accessor :x_window, :y_window, :window_width, :window_height,
                                :tab_ratio, :first_sheet, :active_tab
 
-    validated_attr_accessor  [:visibility], :validate_view_visibility
+    validated_attr_accessor [:visibility], :validate_view_visibility
 
     serializable_attributes :visibility, :minimized,
                             :show_horizontal_scroll, :show_vertical_scroll,
@@ -67,14 +63,13 @@ module Axlsx
     boolean_attr_accessor :minimized, :show_horizontal_scroll, :show_vertical_scroll,
                           :show_sheet_tabs, :auto_filter_date_grouping
 
-
     # Serialize the WorkbookView
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
-       str << '<workbookView '
-       serialized_attributes str
-       str << '></workbookView>'
+      str << '<workbookView '
+      serialized_attributes str
+      str << '></workbookView>'
     end
   end
 end

data/lib/axlsx/workbook/workbook_views.rb

@@ -1,7 +1,6 @@
 module Axlsx
   # a simple types list of BookView objects
   class WorkbookViews < SimpleTypedList
-
     # creates the book views object
     def initialize
       super WorkbookView
@@ -12,11 +11,10 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       return if empty?
+
       str << "<bookViews>"
       each { |view| view.to_xml_string(str) }
       str << '</bookViews>'
     end
   end
 end
-
-

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

@@ -1,16 +1,14 @@
-
 require 'axlsx/workbook/worksheet/auto_filter/filter_column.rb'
 require 'axlsx/workbook/worksheet/auto_filter/filters.rb'
 
 module Axlsx
-
-  #This class represents an auto filter range in a worksheet
+  # This class represents an auto filter range in a worksheet
   class AutoFilter
-
     # creates a new Autofilter object
     # @param [Worksheet] worksheet
     def initialize(worksheet)
       raise ArgumentError, 'you must provide a worksheet' unless worksheet.is_a?(Worksheet)
+
       @worksheet = worksheet
     end
 
@@ -27,7 +25,8 @@ module Axlsx
     # @return [String]
     def defined_name
       return unless range
-      Axlsx.cell_range(range.split(':').collect { |name| worksheet.name_to_cell(name)})
+
+      Axlsx.cell_range(range.split(':').collect { |name| worksheet.name_to_cell(name) })
     end
 
     # A collection of filterColumns for this auto_filter
@@ -54,24 +53,26 @@ module Axlsx
       start_point = Axlsx::name_to_indices(first_cell)
       end_point = Axlsx::name_to_indices(last_cell)
       # The +1 is so we skip the header row with the filter drop downs
-      rows = worksheet.rows[(start_point.last+1)..end_point.last] || []
+      rows = worksheet.rows[(start_point.last + 1)..end_point.last] || []
 
       column_offset = start_point.first
       columns.each do |column|
         rows.each do |row|
           next if row.hidden
+
           column.apply(row, column_offset)
         end
       end
     end
+
     # serialize the object
     # @return [String]
-    def to_xml_string(str='')
+    def to_xml_string(str = '')
       return unless range
+
       str << "<autoFilter ref='#{range}'>"
       columns.each { |filter_column| filter_column.to_xml_string(str) }
       str << "</autoFilter>"
     end
-
   end
 end

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

@@ -4,7 +4,6 @@ module Axlsx
   # If a column in the AutoFilter range has no criteria specified,
   # then there is no corresponding filterColumn collection expressed for that column.
   class FilterColumn
-
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
 
@@ -17,7 +16,7 @@ module Axlsx
     # @option [Boolean] show_button @see show_button
     def initialize(col_id, filter_type, options = {})
       RestrictionValidator.validate 'FilterColumn.filter', FILTERS, filter_type
-      #Axlsx::validate_unsigned_int(col_id)
+      # Axlsx::validate_unsigned_int(col_id)
       self.col_id = col_id
       parse_options options
       @filter = Axlsx.const_get(Axlsx.camel(filter_type)).new(options)
@@ -27,7 +26,7 @@ module Axlsx
     serializable_attributes :col_id, :hidden_button, :show_button
 
     # Allowed filters
-    FILTERS =  [:filters] #, :top10, :custom_filters, :dynamic_filters, :color_filters, :icon_filters]
+    FILTERS = [:filters] # , :top10, :custom_filters, :dynamic_filters, :color_filters, :icon_filters]
 
     # Zero-based index indicating the AutoFilter column to which this filter information applies.
     # @return [Integer]
@@ -52,7 +51,7 @@ module Axlsx
     end
 
     # Sets the col_id attribute for this filter column.
-    # @param [Integer | Cell] column_index The zero based index of the column to which this filter applies. 
+    # @param [Integer | Cell] column_index The zero based index of the column to which this filter applies.
     #                         When you specify a cell, the column index will be read off the cell
     # @return [Integer]
     def col_id=(column_index)
@@ -65,8 +64,9 @@ module Axlsx
     # @param [Array] row A row from a worksheet that needs to be
     # filtered.
     def apply(row, offset)
-      row.hidden = @filter.apply(row.cells[offset+col_id.to_i])
+      row.hidden = @filter.apply(row.cells[offset + col_id.to_i])
     end
+
     # @param [Boolean] hidden Flag indicating whether the AutoFilter button for this column is hidden.
     # @return [Boolean]
     def hidden_button=(hidden)
@@ -85,7 +85,7 @@ module Axlsx
     end
 
     # Serialize the object to xml
-    def to_xml_string(str='')
+    def to_xml_string(str = '')
       str << "<filterColumn #{serialized_attributes}>"
       @filter.to_xml_string(str)
       str << "</filterColumn>"

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

@@ -1,6 +1,5 @@
 module Axlsx
-
-  # When multiple values are chosen to filter by, or when a group of date values are chosen to filter by, 
+  # When multiple values are chosen to filter by, or when a group of date values are chosen to filter by,
   # this object groups those criteria together.
   class Filters
     include Axlsx::OptionsParser
@@ -16,7 +15,7 @@ module Axlsx
     # @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'])
-    def initialize(options={})
+    def initialize(options = {})
       parse_options options
     end
 
@@ -29,7 +28,7 @@ module Axlsx
     # @return [Boolean]
     attr_reader :blank
 
-    # Calendar type for date grouped items. 
+    # Calendar type for date grouped items.
     # Used to interpret the values in dateGroupItem.
     # This is the calendar type used to evaluate all dates in the filter column,
     # even when those dates are not using the same calendar system / date formatting.
@@ -42,6 +41,7 @@ module Axlsx
     # TODO implement this for date filters as well!
     def apply(cell)
       return false unless cell
+
       filter_items.each do |filter|
         return false if cell.value == filter.val
       end
@@ -76,12 +76,12 @@ module Axlsx
     # Serialize the object to xml
     def to_xml_string(str = '')
       str << "<filters #{serialized_attributes}>"
-      filter_items.each {  |filter| filter.to_xml_string(str) }
+      filter_items.each { |filter| filter.to_xml_string(str) }
       date_group_items.each { |date_group_item| date_group_item.to_xml_string(str) }
       str << '</filters>'
     end
 
-    # not entirely happy with this. 
+    # not entirely happy with this.
     # filter_items should be a simple typed list that overrides << etc
     # to create Filter objects from the inserted values. However this
     # is most likely so rarely used...(really? do you know that?)
@@ -98,13 +98,13 @@ module Axlsx
     def date_group_items=(options)
       options.each do |date_group|
         raise ArgumentError, "date_group_items should be an array of hashes specifying the options for each date_group_item" unless date_group.is_a?(Hash)
+
         date_group_items << DateGroupItem.new(date_group)
       end
     end
 
     # This class expresses a filter criteria value.
     class Filter
-
       # Creates a new filter value object
       # @param [Any] value   The value of the filter. This is not restricted, but
       #                       will be serialized via to_s so if you are passing an object
@@ -113,8 +113,7 @@ module Axlsx
         @val = value
       end
 
-
-      #Filter value used in the criteria.
+      # Filter value used in the criteria.
       attr_accessor :val
 
       # Serializes the filter value object
@@ -124,7 +123,6 @@ module Axlsx
       end
     end
 
-
     # This collection is used to express a group of dates or times which are
     # used in an AutoFilter criteria. Values are always written in the calendar
     # type of the first date encountered in the filter range, so that all
@@ -132,7 +130,7 @@ module Axlsx
     # types, can be correctly compared for the purposes of filtering.
     class DateGroupItem
       include Axlsx::OptionsParser
-include Axlsx::SerializedAttributes
+      include Axlsx::SerializedAttributes
 
       # Creates a new DateGroupItem
       # @param [Hash] options A hash of options to use when
@@ -145,9 +143,10 @@ include Axlsx::SerializedAttributes
       # @option [Integer] hour @see hour
       # @option [Integer] minute @see minute
       # @option [Integer] second @see second
-      def initialize(options={})
-        raise ArgumentError,  "You must specify a year for date time grouping" unless options[:year]
+      def initialize(options = {})
+        raise ArgumentError, "You must specify a year for date time grouping" unless options[:year]
         raise ArgumentError, "You must specify a date_time_grouping when creating a DateGroupItem for auto filter" unless options[:date_time_grouping]
+
         parse_options options
       end
 
@@ -200,7 +199,7 @@ include Axlsx::SerializedAttributes
       end
 
       # The day value for the date group item
-      # This must be between 1 and 31 
+      # This must be between 1 and 31
       # @note no attempt is made to ensure the date value is valid for any given month
       def day=(value)
         RangeValidator.validate "DateGroupItem.day", 0, 31, value