caxlsx 3.4.1 → 4.0.0

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,7 +38,7 @@ 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
 
@@ -56,19 +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
@@ -76,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
 

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,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]
@@ -66,14 +68,14 @@ 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

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,7 @@ 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 +124,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,18 +149,18 @@ 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
@@ -185,32 +187,32 @@ 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 +223,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

data/lib/axlsx/drawing/d_lbls.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # There are more elements in the dLbls spec that allow for
   # customizations and formatting. For now, I am just implementing the
@@ -36,7 +38,7 @@ module Axlsx
       [:show_legend_key, :show_val, :show_cat_name,
        :show_ser_name, :show_percent, :show_bubble_size,
        :show_leader_lines].each do |attr|
-        self.send("#{attr}=", false)
+        send("#{attr}=", false)
       end
     end
 
@@ -69,19 +71,19 @@ module Axlsx
 
     # serializes the data labels
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       validate_attributes_for_chart_type
       str << '<c:dLbls>'
       instance_vals = Axlsx.instance_values_for(self)
       %w(d_lbl_pos show_legend_key show_val show_cat_name show_ser_name show_percent show_bubble_size show_leader_lines).each do |key|
-        next unless instance_vals.keys.include?(key) && instance_vals[key] != nil
+        next unless instance_vals.key?(key) && !instance_vals[key].nil?
 
-        str << "<c:#{Axlsx::camel(key, false)} val='#{instance_vals[key]}' />"
+        str << "<c:#{Axlsx.camel(key, false)} val='#{instance_vals[key]}' />"
       end
       str << '</c:dLbls>'
     end
 
-    # nills out d_lbl_pos and show_leader_lines as these attributes, while valid in the spec actually chrash excel for any chart type other than pie charts.
+    # nills out d_lbl_pos and show_leader_lines as these attributes, while valid in the spec actually crash Excel for any chart type other than pie charts.
     def validate_attributes_for_chart_type
       return if [Pie3DChart, LineChart].include? @chart_type
 

data/lib/axlsx/drawing/drawing.rb

@@ -1,53 +1,55 @@
+# frozen_string_literal: true
+
 module Axlsx
-  require 'axlsx/drawing/d_lbls.rb'
-  require 'axlsx/drawing/title.rb'
-  require 'axlsx/drawing/series_title.rb'
-  require 'axlsx/drawing/series.rb'
-  require 'axlsx/drawing/pie_series.rb'
-  require 'axlsx/drawing/bar_series.rb'
-  require 'axlsx/drawing/line_series.rb'
-  require 'axlsx/drawing/scatter_series.rb'
-  require 'axlsx/drawing/bubble_series.rb'
-  require 'axlsx/drawing/area_series.rb'
-
-  require 'axlsx/drawing/scaling.rb'
-  require 'axlsx/drawing/axis.rb'
-
-  require 'axlsx/drawing/str_val.rb'
-  require 'axlsx/drawing/num_val.rb'
-  require 'axlsx/drawing/str_data.rb'
-  require 'axlsx/drawing/num_data.rb'
-  require 'axlsx/drawing/num_data_source.rb'
-  require 'axlsx/drawing/ax_data_source.rb'
-
-  require 'axlsx/drawing/ser_axis.rb'
-  require 'axlsx/drawing/cat_axis.rb'
-  require 'axlsx/drawing/val_axis.rb'
-  require 'axlsx/drawing/axes.rb'
-
-  require 'axlsx/drawing/marker.rb'
-
-  require 'axlsx/drawing/one_cell_anchor.rb'
-  require 'axlsx/drawing/two_cell_anchor.rb'
-  require 'axlsx/drawing/graphic_frame.rb'
-
-  require 'axlsx/drawing/view_3D.rb'
-  require 'axlsx/drawing/chart.rb'
-  require 'axlsx/drawing/pie_3D_chart.rb'
-  require 'axlsx/drawing/bar_3D_chart.rb'
-  require 'axlsx/drawing/bar_chart.rb'
-  require 'axlsx/drawing/line_chart.rb'
-  require 'axlsx/drawing/line_3D_chart.rb'
-  require 'axlsx/drawing/scatter_chart.rb'
-  require 'axlsx/drawing/bubble_chart.rb'
-  require 'axlsx/drawing/area_chart.rb'
-
-  require 'axlsx/drawing/picture_locking.rb'
-  require 'axlsx/drawing/pic.rb'
-  require 'axlsx/drawing/hyperlink.rb'
-
-  require 'axlsx/drawing/vml_drawing.rb'
-  require 'axlsx/drawing/vml_shape.rb'
+  require 'axlsx/drawing/d_lbls'
+  require 'axlsx/drawing/title'
+  require 'axlsx/drawing/series_title'
+  require 'axlsx/drawing/series'
+  require 'axlsx/drawing/pie_series'
+  require 'axlsx/drawing/bar_series'
+  require 'axlsx/drawing/line_series'
+  require 'axlsx/drawing/scatter_series'
+  require 'axlsx/drawing/bubble_series'
+  require 'axlsx/drawing/area_series'
+
+  require 'axlsx/drawing/scaling'
+  require 'axlsx/drawing/axis'
+
+  require 'axlsx/drawing/str_val'
+  require 'axlsx/drawing/num_val'
+  require 'axlsx/drawing/str_data'
+  require 'axlsx/drawing/num_data'
+  require 'axlsx/drawing/num_data_source'
+  require 'axlsx/drawing/ax_data_source'
+
+  require 'axlsx/drawing/ser_axis'
+  require 'axlsx/drawing/cat_axis'
+  require 'axlsx/drawing/val_axis'
+  require 'axlsx/drawing/axes'
+
+  require 'axlsx/drawing/marker'
+
+  require 'axlsx/drawing/one_cell_anchor'
+  require 'axlsx/drawing/two_cell_anchor'
+  require 'axlsx/drawing/graphic_frame'
+
+  require 'axlsx/drawing/view_3D'
+  require 'axlsx/drawing/chart'
+  require 'axlsx/drawing/pie_3D_chart'
+  require 'axlsx/drawing/bar_3D_chart'
+  require 'axlsx/drawing/bar_chart'
+  require 'axlsx/drawing/line_chart'
+  require 'axlsx/drawing/line_3D_chart'
+  require 'axlsx/drawing/scatter_chart'
+  require 'axlsx/drawing/bubble_chart'
+  require 'axlsx/drawing/area_chart'
+
+  require 'axlsx/drawing/picture_locking'
+  require 'axlsx/drawing/pic'
+  require 'axlsx/drawing/hyperlink'
+
+  require 'axlsx/drawing/vml_drawing'
+  require 'axlsx/drawing/vml_shape'
 
   # A Drawing is a canvas for charts and images. Each worksheet has a single drawing that manages anchors.
   # The anchors reference the charts or images via graphical frames. This is not a trivial relationship so please do follow the advice in the note.
@@ -106,15 +108,15 @@ module Axlsx
     # An array of hyperlink objects associated with this drawings images
     # @return [Array]
     def hyperlinks
-      links = self.images.select { |a| a.hyperlink.is_a?(Hyperlink) }
-      links.map { |a| a.hyperlink }
+      links = images.select { |a| a.hyperlink.is_a?(Hyperlink) }
+      links.map(&:hyperlink)
     end
 
     # An array of image objects that are associated with this drawing's anchors
     # @return [Array]
     def images
       images = @anchors.select { |a| a.object.is_a?(Pic) }
-      images.map { |a| a.object }
+      images.map(&:object)
     end
 
     # The index of this drawing in the owning workbooks's drawings collection.
@@ -126,14 +128,14 @@ module Axlsx
     # The part name for this drawing
     # @return [String]
     def pn
-      "#{DRAWING_PN % (index + 1)}"
+      format(DRAWING_PN, index + 1)
     end
 
     # The relational part name for this drawing
     # #NOTE This should be rewritten to return an Axlsx::Relationship object.
     # @return [String]
     def rels_pn
-      "#{DRAWING_RELS_PN % (index + 1)}"
+      format(DRAWING_RELS_PN, index + 1)
     end
 
     # A list of objects this drawing holds.
@@ -153,9 +155,9 @@ module Axlsx
     # 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" standalone="yes"?>'
-      str << ('<xdr:wsDr xmlns:xdr="' << XML_NS_XDR << '" xmlns:a="' << XML_NS_A << '">')
+      str << '<xdr:wsDr xmlns:xdr="' << XML_NS_XDR << '" xmlns:a="' << XML_NS_A << '">'
       anchors.each { |anchor| anchor.to_xml_string(str) }
       str << '</xdr:wsDr>'
     end

data/lib/axlsx/drawing/graphic_frame.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A graphic frame defines a container for a chart object
   # @note The recommended way to manage charts is Worksheet#add_chart
@@ -29,11 +31,11 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       # macro attribute should be optional!
       str << '<xdr:graphicFrame>'
       str << '<xdr:nvGraphicFramePr>'
-      str << ('<xdr:cNvPr id="' << @anchor.drawing.index.to_s << '" name="' << 'item_' << @anchor.drawing.index.to_s << '"/>')
+      str << '<xdr:cNvPr id="' << @anchor.drawing.index.to_s << '" name="' << 'item_' << @anchor.drawing.index.to_s << '"/>'
       str << '<xdr:cNvGraphicFramePr/>'
       str << '</xdr:nvGraphicFramePr>'
       str << '<xdr:xfrm>'
@@ -41,8 +43,8 @@ module Axlsx
       str << '<a:ext cx="0" cy="0"/>'
       str << '</xdr:xfrm>'
       str << '<a:graphic>'
-      str << ('<a:graphicData uri="' << XML_NS_C << '">')
-      str << ('<c:chart xmlns:c="' << XML_NS_C << '" xmlns:r="' << XML_NS_R << '" r:id="' << rId << '"/>')
+      str << '<a:graphicData uri="' << XML_NS_C << '">'
+      str << '<c:chart xmlns:c="' << XML_NS_C << '" xmlns:r="' << XML_NS_R << '" r:id="' << rId << '"/>'
       str << '</a:graphicData>'
       str << '</a:graphic>'
       str << '</xdr:graphicFrame>'