caxlsx 3.3.0 → 3.4.0

data/lib/axlsx/stylesheet/color.rb

@@ -1,8 +1,6 @@
-# encoding: UTF-8
 module Axlsx
   # The color class represents a color used for borders, fills an fonts
   class Color
-
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
 
@@ -10,7 +8,7 @@ module Axlsx
     # @option options [Boolean] auto
     # @option options [String] rgb
     # @option options [Float] tint
-    def initialize(options={})
+    def initialize(options = {})
       @rgb = "FF000000"
       parse_options options
     end
@@ -39,15 +37,16 @@ module Axlsx
 
     # no support for theme just yet
     # @return [Integer]
-    #attr_reader :theme
+    # attr_reader :theme
 
     # The tint value.
     # @note valid values are between -1.0 and 1.0
     # @return [Float]
     attr_reader :tint
 
-     # @see auto
+    # @see auto
     def auto=(v) Axlsx::validate_boolean v; @auto = v end
+
     # @see color
     def rgb=(v)
       Axlsx::validate_string(v)
@@ -55,8 +54,10 @@ module Axlsx
       v = v * 3 if v.size == 2
       v = v.rjust(8, 'FF')
       raise ArgumentError, "Invalid color rgb value: #{v}." unless v.match(/[0-9A-F]{8}/)
+
       @rgb = v
     end
+
     # @see tint
     def tint=(v) Axlsx::validate_float v; @tint = v end
 

data/lib/axlsx/stylesheet/dxf.rb

@@ -1,15 +1,13 @@
-# encoding: UTF-8
 module Axlsx
   # The Dxf class defines an incremental formatting record for use in Styles. The recommended way to manage styles for your workbook is with Styles#add_style
   # @see Styles#add_style
   class Dxf
-
     include Axlsx::OptionsParser
 
     # The order in which the child elements is put in the XML seems to
     # be important for Excel
     CHILD_ELEMENTS = [:font, :numFmt, :fill, :alignment, :border, :protection]
-    #does not support extList (ExtensionList)
+    # does not support extList (ExtensionList)
 
     # The cell alignment for this style
     # @return [CellAlignment]
@@ -44,7 +42,7 @@ module Axlsx
     # @option options [Font] font
     # @option options [CellAlignment] alignment
     # @option options [CellProtection] protection
-    def initialize(options={})
+    def initialize(options = {})
       parse_options options
     end
 
@@ -73,7 +71,5 @@ module Axlsx
       end
       str << '</dxf>'
     end
-
   end
-
 end

data/lib/axlsx/stylesheet/fill.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Axlsx
   # The Fill is a formatting object that manages the background color, and pattern for cells.
   # @note The recommended way to manage styles in your workbook is to use Styles#add_style.
@@ -6,7 +5,6 @@ module Axlsx
   # @see PatternFill
   # @see GradientFill
   class Fill
-
     # The type of fill
     # @return [PatternFill, GradientFill]
     attr_reader :fill_type
@@ -29,7 +27,5 @@ module Axlsx
 
     # @see fill_type
     def fill_type=(v) DataTypeValidator.validate "Fill.fill_type", [PatternFill, GradientFill], v; @fill_type = v; end
-
-
   end
 end

data/lib/axlsx/stylesheet/font.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Axlsx
   # The Font class details a font instance for use in styling cells.
   # @note The recommended way to manage fonts, and other styles is Styles#add_style
@@ -21,7 +20,7 @@ module Axlsx
     # @option options [Boolean] extend
     # @option options [Color] color
     # @option options [Integer] sz
-    def initialize(options={})
+    def initialize(options = {})
       parse_options options
     end
 
@@ -100,7 +99,7 @@ module Axlsx
 
     # The font's extend property
     # @return [Boolean]
-    attr_reader  :extend
+    attr_reader :extend
 
     # The color of the font
     # @return [Color]
@@ -110,7 +109,7 @@ module Axlsx
     # @return [Integer]
     attr_reader :sz
 
-     # @see name
+    # @see name
     def name=(v) Axlsx::validate_string v; @name = v end
     # @see charset
     def charset=(v) Axlsx::validate_unsigned_int v; @charset = v end
@@ -120,6 +119,7 @@ module Axlsx
     def b=(v) Axlsx::validate_boolean v; @b = v end
     # @see i
     def i=(v) Axlsx::validate_boolean v; @i = v end
+
     # @see u
     def u=(v)
       v = :single if (v == true || v == 1 || v == :true || v == 'true')
@@ -127,6 +127,7 @@ module Axlsx
       Axlsx::validate_cell_u v
       @u = v
     end
+
     # @see strike
     def strike=(v) Axlsx::validate_boolean v; @strike = v end
     # @see outline
@@ -138,9 +139,9 @@ module Axlsx
     # @see extend
     def extend=(v) Axlsx::validate_boolean v; @extend = v end
     # @see color
-    def color=(v) DataTypeValidator.validate "Font.color", Color, v; @color=v end
+    def color=(v) DataTypeValidator.validate "Font.color", Color, v; @color = v end
     # @see sz
-    def sz=(v) Axlsx::validate_unsigned_int v; @sz=v end
+    def sz=(v) Axlsx::validate_unsigned_int v; @sz = v end
 
     # Serializes the object
     # @param [String] str

data/lib/axlsx/stylesheet/gradient_fill.rb

@@ -1,9 +1,7 @@
-# encoding: UTF-8
 module Axlsx
   # A GradientFill defines the color and positioning for gradiant cell fill.
   # @see Open Office XML Part 1 §18.8.24
   class GradientFill
-
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
 
@@ -14,7 +12,7 @@ module Axlsx
     # @option options [Float] right
     # @option options [Float] top
     # @option options [Float] bottom
-    def initialize(options={})
+    def initialize(options = {})
       options[:type] ||= :linear
       parse_options options
       @stop = SimpleTypedList.new GradientStop
@@ -68,8 +66,8 @@ module Axlsx
 
     # @see right
     def right=(v)
-     validate_format_percentage "GradientFill.right", v
-     @right = v
+      validate_format_percentage "GradientFill.right", v
+      @right = v
     end
 
     # @see top
@@ -86,7 +84,7 @@ module Axlsx
 
     # validates that the value provided is between 0.0 and 1.0
     def validate_format_percentage(name, value)
-      DataTypeValidator.validate name, Float, value, lambda { |arg| arg >= 0.0 && arg <= 1.0}
+      DataTypeValidator.validate name, Float, value, lambda { |arg| arg >= 0.0 && arg <= 1.0 }
     end
 
     # Serializes the object

data/lib/axlsx/stylesheet/gradient_stop.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Axlsx
   # The GradientStop object represents a color point in a gradient.
   # @see Open Office XML Part 1 §18.8.24
@@ -21,9 +20,9 @@ module Axlsx
     end
 
     # @see color
-    def color=(v) DataTypeValidator.validate "GradientStop.color", Color, v; @color=v end
+    def color=(v) DataTypeValidator.validate "GradientStop.color", Color, v; @color = v end
     # @see position
-    def position=(v) DataTypeValidator.validate "GradientStop.position", Float, v, lambda { |arg| arg >= 0 && arg <= 1}; @position = v end
+    def position=(v) DataTypeValidator.validate "GradientStop.position", Float, v, lambda { |arg| arg >= 0 && arg <= 1 }; @position = v end
 
     # Serializes the object
     # @param [String] str

data/lib/axlsx/stylesheet/num_fmt.rb

@@ -1,9 +1,7 @@
-# encoding: UTF-8
 module Axlsx
   # A NumFmt object defines an identifier and formatting code for data in cells.
   # @note The recommended way to manage styles is Styles#add_style
   class NumFmt
-
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
 
@@ -11,7 +9,7 @@ module Axlsx
     # @param [Hash] options Options for the number format object
     # @option [Integer] numFmtId The predefined format id or new format id for this format
     # @option [String] formatCode The format code for this number format
-    def initialize(options={})
+    def initialize(options = {})
       @numFmtId = 0
       @formatCode = ""
       parse_options options
@@ -81,6 +79,5 @@ module Axlsx
       end
       str
     end
-
   end
 end

data/lib/axlsx/stylesheet/pattern_fill.rb

@@ -1,16 +1,14 @@
-# encoding: UTF-8
 module Axlsx
   # A PatternFill is the pattern and solid fill styling for a cell.
   # @note The recommended way to manage styles is with Styles#add_style
   # @see Style#add_style
   class PatternFill
-
     include Axlsx::OptionsParser
     # Creates a new PatternFill Object
     # @option options [Symbol] patternType
     # @option options [Color] fgColor
     # @option options [Color] bgColor
-    def initialize(options={})
+    def initialize(options = {})
       @patternType = :none
       parse_options options
     end
@@ -49,9 +47,9 @@ module Axlsx
     attr_reader :patternType
 
     # @see fgColor
-    def fgColor=(v) DataTypeValidator.validate "PatternFill.fgColor", Color, v; @fgColor=v end
+    def fgColor=(v) DataTypeValidator.validate "PatternFill.fgColor", Color, v; @fgColor = v end
     # @see bgColor
-    def bgColor=(v) DataTypeValidator.validate "PatternFill.bgColor", Color, v; @bgColor=v end
+    def bgColor=(v) DataTypeValidator.validate "PatternFill.bgColor", Color, v; @bgColor = v end
     # @see patternType
     def patternType=(v) Axlsx::validate_pattern_type v; @patternType = v end
 

data/lib/axlsx/stylesheet/styles.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Axlsx
   require 'axlsx/stylesheet/border.rb'
   require 'axlsx/stylesheet/border_pr.rb'
@@ -18,7 +17,7 @@ module Axlsx
   require 'axlsx/stylesheet/xf.rb'
   require 'axlsx/stylesheet/cell_protection.rb'
 
-  #The Styles class manages worksheet styles
+  # 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.
   # All portions of the stylesheet are implemented here exception colors, which specify legacy and modified pallete colors, and exLst, whic is used as a future feature data storage area.
   # @see  Office Open XML Part 1 18.8.11 for gory details on how this stuff gets put together
@@ -137,7 +136,7 @@ module Axlsx
     # @option options [Integer] family The font family to use.
     # @option options [String] font_name The name of the font to use
     # @option options [Integer] num_fmt The number format to apply
-    # @option options [String] format_code The formatting to apply. 
+    # @option options [String] format_code The formatting to apply.
     # @option options [Integer|Hash] border The border style to use.
     #   borders support style, color and edges options @see parse_border_options
     # @option options [String] bg_color The background color to apply to the cell
@@ -225,22 +224,26 @@ 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={})
+    def add_style(options = {})
       # Default to :xf
       options[:type] ||= :xf
 
-      raise ArgumentError, "Type must be one of [:xf, :dxf]" unless [:xf, :dxf].include?(options[:type] )
+      raise ArgumentError, "Type must be one of [:xf, :dxf]" unless [:xf, :dxf].include?(options[:type])
 
-      if options[:border].is_a?(Hash) && options[:border][:edges] == :all
-        options[:border][:edges] = Axlsx::Border::EDGES
+      if options[:border].is_a?(Hash)
+        if options[:border][:edges] == :all
+          options[:border][:edges] = Axlsx::Border::EDGES
+        elsif options[:border][:edges]
+          options[:border][:edges] = options[:border][:edges].map(&:to_sym) ### normalize for style caching
+        end
       end
 
       if options[:type] == :xf
         # Check to see if style in cache already
-        
-        font_defaults = {name: @fonts.first.name, sz: @fonts.first.sz, family: @fonts.first.family} 
 
-        raw_style = {type: :xf}.merge(font_defaults).merge(options)
+        font_defaults = { name: @fonts.first.name, sz: @fonts.first.sz, family: @fonts.first.family }
+
+        raw_style = { type: :xf }.merge(font_defaults).merge(options)
 
         if raw_style[:format_code]
           raw_style.delete(:num_fmt)
@@ -264,7 +267,7 @@ module Axlsx
       when :dxf
         style = Dxf.new :fill => fill, :font => font, :numFmt => numFmt, :border => border, :alignment => alignment, :protection => protection
       else
-        style = Xf.new :fillId=>fill || 0, :fontId=>font || 0, :numFmtId=>numFmt || 0, :borderId=>border || 0, :alignment => alignment, :protection => protection, :applyFill=>!fill.nil?, :applyFont=>!font.nil?, :applyNumberFormat =>!numFmt.nil?, :applyBorder=>!border.nil?, :applyAlignment => !alignment.nil?, :applyProtection => !protection.nil?
+        style = Xf.new :fillId => fill || 0, :fontId => font || 0, :numFmtId => numFmt || 0, :borderId => border || 0, :alignment => alignment, :protection => protection, :applyFill => !fill.nil?, :applyFont => !font.nil?, :applyNumberFormat => !numFmt.nil?, :applyBorder => !border.nil?, :applyAlignment => !alignment.nil?, :applyProtection => !protection.nil?
       end
 
       if options[:type] == :xf
@@ -287,8 +290,9 @@ module Axlsx
     # @option options [Boolean] hide boolean value defining cell protection attribute for hiding.
     # @option options [Boolean] locked boolean value defining cell protection attribute for locking.
     # @return [CellProtection]
-    def parse_protection_options(options={})
+    def parse_protection_options(options = {})
       return if (options.keys & [:hidden, :locked]).empty?
+
       CellProtection.new(options)
     end
 
@@ -297,8 +301,9 @@ module Axlsx
     # @option options [Hash] alignment A hash of options to prive the CellAlignment intializer
     # @return [CellAlignment]
     # @see CellAlignment
-    def parse_alignment_options(options={})
+    def parse_alignment_options(options = {})
       return unless options[:alignment]
+
       CellAlignment.new options[:alignment]
     end
 
@@ -317,8 +322,9 @@ module Axlsx
     # @option options [Integer] family The font family to use.
     # @option options [String] font_name The name of the font to use
     # @return [Font|Integer]
-    def parse_font_options(options={})
+    def parse_font_options(options = {})
       return if (options.keys & [:fg_color, :sz, :b, :i, :u, :strike, :outline, :shadow, :charset, :family, :font_name]).empty?
+
       Axlsx.instance_values_for(fonts.first).each do |key, value|
         # Thanks for that 1.8.7 - cant do a simple merge...
         options[key.to_sym] = value unless options.keys.include?(key.to_sym)
@@ -333,31 +339,32 @@ module Axlsx
     # @note noop if :bg_color is not specified in options
     # @option options [String] bg_color The rgb color to apply to the fill
     # @return [Fill|Integer]
-    def parse_fill_options(options={})
+    def parse_fill_options(options = {})
       return unless options[:bg_color]
-      color = Color.new(:rgb=>options[:bg_color])
+
+      color = Color.new(:rgb => options[:bg_color])
       dxf = options[:type] == :dxf
       color_key = dxf ? :bgColor : :fgColor
-      pattern = PatternFill.new(:patternType =>:solid, color_key=>color)
+      pattern = PatternFill.new(:patternType => :solid, color_key => color)
       fill = Fill.new(pattern)
       dxf ? fill : fills << fill
     end
 
     # parses Style#add_style options for borders.
     # @note noop if :border is not specified in options
-    # @option options [Hash|Integer] A border style definition hash or the index of an existing border. 
-    # Border style definition hashes must include :style and :color key-value entries and 
-    # may include an :edges entry that references an array of symbols identifying which border edges 
+    # @option options [Hash|Integer] A border style definition hash or the index of an existing border.
+    # Border style definition hashes must include :style and :color key-value entries and
+    # may include an :edges entry that references an array of symbols identifying which border edges
     # you wish to apply the style or any other valid Border initializer options.
     # If the :edges entity is not provided the style is applied to all edges of cells that reference this style.
-    # Also available :border_top, :border_right, :border_bottom and :border_left options with :style and/or :color 
+    # Also available :border_top, :border_right, :border_bottom and :border_left options with :style and/or :color
     # key-value entries, which override :border values.
     # @example
     #   #apply a thick red border to the top and bottom
     #   { :border => { :style => :thick, :color => "FFFF0000", :edges => [:top, :bottom] }
     # @return [Border|Integer]
-    def parse_border_options(options={})
-      if options[:border].nil? && Border::EDGES.all?{|x| options["border_#{x}".to_sym].nil? }
+    def parse_border_options(options = {})
+      if options[:border].nil? && Border::EDGES.all? { |x| options["border_#{x}".to_sym].nil? }
         return nil
       end
 
@@ -373,7 +380,7 @@ module Axlsx
         end
       end
 
-      validate_border_hash = ->(val){
+      validate_border_hash = ->(val) {
         if !(val.keys.include?(:style) && val.keys.include?(:color))
           raise ArgumentError, (ERR_INVALID_BORDER_OPTIONS % options[:border])
         end
@@ -440,10 +447,10 @@ module Axlsx
           end
 
           border.prs << BorderPr.new({
-            :name => edge, 
-            :style => edge_b_opts[:style], 
-            :color => Color.new(:rgb => edge_b_opts[:color]) },
-          )
+            :name => edge,
+            :style => edge_b_opts[:style],
+            :color => Color.new(:rgb => edge_b_opts[:color])
+          })
         end
       end
 
@@ -458,15 +465,15 @@ module Axlsx
     # noop if neither :format_code or :num_format options are set.
     # @option options [Hash] A hash describing the :format_code and/or :num_fmt integer for the style.
     # @return [NumFmt|Integer]
-    def parse_num_fmt_options(options={})
+    def parse_num_fmt_options(options = {})
       return if (options.keys & [:format_code, :num_fmt]).empty?
 
-      #When the user provides format_code - we always need to create a new numFmt object
-      #When the type is :dxf we always need to create a new numFmt object
+      # When the user provides format_code - we always need to create a new numFmt object
+      # When the type is :dxf we always need to create a new numFmt object
       if options[:format_code] || options[:type] == :dxf
-        #If this is a standard xf we pull from numFmts the highest current and increment for num_fmt
-        options[:num_fmt] ||= (@numFmts.map{ |num_fmt| num_fmt.numFmtId }.max + 1) if options[:type] != :dxf
-        numFmt = NumFmt.new(:numFmtId => options[:num_fmt] || 0, :formatCode=> options[:format_code].to_s)
+        # If this is a standard xf we pull from numFmts the highest current and increment for num_fmt
+        options[:num_fmt] ||= (@numFmts.map { |num_fmt| num_fmt.numFmtId }.max + 1) if options[:type] != :dxf
+        numFmt = NumFmt.new(:numFmtId => options[:num_fmt] || 0, :formatCode => options[:format_code].to_s)
         options[:type] == :dxf ? numFmt : (numFmts << numFmt; numFmt.numFmtId)
       else
         options[:num_fmt]
@@ -486,46 +493,47 @@ module Axlsx
     end
 
     private
+
     # Creates the default set of styles the exel requires to be valid as well as setting up the
     # Axlsx::STYLE_THIN_BORDER
     def load_default_styles
       @numFmts = SimpleTypedList.new NumFmt, 'numFmts'
-      @numFmts << NumFmt.new(:numFmtId => NUM_FMT_YYYYMMDD, :formatCode=> "yyyy/mm/dd")
-      @numFmts << NumFmt.new(:numFmtId => NUM_FMT_YYYYMMDDHHMMSS, :formatCode=> "yyyy/mm/dd hh:mm:ss")
+      @numFmts << NumFmt.new(:numFmtId => NUM_FMT_YYYYMMDD, :formatCode => "yyyy/mm/dd")
+      @numFmts << NumFmt.new(:numFmtId => NUM_FMT_YYYYMMDDHHMMSS, :formatCode => "yyyy/mm/dd hh:mm:ss")
 
       @numFmts.lock
 
       @fonts = SimpleTypedList.new Font, 'fonts'
-      @fonts << Font.new(:name => "Arial", :sz => 11, :family=>1)
+      @fonts << Font.new(:name => "Arial", :sz => 11, :family => 1)
       @fonts.lock
 
       @fills = SimpleTypedList.new Fill, 'fills'
-      @fills << Fill.new(Axlsx::PatternFill.new(:patternType=>:none))
-      @fills << Fill.new(Axlsx::PatternFill.new(:patternType=>:gray125))
+      @fills << Fill.new(Axlsx::PatternFill.new(:patternType => :none))
+      @fills << Fill.new(Axlsx::PatternFill.new(:patternType => :gray125))
       @fills.lock
 
       @borders = SimpleTypedList.new Border, 'borders'
       @borders << Border.new
       black_border = Border.new
       [:left, :right, :top, :bottom].each do |item|
-        black_border.prs << BorderPr.new(:name=>item, :style=>:thin, :color=>Color.new(:rgb=>"FF000000"))
+        black_border.prs << BorderPr.new(:name => item, :style => :thin, :color => Color.new(:rgb => "FF000000"))
       end
       @borders << black_border
       @borders.lock
 
       @cellStyleXfs = SimpleTypedList.new Xf, "cellStyleXfs"
-      @cellStyleXfs << Xf.new(:borderId=>0, :numFmtId=>0, :fontId=>0, :fillId=>0)
+      @cellStyleXfs << Xf.new(:borderId => 0, :numFmtId => 0, :fontId => 0, :fillId => 0)
       @cellStyleXfs.lock
 
       @cellStyles = SimpleTypedList.new CellStyle, 'cellStyles'
-      @cellStyles << CellStyle.new(:name =>"Normal", :builtinId =>0, :xfId=>0)
+      @cellStyles << CellStyle.new(:name => "Normal", :builtinId => 0, :xfId => 0)
       @cellStyles.lock
 
       @cellXfs = SimpleTypedList.new Xf, "cellXfs"
-      @cellXfs << Xf.new(:borderId=>0, :xfId=>0, :numFmtId=>0, :fontId=>0, :fillId=>0)
-      @cellXfs << Xf.new(:borderId=>1, :xfId=>0, :numFmtId=>0, :fontId=>0, :fillId=>0)
+      @cellXfs << Xf.new(:borderId => 0, :xfId => 0, :numFmtId => 0, :fontId => 0, :fillId => 0)
+      @cellXfs << Xf.new(:borderId => 1, :xfId => 0, :numFmtId => 0, :fontId => 0, :fillId => 0)
       # default date formatting
-      @cellXfs << Xf.new(:borderId=>0, :xfId=>0, :numFmtId=>14, :fontId=>0, :fillId=>0, :applyNumberFormat=>1)
+      @cellXfs << Xf.new(:borderId => 0, :xfId => 0, :numFmtId => 14, :fontId => 0, :fillId => 0, :applyNumberFormat => 1)
       @cellXfs.lock
 
       @dxfs = SimpleTypedList.new(Dxf, "dxfs"); @dxfs.lock

data/lib/axlsx/stylesheet/table_style.rb

@@ -1,9 +1,7 @@
-# encoding: UTF-8
 module Axlsx
   # A single table style definition and is a collection for tableStyleElements
   # @note Table are not supported in this version and only the defaults required for a valid workbook are created.
   class TableStyle < SimpleTypedList
-
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
 
@@ -12,7 +10,7 @@ module Axlsx
     # @param [String] name
     # @option options [Boolean] pivot
     # @option options [Boolean] table
-    def initialize(name, options={})
+    def initialize(name, options = {})
       self.name = name
       parse_options options
       super TableStyleElement
@@ -33,22 +31,21 @@ module Axlsx
     attr_reader :table
 
     # @see name
-    def name=(v) Axlsx::validate_string v; @name=v end
+    def name=(v) Axlsx::validate_string v; @name = v end
     # @see pivot
-    def pivot=(v) Axlsx::validate_boolean v; @pivot=v end
+    def pivot=(v) Axlsx::validate_boolean v; @pivot = v end
     # @see table
-    def table=(v) Axlsx::validate_boolean v; @table=v end
+    def table=(v) Axlsx::validate_boolean v; @table = v end
 
     # Serializes the object
     # @param [String] str
     # @return [String]
     def to_xml_string(str = '')
       str << '<tableStyle '
-      serialized_attributes str, {:count => self.size}
+      serialized_attributes str, { :count => self.size }
       str << '>'
       each { |table_style_el| table_style_el.to_xml_string(str) }
       str << '</tableStyle>'
     end
-
   end
 end

data/lib/axlsx/stylesheet/table_style_element.rb

@@ -1,9 +1,7 @@
-# encoding: UTF-8
 module Axlsx
   # an element of style that belongs to a table style.
   # @note tables and table styles are not supported in this version. This class exists in preparation for that support.
   class TableStyleElement
-
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
 
@@ -11,7 +9,7 @@ module Axlsx
     # @option options [Symbol] type
     # @option options [Integer] size
     # @option options [Integer] dxfId
-    def initialize(options={})
+    def initialize(options = {})
       parse_options options
     end
 
@@ -72,6 +70,5 @@ module Axlsx
     def to_xml_string(str = '')
       serialized_tag('tableStyleElement', str)
     end
-
   end
 end

data/lib/axlsx/stylesheet/table_styles.rb

@@ -1,15 +1,13 @@
-# encoding: UTF-8
 module Axlsx
   # TableStyles represents a collection of style definitions for table styles and pivot table styles.
   # @note Support for custom table styles does not exist in this version. Many of the classes required are defined in preparation for future release. Please do not attempt to add custom table styles.
   class TableStyles < SimpleTypedList
-
     include Axlsx::SerializedAttributes
 
     # Creates a new TableStyles object that is a container for TableStyle objects
     # @option options [String] defaultTableStyle
     # @option options [String] defaultPivotStyle
-    def initialize(options={})
+    def initialize(options = {})
       @defaultTableStyle = options[:defaultTableStyle] || "TableStyleMedium9"
       @defaultPivotStyle = options[:defaultPivotStyle] || "PivotStyleLight16"
       super TableStyle
@@ -25,7 +23,7 @@ module Axlsx
     # @return [String]
     attr_reader :defaultPivotStyle
 
-   # @see defaultTableStyle
+    # @see defaultTableStyle
     def defaultTableStyle=(v) Axlsx::validate_string(v); @defaultTableStyle = v; end
     # @see defaultPivotStyle
     def defaultPivotStyle=(v) Axlsx::validate_string(v); @defaultPivotStyle = v; end
@@ -35,12 +33,10 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = '')
       str << '<tableStyles '
-      serialized_attributes str, {:count => self.size }
+      serialized_attributes str, { :count => self.size }
       str << '>'
       each { |table_style| table_style.to_xml_string(str) }
       str << '</tableStyles>'
     end
-
   end
-
 end

data/lib/axlsx/stylesheet/xf.rb

@@ -1,9 +1,8 @@
-# encoding: UTF-8
 module Axlsx
   # The Xf class defines a formatting record for use in Styles. The recommended way to manage styles for your workbook is with Styles#add_style
   # @see Styles#add_style
   class Xf
-    #does not support extList (ExtensionList)
+    # does not support extList (ExtensionList)
 
     include Axlsx::SerializedAttributes
     include Axlsx::OptionsParser
@@ -23,7 +22,7 @@ module Axlsx
     # @option options [Boolean] applyProtection
     # @option options [CellAlignment] alignment
     # @option options [CellProtection] protection
-    def initialize(options={})
+    def initialize(options = {})
       parse_options options
     end
 
@@ -93,7 +92,7 @@ module Axlsx
     # @return [Boolean]
     attr_reader :applyProtection
 
-      # @see Xf#alignment
+    # @see Xf#alignment
     def alignment=(v) DataTypeValidator.validate "Xf.alignment", CellAlignment, v; @alignment = v end
 
     # @see protection
@@ -141,7 +140,5 @@ module Axlsx
       protection.to_xml_string(str) if self.protection
       str << '</xf>'
     end
-
-
   end
 end