caxlsx 3.3.0 → 4.0.0

data/lib/axlsx/drawing/ax_data_source.rb

@@ -1,13 +1,13 @@
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # An axis data source that can contain referenced or literal strings or numbers
   # @note only string data types are supported - mainly because we have not implemented a chart type that requires a numerical axis value
   class AxDataSource < NumDataSource
-
     # creates a new NumDataSource object
     # @option options [Array] data An array of Cells or Numeric objects
     # @option options [Symbol] tag_name see tag_name
-    def initialize(options={})
+    def initialize(options = {})
       @tag_name = :cat
       @data_type = StrData
       @ref_tag_name = :strRef
@@ -19,8 +19,5 @@ module Axlsx
     def self.allowed_tag_names
       [:xVal, :cat]
     end
-
   end
-
 end
-

data/lib/axlsx/drawing/axes.rb

@@ -1,22 +1,23 @@
+# frozen_string_literal: true
+
 module Axlsx
-  
   # The Axes class creates and manages axis information and
   # serialization for charts.
   class Axes
-
     # @param [Hash] options options used to generate axis each key
     # should be an axis name like :val_axis and its value should be the
     # class of the axis type to construct. The :cat_axis, if there is one,
     # must come first (we assume a Ruby 1.9+ Hash or an OrderedHash).
-    def initialize(options={})
-      raise(ArgumentError, "CatAxis must come first") if options.keys.include?(:cat_axis) && options.keys.first != :cat_axis
+    def initialize(options = {})
+      raise(ArgumentError, "CatAxis must come first") if options.key?(:cat_axis) && options.keys.first != :cat_axis
+
       options.each do |name, axis_class|
         add_axis(name, axis_class)
       end
     end
 
     # [] provides assiciative access to a specic axis store in an axes
-    # instance. 
+    # instance.
     # @return [Axis]
     def [](name)
       axes.assoc(name)[1]
@@ -27,12 +28,12 @@ module Axlsx
     # @param [Hash] options
     # @option options ids
     # If the ids option is specified only the axis identifier is
-    # serialized. Otherwise, each axis is serialized in full. 
-    def to_xml_string(str = '', options = {})
+    # serialized. Otherwise, each axis is serialized in full.
+    def to_xml_string(str = +'', options = {})
       if options[:ids]
         # CatAxis must come first in the XML (for Microsoft Excel at least)
-        sorted = axes.sort_by { |name, axis| axis.kind_of?(CatAxis) ? 0 : 1 }
-        sorted.each { |axis| str << ('<c:axId val="' << axis[1].id.to_s << '"/>') }        
+        sorted = axes.sort_by { |_name, axis| axis.is_a?(CatAxis) ? 0 : 1 }
+        sorted.each { |axis| str << '<c:axId val="' << axis[1].id.to_s << '"/>' }
       else
         axes.each { |axis| axis[1].to_xml_string(str) }
       end

data/lib/axlsx/drawing/axis.rb

@@ -1,9 +1,8 @@
-# encoding: UTF-8
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # the access class defines common properties and values for a chart axis.
   class Axis
-
     include Axlsx::OptionsParser
 
     # Creates an Axis object
@@ -12,11 +11,11 @@ module Axlsx
     # @option options [Symbol] crosses
     # @option options [Symbol] tick_lbl_pos
     # @raise [ArgumentError] If axi_id or cross_ax are not unsigned integers
-    def initialize(options={})
-      @id = rand(8 ** 8)
+    def initialize(options = {})
+      @id = rand(8**8)
       @format_code = "General"
       @delete = @label_rotation = 0
-      @scaling = Scaling.new(:orientation=>:minMax)
+      @scaling = Scaling.new(orientation: :minMax)
       @title = @color = nil
       self.ax_pos = :b
       self.tick_lbl_pos = :nextTo
@@ -83,19 +82,19 @@ module Axlsx
     # the title for the axis. This can be a cell or a fixed string.
     attr_reader :title
 
-    # The color for this axis. This value is used when rendering the axis line in the chart. 
+    # The color for this axis. This value is used when rendering the axis line in the chart.
     # colors should be in 6 character rbg format
     # @return [String] the rbg color assinged.
     # @see color
     def color=(color_rgb)
       @color = color_rgb
     end
-    
+
     # The crossing axis for this axis
     # @param [Axis] axis
     def cross_axis=(axis)
-       DataTypeValidator.validate "#{self.class}.cross_axis", [Axis], axis
-       @cross_axis = axis
+      DataTypeValidator.validate "#{self.class}.cross_axis", [Axis], axis
+      @cross_axis = axis
     end
 
     # The position of the axis
@@ -110,15 +109,15 @@ module Axlsx
 
     # The number format format code for this axis
     # default :General
-    def format_code=(v) Axlsx::validate_string(v); @format_code = v; end
+    def format_code=(v) Axlsx.validate_string(v); @format_code = v; end
 
     # Specify if gridlines should be shown for this axis
     # default true
-    def gridlines=(v) Axlsx::validate_boolean(v); @gridlines = v; end
+    def gridlines=(v) Axlsx.validate_boolean(v); @gridlines = v; end
 
     # Specify if axis should be removed from the chart
     # default false
-    def delete=(v) Axlsx::validate_boolean(v); @delete = v; end
+    def delete=(v) Axlsx.validate_boolean(v); @delete = v; end
 
     # specifies how the perpendicular axis is crossed
     # must be one of [:autoZero, :min, :max]
@@ -127,9 +126,9 @@ module Axlsx
     # Specify the degree of label rotation to apply to labels
     # default true
     def label_rotation=(v)
-      Axlsx::validate_int(v)
+      Axlsx.validate_int(v)
       adjusted = v.to_i * 60000
-      Axlsx::validate_angle(adjusted)
+      Axlsx.validate_angle(adjusted)
       @label_rotation = adjusted
     end
 
@@ -149,13 +148,13 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
-      str << ('<c:axId val="' << @id.to_s << '"/>')
+    def to_xml_string(str = +'')
+      str << '<c:axId val="' << @id.to_s << '"/>'
       @scaling.to_xml_string str
-      str << ('<c:delete val="' << @delete.to_s << '"/>')
-      str << ('<c:axPos val="' << @ax_pos.to_s << '"/>')
+      str << '<c:delete val="' << @delete.to_s << '"/>'
+      str << '<c:axPos val="' << @ax_pos.to_s << '"/>'
       str << '<c:majorGridlines>'
-      # TODO shape properties need to be extracted into a class
+      # TODO: shape properties need to be extracted into a class
       if gridlines == false
         str << '<c:spPr>'
         str << '<a:ln>'
@@ -164,27 +163,25 @@ module Axlsx
         str << '</c:spPr>'
       end
       str << '</c:majorGridlines>'
-      @title.to_xml_string(str) unless @title == nil
+      @title.to_xml_string(str) unless @title.nil?
       # Need to set sourceLinked to 0 if we're setting a format code on this row
       # otherwise it will never take, as it will always prefer the 'General' formatting
       # of the cells themselves
-      str << ('<c:numFmt formatCode="' << @format_code << '" sourceLinked="' << (@format_code.eql?('General') ? '1' : '0') << '"/>')
+      str << '<c:numFmt formatCode="' << @format_code << '" sourceLinked="' << (@format_code.eql?('General') ? '1' : '0') << '"/>'
       str << '<c:majorTickMark val="none"/>'
       str << '<c:minorTickMark val="none"/>'
-      str << ('<c:tickLblPos val="' << @tick_lbl_pos.to_s << '"/>')
-      # TODO - this is also being used for series colors
+      str << '<c:tickLblPos val="' << @tick_lbl_pos.to_s << '"/>'
+      # TODO: this is also being used for series colors
       # time to extract this into a class spPr - Shape Properties
       if @color
         str << '<c:spPr><a:ln><a:solidFill>'
-        str << ('<a:srgbClr val="' << @color << '"/>')
+        str << '<a:srgbClr val="' << @color << '"/>'
         str << '</a:solidFill></a:ln></c:spPr>'
       end
       # some potential value in implementing this in full. Very detailed!
-      str << ('<c:txPr><a:bodyPr rot="' << @label_rotation.to_s << '"/><a:lstStyle/><a:p><a:pPr><a:defRPr/></a:pPr><a:endParaRPr/></a:p></c:txPr>')
-      str << ('<c:crossAx val="' << @cross_axis.id.to_s << '"/>')
-      str << ('<c:crosses val="' << @crosses.to_s << '"/>')
+      str << '<c:txPr><a:bodyPr rot="' << @label_rotation.to_s << '"/><a:lstStyle/><a:p><a:pPr><a:defRPr/></a:pPr><a:endParaRPr/></a:p></c:txPr>'
+      str << '<c:crossAx val="' << @cross_axis.id.to_s << '"/>'
+      str << '<c:crosses val="' << @crosses.to_s << '"/>'
     end
-
   end
-
 end

data/lib/axlsx/drawing/bar_3D_chart.rb

@@ -1,13 +1,12 @@
-# encoding: UTF-8
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # The Bar3DChart is a three dimentional barchart (who would have guessed?) that you can add to your worksheet.
   # @see Worksheet#add_chart
   # @see Chart#add_series
   # @see Package#serialize
   # @see README for an example
   class Bar3DChart < Chart
-
     # the category axis
     # @return [CatAxis]
     def cat_axis
@@ -42,7 +41,7 @@ module Axlsx
     end
     alias :gapWidth :gap_width
 
-    #grouping for a column, line, or area chart.
+    # grouping for a column, line, or area chart.
     # must be one of  [:percentStacked, :clustered, :standard, :stacked]
     # @return [Symbol]
     def grouping
@@ -73,12 +72,12 @@ module Axlsx
     # @option options [Integer] perspective
     # @see Chart
     # @see View3D
-    def initialize(frame, options={})
+    def initialize(frame, options = {})
       @vary_colors = true
       @gap_width, @gap_depth, @shape = nil, nil, nil
       super(frame, options)
       @series_type = BarSeries
-      @view_3D = View3D.new({:r_ang_ax=>1}.merge(options))
+      @view_3D = View3D.new({ r_ang_ax: 1 }.merge(options))
       @d_lbls = nil
     end
 
@@ -90,7 +89,7 @@ module Axlsx
     end
     alias :barDir= :bar_dir=
 
-    #grouping for a column, line, or area chart.
+    # grouping for a column, line, or area chart.
     # must be one of  [:percentStacked, :clustered, :standard, :stacked]
     def grouping=(v)
       RestrictionValidator.validate "Bar3DChart.grouping", [:percentStacked, :clustered, :standard, :stacked], v
@@ -100,14 +99,14 @@ module Axlsx
     # space between bar or column clusters, as a percentage of the bar or column width.
     def gap_width=(v)
       RangeValidator.validate "Bar3DChart.gap_width", 0, 500, v
-      @gap_width=(v)
+      @gap_width = v
     end
     alias :gapWidth= :gap_width=
 
     # space between bar or column clusters, as a percentage of the bar or column width.
     def gap_depth=(v)
       RangeValidator.validate "Bar3DChart.gap_depth", 0, 500, v
-      @gap_depth=(v)
+      @gap_depth = v
     end
     alias :gapDepth= :gap_depth=
 
@@ -121,18 +120,18 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       super(str) do
         str << '<c:bar3DChart>'
-        str << ('<c:barDir val="' << bar_dir.to_s << '"/>')
-        str << ('<c:grouping val="' << grouping.to_s << '"/>')
-        str << ('<c:varyColors val="' << vary_colors.to_s << '"/>')
+        str << '<c:barDir val="' << bar_dir.to_s << '"/>'
+        str << '<c:grouping val="' << grouping.to_s << '"/>'
+        str << '<c:varyColors val="' << vary_colors.to_s << '"/>'
         @series.each { |ser| ser.to_xml_string(str) }
         @d_lbls.to_xml_string(str) if @d_lbls
-        str << ('<c:gapWidth val="' << @gap_width.to_s << '"/>') unless @gap_width.nil?
-        str << ('<c:gapDepth val="' << @gap_depth.to_s << '"/>') unless @gap_depth.nil?
-        str << ('<c:shape val="' << @shape.to_s << '"/>') unless @shape.nil?
-        axes.to_xml_string(str, :ids => true)
+        str << '<c:gapWidth val="' << @gap_width.to_s << '"/>' unless @gap_width.nil?
+        str << '<c:gapDepth val="' << @gap_depth.to_s << '"/>' unless @gap_depth.nil?
+        str << '<c:shape val="' << @shape.to_s << '"/>' unless @shape.nil?
+        axes.to_xml_string(str, ids: true)
         str << '</c:bar3DChart>'
         axes.to_xml_string(str)
       end
@@ -142,7 +141,7 @@ module Axlsx
     # category axes specified via axes[:val_axes] and axes[:cat_axis]
     # @return [Axes]
     def axes
-     @axes ||= Axes.new(:cat_axis => CatAxis, :val_axis => ValAxis)
+      @axes ||= Axes.new(cat_axis: CatAxis, val_axis: ValAxis)
     end
   end
 end

data/lib/axlsx/drawing/bar_chart.rb

@@ -1,13 +1,12 @@
-# encoding: UTF-8
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # The BarChart is a two dimentional barchart that you can add to your worksheet.
   # @see Worksheet#add_chart
   # @see Chart#add_series
   # @see Package#serialize
   # @see README for an example
   class BarChart < Chart
-
     # the category axis
     # @return [CatAxis]
     def cat_axis
@@ -37,7 +36,7 @@ module Axlsx
     end
     alias :gapWidth :gap_width
 
-    #grouping for a column, line, or area chart.
+    # grouping for a column, line, or area chart.
     # must be one of  [:percentStacked, :clustered, :standard, :stacked]
     # @return [Symbol]
     def grouping
@@ -66,7 +65,7 @@ module Axlsx
     # @option options [String] gap_width
     # @option options [Symbol] shape
     # @see Chart
-    def initialize(frame, options={})
+    def initialize(frame, options = {})
       @vary_colors = true
       @gap_width, @overlap, @shape = nil, nil, nil
       super(frame, options)
@@ -82,7 +81,7 @@ module Axlsx
     end
     alias :barDir= :bar_dir=
 
-    #grouping for a column, line, or area chart.
+    # grouping for a column, line, or area chart.
     # must be one of  [:percentStacked, :clustered, :standard, :stacked]
     def grouping=(v)
       RestrictionValidator.validate "BarChart.grouping", [:percentStacked, :clustered, :standard, :stacked], v
@@ -92,13 +91,13 @@ module Axlsx
     # space between bar or column clusters, as a percentage of the bar or column width.
     def gap_width=(v)
       RangeValidator.validate "BarChart.gap_width", 0, 500, v
-      @gap_width=(v)
+      @gap_width = v
     end
     alias :gapWidth= :gap_width=
 
     def overlap=(v)
       RangeValidator.validate "BarChart.overlap", -100, 100, v
-      @overlap=(v)
+      @overlap = v
     end
 
     # The shape of the bars or columns
@@ -111,18 +110,18 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       super(str) do
         str << '<c:barChart>'
-        str << ('<c:barDir val="' << bar_dir.to_s << '"/>')
-        str << ('<c:grouping val="' << grouping.to_s << '"/>')
-        str << ('<c:varyColors val="' << vary_colors.to_s << '"/>')
+        str << '<c:barDir val="' << bar_dir.to_s << '"/>'
+        str << '<c:grouping val="' << grouping.to_s << '"/>'
+        str << '<c:varyColors val="' << vary_colors.to_s << '"/>'
         @series.each { |ser| ser.to_xml_string(str) }
         @d_lbls.to_xml_string(str) if @d_lbls
-        str << ('<c:overlap val="' << @overlap.to_s << '"/>') unless @overlap.nil?
-        str << ('<c:gapWidth val="' << @gap_width.to_s << '"/>') unless @gap_width.nil?
-        str << ('<c:shape val="' << @shape.to_s << '"/>') unless @shape.nil?
-        axes.to_xml_string(str, :ids => true)
+        str << '<c:overlap val="' << @overlap.to_s << '"/>' unless @overlap.nil?
+        str << '<c:gapWidth val="' << @gap_width.to_s << '"/>' unless @gap_width.nil?
+        str << '<c:shape val="' << @shape.to_s << '"/>' unless @shape.nil?
+        axes.to_xml_string(str, ids: true)
         str << '</c:barChart>'
         axes.to_xml_string(str)
       end
@@ -132,7 +131,7 @@ module Axlsx
     # category axes specified via axes[:val_axes] and axes[:cat_axis]
     # @return [Axes]
     def axes
-     @axes ||= Axes.new(:cat_axis => CatAxis, :val_axis => ValAxis)
+      @axes ||= Axes.new(cat_axis: CatAxis, val_axis: ValAxis)
     end
   end
 end

data/lib/axlsx/drawing/bar_series.rb

@@ -1,12 +1,11 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
   # A BarSeries defines the title, data and labels for bar charts
   # @note The recommended way to manage series is to use Chart#add_series
   # @see Worksheet#add_chart
   # @see Chart#add_series
   class BarSeries < Series
-
-
     # The data for this series.
     # @return [NumDataSource]
     attr_reader :data
@@ -35,11 +34,11 @@ module Axlsx
     # @option options [String] colors an array of colors to use when rendering each data point
     # @option options [String] series_color a color to use when rendering series
     # @param [Chart] chart
-    def initialize(chart, options={})
+    def initialize(chart, options = {})
       @shape = :box
       @colors = []
       super(chart, options)
-      self.labels = AxDataSource.new({:data => options[:labels]}) unless options[:labels].nil?
+      self.labels = AxDataSource.new({ data: options[:labels] }) unless options[:labels].nil?
       self.data = NumDataSource.new(options) unless options[:data].nil?
     end
 
@@ -59,20 +58,19 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       super(str) do
-
         colors.each_with_index do |c, index|
           str << '<c:dPt>'
-          str << ('<c:idx val="' << index.to_s << '"/>')
+          str << '<c:idx val="' << index.to_s << '"/>'
           str << '<c:spPr><a:solidFill>'
-          str << ('<a:srgbClr val="' << c << '"/>')
+          str << '<a:srgbClr val="' << c << '"/>'
           str << '</a:solidFill></c:spPr></c:dPt>'
         end
 
         if series_color
           str << '<c:spPr><a:solidFill>'
-          str << ('<a:srgbClr val="' << series_color << '"/>')
+          str << '<a:srgbClr val="' << series_color << '"/>'
           str << '</a:solidFill>'
           str << '</c:spPr>'
         end
@@ -80,7 +78,7 @@ module Axlsx
         @labels.to_xml_string(str) unless @labels.nil?
         @data.to_xml_string(str) unless @data.nil?
         # this is actually only required for shapes other than box
-        str << ('<c:shape val="' << shape.to_s << '"></c:shape>')
+        str << '<c:shape val="' << shape.to_s << '"></c:shape>'
       end
     end
 
@@ -91,7 +89,5 @@ module Axlsx
 
     # assigns the labels for this series
     def labels=(v) DataTypeValidator.validate "Series.labels", [AxDataSource], v; @labels = v; end
-
   end
-
 end

data/lib/axlsx/drawing/bubble_chart.rb

@@ -1,12 +1,11 @@
-# encoding: UTF-8
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # The BubbleChart allows you to insert a bubble chart into your worksheet
   # @see Worksheet#add_chart
   # @see Chart#add_series
   # @see README for an example
   class BubbleChart < Chart
-
     include Axlsx::OptionsParser
 
     # the x value axis
@@ -24,10 +23,10 @@ module Axlsx
     alias :yValAxis :y_val_axis
 
     # Creates a new bubble chart
-    def initialize(frame, options={})
+    def initialize(frame, options = {})
       @vary_colors = 0
 
-           super(frame, options)
+      super(frame, options)
       @series_type = BubbleSeries
       @d_lbls = nil
       parse_options options
@@ -36,13 +35,13 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       super(str) do
         str << '<c:bubbleChart>'
-        str << ('<c:varyColors val="' << vary_colors.to_s << '"/>')
+        str << '<c:varyColors val="' << vary_colors.to_s << '"/>'
         @series.each { |ser| ser.to_xml_string(str) }
         d_lbls.to_xml_string(str) if @d_lbls
-        axes.to_xml_string(str, :ids => true)
+        axes.to_xml_string(str, ids: true)
         str << '</c:bubbleChart>'
         axes.to_xml_string(str)
       end
@@ -53,7 +52,7 @@ module Axlsx
     # a y_val_axis
     # @return [Axes]
     def axes
-      @axes ||= Axes.new(:x_val_axis => ValAxis, :y_val_axis => ValAxis)
+      @axes ||= Axes.new(x_val_axis: ValAxis, y_val_axis: ValAxis)
     end
   end
 end

data/lib/axlsx/drawing/bubble_series.rb

@@ -1,13 +1,12 @@
-# encoding: UTF-8
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # A BubbleSeries defines the x/y position and bubble size of data in the chart
   # @note The recommended way to manage series is to use Chart#add_series
   # @see Worksheet#add_chart
   # @see Chart#add_series
   # @see examples/example.rb
   class BubbleSeries < Series
-
     # The x data for this series.
     # @return [AxDataSource]
     attr_reader :xData
@@ -26,12 +25,12 @@ module Axlsx
     attr_reader :color
 
     # Creates a new BubbleSeries
-    def initialize(chart, options={})
+    def initialize(chart, options = {})
       @xData, @yData, @bubbleSize = nil
       super(chart, options)
-      @xData = AxDataSource.new(:tag_name => :xVal, :data => options[:xData]) unless options[:xData].nil?
-      @yData = NumDataSource.new({:tag_name => :yVal, :data => options[:yData]}) unless options[:yData].nil?
-      @bubbleSize = NumDataSource.new({:tag_name => :bubbleSize, :data => options[:bubbleSize]}) unless options[:bubbleSize].nil?
+      @xData = AxDataSource.new(tag_name: :xVal, data: options[:xData]) unless options[:xData].nil?
+      @yData = NumDataSource.new({ tag_name: :yVal, data: options[:yData] }) unless options[:yData].nil?
+      @bubbleSize = NumDataSource.new({ tag_name: :bubbleSize, data: options[:bubbleSize] }) unless options[:bubbleSize].nil?
     end
 
     # @see color
@@ -42,15 +41,15 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       super(str) do
         # needs to override the super color here to push in ln/and something else!
         if color
           str << '<c:spPr><a:solidFill>'
-          str << ('<a:srgbClr val="' << color << '"/>')
+          str << '<a:srgbClr val="' << color << '"/>'
           str << '</a:solidFill>'
           str << '<a:ln><a:solidFill>'
-          str << ('<a:srgbClr val="' << color << '"/></a:solidFill></a:ln>')
+          str << '<a:srgbClr val="' << color << '"/></a:solidFill></a:ln>'
           str << '</c:spPr>'
         end
         @xData.to_xml_string(str) unless @xData.nil?

data/lib/axlsx/drawing/cat_axis.rb

@@ -1,12 +1,12 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
-  #A CatAxis object defines a chart category axis
+  # A CatAxis object defines a chart category axis
   class CatAxis < Axis
-
     # Creates a new CatAxis object
     # @option options [Integer] tick_lbl_skip
     # @option options [Integer] tick_mark_skip
-    def initialize(options={})
+    def initialize(options = {})
       @tick_lbl_skip = 1
       @tick_mark_skip = 1
       self.auto = 1
@@ -42,18 +42,18 @@ module Axlsx
     alias :tickMarkSkip :tick_mark_skip
 
     # regex for validating label offset
-    LBL_OFFSET_REGEX = /0*(([0-9])|([1-9][0-9])|([1-9][0-9][0-9])|1000)/
+    LBL_OFFSET_REGEX = /0*(([0-9])|([1-9][0-9])|([1-9][0-9][0-9])|1000)/.freeze
 
     # @see tick_lbl_skip
-    def tick_lbl_skip=(v) Axlsx::validate_unsigned_int(v); @tick_lbl_skip = v; end
+    def tick_lbl_skip=(v) Axlsx.validate_unsigned_int(v); @tick_lbl_skip = v; end
     alias :tickLblSkip= :tick_lbl_skip=
 
     # @see tick_mark_skip
-    def tick_mark_skip=(v) Axlsx::validate_unsigned_int(v); @tick_mark_skip = v; end
+    def tick_mark_skip=(v) Axlsx.validate_unsigned_int(v); @tick_mark_skip = v; end
     alias :tickMarkSkip= :tick_mark_skip=
 
     # From the docs: This element specifies that this axis is a date or text axis based on the data that is used for the axis labels, not a specific choice.
-    def auto=(v) Axlsx::validate_boolean(v); @auto = v; end
+    def auto=(v) Axlsx.validate_boolean(v); @auto = v; end
 
     # specifies how the perpendicular axis is crossed
     # must be one of [:ctr, :l, :r]
@@ -68,18 +68,15 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<c:catAx>'
       super(str)
-      str << ('<c:auto val="' << @auto.to_s << '"/>')
-      str << ('<c:lblAlgn val="' << @lbl_algn.to_s << '"/>')
-      str << ('<c:lblOffset val="' << @lbl_offset.to_i.to_s << '"/>')
-      str << ('<c:tickLblSkip val="' << @tick_lbl_skip.to_s << '"/>')
-      str << ('<c:tickMarkSkip val="' << @tick_mark_skip.to_s << '"/>')
+      str << '<c:auto val="' << @auto.to_s << '"/>'
+      str << '<c:lblAlgn val="' << @lbl_algn.to_s << '"/>'
+      str << '<c:lblOffset val="' << @lbl_offset.to_i.to_s << '"/>'
+      str << '<c:tickLblSkip val="' << @tick_lbl_skip.to_s << '"/>'
+      str << '<c:tickMarkSkip val="' << @tick_mark_skip.to_s << '"/>'
       str << '</c:catAx>'
     end
-
   end
-
-
 end