caxlsx 3.3.0 → 4.0.0

data/lib/axlsx/drawing/chart.rb

@@ -1,11 +1,10 @@
-# encoding: UTF-8
-module Axlsx
+# 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.
   # @see README for examples
   class Chart
-
     include Axlsx::OptionsParser
     # Creates a new chart object
     # @param [GraphicalFrame] frame The frame that holds this chart.
@@ -16,10 +15,10 @@ module Axlsx
     # @option options [Array|String|Cell] end_at The X, Y coordinates defining the bottom right corner of the chart.
     # @option options [Boolean] plot_visible_only (true) Whether only data from visible cells should be plotted.
     # @option options [Boolean] rounded_corners (true) Whether the chart area shall have rounded corners.
-    def initialize(frame, options={})
+    def initialize(frame, options = {})
       @style = 18
       @view_3D = nil
-      @graphic_frame=frame
+      @graphic_frame = frame
       @graphic_frame.anchor.drawing.worksheet.workbook.charts << self
       @series = SimpleTypedList.new Series
       @show_legend = true
@@ -52,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
@@ -63,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]
@@ -125,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.
@@ -150,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
@@ -181,39 +180,39 @@ module Axlsx
     # Adds a new series to the chart's series collection.
     # @return [Series]
     # @see Series
-    def add_series(options={})
+    def add_series(options = {})
       @series_type.new(self, options)
       @series.last
     end
 
     # 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>'
@@ -224,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
@@ -275,7 +274,7 @@ module Axlsx
     # reference or cell to use in setting the start marker position.
     # @param [Integer] y The row
     # @return [Marker]
-    def start_at(x=0, y=0)
+    def start_at(x = 0, y = 0)
       @graphic_frame.anchor.start_at(x, y)
     end
 
@@ -286,14 +285,12 @@ module Axlsx
     # @param [Integer] y The row - default 10
     # @return [Marker]
     # @see start_at
-    def end_at(x=10, y=10)
+    def end_at(x = 10, y = 10)
       @graphic_frame.anchor.end_at(x, y)
     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
     alias :view3D= :view_3D=
-
   end
-
 end

data/lib/axlsx/drawing/d_lbls.rb

@@ -1,16 +1,18 @@
+# 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
   # basics.
-  #The DLbls class manages serialization of data labels
+  # The DLbls class manages serialization of data labels
   # showLeaderLines and leaderLines are not currently implemented
   class DLbls
-
     include Axlsx::Accessors
-    include Axlsx::OptionsParser 
+    include Axlsx::OptionsParser
     # creates a new DLbls object
-    def initialize(chart_type, options={})
+    def initialize(chart_type, options = {})
       raise ArgumentError, 'chart_type must inherit from Chart' unless [Chart, LineChart].include?(chart_type.superclass)
+
       @chart_type = chart_type
       initialize_defaults
       parse_options options
@@ -18,31 +20,31 @@ module Axlsx
 
     # These attributes are all boolean so I'm doing a bit of a hand
     # waving magic show to set up the attriubte accessors
-    # @note 
-    #   not all charts support all methods! 
+    # @note
+    #   not all charts support all methods!
     #   Bar3DChart and Line3DChart and ScatterChart do not support d_lbl_pos or show_leader_lines
-    #    
-    boolean_attr_accessor :show_legend_key, 
-                          :show_val, 
-                          :show_cat_name, 
-                          :show_ser_name, 
-                          :show_percent, 
-                          :show_bubble_size, 
+    #
+    boolean_attr_accessor :show_legend_key,
+                          :show_val,
+                          :show_cat_name,
+                          :show_ser_name,
+                          :show_percent,
+                          :show_bubble_size,
                           :show_leader_lines
 
     # Initialize all the values to false as Excel requires them to
     # explicitly be disabled or all will show.
     def initialize_defaults
-      [:show_legend_key, :show_val, :show_cat_name, 
-       :show_ser_name, :show_percent, :show_bubble_size, 
+      [: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
 
-    # The chart type that is using this data lables instance. 
+    # The chart type that is using this data lables instance.
     # This affects the xml output as not all chart types support the
-    # same data label attributes. 
+    # same data label attributes.
     attr_reader :chart_type
 
     # The position of the data labels in the chart
@@ -50,6 +52,7 @@ module Axlsx
     # @return [Symbol]
     def d_lbl_pos
       return unless [Pie3DChart, LineChart].include? @chart_type
+
       @d_lbl_pos ||= :bestFit
     end
 
@@ -61,31 +64,31 @@ module Axlsx
     # @param [Symbol] label_position the postion you want to use.
     def d_lbl_pos=(label_position)
       return unless [Pie3DChart, LineChart].include? @chart_type
-      Axlsx::RestrictionValidator.validate 'DLbls#d_lbl_pos',  [:bestFit, :b, :ctr, :inBase, :inEnd, :l, :outEnd, :r, :t], label_position
+
+      Axlsx::RestrictionValidator.validate 'DLbls#d_lbl_pos', [:bestFit, :b, :ctr, :inBase, :inEnd, :l, :outEnd, :r, :t], label_position
       @d_lbl_pos = label_position
     end
 
-   
     # 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
-        str <<  "<c:#{Axlsx::camel(key, false)} val='#{instance_vals[key]}' />" 
+        next unless instance_vals.key?(key) && !instance_vals[key].nil?
+
+        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
+
       @d_lbl_pos = nil
       @show_leader_lines = nil
     end
-
-
   end
 end

data/lib/axlsx/drawing/drawing.rb

@@ -1,54 +1,55 @@
-# encoding: UTF-8
+# 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.
@@ -58,7 +59,6 @@ module Axlsx
   # @see Chart
   # see examples/example.rb for an example of how to create a chart.
   class Drawing
-
     # The worksheet that owns the drawing
     # @return [Worksheet]
     attr_reader :worksheet
@@ -77,12 +77,11 @@ module Axlsx
       @anchors = SimpleTypedList.new [TwoCellAnchor, OneCellAnchor]
     end
 
-
     # Adds an image to the chart If th end_at option is specified we create a two cell anchor. By default we use a one cell anchor.
     # @note The recommended way to manage images is to use Worksheet.add_image. Please refer to that method for documentation.
     # @see Worksheet#add_image
     # @return [Pic]
-    def add_image(options={})
+    def add_image(options = {})
       if options[:end_at]
         TwoCellAnchor.new(self, options).add_pic(options)
       else
@@ -94,7 +93,7 @@ module Axlsx
     # Adds a chart to the drawing.
     # @note The recommended way to manage charts is to use Worksheet.add_chart. Please refer to that method for documentation.
     # @see Worksheet#add_chart
-    def add_chart(chart_type, options={})
+    def add_chart(chart_type, options = {})
       TwoCellAnchor.new(self, options)
       @anchors.last.add_chart(chart_type, options)
     end
@@ -109,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.
@@ -129,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.
@@ -156,12 +155,11 @@ 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
-
   end
 end

data/lib/axlsx/drawing/graphic_frame.rb

@@ -1,10 +1,10 @@
-# encoding: UTF-8
+# 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
   # @see Worksheet#add_chart
   class GraphicFrame
-
     # A reference to the chart object associated with this frame
     # @return [Chart]
     attr_reader :chart
@@ -31,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>'
@@ -43,12 +43,11 @@ 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>'
     end
-
   end
 end

data/lib/axlsx/drawing/hyperlink.rb

@@ -1,25 +1,25 @@
-# encoding: UTF-8
+# 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
   # @see {file:README} README
   class Hyperlink
-
     include Axlsx::SerializedAttributes
     include Axlsx::OptionsParser
 
-    #Creates a hyperlink object
+    # Creates a hyperlink object
     # parent must be a Pic for now, although I expect that other object support this tag and its cNvPr parent
     # @param [Pic] parent
     # @option options [String] tooltip message shown when hyperlinked object is hovered over with mouse.
     # @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.
-    def initialize(parent, options={})
+    def initialize(parent, options = {})
       DataTypeValidator.validate "Hyperlink.parent", [Pic], parent
       @parent = parent
       parse_options options
@@ -40,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
 
@@ -52,7 +52,7 @@ 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.
@@ -62,7 +62,7 @@ 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.
@@ -71,7 +71,7 @@ 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]
@@ -86,15 +86,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,6 +1,6 @@
-# encoding: UTF-8
-module Axlsx
+# 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
   #   # This example creates a line in a single sheet.
@@ -20,14 +20,13 @@ module Axlsx
   # @see Series
   # @see Package#serialize
   class Line3DChart < Axlsx::LineChart
-
     # space between bar or column clusters, as a percentage of the bar or column width.
     # @return [String]
     attr_reader :gap_depth
     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]
@@ -41,28 +40,27 @@ module Axlsx
     # @see Chart
     # @see lineChart
     # @see View3D
-    def initialize(frame, options={})
+    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
 
-
     # @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 = '')
-        super(str) do
-          str << ('<c:gapDepth val="' << @gap_depth.to_s << '"/>') unless @gap_depth.nil?
-        end
+    # Serializes the object
+    # @param [String] str
+    # @return [String]
+    def to_xml_string(str = +'')
+      super(str) do
+        str << '<c:gapDepth val="' << @gap_depth.to_s << '"/>' unless @gap_depth.nil?
       end
+    end
   end
 end