caxlsx 3.4.1 → 4.1.0

data/lib/axlsx/drawing/axis.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # the access class defines common properties and values for a chart axis.
   class Axis
@@ -13,7 +15,7 @@ module Axlsx
       @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
@@ -97,36 +99,54 @@ module Axlsx
 
     # The position of the axis
     # must be one of [:l, :r, :t, :b]
-    def ax_pos=(v) RestrictionValidator.validate "#{self.class}.ax_pos", [:l, :r, :b, :t], v; @ax_pos = v; end
+    def ax_pos=(v)
+      RestrictionValidator.validate "#{self.class}.ax_pos", [:l, :r, :b, :t], v
+      @ax_pos = v
+    end
     alias :axPos= :ax_pos=
 
     # the position of the tick labels
     # must be one of [:nextTo, :high, :low1]
-    def tick_lbl_pos=(v) RestrictionValidator.validate "#{self.class}.tick_lbl_pos", [:nextTo, :high, :low, :none], v; @tick_lbl_pos = v; end
+    def tick_lbl_pos=(v)
+      RestrictionValidator.validate "#{self.class}.tick_lbl_pos", [:nextTo, :high, :low, :none], v
+      @tick_lbl_pos = v
+    end
     alias :tickLblPos= :tick_lbl_pos=
 
     # 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]
-    def crosses=(v) RestrictionValidator.validate "#{self.class}.crosses", [:autoZero, :min, :max], v; @crosses = v; end
+    def crosses=(v)
+      RestrictionValidator.validate "#{self.class}.crosses", [:autoZero, :min, :max], v
+      @crosses = v
+    end
 
     # 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
 
@@ -146,13 +166,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>'
@@ -161,25 +181,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,3 +1,5 @@
+# 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
@@ -75,7 +77,7 @@ module Axlsx
       @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
 
@@ -97,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=
 
@@ -118,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
@@ -139,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,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # The BarChart is a two dimentional barchart that you can add to your worksheet.
   # @see Worksheet#add_chart
@@ -89,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
@@ -108,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
@@ -129,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,3 +1,5 @@
+# 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
@@ -36,12 +38,15 @@ module Axlsx
       @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
 
     # @see colors
-    def colors=(v) DataTypeValidator.validate "BarSeries.colors", [Array], v; @colors = v end
+    def colors=(v)
+      DataTypeValidator.validate "BarSeries.colors", [Array], v
+      @colors = v
+    end
 
     def series_color=(v)
       @series_color = v
@@ -56,19 +61,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
@@ -76,16 +81,22 @@ 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
 
     private
 
     # assigns the data for this series
-    def data=(v) DataTypeValidator.validate "Series.data", [NumDataSource], v; @data = v; end
+    def data=(v)
+      DataTypeValidator.validate "Series.data", [NumDataSource], v
+      @data = v
+    end
 
     # assigns the labels for this series
-    def labels=(v) DataTypeValidator.validate "Series.labels", [AxDataSource], v; @labels = v; end
+    def labels=(v)
+      DataTypeValidator.validate "Series.labels", [AxDataSource], v
+      @labels = v
+    end
   end
 end

data/lib/axlsx/drawing/bubble_chart.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # The BubbleChart allows you to insert a bubble chart into your worksheet
   # @see Worksheet#add_chart
@@ -33,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
@@ -50,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,3 +1,5 @@
+# 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
@@ -26,9 +28,9 @@ module Axlsx
     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
@@ -39,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,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A CatAxis object defines a chart category axis
   class CatAxis < Axis
@@ -40,40 +42,55 @@ 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]
-    def lbl_algn=(v) RestrictionValidator.validate "#{self.class}.lbl_algn", [:ctr, :l, :r], v; @lbl_algn = v; end
+    def lbl_algn=(v)
+      RestrictionValidator.validate "#{self.class}.lbl_algn", [:ctr, :l, :r], v
+      @lbl_algn = v
+    end
     alias :lblAlgn= :lbl_algn=
 
     # The offset of the labels
     # must be between a string between 0 and 1000
-    def lbl_offset=(v) RegexValidator.validate "#{self.class}.lbl_offset", LBL_OFFSET_REGEX, v; @lbl_offset = v; end
+    def lbl_offset=(v)
+      RegexValidator.validate "#{self.class}.lbl_offset", LBL_OFFSET_REGEX, v
+      @lbl_offset = v
+    end
     alias :lblOffset= :lbl_offset=
 
     # 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

data/lib/axlsx/drawing/chart.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A Chart is the superclass for specific charts
   # @note Worksheet#add_chart is the recommended way to create charts for your worksheets.
@@ -49,7 +51,7 @@ module Axlsx
     # @return [Series]
     attr_reader :series_type
 
-    # TODO data labels!
+    # TODO: data labels!
     def d_lbls
       @d_lbls ||= DLbls.new(self.class)
     end
@@ -60,7 +62,10 @@ module Axlsx
 
     # Configures the vary_colors options for this chart
     # @param [Boolean] v The value to set
-    def vary_colors=(v) Axlsx::validate_boolean(v); @vary_colors = v; end
+    def vary_colors=(v)
+      Axlsx.validate_boolean(v)
+      @vary_colors = v
+    end
 
     # The title object for the chart.
     # @return [Title]
@@ -122,7 +127,7 @@ module Axlsx
     # The part name for this chart
     # @return [String]
     def pn
-      "#{CHART_PN % (index + 1)}"
+      format(CHART_PN, index + 1)
     end
 
     # The title object for the chart.
@@ -147,21 +152,33 @@ module Axlsx
     # Show the legend in the chart
     # @param [Boolean] v
     # @return [Boolean]
-    def show_legend=(v) Axlsx::validate_boolean(v); @show_legend = v; end
+    def show_legend=(v)
+      Axlsx.validate_boolean(v)
+      @show_legend = v
+    end
 
     # How to display blank values
     # @see display_blanks_as
     # @param [Symbol] v
     # @return [Symbol]
-    def display_blanks_as=(v) Axlsx::validate_display_blanks_as(v); @display_blanks_as = v; end
+    def display_blanks_as=(v)
+      Axlsx.validate_display_blanks_as(v)
+      @display_blanks_as = v
+    end
 
     # The style for the chart.
     # see ECMA Part 1 §21.2.2.196
     # @param [Integer] v must be between 1 and 48
-    def style=(v) DataTypeValidator.validate "Chart.style", Integer, v, lambda { |arg| arg >= 1 && arg <= 48 }; @style = v; end
+    def style=(v)
+      DataTypeValidator.validate "Chart.style", Integer, v, ->(arg) { arg >= 1 && arg <= 48 }
+      @style = v
+    end
 
     # @see legend_position
-    def legend_position=(v) RestrictionValidator.validate "Chart.legend_position", [:b, :l, :r, :t, :tr], v; @legend_position = v; end
+    def legend_position=(v)
+      RestrictionValidator.validate "Chart.legend_position", [:b, :l, :r, :t, :tr], v
+      @legend_position = v
+    end
 
     # backwards compatibility to allow chart.to and chart.from access to anchor markers
     # @note This will be disconinued in version 2.0.0. Please use the end_at method
@@ -185,32 +202,38 @@ module Axlsx
 
     # Assigns a background color to chart area
     def bg_color=(v)
-      DataTypeValidator.validate(:color, Color, Color.new(:rgb => v))
+      DataTypeValidator.validate(:color, Color, Color.new(rgb: v))
       @bg_color = v
     end
 
     # Whether only data from visible cells should be plotted.
     # @param [Boolean] v
     # @return [Boolean]
-    def plot_visible_only=(v) Axlsx::validate_boolean(v); @plot_visible_only = v; end
+    def plot_visible_only=(v)
+      Axlsx.validate_boolean(v)
+      @plot_visible_only = v
+    end
 
     # Whether the chart area shall have rounded corners.
     # @param [Boolean] v
     # @return [Boolean]
-    def rounded_corners=(v) Axlsx::validate_boolean(v); @rounded_corners = v; end
+    def rounded_corners=(v)
+      Axlsx.validate_boolean(v)
+      @rounded_corners = v
+    end
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<?xml version="1.0" encoding="UTF-8"?>'
-      str << ('<c:chartSpace xmlns:c="' << XML_NS_C << '" xmlns:a="' << XML_NS_A << '" xmlns:r="' << XML_NS_R << '">')
-      str << ('<c:date1904 val="' << Axlsx::Workbook.date1904.to_s << '"/>')
-      str << ('<c:roundedCorners val="' << rounded_corners.to_s << '"/>')
-      str << ('<c:style val="' << style.to_s << '"/>')
+      str << '<c:chartSpace xmlns:c="' << XML_NS_C << '" xmlns:a="' << XML_NS_A << '" xmlns:r="' << XML_NS_R << '">'
+      str << '<c:date1904 val="' << Axlsx::Workbook.date1904.to_s << '"/>'
+      str << '<c:roundedCorners val="' << rounded_corners.to_s << '"/>'
+      str << '<c:style val="' << style.to_s << '"/>'
       str << '<c:chart>'
       @title.to_xml_string(str) unless @title.empty?
-      str << ('<c:autoTitleDeleted val="' << (@title == nil).to_s << '"/>')
+      str << '<c:autoTitleDeleted val="' << @title.nil?.to_s << '"/>'
       @view_3D.to_xml_string(str) if @view_3D
       str << '<c:floor><c:thickness val="0"/></c:floor>'
       str << '<c:sideWall><c:thickness val="0"/></c:sideWall>'
@@ -221,13 +244,13 @@ module Axlsx
       str << '</c:plotArea>'
       if @show_legend
         str << '<c:legend>'
-        str << ('<c:legendPos val="' << @legend_position.to_s << '"/>')
+        str << '<c:legendPos val="' << @legend_position.to_s << '"/>'
         str << '<c:layout/>'
         str << '<c:overlay val="0"/>'
         str << '</c:legend>'
       end
-      str << ('<c:plotVisOnly val="' << @plot_visible_only.to_s << '"/>')
-      str << ('<c:dispBlanksAs val="' << display_blanks_as.to_s << '"/>')
+      str << '<c:plotVisOnly val="' << @plot_visible_only.to_s << '"/>'
+      str << '<c:dispBlanksAs val="' << display_blanks_as.to_s << '"/>'
       str << '<c:showDLblsOverMax val="1"/>'
       str << '</c:chart>'
       if bg_color
@@ -288,7 +311,10 @@ module Axlsx
     end
 
     # sets the view_3D object for the chart
-    def view_3D=(v) DataTypeValidator.validate "#{self.class}.view_3D", View3D, v; @view_3D = v; end
+    def view_3D=(v)
+      DataTypeValidator.validate "#{self.class}.view_3D", View3D, v
+      @view_3D = v
+    end
     alias :view3D= :view_3D=
   end
 end