caxlsx 4.0.0 → 4.2.0

data/lib/axlsx/drawing/bar_series.rb

@@ -37,13 +37,16 @@ module Axlsx
     def initialize(chart, options = {})
       @shape = :box
       @colors = []
-      super(chart, options)
+      super
       self.labels = AxDataSource.new({ data: options[:labels] }) unless options[:labels].nil?
       self.data = NumDataSource.new(options) unless options[:data].nil?
     end
 
     # @see colors
-    def colors=(v) DataTypeValidator.validate "BarSeries.colors", [Array], v; @colors = v end
+    def colors=(v)
+      DataTypeValidator.validate "BarSeries.colors", [Array], v
+      @colors = v
+    end
 
     def series_color=(v)
       @series_color = v
@@ -59,7 +62,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = +'')
-      super(str) do
+      super do
         colors.each_with_index do |c, index|
           str << '<c:dPt>'
           str << '<c:idx val="' << index.to_s << '"/>'
@@ -85,9 +88,15 @@ module Axlsx
     private
 
     # assigns the data for this series
-    def data=(v) DataTypeValidator.validate "Series.data", [NumDataSource], v; @data = v; end
+    def data=(v)
+      DataTypeValidator.validate "Series.data", [NumDataSource], v
+      @data = v
+    end
 
     # assigns the labels for this series
-    def labels=(v) DataTypeValidator.validate "Series.labels", [AxDataSource], v; @labels = v; end
+    def labels=(v)
+      DataTypeValidator.validate "Series.labels", [AxDataSource], v
+      @labels = v
+    end
   end
 end

data/lib/axlsx/drawing/bubble_chart.rb

@@ -26,7 +26,7 @@ module Axlsx
     def initialize(frame, options = {})
       @vary_colors = 0
 
-      super(frame, options)
+      super
       @series_type = BubbleSeries
       @d_lbls = nil
       parse_options options
@@ -36,7 +36,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = +'')
-      super(str) do
+      super do
         str << '<c:bubbleChart>'
         str << '<c:varyColors val="' << vary_colors.to_s << '"/>'
         @series.each { |ser| ser.to_xml_string(str) }

data/lib/axlsx/drawing/bubble_series.rb

@@ -27,7 +27,7 @@ module Axlsx
     # Creates a new BubbleSeries
     def initialize(chart, options = {})
       @xData, @yData, @bubbleSize = nil
-      super(chart, options)
+      super
       @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?
@@ -42,7 +42,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = +'')
-      super(str) do
+      super do
         # needs to override the super color here to push in ln/and something else!
         if color
           str << '<c:spPr><a:solidFill>'

data/lib/axlsx/drawing/cat_axis.rb

@@ -12,7 +12,7 @@ module Axlsx
       self.auto = 1
       self.lbl_algn = :ctr
       self.lbl_offset = "100"
-      super(options)
+      super
     end
 
     # 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.
@@ -31,7 +31,7 @@ module Axlsx
     attr_reader :lbl_offset
     alias :lblOffset :lbl_offset
 
-    # The number of tick lables to skip between labels
+    # The number of tick labels to skip between labels
     # @return [Integer]
     attr_reader :tick_lbl_skip
     alias :tickLblSkip :tick_lbl_skip
@@ -45,24 +45,39 @@ module Axlsx
     LBL_OFFSET_REGEX = /0*(([0-9])|([1-9][0-9])|([1-9][0-9][0-9])|1000)/.freeze
 
     # @see tick_lbl_skip
-    def tick_lbl_skip=(v) Axlsx.validate_unsigned_int(v); @tick_lbl_skip = v; end
+    def tick_lbl_skip=(v)
+      Axlsx.validate_unsigned_int(v)
+      @tick_lbl_skip = v
+    end
     alias :tickLblSkip= :tick_lbl_skip=
 
     # @see tick_mark_skip
-    def tick_mark_skip=(v) Axlsx.validate_unsigned_int(v); @tick_mark_skip = v; end
+    def tick_mark_skip=(v)
+      Axlsx.validate_unsigned_int(v)
+      @tick_mark_skip = v
+    end
     alias :tickMarkSkip= :tick_mark_skip=
 
     # From the docs: This element specifies that this axis is a date or text axis based on the data that is used for the axis labels, not a specific choice.
-    def auto=(v) Axlsx.validate_boolean(v); @auto = v; end
+    def auto=(v)
+      Axlsx.validate_boolean(v)
+      @auto = v
+    end
 
     # specifies how the perpendicular axis is crossed
     # must be one of [:ctr, :l, :r]
-    def lbl_algn=(v) RestrictionValidator.validate "#{self.class}.lbl_algn", [:ctr, :l, :r], v; @lbl_algn = v; end
+    def lbl_algn=(v)
+      RestrictionValidator.validate "#{self.class}.lbl_algn", [:ctr, :l, :r], v
+      @lbl_algn = v
+    end
     alias :lblAlgn= :lbl_algn=
 
     # The offset of the labels
     # must be between a string between 0 and 1000
-    def lbl_offset=(v) RegexValidator.validate "#{self.class}.lbl_offset", LBL_OFFSET_REGEX, v; @lbl_offset = v; end
+    def lbl_offset=(v)
+      RegexValidator.validate "#{self.class}.lbl_offset", LBL_OFFSET_REGEX, v
+      @lbl_offset = v
+    end
     alias :lblOffset= :lbl_offset=
 
     # Serializes the object
@@ -70,7 +85,7 @@ module Axlsx
     # @return [String]
     def to_xml_string(str = +'')
       str << '<c:catAx>'
-      super(str)
+      super
       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 << '"/>'

data/lib/axlsx/drawing/chart.rb

@@ -62,7 +62,10 @@ module Axlsx
 
     # Configures the vary_colors options for this chart
     # @param [Boolean] v The value to set
-    def vary_colors=(v) Axlsx.validate_boolean(v); @vary_colors = v; end
+    def vary_colors=(v)
+      Axlsx.validate_boolean(v)
+      @vary_colors = v
+    end
 
     # The title object for the chart.
     # @return [Title]
@@ -149,21 +152,33 @@ module Axlsx
     # Show the legend in the chart
     # @param [Boolean] v
     # @return [Boolean]
-    def show_legend=(v) Axlsx.validate_boolean(v); @show_legend = v; end
+    def show_legend=(v)
+      Axlsx.validate_boolean(v)
+      @show_legend = v
+    end
 
     # How to display blank values
     # @see display_blanks_as
     # @param [Symbol] v
     # @return [Symbol]
-    def display_blanks_as=(v) Axlsx.validate_display_blanks_as(v); @display_blanks_as = v; end
+    def display_blanks_as=(v)
+      Axlsx.validate_display_blanks_as(v)
+      @display_blanks_as = v
+    end
 
     # The style for the chart.
     # see ECMA Part 1 §21.2.2.196
     # @param [Integer] v must be between 1 and 48
-    def style=(v) DataTypeValidator.validate "Chart.style", Integer, v, ->(arg) { arg >= 1 && arg <= 48 }; @style = v; end
+    def style=(v)
+      DataTypeValidator.validate "Chart.style", Integer, v, ->(arg) { arg >= 1 && arg <= 48 }
+      @style = v
+    end
 
     # @see legend_position
-    def legend_position=(v) RestrictionValidator.validate "Chart.legend_position", [:b, :l, :r, :t, :tr], v; @legend_position = v; end
+    def legend_position=(v)
+      RestrictionValidator.validate "Chart.legend_position", [:b, :l, :r, :t, :tr], v
+      @legend_position = v
+    end
 
     # backwards compatibility to allow chart.to and chart.from access to anchor markers
     # @note This will be disconinued in version 2.0.0. Please use the end_at method
@@ -194,12 +209,18 @@ module Axlsx
     # 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
@@ -290,7 +311,10 @@ module Axlsx
     end
 
     # sets the view_3D object for the chart
-    def view_3D=(v) DataTypeValidator.validate "#{self.class}.view_3D", View3D, v; @view_3D = v; end
+    def view_3D=(v)
+      DataTypeValidator.validate "#{self.class}.view_3D", View3D, v
+      @view_3D = v
+    end
     alias :view3D= :view_3D=
   end
 end

data/lib/axlsx/drawing/d_lbls.rb

@@ -19,7 +19,7 @@ module Axlsx
     end
 
     # These attributes are all boolean so I'm doing a bit of a hand
-    # waving magic show to set up the attriubte accessors
+    # waving magic show to set up the attribute accessors
     # @note
     #   not all charts support all methods!
     #   Bar3DChart and Line3DChart and ScatterChart do not support d_lbl_pos or show_leader_lines
@@ -38,11 +38,11 @@ module Axlsx
       [:show_legend_key, :show_val, :show_cat_name,
        :show_ser_name, :show_percent, :show_bubble_size,
        :show_leader_lines].each do |attr|
-        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 labels instance.
     # This affects the xml output as not all chart types support the
     # same data label attributes.
     attr_reader :chart_type
@@ -51,19 +51,19 @@ 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
 
     # @see DLbls#d_lbl_pos
-    # Assigns the label postion for this data labels on this chart.
+    # Assigns the label position for this data labels on this chart.
     # Allowed positions are :bestFit, :b, :ctr, :inBase, :inEnd, :l,
     # :outEnd, :r and :t
     # The default is :bestFit
-    # @param [Symbol] label_position the postion you want to use.
+    # @param [Symbol] label_position the position 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
@@ -85,7 +85,7 @@ module Axlsx
 
     # 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,55 +1,56 @@
 # frozen_string_literal: true
 
 module Axlsx
-  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'
+  require_relative 'd_lbls'
+  require_relative 'title'
+  require_relative 'series_title'
+  require_relative 'series'
+  require_relative 'pie_series'
+  require_relative 'bar_series'
+  require_relative 'line_series'
+  require_relative 'scatter_series'
+  require_relative 'bubble_series'
+  require_relative 'area_series'
+
+  require_relative 'scaling'
+  require_relative 'axis'
+
+  require_relative 'str_val'
+  require_relative 'num_val'
+  require_relative 'str_data'
+  require_relative 'num_data'
+  require_relative 'num_data_source'
+  require_relative 'ax_data_source'
+
+  require_relative 'ser_axis'
+  require_relative 'cat_axis'
+  require_relative 'val_axis'
+  require_relative 'axes'
+
+  require_relative 'marker'
+
+  require_relative 'one_cell_anchor'
+  require_relative 'two_cell_anchor'
+  require_relative 'graphic_frame'
+
+  require_relative 'view_3D'
+  require_relative 'chart'
+  require_relative 'pie_3D_chart'
+  require_relative 'pie_chart'
+  require_relative 'bar_3D_chart'
+  require_relative 'bar_chart'
+  require_relative 'line_chart'
+  require_relative 'line_3D_chart'
+  require_relative 'scatter_chart'
+  require_relative 'bubble_chart'
+  require_relative 'area_chart'
+
+  require_relative 'picture_locking'
+  require_relative 'pic'
+  require_relative 'hyperlink'
+
+  require_relative 'vml_drawing'
+  require_relative '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.

data/lib/axlsx/drawing/hyperlink.rb

@@ -52,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.
@@ -62,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.
@@ -70,8 +76,11 @@ module Axlsx
     attr_reader :history
 
     # @see history
-    # param [Boolean] v The value to assing
-    def history=(v) Axlsx.validate_boolean(v); @history = v end
+    # param [Boolean] v The value to assign
+    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]

data/lib/axlsx/drawing/line_3D_chart.rb

@@ -1,7 +1,7 @@
 # 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.
+  # The Line3DChart is a three dimensional 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.
   #   require "rubygems" # if that is your preferred way to manage gems!
@@ -43,7 +43,7 @@ module Axlsx
     def initialize(frame, options = {})
       @gap_depth = nil
       @view_3D = View3D.new({ r_ang_ax: 1 }.merge(options))
-      super(frame, options)
+      super
       axes.add_axis :ser_axis, SerAxis
     end
 
@@ -58,7 +58,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = +'')
-      super(str) do
+      super do
         str << '<c:gapDepth val="' << @gap_depth.to_s << '"/>' unless @gap_depth.nil?
       end
     end

data/lib/axlsx/drawing/line_chart.rb

@@ -1,7 +1,7 @@
 # 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.
+  # The LineChart is a two dimensional 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.
   #   require "rubygems" # if that is your preferred way to manage gems!
@@ -47,7 +47,7 @@ module Axlsx
     def initialize(frame, options = {})
       @vary_colors = false
       @grouping = :standard
-      super(frame, options)
+      super
       @series_type = LineSeries
       @d_lbls = nil
     end
@@ -75,7 +75,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = +'')
-      super(str) do
+      super do
         str << "<c:" << node_name << ">"
         str << '<c:grouping val="' << grouping.to_s << '"/>'
         str << '<c:varyColors val="' << vary_colors.to_s << '"/>'

data/lib/axlsx/drawing/line_series.rb

@@ -40,7 +40,7 @@ module Axlsx
       @marker_symbol = options[:marker_symbol] || :default
       @smooth = false
       @labels, @data = nil, nil
-      super(chart, options)
+      super
       @labels = AxDataSource.new(data: options[:labels]) unless options[:labels].nil?
       @data = NumDataSource.new(options) unless options[:data].nil?
     end
@@ -72,7 +72,7 @@ module Axlsx
     # @param [String] str
     # @return [String]
     def to_xml_string(str = +'')
-      super(str) do
+      super do
         if color
           str << '<c:spPr><a:solidFill>'
           str << '<a:srgbClr val="' << color << '"/>'
@@ -101,9 +101,15 @@ module Axlsx
     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

@@ -34,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"

data/lib/axlsx/drawing/num_val.rb

@@ -13,7 +13,7 @@ module Axlsx
     # @option options [Integer] v
     def initialize(options = {})
       @format_code = "General"
-      super(options)
+      super
     end
 
     # @see format_code

data/lib/axlsx/drawing/one_cell_anchor.rb

@@ -60,10 +60,16 @@ module Axlsx
 
     #
     # @see height
-    def height=(v) Axlsx.validate_unsigned_int(v); @height = v; end
+    def height=(v)
+      Axlsx.validate_unsigned_int(v)
+      @height = v
+    end
 
     # @see width
-    def width=(v) Axlsx.validate_unsigned_int(v); @width = v; end
+    def width=(v)
+      Axlsx.validate_unsigned_int(v)
+      @width = v
+    end
 
     # The index of this anchor in the drawing
     # @return [Integer]

data/lib/axlsx/drawing/pic.rb

@@ -69,7 +69,7 @@ module Axlsx
       options[:href] = v
       if hyperlink.is_a?(Hyperlink)
         options.each do |o|
-          hyperlink.send("#{o[0]}=", o[1]) if hyperlink.respond_to? "#{o[0]}="
+          hyperlink.send(:"#{o[0]}=", o[1]) if hyperlink.respond_to? :"#{o[0]}="
         end
       else
         @hyperlink = Hyperlink.new(self, options)
@@ -80,7 +80,7 @@ module Axlsx
     def image_src=(v)
       Axlsx.validate_string(v)
       if remote?
-        RegexValidator.validate('Pic.image_src', /\A#{URI::DEFAULT_PARSER.make_regexp}\z/, v)
+        RegexValidator.validate('Pic.image_src', /\A#{Axlsx.uri_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)
@@ -91,13 +91,22 @@ module Axlsx
     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=(v)
+      Axlsx.validate_boolean(v)
+      @remote = v
+    end
 
     def remote?
       remote == 1 || remote.to_s == 'true'
@@ -109,7 +118,7 @@ module Axlsx
       File.basename(image_src) unless remote? || image_src.nil?
     end
 
-    # returns the extension of image_src without the preceeding '.'
+    # returns the extension of image_src without the preceding '.'
     # @return [String]
     def extname
       File.extname(image_src).delete('.') unless image_src.nil?
@@ -213,9 +222,9 @@ module Axlsx
     # Return correct xml relationship string portion
     def relationship_xml_portion
       if remote?
-        (+'<a:blip xmlns:r ="' << XML_NS_R << '" r:link="' << relationship.Id << '">')
+        (+'<a:blip xmlns:r="' << XML_NS_R << '" r:link="' << relationship.Id << '">')
       else
-        (+'<a:blip xmlns:r ="' << XML_NS_R << '" r:embed="' << relationship.Id << '">')
+        (+'<a:blip xmlns:r="' << XML_NS_R << '" r:embed="' << relationship.Id << '">')
       end
     end