caxlsx 4.0.0 → 4.4.1

data/lib/axlsx/stylesheet/styles.rb

@@ -1,27 +1,28 @@
 # frozen_string_literal: true
 
 module Axlsx
-  require 'axlsx/stylesheet/border'
-  require 'axlsx/stylesheet/border_pr'
-  require 'axlsx/stylesheet/cell_alignment'
-  require 'axlsx/stylesheet/cell_style'
-  require 'axlsx/stylesheet/color'
-  require 'axlsx/stylesheet/fill'
-  require 'axlsx/stylesheet/font'
-  require 'axlsx/stylesheet/gradient_fill'
-  require 'axlsx/stylesheet/gradient_stop'
-  require 'axlsx/stylesheet/num_fmt'
-  require 'axlsx/stylesheet/pattern_fill'
-  require 'axlsx/stylesheet/table_style'
-  require 'axlsx/stylesheet/table_styles'
-  require 'axlsx/stylesheet/table_style_element'
-  require 'axlsx/stylesheet/dxf'
-  require 'axlsx/stylesheet/xf'
-  require 'axlsx/stylesheet/cell_protection'
+  require_relative 'border'
+  require_relative 'border_pr'
+  require_relative 'cell_alignment'
+  require_relative 'cell_style'
+  require_relative 'color'
+  require_relative 'fill'
+  require_relative 'font'
+  require_relative 'gradient_fill'
+  require_relative 'gradient_stop'
+  require_relative 'num_fmt'
+  require_relative 'pattern_fill'
+  require_relative 'table_style'
+  require_relative 'table_styles'
+  require_relative 'table_style_element'
+  require_relative 'theme'
+  require_relative 'dxf'
+  require_relative 'xf'
+  require_relative 'cell_protection'
 
   # 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.
+  # All portions of the stylesheet are implemented here exception colors, which specify legacy and modified palette colors, and exLst, which 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
   # @see  Styles#add_style
   # @note The recommended way to manage styles is with add_style
@@ -156,7 +157,7 @@ module Axlsx
     #   ws = p.workbook.add_worksheet
     #
     #   # black text on a white background at 14pt with thin borders!
-    #   title = ws.styles.add_style(:bg_color => "FFFF0000", :fg_color=>"#FF000000", :sz=>14,  :border=> {:style => :thin, :color => "FFFF0000"}
+    #   title = ws.styles.add_style(:bg_color => "FFFF0000", :fg_color=>"FF000000", :sz=>14,  :border=> {:style => :thin, :color => "FFFF0000"}
     #
     #   ws.add_row ["Least Popular Pets"]
     #   ws.add_row ["", "Dry Skinned Reptiles", "Bald Cats", "Violent Parrots"], :style=>title
@@ -174,7 +175,7 @@ module Axlsx
     #
     #   # define your styles
     #   title = ws.styles.add_style(:bg_color => "FFFF0000",
-    #                              :fg_color=>"#FF000000",
+    #                              :fg_color=>"FF000000",
     #                              :border=>Axlsx::STYLE_THIN_BORDER,
     #                              :alignment=>{:horizontal => :center})
     #
@@ -209,10 +210,10 @@ module Axlsx
     #
     #   # define your styles
     #   profitable = wb.styles.add_style(:bg_color => "FFFF0000",
-    #                              :fg_color=>"#FF000000",
+    #                              :fg_color=>"FF000000",
     #                              :type => :dxf)
     #
-    #   ws.add_row ["Genreated At:", Time.now], :styles=>[nil, date_time]
+    #   ws.add_row ["Generated At:", Time.now], :styles=>[nil, date_time]
     #   ws.add_row ["Previous Year Quarterly Profits (JPY)"], :style=>title
     #   ws.add_row ["Quarter", "Profit", "% of Total"], :style=>title
     #   ws.add_row ["Q1", 4000, 40], :style=>[title, currency, percent]
@@ -245,7 +246,7 @@ module Axlsx
 
         font_defaults = { name: @fonts.first.name, sz: @fonts.first.sz, family: @fonts.first.family }
 
-        raw_style = { type: :xf }.merge(font_defaults).merge(options)
+        raw_style = { type: :xf }.merge(font_defaults, options)
 
         if raw_style[:format_code]
           raw_style.delete(:num_fmt)
@@ -275,7 +276,7 @@ module Axlsx
       if options[:type] == :xf
         xf_index = (cellXfs << style)
 
-        # Add styles to style_index cache for re-use
+        # Add styles to style_index cache for reuse
         style_index[xf_index] = raw_style
 
         xf_index
@@ -298,7 +299,7 @@ module Axlsx
 
     # parses add_style options for alignment
     # noop if options hash does not include :alignment key
-    # @option options [Hash] alignment A hash of options to prive the CellAlignment intializer
+    # @option options [Hash] alignment A hash of options to prive the CellAlignment initializer
     # @return [CellAlignment]
     # @see CellAlignment
     def parse_alignment_options(options = {})
@@ -325,27 +326,60 @@ module Axlsx
     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.key?(key.to_sym)
-      end
-      font = Font.new(options)
+      font = Font.new(Axlsx.instance_values_for(fonts.first).merge(options))
       font.color = Color.new(rgb: options[:fg_color]) if options[:fg_color]
       font.name = options[:font_name] if options[:font_name]
       options[:type] == :dxf ? font : fonts << font
     end
 
     # parses add_style options for fills. If the options hash contains :type => :dxf we return a Fill object. If not, we return the index of the fill after being added to the fills collection.
-    # @note noop if :bg_color is not specified in options
-    # @option options [String] bg_color The rgb color to apply to the fill
+    # @note noop unless at least one of the documented attributes is specified in options
+    # @option options [String] bg_color The rgb color to apply to the fill. An alias for pattern_bg_color if you need only a solid background
+    # @option options [String] pattern_type The fill pattern to apply to the fill
+    # @option options [String] pattern_bg_color The rgb color to apply to the fill as the first color
+    # @option options [String] pattern_fg_color The rgb color to apply to the fill as the second color
     # @return [Fill|Integer]
     def parse_fill_options(options = {})
-      return unless options[:bg_color]
+      return unless options[:bg_color] || options[:pattern_type] || options[:pattern_bg_color] || options[:pattern_fg_color]
 
-      color = Color.new(rgb: options[:bg_color])
+      pattern_type = options[:pattern_type] || :solid
       dxf = options[:type] == :dxf
-      color_key = dxf ? :bgColor : :fgColor
-      pattern = PatternFill.new(:patternType => :solid, color_key => color)
+
+      pattern_options = {
+        patternType: pattern_type
+      }
+
+      if options[:pattern_bg_color] && options[:bg_color]
+        warn 'Both `bg_color` and `pattern_bg_color` got defined. To get a solid background without defining it in `patter_type`, use only `bg_color`, otherwise use only `pattern_bg_color` to avoid confusion.'
+      end
+
+      bg_color = options[:pattern_bg_color] || options[:bg_color]
+      fg_color = options[:pattern_fg_color]
+
+      # Both bgColor and fgColor happens to configure the background of the cell.
+      # One of them sets the "background" of the cell, while the other one is
+      # responsible for the "pattern" of the cell. When you pick "solid" pattern for
+      # a normal xf style, then it's a rectangle covering all bgColor with fgColor,
+      # which means we need to to set the given background color to fgColor as well.
+      # For some reason I wasn't able find, it works the opposite for dxf styles
+      # (differential formatting records), so to get the expected color, we need
+      # to put it into bgColor. We only need these cross-assignments when using
+      # "solid" pattern and the user provided only one color to get the least
+      # amount of surprise
+
+      if bg_color
+        pattern_options[:bgColor] = Color.new(rgb: bg_color)
+      elsif pattern_type == :solid && fg_color
+        pattern_options[:bgColor] = Color.new(rgb: fg_color)
+      end
+
+      if fg_color
+        pattern_options[:fgColor] = Color.new(rgb: fg_color)
+      elsif pattern_type == :solid && bg_color
+        pattern_options[:fgColor] = Color.new(rgb: bg_color)
+      end
+
+      pattern = PatternFill.new(pattern_options)
       fill = Fill.new(pattern)
       dxf ? fill : fills << fill
     end
@@ -364,7 +398,7 @@ module Axlsx
     #   { :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? }
+      if options[:border].nil? && Border::EDGES.all? { |x| options[:"border_#{x}"].nil? }
         return nil
       end
 
@@ -409,7 +443,7 @@ module Axlsx
       end
 
       Border::EDGES.each do |edge|
-        val = options["border_#{edge}".to_sym]
+        val = options[:"border_#{edge}"]
 
         if val
           borders_array << val.merge(edges: [edge])
@@ -430,8 +464,8 @@ module Axlsx
           end
         end
 
-        if options["border_#{edge}".to_sym]
-          edge_b_opts = edge_b_opts.merge(options["border_#{edge}".to_sym])
+        if options[:"border_#{edge}"]
+          edge_b_opts = edge_b_opts.merge(options[:"border_#{edge}"])
           skip_edge = false
         end
 
@@ -472,7 +506,12 @@ module Axlsx
         # If this is a standard xf we pull from numFmts the highest current and increment for num_fmt
         options[:num_fmt] ||= (@numFmts.map(&: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)
+        if options[:type] == :dxf
+          numFmt
+        else
+          numFmts << numFmt
+          numFmt.numFmtId
+        end
       else
         options[:num_fmt]
       end
@@ -534,8 +573,10 @@ module Axlsx
       @cellXfs << Xf.new(borderId: 0, xfId: 0, numFmtId: 14, fontId: 0, fillId: 0, applyNumberFormat: 1)
       @cellXfs.lock
 
-      @dxfs = SimpleTypedList.new(Dxf, "dxfs"); @dxfs.lock
-      @tableStyles = TableStyles.new(defaultTableStyle: "TableStyleMedium9", defaultPivotStyle: "PivotStyleLight16"); @tableStyles.lock
+      @dxfs = SimpleTypedList.new(Dxf, "dxfs")
+      @dxfs.lock
+      @tableStyles = TableStyles.new(defaultTableStyle: "TableStyleMedium9", defaultPivotStyle: "PivotStyleLight16")
+      @tableStyles.lock
     end
   end
 end

data/lib/axlsx/stylesheet/table_style.rb

@@ -15,7 +15,7 @@ module Axlsx
     def initialize(name, options = {})
       self.name = name
       parse_options options
-      super TableStyleElement
+      super(TableStyleElement)
     end
 
     serializable_attributes :name, :pivot, :table
@@ -33,11 +33,22 @@ 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

data/lib/axlsx/stylesheet/table_style_element.rb

@@ -58,13 +58,22 @@ module Axlsx
     attr_reader :dxfId
 
     # @see type
-    def type=(v) Axlsx.validate_table_element_type v; @type = v end
+    def type=(v)
+      Axlsx.validate_table_element_type v
+      @type = v
+    end
 
     # @see size
-    def size=(v) Axlsx.validate_unsigned_int v; @size = v end
+    def size=(v)
+      Axlsx.validate_unsigned_int v
+      @size = v
+    end
 
     # @see dxfId
-    def dxfId=(v) Axlsx.validate_unsigned_int v; @dxfId = v end
+    def dxfId=(v)
+      Axlsx.validate_unsigned_int v
+      @dxfId = v
+    end
 
     # Serializes the object
     # @param [String] str

data/lib/axlsx/stylesheet/table_styles.rb

@@ -12,7 +12,7 @@ module Axlsx
     def initialize(options = {})
       @defaultTableStyle = options[:defaultTableStyle] || "TableStyleMedium9"
       @defaultPivotStyle = options[:defaultPivotStyle] || "PivotStyleLight16"
-      super TableStyle
+      super(TableStyle)
     end
 
     serializable_attributes :defaultTableStyle, :defaultPivotStyle
@@ -26,9 +26,16 @@ module Axlsx
     attr_reader :defaultPivotStyle
 
     # @see defaultTableStyle
-    def defaultTableStyle=(v) Axlsx.validate_string(v); @defaultTableStyle = v; end
+    def defaultTableStyle=(v)
+      Axlsx.validate_string(v)
+      @defaultTableStyle = v
+    end
+
     # @see defaultPivotStyle
-    def defaultPivotStyle=(v) Axlsx.validate_string(v); @defaultPivotStyle = v; end
+    def defaultPivotStyle=(v)
+      Axlsx.validate_string(v)
+      @defaultPivotStyle = v
+    end
 
     # Serializes the object
     # @param [String] str

data/lib/axlsx/stylesheet/theme.rb

@@ -0,0 +1,163 @@
+# frozen_string_literal: true
+
+module Axlsx
+  # Theme represents the theme part of the package and is responsible for
+  # generating the default Office theme that is required for encryption compatibility
+  class Theme
+    # The part name of this theme
+    # @return [String]
+    def pn
+      THEME_PN
+    end
+
+    # Serializes the default theme to XML
+    # @param [String] str
+    # @return [String]
+    def to_xml_string(str = +'')
+      str << <<~XML.delete("\n")
+        <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+        <a:theme xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" name="Office Theme">
+        <a:themeElements>
+        <a:clrScheme name="Office">
+        <a:dk1><a:sysClr val="windowText" lastClr="000000"/></a:dk1>
+        <a:lt1><a:sysClr val="window" lastClr="FFFFFF"/></a:lt1>
+        <a:dk2><a:srgbClr val="1F497D"/></a:dk2>
+        <a:lt2><a:srgbClr val="EEECE1"/></a:lt2>
+        <a:accent1><a:srgbClr val="4F81BD"/></a:accent1>
+        <a:accent2><a:srgbClr val="C0504D"/></a:accent2>
+        <a:accent3><a:srgbClr val="9BBB59"/></a:accent3>
+        <a:accent4><a:srgbClr val="8064A2"/></a:accent4>
+        <a:accent5><a:srgbClr val="4BACC6"/></a:accent5>
+        <a:accent6><a:srgbClr val="F79646"/></a:accent6>
+        <a:hlink><a:srgbClr val="0000FF"/></a:hlink>
+        <a:folHlink><a:srgbClr val="800080"/></a:folHlink>
+        </a:clrScheme>
+
+        <a:fontScheme name="Office">
+        <a:majorFont>
+        <a:latin typeface="Cambria"/>
+        <a:ea typeface=""/>
+        <a:cs typeface=""/>
+        </a:majorFont>
+        <a:minorFont>
+        <a:latin typeface="Calibri"/>
+        <a:ea typeface=""/>
+        <a:cs typeface=""/>
+        </a:minorFont>
+        </a:fontScheme>
+
+        <a:fmtScheme name="Office">
+        <a:fillStyleLst>
+        <a:solidFill><a:schemeClr val="phClr"/></a:solidFill>
+        <a:gradFill rotWithShape="1">
+        <a:gsLst>
+        <a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="50000"/><a:satMod val="300000"/></a:schemeClr></a:gs>
+        <a:gs pos="35000"><a:schemeClr val="phClr"><a:tint val="37000"/><a:satMod val="300000"/></a:schemeClr></a:gs>
+        <a:gs pos="100000"><a:schemeClr val="phClr"><a:tint val="15000"/><a:satMod val="350000"/></a:schemeClr></a:gs>
+        </a:gsLst>
+        <a:lin ang="16200000" scaled="1"/>
+        </a:gradFill>
+        <a:gradFill rotWithShape="1">
+        <a:gsLst>
+        <a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="100000"/><a:shade val="100000"/><a:satMod val="130000"/></a:schemeClr></a:gs>
+        <a:gs pos="100000"><a:schemeClr val="phClr"><a:tint val="50000"/><a:shade val="100000"/><a:satMod val="350000"/></a:schemeClr></a:gs>
+        </a:gsLst>
+        <a:lin ang="16200000" scaled="false"/>
+        </a:gradFill>
+        </a:fillStyleLst>
+
+        <a:lnStyleLst>
+        <a:ln w="9525" cap="flat" cmpd="sng" algn="ctr">
+        <a:solidFill><a:schemeClr val="phClr"><a:shade val="95000"/><a:satMod val="105000"/></a:schemeClr></a:solidFill>
+        <a:prstDash val="solid"/>
+        </a:ln>
+        <a:ln w="25400" cap="flat" cmpd="sng" algn="ctr">
+        <a:solidFill><a:schemeClr val="phClr"/></a:solidFill>
+        <a:prstDash val="solid"/>
+        </a:ln>
+        <a:ln w="38100" cap="flat" cmpd="sng" algn="ctr">
+        <a:solidFill><a:schemeClr val="phClr"/></a:solidFill>
+        <a:prstDash val="solid"/>
+        </a:ln>
+        </a:lnStyleLst>
+
+        <a:effectStyleLst>
+        <a:effectStyle>
+        <a:effectLst>
+        <a:outerShdw blurRad="40000" dist="20000" dir="5400000" rotWithShape="false">
+        <a:srgbClr val="000000"><a:alpha val="38000"/></a:srgbClr>
+        </a:outerShdw>
+        </a:effectLst>
+        </a:effectStyle>
+        <a:effectStyle>
+        <a:effectLst>
+        <a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="false">
+        <a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr>
+        </a:outerShdw>
+        </a:effectLst>
+        </a:effectStyle>
+        <a:effectStyle>
+        <a:effectLst>
+        <a:outerShdw blurRad="40000" dist="23000" dir="5400000" rotWithShape="false">
+        <a:srgbClr val="000000"><a:alpha val="35000"/></a:srgbClr>
+        </a:outerShdw>
+        </a:effectLst>
+        <a:scene3d>
+        <a:camera prst="orthographicFront"><a:rot lat="0" lon="0" rev="0"/></a:camera>
+        <a:lightRig rig="threePt" dir="t"><a:rot lat="0" lon="0" rev="1200000"/></a:lightRig>
+        </a:scene3d>
+        <a:sp3d><a:bevelT w="63500" h="25400"/></a:sp3d>
+        </a:effectStyle>
+        </a:effectStyleLst>
+
+        <a:bgFillStyleLst>
+        <a:solidFill><a:schemeClr val="phClr"/></a:solidFill>
+        <a:gradFill rotWithShape="1">
+        <a:gsLst>
+        <a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="40000"/><a:satMod val="350000"/></a:schemeClr></a:gs>
+        <a:gs pos="40000"><a:schemeClr val="phClr"><a:tint val="45000"/><a:shade val="99000"/><a:satMod val="350000"/></a:schemeClr></a:gs>
+        <a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="20000"/><a:satMod val="255000"/></a:schemeClr></a:gs>
+        </a:gsLst>
+        <a:path path="circle"><a:fillToRect l="50000" t="-80000" r="50000" b="180000"/></a:path>
+        </a:gradFill>
+        <a:gradFill rotWithShape="1">
+        <a:gsLst>
+        <a:gs pos="0"><a:schemeClr val="phClr"><a:tint val="80000"/><a:satMod val="300000"/></a:schemeClr></a:gs>
+        <a:gs pos="100000"><a:schemeClr val="phClr"><a:shade val="30000"/><a:satMod val="200000"/></a:schemeClr></a:gs>
+        </a:gsLst>
+        <a:path path="circle"><a:fillToRect l="50000" t="50000" r="50000" b="50000"/></a:path>
+        </a:gradFill>
+        </a:bgFillStyleLst>
+        </a:fmtScheme>
+        </a:themeElements>
+
+        <a:objectDefaults>
+        <a:spDef>
+        <a:spPr/>
+        <a:bodyPr/>
+        <a:lstStyle/>
+        <a:style>
+        <a:lnRef idx="1"><a:schemeClr val="accent1"/></a:lnRef>
+        <a:fillRef idx="3"><a:schemeClr val="accent1"/></a:fillRef>
+        <a:effectRef idx="2"><a:schemeClr val="accent1"/></a:effectRef>
+        <a:fontRef idx="minor"><a:schemeClr val="lt1"/></a:fontRef>
+        </a:style>
+        </a:spDef>
+        <a:lnDef>
+        <a:spPr/>
+        <a:bodyPr/>
+        <a:lstStyle/>
+        <a:style>
+        <a:lnRef idx="2"><a:schemeClr val="accent1"/></a:lnRef>
+        <a:fillRef idx="0"><a:schemeClr val="accent1"/></a:fillRef>
+        <a:effectRef idx="1"><a:schemeClr val="accent1"/></a:effectRef>
+        <a:fontRef idx="minor"><a:schemeClr val="tx1"/></a:fontRef>
+        </a:style>
+        </a:lnDef>
+        </a:objectDefaults>
+        <a:extraClrSchemeLst/>
+        </a:theme>
+      XML
+    end
+  end
+end

data/lib/axlsx/stylesheet/xf.rb

@@ -8,6 +8,7 @@ module Axlsx
 
     include Axlsx::SerializedAttributes
     include Axlsx::OptionsParser
+
     # Creates a new Xf object
     # @option options [Integer] numFmtId
     # @option options [Integer] fontId
@@ -62,7 +63,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 +96,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