caxlsx 3.3.0 → 4.0.0

data/lib/axlsx/workbook/worksheet/table.rb

@@ -1,10 +1,10 @@
-# encoding: UTF-8
+# frozen_string_literal: true
+
 module Axlsx
   # Table
   # @note Worksheet#add_table is the recommended way to create tables for your worksheets.
   # @see README for examples
   class Table
-
     include Axlsx::OptionsParser
 
     # Creates a new Table object
@@ -12,13 +12,13 @@ module Axlsx
     # @param [Worksheet] sheet The sheet containing the table data.
     # @option options [Cell, String] name
     # @option options [TableStyle] style
-    def initialize(ref, sheet, options={})
+    def initialize(ref, sheet, options = {})
       @ref = ref
       @sheet = sheet
       @style = nil
       @sheet.workbook.tables << self
       @table_style_info = TableStyleInfo.new(options[:style_info]) if options[:style_info]
-      @name = "Table#{index+1}"
+      @name = "Table#{index + 1}"
       parse_options options
       yield self if block_given?
     end
@@ -44,7 +44,7 @@ module Axlsx
     # The part name for this table
     # @return [String]
     def pn
-      "#{TABLE_PN % (index+1)}"
+      format(TABLE_PN, index + 1)
     end
 
     # The relationship id for this table.
@@ -64,7 +64,7 @@ module Axlsx
       end
     end
 
-    # TableStyleInfo for the table. 
+    # TableStyleInfo for the table.
     # initialization can be fed via the :style_info option
     def table_style_info
       @table_style_info ||= TableStyleInfo.new
@@ -73,14 +73,14 @@ 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"?>'
-      str << ('<table xmlns="' << XML_NS << '" id="' << (index+1).to_s << '" name="' << @name << '" displayName="' << @name.gsub(/\s/,'_') << '" ')
-      str << ('ref="' << @ref << '" totalsRowShown="0">')
-      str << ('<autoFilter ref="' << @ref << '"/>')
-      str << ('<tableColumns count="' << header_cells.length.to_s << '">')
-      header_cells.each_with_index do |cell,index|
-        str << ('<tableColumn id ="' << (index+1).to_s << '" name="' << cell.clean_value << '"/>')
+      str << '<table xmlns="' << XML_NS << '" id="' << (index + 1).to_s << '" name="' << @name << '" displayName="' << @name.gsub(/\s/, '_') << '" '
+      str << 'ref="' << @ref << '" totalsRowShown="0">'
+      str << '<autoFilter ref="' << @ref << '"/>'
+      str << '<tableColumns count="' << header_cells.length.to_s << '">'
+      header_cells.each_with_index do |cell, index|
+        str << '<tableColumn id ="' << (index + 1).to_s << '" name="' << cell.clean_value << '"/>'
       end
       str << '</tableColumns>'
       table_style_info.to_xml_string(str)

data/lib/axlsx/workbook/worksheet/table_style_info.rb

@@ -1,5 +1,6 @@
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # The table style info class manages style attributes for defined tables in
   # a worksheet
   class TableStyleInfo
@@ -15,7 +16,7 @@ module Axlsx
     # @option [Boolean] show_column_stripes indicates if column stripes should
     #                   be shown
     # @option [Boolean] show_row_stripes indicates if row stripes should be shown
-    # @option [String] name The name of the style to apply to your table. 
+    # @option [String] name The name of the style to apply to your table.
     #                  Only predefined styles are currently supported.
     #                  @see Annex G. (normative) Predefined SpreadsheetML Style Definitions in part 1 of the specification.
     def initialize(options = {})
@@ -27,13 +28,13 @@ module Axlsx
     # boolean attributes for this object
     boolean_attr_accessor :show_first_column, :show_last_column, :show_row_stripes, :show_column_stripes
     serializable_attributes :show_first_column, :show_last_column, :show_row_stripes, :show_column_stripes,
-      :name
+                            :name
 
     # Initialize all the values to false as Excel requires them to
     # explicitly be disabled or all will show.
     def initialize_defaults
       %w(show_first_column show_last_column show_row_stripes show_column_stripes).each do |attr|
-        self.send("#{attr}=", 0)
+        send("#{attr}=", 0)
       end
     end
 
@@ -42,7 +43,7 @@ module Axlsx
 
     # seralizes this object to an xml string
     # @param [String] str the string to contact this objects serialization to.
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag('tableStyleInfo', str)
     end
   end

data/lib/axlsx/workbook/worksheet/tables.rb

@@ -1,11 +1,12 @@
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # A simple, self serializing class for storing tables
   class Tables < SimpleTypedList
-
     # creates a new Tables object
     def initialize(worksheet)
       raise ArgumentError, "you must provide a worksheet" unless worksheet.is_a?(Worksheet)
+
       super Table
       @worksheet = worksheet
     end
@@ -17,18 +18,19 @@ module Axlsx
     # returns the relationships required by this collection
     def relationships
       return [] if empty?
-      map{ |table| Relationship.new(table, TABLE_R, "../#{table.pn}") }
+
+      map { |table| Relationship.new(table, TABLE_R, "../#{table.pn}") }
     end
 
     # renders the tables xml
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = "")
+    def to_xml_string(str = +'')
       return if empty?
+
       str << "<tableParts count='#{size}'>"
       each { |table| str << "<tablePart r:id='#{table.rId}'/>" }
       str << '</tableParts>'
     end
   end
-
 end

data/lib/axlsx/workbook/worksheet/worksheet.rb

@@ -1,9 +1,8 @@
-# encoding: UTF-8
+# frozen_string_literal: true
 
 require_relative "border_creator"
 
 module Axlsx
-
   # The Worksheet class represents a worksheet in the workbook.
   class Worksheet
     include Axlsx::OptionsParser
@@ -16,12 +15,15 @@ module Axlsx
     # @option options [Hash] page_margins A hash containing page margins for this worksheet. @see PageMargins
     # @option options [Hash] print_options A hash containing print options for this worksheet. @see PrintOptions
     # @option options [Hash] header_footer A hash containing header/footer options for this worksheet. @see HeaderFooter
-    # @option options [Boolean] show_gridlines indicates if gridlines should be shown for this sheet.
-    def initialize(wb, options={})
+    # @option options [Boolean] show_gridlines Whether gridlines should be shown for this sheet.
+    # @option options [Boolean] escape_formulas Whether formulas should be escaped by default. Can be overridden at a
+    #   row/cell level.
+    def initialize(wb, options = {})
       self.workbook = wb
       @sheet_protection = nil
       initialize_page_options(options)
       parse_options options
+      self.escape_formulas = wb.escape_formulas unless defined? @escape_formulas
       @workbook.worksheets << self
       @sheet_id = index + 1
       yield self if block_given?
@@ -43,13 +45,27 @@ module Axlsx
     # The name of the worksheet
     # @return [String]
     def name
-      @name ||= "Sheet" + (index+1).to_s
+      @name ||= "Sheet#{index + 1}"
+    end
+
+    # Whether to treat values starting with an equals sign as formulas or as literal strings.
+    # Allowing user-generated data to be interpreted as formulas is a security risk.
+    # See https://www.owasp.org/index.php/CSV_Injection for details.
+    # @return [Boolean]
+    attr_reader :escape_formulas
+
+    # Sets whether to treat values starting with an equals sign as formulas or as literal strings.
+    # @param [Boolean] value The value to set.
+    # @return [Boolean]
+    def escape_formulas=(value)
+      Axlsx.validate_boolean(value)
+      @escape_formulas = value
     end
 
     # Specifies the visible state of this sheet. Allowed states are
     # :visible, :hidden or :very_hidden. The default value is :visible.
     #
-    # Worksheets in the :hidden state can be shown using the sheet formatting properties in excel.
+    # Worksheets in the :hidden state can be shown using the sheet formatting properties in Excel.
     # :very_hidden sheets should be inaccessible to end users.
     # @param [Symbol] sheet_state The visible state for this sheet.
     def state=(sheet_state)
@@ -102,13 +118,13 @@ module Axlsx
     # The tables in this worksheet
     # @return [Array] of Table
     def tables
-      @tables ||=  Tables.new self
+      @tables ||= Tables.new self
     end
 
     # The pivot tables in this worksheet
     # @return [Array] of Table
     def pivot_tables
-      @pivot_tables ||=  PivotTables.new self
+      @pivot_tables ||= PivotTables.new self
     end
 
     # A collection of column breaks added to this worksheet
@@ -157,7 +173,7 @@ module Axlsx
       @rows.transpose(&block)
     end
 
-    # A range that excel will apply an auto-filter to "A1:B3"
+    # A range that Excel will apply an auto-filter to "A1:B3"
     # This will turn filtering on for the cells in the range.
     # The first row is considered the header, while subsequent rows are considered to be data.
     # @return String
@@ -171,11 +187,11 @@ module Axlsx
     # @return Boolean
     # @see #page_setup
     def fit_to_page?
-      return false unless Axlsx.instance_values_for(self).keys.include?('page_setup')
+      return false unless Axlsx.instance_values_for(self).key?('page_setup')
+
       page_setup.fit_to_page?
     end
 
-
     # Column info for the sheet
     # @return [SimpleTypedList]
     def column_info
@@ -311,7 +327,7 @@ module Axlsx
     # @param [String] name
     def name=(name)
       validate_sheet_name name
-      @name=Axlsx::coder.encode(name)
+      @name = Axlsx.coder.encode(name)
     end
 
     # The auto filter range for the worksheet
@@ -329,13 +345,13 @@ module Axlsx
     # The part name of this worksheet
     # @return [String]
     def pn
-      "#{WORKSHEET_PN % (index+1)}"
+      format(WORKSHEET_PN, index + 1)
     end
 
     # The relationship part name of this worksheet
     # @return [String]
     def rels_pn
-      "#{WORKSHEET_RELS_PN % (index+1)}"
+      format(WORKSHEET_RELS_PN, index + 1)
     end
 
     # The relationship id of this worksheet.
@@ -412,7 +428,7 @@ module Axlsx
     #    sign as formula (default) or as simple string.
     #    Allowing user generated data to be interpreted as formulas can be dangerous
     #   (see https://www.owasp.org/index.php/CSV_Injection for details).
-    def add_row(values=[], options={})
+    def add_row(values = [], options = {})
       row = Row.new(self, values, options)
       update_column_info row, options.delete(:widths)
       yield row if block_given?
@@ -432,7 +448,7 @@ module Axlsx
     # @see ConditionalFormattingRule#initialize
     # @see file:examples/example_conditional_formatting.rb
     def add_conditional_formatting(cells, rules)
-      cf = ConditionalFormatting.new( :sqref => cells )
+      cf = ConditionalFormatting.new(sqref: cells)
       cf.add_rules rules
       conditional_formattings << cf
       conditional_formattings
@@ -453,7 +469,7 @@ module Axlsx
     # @param [Hash] options for the hyperlink
     # @see WorksheetHyperlink for a list of options
     # @return [WorksheetHyperlink]
-    def add_hyperlink(options={})
+    def add_hyperlink(options = {})
       hyperlinks.add(options)
     end
 
@@ -470,54 +486,54 @@ module Axlsx
     # @see Bar3DChart
     # @see Line3DChart
     # @see README for examples
-    def add_chart(chart_type, options={})
+    def add_chart(chart_type, options = {})
       chart = worksheet_drawing.add_chart(chart_type, options)
       yield chart if block_given?
       chart
     end
 
     # needs documentation
-    def add_table(ref, options={})
+    def add_table(ref, options = {})
       tables << Table.new(ref, self, options)
       yield tables.last if block_given?
       tables.last
     end
 
-    def add_pivot_table(ref, range, options={})
+    def add_pivot_table(ref, range, options = {})
       pivot_tables << PivotTable.new(ref, range, self, options)
       yield pivot_tables.last if block_given?
       pivot_tables.last
     end
 
     # Shortcut to worsksheet_comments#add_comment
-    def add_comment(options={})
+    def add_comment(options = {})
       worksheet_comments.add_comment(options)
     end
 
     # Adds a media item to the worksheets drawing
     # @option [Hash] options options passed to drawing.add_image
-    def add_image(options={})
+    def add_image(options = {})
       image = worksheet_drawing.add_image(options)
       yield image if block_given?
       image
     end
 
     # Adds a page break (row break) to the worksheet
-    # @param cell A Cell object or excel style string reference indicating where the break
+    # @param cell A Cell object or Excel style string reference indicating where the break
     # should be added to the sheet.
     # @example
     #   ws.add_page_break("A4")
     def add_page_break(cell)
       DataTypeValidator.validate :worksheet_page_break, [String, Cell], cell
       column_index, row_index = if cell.is_a?(String)
-          Axlsx.name_to_indices(cell)
-        else
-          cell.pos
-        end
+                                  Axlsx.name_to_indices(cell)
+                                else
+                                  cell.pos
+                                end
       if column_index > 0
-        col_breaks.add_break(:id => column_index)
+        col_breaks.add_break(id: column_index)
       end
-      row_breaks.add_break(:id => row_index)
+      row_breaks.add_break(id: row_index)
     end
 
     # This is a helper method that Lets you specify a fixed width for multiple columns in a worksheet in one go.
@@ -529,8 +545,9 @@ module Axlsx
     # @param [Integer|Float|nil] widths
     def column_widths(*widths)
       widths.each_with_index do |value, index|
-        next if value == nil
-        Axlsx::validate_unsigned_numeric(value) unless value == nil
+        next if value.nil?
+
+        Axlsx.validate_unsigned_numeric(value) unless value.nil?
         find_or_create_column_info(index).width = value
       end
     end
@@ -543,7 +560,7 @@ module Axlsx
     # @note You can also specify the style for specific columns in the call to add_row by using an array for the :styles option
     # @see Worksheet#add_row
     # @see README.md for an example
-    def col_style(index, style, options={})
+    def col_style(index, style, options = {})
       offset = options.delete(:row_offset) || 0
       cells = @rows[(offset..-1)].map { |row| row[index] }.flatten.compact
       cells.each { |cell| cell.style = style }
@@ -557,17 +574,17 @@ module Axlsx
     # @note You can also specify the style in the add_row call
     # @see Worksheet#add_row
     # @see README.md for an example
-    def row_style(index, style, options={})
+    def row_style(index, style, options = {})
       offset = options.delete(:col_offset) || 0
       cells = cols[(offset..-1)].map { |column| column[index] }.flatten.compact
       cells.each { |cell| cell.style = style }
     end
 
     # Set the style for cells in a specific column
-    # @param [String|Array] cell references
+    # @param [String|Array] cell_refs Cell references
     # @param [Hash] styles
     def add_style(cell_refs, *styles)
-      if !cell_refs.is_a?(Array)
+      unless cell_refs.is_a?(Array)
         cell_refs = [cell_refs]
       end
 
@@ -585,32 +602,43 @@ module Axlsx
     end
 
     # Set the style for cells in a specific column
-    # @param [String|Array] cell references
-    # @param [Hash|Array|Symbol] border options
-    def add_border(cell_refs, options = Axlsx::Border::EDGES)
-      if !cell_refs.is_a?(Array)
+    # @param [String|Array] cell_refs Cell references
+    # @param [Hash|Array|Symbol] options border options
+    def add_border(cell_refs, options = nil)
+      if options.is_a?(Hash)
+        border_edges = options[:edges]
+        border_style = options[:style]
+        border_color = options[:color]
+      else
+        border_edges = options
+      end
+
+      unless cell_refs.is_a?(Array)
         cell_refs = [cell_refs]
       end
 
       cell_refs.each do |cell_ref|
-        cells = self[cell_ref]
-        Axlsx::BorderCreator.new(self, cells, options).draw
+        item = self[cell_ref]
+
+        cells = item.is_a?(Array) ? item : [item]
+
+        Axlsx::BorderCreator.new(worksheet: self, cells: cells, edges: border_edges, style: border_style, color: border_color).draw
       end
     end
 
     # Returns a sheet node serialization for this sheet in the workbook.
-    def to_sheet_node_xml_string(str='')
+    def to_sheet_node_xml_string(str = +'')
       add_autofilter_defined_name_to_workbook
       str << '<sheet '
       serialized_attributes str
-      str << ('name="' << name << '" ')
-      str << ('r:id="' << rId << '"></sheet>')
+      str << 'name="' << name << '" '
+      str << 'r:id="' << rId << '"></sheet>'
     end
 
     # Serializes the worksheet object to an xml string
     # This intentionally does not use nokogiri for performance reasons
     # @return [String]
-    def to_xml_string str=''
+    def to_xml_string(str = +'')
       add_autofilter_defined_name_to_workbook
       auto_filter.apply if auto_filter.range
       str << '<?xml version="1.0" encoding="UTF-8"?>'
@@ -633,23 +661,23 @@ module Axlsx
       r
     end
 
-    # Returns the cell or cells defined using excel style A1:B3 references.
+    # Returns the cell or cells defined using Excel style A1:B3 references.
     # @param [String|Integer] cell_def the string defining the cell or range of cells, or the rownumber
     # @return [Cell, Array]
     def [](cell_def)
       return rows[cell_def] if cell_def.is_a?(Integer)
 
-      parts = cell_def.split(':').map{ |part| name_to_cell part }
+      parts = cell_def.split(':').map { |part| name_to_cell part }
 
       if parts.size == 1
         parts.first
       else
         if parts.size > 2
-          raise ArgumentError, (ERR_CELL_REFERENCE_INVALID % cell_def)
+          raise ArgumentError, format(ERR_CELL_REFERENCE_INVALID, cell_def)
         elsif parts.first.nil?
-          raise ArgumentError, (ERR_CELL_REFERENCE_MISSING_CELL % [cell_def.split(":").first, cell_def])
+          raise ArgumentError, format(ERR_CELL_REFERENCE_MISSING_CELL, cell_def.split(":").first, cell_def)
         elsif parts.last.nil?
-          raise ArgumentError, (ERR_CELL_REFERENCE_MISSING_CELL % [cell_def.split(":").last, cell_def])
+          raise ArgumentError, format(ERR_CELL_REFERENCE_MISSING_CELL, cell_def.split(":").last, cell_def)
         end
 
         range(*parts)
@@ -660,12 +688,12 @@ module Axlsx
     # @param [String] name The cell or cell range to return. "A1" will return the first cell of the first row.
     # @return [Cell]
     def name_to_cell(name)
-      col_index, row_index = *Axlsx::name_to_indices(name)
+      col_index, row_index = *Axlsx.name_to_indices(name)
 
       r = rows[row_index]
 
       if r
-        return r[col_index]
+        r[col_index]
       end
     end
 
@@ -683,7 +711,7 @@ module Axlsx
     # @note The XLSX format does not support worksheet-specific styles. Even when using this method
     #     you're still working with the single global {Axlsx::Styles} object in the workbook.
     def styles
-      @styles ||= self.workbook.styles
+      @styles ||= workbook.styles
     end
 
     # shortcut level to specify the outline level for a series of rows
@@ -713,7 +741,7 @@ module Axlsx
     end
 
     def outline(collection, range, level = 1, collapsed = true)
-       range.each do |index|
+      range.each do |index|
         unless (item = collection[index]).nil?
           item.outline_level = level
           item.hidden = collapsed
@@ -725,13 +753,15 @@ module Axlsx
     def validate_sheet_name(name)
       DataTypeValidator.validate :worksheet_name, String, name
       # ignore first character (BOM) after encoding to utf16 because Excel does so, too.
-      raise ArgumentError, (ERR_SHEET_NAME_EMPTY) if name.empty?
+      raise ArgumentError, ERR_SHEET_NAME_EMPTY if name.empty?
+
       character_length = name.encode("utf-16")[1..-1].encode("utf-16").bytesize / 2
-      raise ArgumentError, (ERR_SHEET_NAME_TOO_LONG % name) if character_length > WORKSHEET_MAX_NAME_LENGTH
-      raise ArgumentError, (ERR_SHEET_NAME_CHARACTER_FORBIDDEN % name) if WORKSHEET_NAME_FORBIDDEN_CHARS.any? { |char| name.include? char }
-      name = Axlsx::coder.encode(name)
-      sheet_names = @workbook.worksheets.reject { |s| s == self }.map { |s| s.name }
-      raise ArgumentError, (ERR_DUPLICATE_SHEET_NAME % name) if sheet_names.include?(name)
+      raise ArgumentError, format(ERR_SHEET_NAME_TOO_LONG, name) if character_length > WORKSHEET_MAX_NAME_LENGTH
+      raise ArgumentError, format(ERR_SHEET_NAME_CHARACTER_FORBIDDEN, name) if WORKSHEET_NAME_FORBIDDEN_CHARS.any? { |char| name.include? char }
+
+      name = Axlsx.coder.encode(name)
+      sheet_names = @workbook.worksheets.reject { |s| s == self }.map(&:name)
+      raise ArgumentError, format(ERR_DUPLICATE_SHEET_NAME, name) if sheet_names.include?(name)
     end
 
     def serializable_parts
@@ -783,7 +813,6 @@ module Axlsx
       @merged_cells ||= MergedCells.new self
     end
 
-
     # Helper method for parsingout the root node for worksheet
     # @return [String]
     def worksheet_node
@@ -821,9 +850,9 @@ module Axlsx
     end
 
     def add_autofilter_defined_name_to_workbook
-      return if !auto_filter.range
+      return unless auto_filter.range
+
       workbook.add_defined_name auto_filter.defined_name, name: '_xlnm._FilterDatabase', local_sheet_id: index, hidden: 1
     end
-
   end
 end

data/lib/axlsx/workbook/worksheet/worksheet_comments.rb

@@ -1,13 +1,14 @@
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # A wraper class for comments that defines its on worksheet
   # serailization
   class WorksheetComments
-
     # Creates a new WorksheetComments object
     # param [Worksheet] worksheet The worksheet comments in thes object belong to
     def initialize(worksheet)
       raise ArugumentError, 'You must provide a worksheet' unless worksheet.is_a?(Worksheet)
+
       @worksheet = worksheet
     end
 
@@ -22,21 +23,21 @@ module Axlsx
     # Adds a comment
     # @param [Hash] options
     # @see Comments#add_comment
-    def add_comment(options={})
+    def add_comment(options = {})
       comments.add_comment(options)
-    end 
+    end
 
     # The relationships defined by this objects comments collection
     # @return [Relationships]
     def relationships
       return [] unless has_comments?
+
       comments.relationships
     end
 
-
     # Helper method to tell us if there are comments in the comments collection
     # @return [Boolean]
-    def has_comments?
+    def has_comments? # rubocop:disable Naming/PredicateName
       !comments.empty?
     end
 
@@ -44,14 +45,15 @@ module Axlsx
     # @see Relationship#Id
     # @return [String]
     def drawing_rId
-      comments.relationships.find{ |r| r.Type == VML_DRAWING_R }.Id
+      comments.relationships.find { |r| r.Type == VML_DRAWING_R }.Id
     end
 
     # Seraalize the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       return unless has_comments?
+
       str << "<legacyDrawing r:id='#{drawing_rId}' />"
     end
   end

data/lib/axlsx/workbook/worksheet/worksheet_drawing.rb

@@ -1,21 +1,26 @@
-module Axlsx
+# frozen_string_literal: true
 
+module Axlsx
   # This is a utility class for serialing the drawing node in a
   # worksheet. Drawing objects have their own serialization that exports
   # a drawing document. This is only for the single node in the
   # worksheet
   class WorksheetDrawing
-
     # Creates a new WorksheetDrawing
     # @param [Worksheet] worksheet
     def initialize(worksheet)
       raise ArgumentError, 'you must provide a worksheet' unless worksheet.is_a?(Worksheet)
+
       @worksheet = worksheet
       @drawing = nil
     end
 
+    # The worksheet that owns the drawing
+    # @return [Worksheet]
     attr_reader :worksheet
 
+    # The drawing object
+    # @return [Drawing]
     attr_reader :drawing
 
     # adds a chart to the drawing object
@@ -37,7 +42,7 @@ module Axlsx
 
     # helper method to tell us if the drawing has something in it or not
     # @return [Boolean]
-    def has_drawing?
+    def has_drawing? # rubocop:disable Naming/PredicateName
       @drawing.is_a? Drawing
     end
 
@@ -45,13 +50,15 @@ module Axlsx
     # @return [Relationship]
     def relationship
       return unless has_drawing?
+
       Relationship.new(self, DRAWING_R, "../#{drawing.pn}")
     end
 
     # Serialize the drawing for the worksheet
     # @param [String] str
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       return unless has_drawing?
+
       str << "<drawing r:id='#{relationship.Id}'/>"
     end
   end