caxlsx 3.3.0 → 4.0.0

data/lib/axlsx/stylesheet/cell_alignment.rb

@@ -1,16 +1,13 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
-  
- 
   # CellAlignment stores information about the cell alignment of a style Xf Object.
   # @note Using Styles#add_style is the recommended way to manage cell alignment.
   # @see Styles#add_style
   class CellAlignment
-    
-
     include Axlsx::SerializedAttributes
     include Axlsx::OptionsParser
-    
+
     serializable_attributes :horizontal, :vertical, :text_rotation, :wrap_text, :indent, :relative_indent, :justify_last_line, :shrink_to_fit, :reading_order
     # Create a new cell_alignment object
     # @option options [Symbol] horizontal
@@ -22,12 +19,10 @@ module Axlsx
     # @option options [Boolean] justify_last_line
     # @option options [Boolean] shrink_to_fit
     # @option options [Integer] reading_order
-    def initialize(options={})
+    def initialize(options = {})
       parse_options options
     end
 
-
-
     # The horizontal alignment of the cell.
     # @note
     #  The horizontal cell alignement style must be one of
@@ -91,42 +86,41 @@ module Axlsx
     alias :readingOrder :reading_order
 
     # @see horizontal
-    def horizontal=(v) Axlsx::validate_horizontal_alignment v; @horizontal = v end
+    def horizontal=(v) Axlsx.validate_horizontal_alignment v; @horizontal = v end
     # @see vertical
-    def vertical=(v) Axlsx::validate_vertical_alignment v; @vertical = v end
+    def vertical=(v) Axlsx.validate_vertical_alignment v; @vertical = v end
     # @see textRotation
-    def text_rotation=(v) Axlsx::validate_unsigned_int v; @text_rotation = v end
+    def text_rotation=(v) Axlsx.validate_unsigned_int v; @text_rotation = v end
     alias :textRotation= :text_rotation=
 
     # @see wrapText
-    def wrap_text=(v) Axlsx::validate_boolean v; @wrap_text = v end
+    def wrap_text=(v) Axlsx.validate_boolean v; @wrap_text = v end
     alias :wrapText= :wrap_text=
 
     # @see indent
-    def indent=(v) Axlsx::validate_unsigned_int v; @indent = v end
+    def indent=(v) Axlsx.validate_unsigned_int v; @indent = v end
 
     # @see relativeIndent
-    def relative_indent=(v) Axlsx::validate_int v; @relative_indent = v end
+    def relative_indent=(v) Axlsx.validate_int v; @relative_indent = v end
     alias :relativeIndent= :relative_indent=
 
     # @see justifyLastLine
-    def justify_last_line=(v) Axlsx::validate_boolean v; @justify_last_line = v end
+    def justify_last_line=(v) Axlsx.validate_boolean v; @justify_last_line = v end
     alias :justifyLastLine= :justify_last_line=
 
     # @see shrinkToFit
-    def shrink_to_fit=(v) Axlsx::validate_boolean v; @shrink_to_fit = v end
+    def shrink_to_fit=(v) Axlsx.validate_boolean v; @shrink_to_fit = v end
     alias :shrinkToFit= :shrink_to_fit=
 
     # @see readingOrder
-    def reading_order=(v) Axlsx::validate_unsigned_int v; @reading_order = v end
+    def reading_order=(v) Axlsx.validate_unsigned_int v; @reading_order = v end
     alias :readingOrder= :reading_order=
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag('alignment', str)
     end
-
   end
 end

data/lib/axlsx/stylesheet/cell_protection.rb

@@ -1,10 +1,10 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
   # CellProtection stores information about locking or hiding cells in spreadsheet.
   # @note Using Styles#add_style is the recommended way to manage cell protection.
   # @see Styles#add_style
   class CellProtection
-
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
 
@@ -21,21 +21,20 @@ module Axlsx
     # Creates a new CellProtection
     # @option options [Boolean] hidden value for hidden protection
     # @option options [Boolean] locked value for locked protection
-    def initialize(options={})
+    def initialize(options = {})
       parse_options options
     end
 
     # @see hidden
-    def hidden=(v) Axlsx::validate_boolean v; @hidden = v end
+    def hidden=(v) Axlsx.validate_boolean v; @hidden = v end
     # @see locked
-    def locked=(v) Axlsx::validate_boolean v; @locked = v end
+    def locked=(v) Axlsx.validate_boolean v; @locked = v end
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag('protection', str)
     end
-
   end
 end

data/lib/axlsx/stylesheet/cell_style.rb

@@ -1,10 +1,10 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
   # CellStyle defines named styles that reference defined formatting records and can be used in your worksheet.
   # @note Using Styles#add_style is the recommended way to manage cell styling.
   # @see Styles#add_style
   class CellStyle
-
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
 
@@ -15,7 +15,7 @@ module Axlsx
     # @option options [Integer] iLevel
     # @option options [Boolean] hidden
     # @option options [Boolean] customBuiltIn
-    def initialize(options={})
+    def initialize(options = {})
       parse_options options
     end
 
@@ -39,7 +39,7 @@ module Axlsx
     # @return [Integer]
     attr_reader :iLevel
 
-    # Determines if this named style should show in the list of styles when using excel
+    # Determines if this named style should show in the list of styles when using Excel
     # @return [Boolean]
     attr_reader :hidden
 
@@ -47,26 +47,24 @@ module Axlsx
     # @return [Boolean]
     attr_reader :customBuiltin
 
-     # @see name
-    def name=(v)  Axlsx::validate_string v; @name = v end
+    # @see name
+    def name=(v) Axlsx.validate_string v; @name = 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 builtinId
-    def builtinId=(v) Axlsx::validate_unsigned_int v; @builtinId = v end
+    def builtinId=(v) Axlsx.validate_unsigned_int v; @builtinId = v end
     # @see iLivel
-    def iLevel=(v) Axlsx::validate_unsigned_int v; @iLevel = v end
+    def iLevel=(v) Axlsx.validate_unsigned_int v; @iLevel = v end
     # @see hidden
-    def hidden=(v) Axlsx::validate_boolean v; @hidden = v end
+    def hidden=(v) Axlsx.validate_boolean v; @hidden = v end
     # @see customBuiltin
-    def customBuiltin=(v) Axlsx::validate_boolean v; @customBuiltin = v end
+    def customBuiltin=(v) Axlsx.validate_boolean v; @customBuiltin = v end
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag('cellStyle', str)
     end
-
   end
-
 end

data/lib/axlsx/stylesheet/color.rb

@@ -1,8 +1,8 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
   # The color class represents a color used for borders, fills an fonts
   class Color
-
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
 
@@ -10,7 +10,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,26 +39,29 @@ 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
-    def auto=(v) Axlsx::validate_boolean v; @auto = v end
+    # @see auto
+    def auto=(v) Axlsx.validate_boolean v; @auto = v end
+
     # @see color
     def rgb=(v)
-      Axlsx::validate_string(v)
+      Axlsx.validate_string(v)
       v = v.upcase
-      v = v * 3 if v.size == 2
+      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}/)
+      raise ArgumentError, "Invalid color rgb value: #{v}." unless /[0-9A-F]{8}/.match?(v)
+
       @rgb = v
     end
+
     # @see tint
-    def tint=(v) Axlsx::validate_float v; @tint = v end
+    def tint=(v) Axlsx.validate_float v; @tint = v end
 
     # This version does not support themes
     # def theme=(v) Axlsx::validate_unsigned_integer v; @theme = v end
@@ -69,8 +72,8 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '', tag_name = 'color')
-      serialized_tag('' + tag_name + '', str)
+    def to_xml_string(str = +'', tag_name = 'color')
+      serialized_tag(tag_name.to_s, str)
     end
   end
 end

data/lib/axlsx/stylesheet/dxf.rb

@@ -1,15 +1,15 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 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)
+    CHILD_ELEMENTS = [:font, :numFmt, :fill, :alignment, :border, :protection].freeze
+    # does not support extList (ExtensionList)
 
     # The cell alignment for this style
     # @return [CellAlignment]
@@ -44,7 +44,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
 
@@ -64,16 +64,14 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<dxf>'
       # Dxf elements have no attributes. All of the instance variables
       # are child elements.
       CHILD_ELEMENTS.each do |element|
-        self.send(element).to_xml_string(str) if self.send(element)
+        send(element).to_xml_string(str) if send(element)
       end
       str << '</dxf>'
     end
-
   end
-
 end

data/lib/axlsx/stylesheet/fill.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 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 +7,6 @@ module Axlsx
   # @see PatternFill
   # @see GradientFill
   class Fill
-
     # The type of fill
     # @return [PatternFill, GradientFill]
     attr_reader :fill_type
@@ -21,7 +21,7 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<fill>'
       @fill_type.to_xml_string(str)
       str << '</fill>'
@@ -29,7 +29,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,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 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 +22,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 +101,7 @@ module Axlsx
 
     # The font's extend property
     # @return [Boolean]
-    attr_reader  :extend
+    attr_reader :extend
 
     # The color of the font
     # @return [Color]
@@ -110,45 +111,47 @@ module Axlsx
     # @return [Integer]
     attr_reader :sz
 
-     # @see name
-    def name=(v) Axlsx::validate_string v; @name = v end
+    # @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
+    def charset=(v) Axlsx.validate_unsigned_int v; @charset = v end
     # @see family
-    def family=(v) Axlsx::validate_unsigned_int v; @family = v end
+    def family=(v) Axlsx.validate_unsigned_int v; @family = v end
     # @see b
-    def b=(v) Axlsx::validate_boolean v; @b = v end
+    def b=(v) Axlsx.validate_boolean v; @b = v end
     # @see i
-    def i=(v) Axlsx::validate_boolean v; @i = v end
+    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')
-      v = :none if (v == false || v == 0 || v == :false || v == 'false')
-      Axlsx::validate_cell_u v
+      v = :single if v == true || v == 1 || v == :true || v == 'true'
+      v = :none if v == false || v == 0 || v == :false || v == 'false'
+      Axlsx.validate_cell_u v
       @u = v
     end
+
     # @see strike
-    def strike=(v) Axlsx::validate_boolean v; @strike = v end
+    def strike=(v) Axlsx.validate_boolean v; @strike = v end
     # @see outline
-    def outline=(v) Axlsx::validate_boolean v; @outline = v end
+    def outline=(v) Axlsx.validate_boolean v; @outline = v end
     # @see shadow
-    def shadow=(v) Axlsx::validate_boolean v; @shadow = v end
+    def shadow=(v) Axlsx.validate_boolean v; @shadow = v end
     # @see condense
-    def condense=(v) Axlsx::validate_boolean v; @condense = v end
+    def condense=(v) Axlsx.validate_boolean v; @condense = v end
     # @see extend
-    def extend=(v) Axlsx::validate_boolean v; @extend = v end
+    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
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<font>'
       Axlsx.instance_values_for(self).each do |k, v|
-        v.is_a?(Color) ? v.to_xml_string(str) : (str << ('<' << k.to_s << ' val="' << Axlsx.booleanize(v).to_s << '"/>'))
+        v.is_a?(Color) ? v.to_xml_string(str) : (str << '<' << k.to_s << ' val="' << Axlsx.booleanize(v).to_s << '"/>')
       end
       str << '</font>'
     end

data/lib/axlsx/stylesheet/gradient_fill.rb

@@ -1,9 +1,9 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 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 +14,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
@@ -55,10 +55,10 @@ module Axlsx
     attr_reader :stop
 
     # @see type
-    def type=(v) Axlsx::validate_gradient_type v; @type = v end
+    def type=(v) Axlsx.validate_gradient_type v; @type = v end
 
     # @see degree
-    def degree=(v) Axlsx::validate_float v; @degree = v end
+    def degree=(v) Axlsx.validate_float v; @degree = v end
 
     # @see left
     def left=(v)
@@ -68,8 +68,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,13 +86,13 @@ 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, ->(arg) { arg >= 0.0 && arg <= 1.0 }
     end
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<gradientFill '
       serialized_attributes str
       str << '>'

data/lib/axlsx/stylesheet/gradient_stop.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
   # The GradientStop object represents a color point in a gradient.
   # @see Open Office XML Part 1 §18.8.24
@@ -21,16 +22,16 @@ 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, ->(arg) { arg >= 0 && arg <= 1 }; @position = v end
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
-      str << ('<stop position="' << position.to_s << '">')
-      self.color.to_xml_string(str)
+    def to_xml_string(str = +'')
+      str << '<stop position="' << position.to_s << '">'
+      color.to_xml_string(str)
       str << '</stop>'
     end
   end

data/lib/axlsx/stylesheet/num_fmt.rb

@@ -1,9 +1,9 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 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 +11,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
@@ -20,7 +20,7 @@ module Axlsx
     serializable_attributes :formatCode, :numFmtId
 
     # @return [String] The formatting to use for this number format.
-    # @see http://support.microsoft.com/kb/264372
+    # @see https://support.microsoft.com/kb/264372
     attr_reader :formatCode
 
     # @return [Integer] An unsigned integer referencing a standard or custom number format.
@@ -61,26 +61,21 @@ module Axlsx
     attr_reader :numFmtId
 
     # @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 formatCode
-    def formatCode=(v) Axlsx::validate_string v; @formatCode = v end
+    def formatCode=(v) Axlsx.validate_string v; @formatCode = v end
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag('numFmt', str)
     end
 
     # Override to avoid removing underscores
-    def serialized_attributes(str = '', additional_attributes = {})
-      attributes = declared_attributes.merge! additional_attributes
-      attributes.each do |key, value|
-        str << "#{Axlsx.camel(key, false)}=\"#{Axlsx.booleanize(value)}\" "
-      end
-      str
+    def serialized_attributes(str = +'', additional_attributes = {})
+      super(str, additional_attributes, false)
     end
-
   end
 end

data/lib/axlsx/stylesheet/pattern_fill.rb

@@ -1,16 +1,16 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 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,17 +49,17 @@ 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
+    def patternType=(v) Axlsx.validate_pattern_type v; @patternType = v end
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
-      str << ('<patternFill patternType="' << patternType.to_s << '">')
+    def to_xml_string(str = +'')
+      str << '<patternFill patternType="' << patternType.to_s << '">'
       if fgColor.is_a?(Color)
         fgColor.to_xml_string str, "fgColor"
       end