caxlsx 3.4.1 → 4.1.0

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
 
@@ -49,7 +51,7 @@ module Axlsx
     # @see d_lbl_pos= for a list of allowed values
     # @return [Symbol]
     def d_lbl_pos
-      return unless [Pie3DChart, LineChart].include? @chart_type
+      return unless [PieChart, Pie3DChart, LineChart].include? @chart_type
 
       @d_lbl_pos ||= :bestFit
     end
@@ -61,7 +63,7 @@ module Axlsx
     # The default is :bestFit
     # @param [Symbol] label_position the postion you want to use.
     def d_lbl_pos=(label_position)
-      return unless [Pie3DChart, LineChart].include? @chart_type
+      return unless [PieChart, Pie3DChart, LineChart].include? @chart_type
 
       Axlsx::RestrictionValidator.validate 'DLbls#d_lbl_pos', [:bestFit, :b, :ctr, :inBase, :inEnd, :l, :outEnd, :r, :t], label_position
       @d_lbl_pos = label_position
@@ -69,21 +71,21 @@ 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
+      return if [PieChart, Pie3DChart, LineChart].include? @chart_type
 
       @d_lbl_pos = nil
       @show_leader_lines = nil

data/lib/axlsx/drawing/drawing.rb

@@ -1,53 +1,56 @@
+# 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/pie_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 +109,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 +129,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 +156,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>'

data/lib/axlsx/drawing/hyperlink.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # a hyperlink object adds an action to an image when clicked so that when the image is clicked the link is fecthed.
   # @note using the hyperlink option when calling add_image on a drawing object is the recommended way to manage hyperlinks
@@ -13,7 +15,7 @@ module Axlsx
     # @option options [String] tgtFrame Target frame for opening hyperlink
     # @option options [String] invalidUrl supposedly use to store the href when we know it is an invalid resource.
     # @option options [String] href the target resource this hyperlink links to. This is actually stored on the relationship.
-    # @option options [String] action A string that can be used to perform specific actions. For excel please see this reference: http://msdn.microsoft.com/en-us/library/ff532419%28v=office.12%29.aspx
+    # @option options [String] action A string that can be used to perform specific actions. For Excel please see this reference: https://msdn.microsoft.com/en-us/library/ff532419%28v=office.12%29.aspx
     # @option options [Boolean] endSnd terminate any sound events when processing this link
     # @option options [Boolean] history include this link in the list of visited links for the applications history.
     # @option options [Boolean] highlightClick indicate that the link has already been visited.
@@ -38,7 +40,7 @@ module Axlsx
     alias :invalidUrl :invalid_url
     alias :invalidUrl= :invalid_url=
 
-    # An action to take when the link is clicked. The specification says "This can be used to specify a slide to be navigated to or a script of code to be run." but in most cases you will not need to do anything with this. MS does reserve a few interesting strings. @see http://msdn.microsoft.com/en-us/library/ff532419%28v=office.12%29.aspx
+    # An action to take when the link is clicked. The specification says "This can be used to specify a slide to be navigated to or a script of code to be run." but in most cases you will not need to do anything with this. MS does reserve a few interesting strings. @see https://msdn.microsoft.com/en-us/library/ff532419%28v=office.12%29.aspx
     # @return [String]
     attr_accessor :action
 
@@ -50,7 +52,10 @@ module Axlsx
     # @see endSnd
     # @param [Boolean] v The boolean value indicating the termination of playing sounds on click
     # @return [Boolean]
-    def end_snd=(v) Axlsx::validate_boolean(v); @end_snd = v end
+    def end_snd=(v)
+      Axlsx.validate_boolean(v)
+      @end_snd = v
+    end
     alias :endSnd= :end_snd=
 
     # indicates that the link has already been clicked.
@@ -60,7 +65,10 @@ module Axlsx
 
     # @see highlightClick
     # @param [Boolean] v The value to assign
-    def highlight_click=(v) Axlsx::validate_boolean(v); @highlight_click = v end
+    def highlight_click=(v)
+      Axlsx.validate_boolean(v)
+      @highlight_click = v
+    end
     alias :highlightClick= :highlight_click=
 
     # From the specs: Specifies whether to add this URI to the history when navigating to it. This allows for the viewing of this presentation without the storing of history information on the viewing machine. If this attribute is omitted, then a value of 1 or true is assumed.
@@ -69,7 +77,10 @@ module Axlsx
 
     # @see history
     # param [Boolean] v The value to assing
-    def history=(v) Axlsx::validate_boolean(v); @history = v end
+    def history=(v)
+      Axlsx.validate_boolean(v)
+      @history = v
+    end
 
     # From the specs: Specifies the target frame that is to be used when opening this hyperlink. When the hyperlink is activated this attribute is used to determine if a new window is launched for viewing or if an existing one can be used. If this attribute is omitted, than a new window is opened.
     # @return [String]
@@ -84,14 +95,14 @@ module Axlsx
     # The relationship object for this hyperlink.
     # @return [Relationship]
     def relationship
-      Relationship.new(self, HYPERLINK_R, href, :target_mode => :External)
+      Relationship.new(self, HYPERLINK_R, href, target_mode: :External)
     end
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
-      serialized_tag 'a:hlinkClick', str, { :'r:id' => relationship.Id, :'xmlns:r' => XML_NS_R }
+    def to_xml_string(str = +'')
+      serialized_tag 'a:hlinkClick', str, { 'r:id': relationship.Id, 'xmlns:r': XML_NS_R }
     end
   end
 end

data/lib/axlsx/drawing/line_3D_chart.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # The Line3DChart is a three dimentional line chart (who would have guessed?) that you can add to your worksheet.
   # @example Creating a chart
@@ -24,7 +26,7 @@ module Axlsx
     alias :gapDepth :gap_depth
 
     # validation regex for gap amount percent
-    GAP_AMOUNT_PERCENT = /0*(([0-9])|([1-9][0-9])|([1-4][0-9][0-9])|500)%/
+    GAP_AMOUNT_PERCENT = /0*(([0-9])|([1-9][0-9])|([1-4][0-9][0-9])|500)%/.freeze
 
     # the category axis
     # @return [Axis]
@@ -40,7 +42,7 @@ module Axlsx
     # @see View3D
     def initialize(frame, options = {})
       @gap_depth = nil
-      @view_3D = View3D.new({ :r_ang_ax => 1 }.merge(options))
+      @view_3D = View3D.new({ r_ang_ax: 1 }.merge(options))
       super(frame, options)
       axes.add_axis :ser_axis, SerAxis
     end
@@ -48,16 +50,16 @@ module Axlsx
     # @see gapDepth
     def gap_depth=(v)
       RegexValidator.validate "Line3DChart.gapWidth", GAP_AMOUNT_PERCENT, v
-      @gap_depth = (v)
+      @gap_depth = v
     end
     alias :gapDepth= :gap_depth=
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       super(str) do
-        str << ('<c:gapDepth val="' << @gap_depth.to_s << '"/>') unless @gap_depth.nil?
+        str << '<c:gapDepth val="' << @gap_depth.to_s << '"/>' unless @gap_depth.nil?
       end
     end
   end

data/lib/axlsx/drawing/line_chart.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # The LineChart is a two dimentional line chart (who would have guessed?) that you can add to your worksheet.
   # @example Creating a chart
@@ -61,7 +63,7 @@ module Axlsx
     # chart based on the actual class type and not a fixed node name.
     # @return [String]
     def node_name
-      path = self.class.to_s
+      path = self.class.name
       if i = path.rindex('::')
         path = path[(i + 2)..-1]
       end
@@ -72,16 +74,16 @@ 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:" << node_name << ">")
-        str << ('<c:grouping val="' << grouping.to_s << '"/>')
-        str << ('<c:varyColors val="' << vary_colors.to_s << '"/>')
+        str << "<c:" << node_name << ">"
+        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
         yield if block_given?
-        axes.to_xml_string(str, :ids => true)
-        str << ("</c:" << node_name << ">")
+        axes.to_xml_string(str, ids: true)
+        str << "</c:" << node_name << ">"
         axes.to_xml_string(str)
       end
     end
@@ -90,7 +92,7 @@ module Axlsx
     # 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/line_series.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A LineSeries defines the title, data and labels for line charts
   # @note The recommended way to manage series is to use Chart#add_series
@@ -35,11 +37,11 @@ module Axlsx
     # @param [Chart] chart
     def initialize(chart, options = {})
       @show_marker = false
-      @marker_symbol = options[:marker_symbol] ? options[:marker_symbol] : :default
+      @marker_symbol = options[:marker_symbol] || :default
       @smooth = false
       @labels, @data = nil, nil
       super(chart, options)
-      @labels = AxDataSource.new(:data => options[:labels]) unless options[:labels].nil?
+      @labels = AxDataSource.new(data: options[:labels]) unless options[:labels].nil?
       @data = NumDataSource.new(options) unless options[:data].nil?
     end
 
@@ -50,34 +52,34 @@ module Axlsx
 
     # @see show_marker
     def show_marker=(v)
-      Axlsx::validate_boolean(v)
+      Axlsx.validate_boolean(v)
       @show_marker = v
     end
 
     # @see marker_symbol
     def marker_symbol=(v)
-      Axlsx::validate_marker_symbol(v)
+      Axlsx.validate_marker_symbol(v)
       @marker_symbol = v
     end
 
     # @see smooth
     def smooth=(v)
-      Axlsx::validate_boolean(v)
+      Axlsx.validate_boolean(v)
       @smooth = v
     end
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       super(str) do
         if color
           str << '<c:spPr><a:solidFill>'
-          str << ('<a:srgbClr val="' << color << '"/>')
+          str << '<a:srgbClr val="' << color << '"/>'
           str << '</a:solidFill>'
           str << '<a:ln w="28800">'
           str << '<a:solidFill>'
-          str << ('<a:srgbClr val="' << color << '"/>')
+          str << '<a:srgbClr val="' << color << '"/>'
           str << '</a:solidFill>'
           str << '</a:ln>'
           str << '<a:round/>'
@@ -87,21 +89,27 @@ module Axlsx
         if !@show_marker
           str << '<c:marker><c:symbol val="none"/></c:marker>'
         elsif @marker_symbol != :default
-          str << '<c:marker><c:symbol val="' + @marker_symbol.to_s + '"/></c:marker>'
+          str << '<c:marker><c:symbol val="' << @marker_symbol.to_s << '"/></c:marker>'
         end
 
         @labels.to_xml_string(str) unless @labels.nil?
         @data.to_xml_string(str) unless @data.nil?
-        str << ('<c:smooth val="' << ((smooth) ? '1' : '0') << '"/>')
+        str << '<c:smooth val="' << (smooth ? '1' : '0') << '"/>'
       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/marker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # The Marker class defines a point in the worksheet that drawing anchors attach to.
   # @note The recommended way to manage markers is Worksheet#add_chart Markers are created for a two cell anchor based on the :start and :end options.
@@ -32,13 +34,28 @@ module Axlsx
     attr_reader :rowOff
 
     # @see col
-    def col=(v) Axlsx::validate_unsigned_int v; @col = v end
+    def col=(v)
+      Axlsx.validate_unsigned_int v
+      @col = v
+    end
+
     # @see colOff
-    def colOff=(v) Axlsx::validate_int v; @colOff = v end
+    def colOff=(v)
+      Axlsx.validate_int v
+      @colOff = v
+    end
+
     # @see row
-    def row=(v) Axlsx::validate_unsigned_int v; @row = v end
+    def row=(v)
+      Axlsx.validate_unsigned_int v
+      @row = v
+    end
+
     # @see rowOff
-    def rowOff=(v) Axlsx::validate_int v; @rowOff = v end
+    def rowOff=(v)
+      Axlsx.validate_int v
+      @rowOff = v
+    end
 
     # shortcut to set the column, row position for this marker
     # @param col the column for the marker, a Cell object or a string reference like "B7"
@@ -54,9 +71,9 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       [:col, :colOff, :row, :rowOff].each do |k|
-        str << ('<xdr:' << k.to_s << '>' << self.send(k).to_s << '</xdr:' << k.to_s << '>')
+        str << '<xdr:' << k.to_s << '>' << send(k).to_s << '</xdr:' << k.to_s << '>'
       end
     end
 
@@ -66,7 +83,7 @@ module Axlsx
     # @see Chart#start_at
     def parse_coord_args(x, y = 0)
       if x.is_a?(String)
-        x, y = *Axlsx::name_to_indices(x)
+        x, y = *Axlsx.name_to_indices(x)
       end
       if x.is_a?(Cell)
         x, y = *x.pos

data/lib/axlsx/drawing/num_data.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # This class specifies data for a particular data point. It is used for both numCache and numLit object
   class NumData
@@ -23,25 +25,25 @@ module Axlsx
       @tag_name = values.first.is_a?(Cell) ? :numCache : :numLit
       values.each do |value|
         value = value.is_formula? ? 0 : value.value if value.is_a?(Cell)
-        @pt << NumVal.new(:v => value)
+        @pt << NumVal.new(v: value)
       end
     end
 
     # @see format_code
     def format_code=(v = 'General')
-      Axlsx::validate_string(v)
+      Axlsx.validate_string(v)
       @format_code = v
     end
 
     # serialize the object
-    def to_xml_string(str = "")
-      str << ('<c:' << @tag_name.to_s << '>')
-      str << ('<c:formatCode>' << format_code.to_s << '</c:formatCode>')
-      str << ('<c:ptCount val="' << @pt.size.to_s << '"/>')
+    def to_xml_string(str = +'')
+      str << '<c:' << @tag_name.to_s << '>'
+      str << '<c:formatCode>' << format_code.to_s << '</c:formatCode>'
+      str << '<c:ptCount val="' << @pt.size.to_s << '"/>'
       @pt.each_with_index do |num_val, index|
         num_val.to_xml_string index, str
       end
-      str << ('</c:' << @tag_name.to_s << '>')
+      str << '</c:' << @tag_name.to_s << '>'
     end
   end
 end

data/lib/axlsx/drawing/num_data_source.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A numeric data source for use by charts.
   class NumDataSource
@@ -15,7 +17,7 @@ module Axlsx
       @f = nil
       @data = @data_type.new(options)
       if options[:data] && options[:data].first.is_a?(Cell)
-        @f = Axlsx::cell_range(options[:data])
+        @f = Axlsx.cell_range(options[:data])
       end
       parse_options options
     end
@@ -42,17 +44,17 @@ module Axlsx
 
     # serialize the object
     # @param [String] str
-    def to_xml_string(str = "")
-      str << ('<c:' << tag_name.to_s << '>')
+    def to_xml_string(str = +'')
+      str << '<c:' << tag_name.to_s << '>'
       if @f
-        str << ('<c:' << @ref_tag_name.to_s << '>')
-        str << ('<c:f>' << @f.to_s << '</c:f>')
+        str << '<c:' << @ref_tag_name.to_s << '>'
+        str << '<c:f>' << @f.to_s << '</c:f>'
       end
       @data.to_xml_string str
       if @f
-        str << ('</c:' << @ref_tag_name.to_s << '>')
+        str << '</c:' << @ref_tag_name.to_s << '>'
       end
-      str << ('</c:' << tag_name.to_s << '>')
+      str << '</c:' << tag_name.to_s << '>'
     end
   end
 end