caxlsx 3.3.0 → 4.0.0

data/lib/axlsx/drawing/pic.rb

@@ -1,14 +1,15 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
   # a Pic object represents an image in your worksheet
   # Worksheet#add_image is the recommended way to manage images in your sheets
   # @see Worksheet#add_image
   class Pic
-
     include Axlsx::OptionsParser
 
     # Creates a new Pic(ture) object
     # @param [Anchor] anchor the anchor that holds this image
+    # @option options [Boolean] :remote indicates if image_src is a remote URI
     # @option options [String] :name
     # @option options [String] :descr
     # @option options [String] :image_src
@@ -16,10 +17,11 @@ module Axlsx
     # @option options [Integer] :width
     # @option options [Integer] :height
     # @option options [Float] :opacity - set the picture opacity, accepts a value between 0.0 and 1.0
-    def initialize(anchor, options={})
+    def initialize(anchor, options = {})
       @anchor = anchor
       @hyperlink = nil
       @anchor.drawing.worksheet.workbook.images << self
+      @remote = options[:remote]
       parse_options options
       start_at(*options[:start_at]) if options[:start_at]
       yield self if block_given?
@@ -28,7 +30,7 @@ module Axlsx
     end
 
     # allowed mime types
-    ALLOWED_MIME_TYPES = %w(image/jpeg image/png image/gif)
+    ALLOWED_MIME_TYPES = %w(image/jpeg image/png image/gif).freeze
 
     # The name to use for this picture
     # @return [String]
@@ -56,10 +58,14 @@ module Axlsx
     # @return [Integer]
     attr_reader :opacity
 
+    # Flag for remote picture (from URI)
+    # @return [Boolean]
+    attr_reader :remote
+
     # sets or updates a hyperlink for this image.
     # @param [String] v The href value for the hyper link
     # @option options @see Hyperlink#initialize All options available to the Hyperlink class apply - however href will be overridden with the v parameter value.
-    def hyperlink=(v, options={})
+    def hyperlink=(v, options = {})
       options[:href] = v
       if hyperlink.is_a?(Hyperlink)
         options.each do |o|
@@ -72,22 +78,35 @@ module Axlsx
     end
 
     def image_src=(v)
-      Axlsx::validate_string(v)
-      RestrictionValidator.validate 'Pic.image_src', ALLOWED_MIME_TYPES, MimeTypeUtils.get_mime_type(v)
-      raise ArgumentError, "File does not exist" unless File.exist?(v)
+      Axlsx.validate_string(v)
+      if remote?
+        RegexValidator.validate('Pic.image_src', /\A#{URI::DEFAULT_PARSER.make_regexp}\z/, v)
+        RestrictionValidator.validate 'Pic.image_src', ALLOWED_MIME_TYPES, MimeTypeUtils.get_mime_type_from_uri(v)
+      else
+        RestrictionValidator.validate 'Pic.image_src', ALLOWED_MIME_TYPES, MimeTypeUtils.get_mime_type(v)
+        raise ArgumentError, "File does not exist" unless File.exist?(v)
+      end
+
       @image_src = v
     end
 
     # @see name
-    def name=(v) Axlsx::validate_string(v); @name = v; end
+    def name=(v) Axlsx.validate_string(v); @name = v; end
 
     # @see descr
-    def descr=(v) Axlsx::validate_string(v); @descr = v; end
+    def descr=(v) Axlsx.validate_string(v); @descr = v; end
+
+    # @see remote
+    def remote=(v) Axlsx.validate_boolean(v); @remote = v; end
+
+    def remote?
+      remote == 1 || remote.to_s == 'true'
+    end
 
     # The file name of image_src without any path information
     # @return [String]
     def file_name
-      File.basename(image_src) unless image_src.nil?
+      File.basename(image_src) unless remote? || image_src.nil?
     end
 
     # returns the extension of image_src without the preceeding '.'
@@ -105,19 +124,24 @@ module Axlsx
     # The part name for this image used in serialization and relationship building
     # @return [String]
     def pn
-      "#{IMAGE_PN % [(index+1), extname]}"
+      format(IMAGE_PN, index + 1, extname)
     end
 
     # The relationship object for this pic.
     # @return [Relationship]
     def relationship
-      Relationship.new(self, IMAGE_R, "../#{pn}")
+      if remote?
+        Relationship.new(self, IMAGE_R, image_src.to_s, target_mode: :External)
+      else
+        Relationship.new(self, IMAGE_R, "../#{pn}")
+      end
     end
 
     # providing access to the anchor's width attribute
     # @see OneCellAnchor.width
     def width
       return unless @anchor.is_a?(OneCellAnchor)
+
       @anchor.width
     end
 
@@ -147,7 +171,7 @@ module Axlsx
     # @param [Integer] x The column
     # @param [Integer] y The row
     # @return [Marker]
-    def start_at(x, y=nil)
+    def start_at(x, y = nil)
       @anchor.start_at x, y
       @anchor.from
     end
@@ -156,7 +180,7 @@ module Axlsx
     # @param [Integer] x The column
     # @param [Integer] y The row
     # @return [Marker]
-    def end_at(x, y=nil)
+    def end_at(x, y = nil)
       use_two_cell_anchor unless @anchor.is_a?(TwoCellAnchor)
       @anchor.end_at x, y
       @anchor.to
@@ -165,16 +189,16 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<xdr:pic>'
       str << '<xdr:nvPicPr>'
-      str << ('<xdr:cNvPr id="2" name="' << name.to_s << '" descr="' << descr.to_s << '">')
+      str << '<xdr:cNvPr id="2" name="' << name.to_s << '" descr="' << descr.to_s << '">'
       hyperlink.to_xml_string(str) if hyperlink.is_a?(Hyperlink)
       str << '</xdr:cNvPr><xdr:cNvPicPr>'
       picture_locking.to_xml_string(str)
       str << '</xdr:cNvPicPr></xdr:nvPicPr>'
       str << '<xdr:blipFill>'
-      str << ('<a:blip xmlns:r ="' << XML_NS_R << '" r:embed="' << relationship.Id << '">')
+      str << relationship_xml_portion
       if opacity
         str << "<a:alphaModFix amt=\"#{opacity}\"/>"
       end
@@ -186,17 +210,28 @@ module Axlsx
 
     private
 
+    # Return correct xml relationship string portion
+    def relationship_xml_portion
+      if remote?
+        (+'<a:blip xmlns:r ="' << XML_NS_R << '" r:link="' << relationship.Id << '">')
+      else
+        (+'<a:blip xmlns:r ="' << XML_NS_R << '" r:embed="' << relationship.Id << '">')
+      end
+    end
+
     # Changes the anchor to a one cell anchor.
     def use_one_cell_anchor
       return if @anchor.is_a?(OneCellAnchor)
-      new_anchor = OneCellAnchor.new(@anchor.drawing, :start_at => [@anchor.from.col, @anchor.from.row])
+
+      new_anchor = OneCellAnchor.new(@anchor.drawing, start_at: [@anchor.from.col, @anchor.from.row])
       swap_anchor(new_anchor)
     end
 
-    #changes the anchor type to a two cell anchor
+    # changes the anchor type to a two cell anchor
     def use_two_cell_anchor
       return if @anchor.is_a?(TwoCellAnchor)
-      new_anchor = TwoCellAnchor.new(@anchor.drawing, :start_at => [@anchor.from.col, @anchor.from.row])
+
+      new_anchor = TwoCellAnchor.new(@anchor.drawing, start_at: [@anchor.from.col, @anchor.from.row])
       swap_anchor(new_anchor)
     end
 
@@ -204,7 +239,7 @@ module Axlsx
     def swap_anchor(new_anchor)
       new_anchor.drawing.anchors.delete(new_anchor)
       @anchor.drawing.anchors[@anchor.drawing.anchors.index(@anchor)] = new_anchor
-      new_anchor.instance_variable_set "@object", @anchor.object
+      new_anchor.instance_variable_set :@object, @anchor.object
       @anchor = new_anchor
     end
   end

data/lib/axlsx/drawing/picture_locking.rb

@@ -1,15 +1,15 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
   # The picture locking class defines the locking properties for pictures in your workbook.
   class PictureLocking
-
     include Axlsx::OptionsParser
     include Axlsx::SerializedAttributes
     include Axlsx::Accessors
 
     boolean_attr_accessor :noGrp, :noSelect, :noRot, :noChangeAspect,
-                            :noMove, :noResize, :noEditPoints, :noAdjustHandles,
-                            :noChangeArrowheads, :noChangeShapeType
+                          :noMove, :noResize, :noEditPoints, :noAdjustHandles,
+                          :noChangeArrowheads, :noChangeShapeType
 
     serializable_attributes :noGrp, :noSelect, :noRot, :noChangeAspect,
                             :noMove, :noResize, :noEditPoints, :noAdjustHandles,
@@ -26,7 +26,7 @@ module Axlsx
     # @option options [Boolean] noAdjustHandles
     # @option options [Boolean] noChangeArrowheads
     # @option options [Boolean] noChangeShapeType
-    def initialize(options={})
+    def initialize(options = {})
       @noChangeAspect = true
       parse_options options
     end
@@ -34,9 +34,8 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag('a:picLocks', str)
     end
-
   end
 end

data/lib/axlsx/drawing/pie_3D_chart.rb

@@ -1,13 +1,11 @@
-# encoding: UTF-8
-module Axlsx
-
+# frozen_string_literal: true
 
+module Axlsx
   # The Pie3DChart is a three dimentional piechart (who would have guessed?) that you can add to your worksheet.
   # @see Worksheet#add_chart
   # @see Chart#add_series
   # @see README for an example
   class Pie3DChart < Chart
-
     # Creates a new pie chart object
     # @param [GraphicFrame] frame The workbook that owns this chart.
     # @option options [Cell, String] title
@@ -22,26 +20,25 @@ module Axlsx
     # @option options [Integer] perspective
     # @see Chart
     # @see View3D
-    def initialize(frame, options={})
+    def initialize(frame, options = {})
       @vary_colors = true
       super(frame, options)
       @series_type = PieSeries
-      @view_3D = View3D.new({:rot_x =>30, :perspective=>30}.merge(options))
+      @view_3D = View3D.new({ rot_x: 30, perspective: 30 }.merge(options))
       @d_lbls = nil
     end
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       super(str) do
         str << '<c:pie3DChart>'
-        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
         str << '</c:pie3DChart>'
       end
     end
-
   end
 end

data/lib/axlsx/drawing/pie_series.rb

@@ -1,12 +1,11 @@
-# encoding: UTF-8
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # A PieSeries defines the data and labels and explosion for pie charts series.
   # @note The recommended way to manage series is to use Chart#add_series
   # @see Worksheet#add_chart
   # @see Chart#add_series
   class PieSeries < Series
-
     # The data for this series.
     # @return [SimpleTypedList]
     attr_reader :data
@@ -28,11 +27,11 @@ module Axlsx
     # @option options [String] title
     # @option options [Integer] explosion
     # @param [Chart] chart
-    def initialize(chart, options={})
+    def initialize(chart, options = {})
       @explosion = nil
       @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
 
@@ -40,19 +39,19 @@ module Axlsx
     def colors=(v) DataTypeValidator.validate "BarSeries.colors", [Array], v; @colors = v end
 
     # @see explosion
-    def explosion=(v) Axlsx::validate_unsigned_int(v); @explosion = v; end
+    def explosion=(v) Axlsx.validate_unsigned_int(v); @explosion = v; end
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       super(str) do
-        str << '<c:explosion val="' + @explosion.to_s + '"/>' unless @explosion.nil?
+        str << '<c:explosion val="' << @explosion.to_s << '"/>' unless @explosion.nil?
         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
         @labels.to_xml_string str unless @labels.nil?
@@ -68,7 +67,5 @@ module Axlsx
 
     # assigns the labels for this series
     def labels=(v) DataTypeValidator.validate "Series.labels", [AxDataSource], v; @labels = v; end
-
   end
-
 end

data/lib/axlsx/drawing/scaling.rb

@@ -1,8 +1,8 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
   # The Scaling class defines axis scaling
   class Scaling
-
     include Axlsx::OptionsParser
 
     # creates a new Scaling object
@@ -10,7 +10,7 @@ module Axlsx
     # @option options [Symbol] orientation
     # @option options [Float] max
     # @option options [Float] min
-    def initialize(options={})
+    def initialize(options = {})
       @orientation = :minMax
       @logBase, @min, @max = nil, nil, nil
       parse_options options
@@ -35,7 +35,7 @@ module Axlsx
     attr_reader :min
 
     # @see logBase
-    def logBase=(v) DataTypeValidator.validate "Scaling.logBase", [Integer], v, lambda { |arg| arg >= 2 && arg <= 1000}; @logBase = v; end
+    def logBase=(v) DataTypeValidator.validate "Scaling.logBase", [Integer], v, ->(arg) { arg >= 2 && arg <= 1000 }; @logBase = v; end
     # @see orientation
     def orientation=(v) RestrictionValidator.validate "Scaling.orientation", [:minMax, :maxMin], v; @orientation = v; end
     # @see max
@@ -47,14 +47,13 @@ module Axlsx
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<c:scaling>'
-      str << ('<c:logBase val="' << @logBase.to_s << '"/>') unless @logBase.nil?
-      str << ('<c:orientation val="' << @orientation.to_s << '"/>') unless @orientation.nil?
-      str << ('<c:min val="' << @min.to_s << '"/>') unless @min.nil?
-      str << ('<c:max val="' << @max.to_s << '"/>') unless @max.nil?
+      str << '<c:logBase val="' << @logBase.to_s << '"/>' unless @logBase.nil?
+      str << '<c:orientation val="' << @orientation.to_s << '"/>' unless @orientation.nil?
+      str << '<c:min val="' << @min.to_s << '"/>' unless @min.nil?
+      str << '<c:max val="' << @max.to_s << '"/>' unless @max.nil?
       str << '</c:scaling>'
     end
-
   end
 end

data/lib/axlsx/drawing/scatter_chart.rb

@@ -1,12 +1,11 @@
-# encoding: UTF-8
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # The ScatterChart allows you to insert a scatter chart into your worksheet
   # @see Worksheet#add_chart
   # @see Chart#add_series
   # @see README for an example
   class ScatterChart < Chart
-
     include Axlsx::OptionsParser
 
     # The Style for the scatter chart
@@ -30,11 +29,11 @@ module Axlsx
     alias :yValAxis :y_val_axis
 
     # Creates a new scatter chart
-    def initialize(frame, options={})
+    def initialize(frame, options = {})
       @vary_colors = 0
       @scatter_style = :lineMarker
 
-           super(frame, options)
+      super(frame, options)
       @series_type = ScatterSeries
       @d_lbls = nil
       parse_options options
@@ -50,14 +49,14 @@ 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:scatterChart>'
-        str << ('<c:scatterStyle val="' << scatter_style.to_s << '"/>')
-        str << ('<c:varyColors val="' << vary_colors.to_s << '"/>')
+        str << '<c:scatterStyle val="' << scatter_style.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:scatterChart>'
         axes.to_xml_string(str)
       end
@@ -68,7 +67,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/scatter_series.rb

@@ -1,13 +1,12 @@
-# encoding: UTF-8
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # A ScatterSeries defines the x and y position of data in the chart
   # @note The recommended way to manage series is to use Chart#add_series
   # @see Worksheet#add_chart
   # @see Chart#add_series
   # @see examples/example.rb
   class ScatterSeries < Series
-
     # The x data for this series.
     # @return [NamedAxisData]
     attr_reader :xData
@@ -37,14 +36,14 @@ module Axlsx
     attr_reader :marker_symbol
 
     # Creates a new ScatterSeries
-    def initialize(chart, options={})
+    def initialize(chart, options = {})
       @xData, @yData = nil
       if options[:smooth].nil?
         # If caller hasn't specified smoothing or not, turn smoothing on or off based on scatter style
         @smooth = [:smooth, :smoothMarker].include?(chart.scatter_style)
       else
         # Set smoothing according to the option provided
-        Axlsx::validate_boolean(options[:smooth])
+        Axlsx.validate_boolean(options[:smooth])
         @smooth = options[:smooth]
       end
       @ln_width = options[:ln_width] unless options[:ln_width].nil?
@@ -52,8 +51,8 @@ module Axlsx
       @marker_symbol = :default
 
       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?
+      @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?
     end
 
     # @see color
@@ -63,7 +62,7 @@ module Axlsx
 
     # @see smooth
     def smooth=(v)
-      Axlsx::validate_boolean(v)
+      Axlsx.validate_boolean(v)
       @smooth = v
     end
 
@@ -74,29 +73,29 @@ module Axlsx
 
     # @see marker_symbol
     def marker_symbol=(v)
-      Axlsx::validate_marker_symbol(v)
+      Axlsx.validate_marker_symbol(v)
       @marker_symbol = v
     end
 
     # 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>'
           str << '<c:marker>'
           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>'
           str << marker_symbol_xml
           str << '</c:marker>'
@@ -111,7 +110,7 @@ module Axlsx
         end
         @xData.to_xml_string(str) unless @xData.nil?
         @yData.to_xml_string(str) unless @yData.nil?
-        str << ('<c:smooth val="' << ((smooth) ? '1' : '0') << '"/>')
+        str << '<c:smooth val="' << (smooth ? '1' : '0') << '"/>'
       end
       str
     end
@@ -122,7 +121,7 @@ module Axlsx
       if !@show_marker
         '<c:symbol val="none"/>'
       elsif @marker_symbol != :default
-        '<c:symbol val="' + @marker_symbol.to_s + '"/>'
+        +'<c:symbol val="' << @marker_symbol.to_s << '"/>'
       end.to_s
     end
   end

data/lib/axlsx/drawing/ser_axis.rb

@@ -1,8 +1,8 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
-  #A SerAxis object defines a series axis
+  # A SerAxis object defines a series axis
   class SerAxis < Axis
-
     # The number of tick lables to skip between labels
     # @return [Integer]
     attr_reader :tick_lbl_skip
@@ -16,30 +16,28 @@ module Axlsx
     # Creates a new SerAxis object
     # @option options [Integer] tick_lbl_skip
     # @option options [Integer] tick_mark_skip
-    def initialize(options={})
+    def initialize(options = {})
       @tick_lbl_skip, @tick_mark_skip = 1, 1
       super(options)
     end
 
     # @see tickLblSkip
-    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 tickMarkSkip
-    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=
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<c:serAx>'
       super(str)
-      str << ('<c:tickLblSkip val="' << @tick_lbl_skip.to_s << '"/>') unless @tick_lbl_skip.nil?
-      str << ('<c:tickMarkSkip val="' << @tick_mark_skip.to_s << '"/>') unless @tick_mark_skip.nil?
+      str << '<c:tickLblSkip val="' << @tick_lbl_skip.to_s << '"/>' unless @tick_lbl_skip.nil?
+      str << '<c:tickMarkSkip val="' << @tick_mark_skip.to_s << '"/>' unless @tick_mark_skip.nil?
       str << '</c:serAx>'
     end
   end
-
-
 end

data/lib/axlsx/drawing/series.rb

@@ -1,11 +1,11 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
   # A Series defines the common series attributes and is the super class for all concrete series types.
   # @note The recommended way to manage series is to use Chart#add_series
   # @see Worksheet#add_chart
   # @see Chart#add_series
   class Series
-
     include Axlsx::OptionsParser
 
     # The chart that owns this series
@@ -20,7 +20,7 @@ module Axlsx
     # @param [Chart] chart
     # @option options [Integer] order
     # @option options [String] title
-    def initialize(chart, options={})
+    def initialize(chart, options = {})
       @order = nil
       self.chart = chart
       @chart.series << self
@@ -40,7 +40,7 @@ module Axlsx
     end
 
     # @see order
-    def order=(v)  Axlsx::validate_unsigned_int(v); @order = v; end
+    def order=(v) Axlsx.validate_unsigned_int(v); @order = v; end
 
     # @see title
     def title=(v)
@@ -52,15 +52,15 @@ module Axlsx
     private
 
     # assigns the chart for this series
-    def chart=(v)  DataTypeValidator.validate "Series.chart", Chart, v; @chart = v; end
+    def chart=(v) DataTypeValidator.validate "Series.chart", Chart, v; @chart = v; end
 
     # Serializes the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       str << '<c:ser>'
-      str << ('<c:idx val="' << index.to_s << '"/>')
-      str << ('<c:order val="' << (order || index).to_s << '"/>')
+      str << '<c:idx val="' << index.to_s << '"/>'
+      str << '<c:order val="' << (order || index).to_s << '"/>'
       title.to_xml_string(str) unless title.nil?
       yield if block_given?
       str << '</c:ser>'