caxlsx 3.3.0 → 3.4.0

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

@@ -1,11 +1,9 @@
-# encoding: UTF-8
 module Axlsx
   # View options for a worksheet.
   #
   # @note The recommended way to manage the sheet view is via Worksheet#sheet_view
   # @see Worksheet#sheet_view
   class SheetView
-   
     include Axlsx::OptionsParser
     include Axlsx::Accessors
     include Axlsx::SerializedAttributes
@@ -30,8 +28,8 @@ module Axlsx
     # @option options [Integer] zoom_scale_normal Zoom Scale Normal View
     # @option options [Integer] zoom_scale_page_layout_view Zoom Scale Page Layout View
     # @option options [Integer] zoom_scale_sheet_layout_view Zoom Scale Page Break Preview
-    def initialize(options={})
-      #defaults
+    def initialize(options = {})
+      # defaults
       @color_id = @top_left_cell = @pane = nil
       @right_to_left = @show_formulas = @show_outline_symbols = @show_white_space = @tab_selected = @window_protection = false
       @default_grid_color = @show_grid_lines = @show_row_col_headers = @show_ruler = @show_zeros = true
@@ -42,16 +40,15 @@ module Axlsx
     end
 
     boolean_attr_accessor :default_grid_color, :right_to_left, :show_formulas, :show_grid_lines,
-      :show_row_col_headers, :show_ruler, :show_white_space, :show_zeros, :tab_selected, :window_protection, :show_outline_symbols
+                          :show_row_col_headers, :show_ruler, :show_white_space, :show_zeros, :tab_selected, :window_protection, :show_outline_symbols
 
     serializable_attributes :default_grid_color, :right_to_left, :show_formulas, :show_grid_lines,
-      :show_row_col_headers, :show_ruler, :show_white_space, :show_zeros, :tab_selected, :window_protection, :show_outline_symbols,
-      :zoom_scale_sheet_layout_view, :zoom_scale_page_layout_view, :zoom_scale_normal, :workbook_view_id,
-      :view, :top_left_cell, :color_id, :zoom_scale
-
+                            :show_row_col_headers, :show_ruler, :show_white_space, :show_zeros, :tab_selected, :window_protection, :show_outline_symbols,
+                            :zoom_scale_sheet_layout_view, :zoom_scale_page_layout_view, :zoom_scale_normal, :workbook_view_id,
+                            :view, :top_left_cell, :color_id, :zoom_scale
 
     # instance values that must be serialized as their own elements - e.g. not attributes.
-    CHILD_ELEMENTS = [ :pane, :selections ]
+    CHILD_ELEMENTS = [:pane, :selections]
 
     # The pane object for the sheet view
     # @return [Pane]
@@ -66,11 +63,11 @@ module Axlsx
     # @return [Hash]
     attr_reader :selections
 
-    #  
+    #
     # Color Id
     # Index to the color value for row/column
-    # text headings and gridlines. This is an 
-    # 'index color value' (ICV) rather than 
+    # text headings and gridlines. This is an
+    # 'index color value' (ICV) rather than
     # rgb value.
     # @see type
     # @return [Integer]
@@ -78,18 +75,17 @@ module Axlsx
     attr_reader :color_id
 
     # Top Left Visible Cell
-    # Location of the top left visible cell Location 
+    # Location of the top left visible cell Location
     # of the top left visible cell in the bottom right
     # pane (when in Left-to-Right mode).
     # @see type
     # @return [String]
     # default nil
     attr_reader :top_left_cell
-    
-    
+
     # View Type
     # Indicates the view type.
-    # Options are 
+    # Options are
     #  * normal: Normal view
     #  * page_break_preview: Page break preview
     #  * page_layout: Page Layout View
@@ -99,62 +95,59 @@ module Axlsx
     attr_reader :view
 
     # Workbook View Index
-    # Zero-based index of this workbook view, pointing 
+    # Zero-based index of this workbook view, pointing
     # to a workbookView element in the bookViews collection.
     # @see type
-    # @return [Integer] 
+    # @return [Integer]
     # default 0
     attr_reader :workbook_view_id
 
     # Zoom Scale
-    # Window zoom magnification for current view 
+    # Window zoom magnification for current view
     # representing percent values. This attribute
-    # is restricted to values ranging from 10 to 400. 
+    # is restricted to values ranging from 10 to 400.
     # Horizontal & Vertical scale together.
-    # Current view can be Normal, Page Layout, or 
+    # Current view can be Normal, Page Layout, or
     # Page Break Preview.
     # @see type
-    # @return [Integer] 
+    # @return [Integer]
     # default 100
     attr_reader :zoom_scale
 
-
     # Zoom Scale Normal View
-    # Zoom magnification to use when in normal view, 
-    # representing percent values. This attribute is 
-    # restricted to values ranging from 10 to 400. 
+    # Zoom magnification to use when in normal view,
+    # representing percent values. This attribute is
+    # restricted to values ranging from 10 to 400.
     # Horizontal & Vertical scale together.
-    # Applies for worksheets only; zero implies the 
+    # Applies for worksheets only; zero implies the
     # automatic setting.
     # @see type
-    # @return [Integer] 
+    # @return [Integer]
     # default 0
     attr_reader :zoom_scale_normal
 
-
     # Zoom Scale Page Layout View
-    # Zoom magnification to use when in page layout 
-    # view, representing percent values. This attribute 
-    # is restricted to values ranging from 10 to 400. 
+    # Zoom magnification to use when in page layout
+    # view, representing percent values. This attribute
+    # is restricted to values ranging from 10 to 400.
     # Horizontal & Vertical scale together.
-    # Applies for worksheets only; zero implies 
+    # Applies for worksheets only; zero implies
     # the automatic setting.
     # @see type
-    # @return [Integer] 
+    # @return [Integer]
     # default 0
     attr_reader :zoom_scale_page_layout_view
 
-
     # Zoom Scale Page Break Preview
-    # Zoom magnification to use when in page break 
-    # preview, representing percent values. This 
-    # attribute is restricted to values ranging 
+    # Zoom magnification to use when in page break
+    # preview, representing percent values. This
+    # attribute is restricted to values ranging
     # from 10 to 400. Horizontal & Vertical scale
     # together.
-    # Applies for worksheet only; zero implies 
+    # Applies for worksheet only; zero implies
     # the automatic setting.
     # @see type
-    # @return [Integer] 
+    # @return [Integer]
     # default 0
     attr_reader :zoom_scale_sheet_layout_view
 
@@ -172,7 +165,7 @@ module Axlsx
     # @see top_left_cell
     def top_left_cell=(v)
       cell = (v.class == Axlsx::Cell ? v.r_abs : v)
-      Axlsx::validate_string(cell)  
+      Axlsx::validate_string(cell)
       @top_left_cell = cell
     end
 

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

@@ -1,10 +1,8 @@
-# encoding: UTF-8
 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 +10,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 +42,7 @@ module Axlsx
     # The part name for this table
     # @return [String]
     def pn
-      "#{TABLE_PN % (index+1)}"
+      "#{TABLE_PN % (index + 1)}"
     end
 
     # The relationship id for this table.
@@ -64,7 +62,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
@@ -75,12 +73,12 @@ module Axlsx
     # @return [String]
     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 << ('<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 << '"/>')
+      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,4 @@
 module Axlsx
-
   # The table style info class manages style attributes for defined tables in
   # a worksheet
   class TableStyleInfo
@@ -15,7 +14,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,7 +26,7 @@ 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.

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

@@ -1,11 +1,10 @@
 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,7 +16,8 @@ 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
@@ -25,10 +25,10 @@ module Axlsx
     # @return [String]
     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,6 @@
-# encoding: UTF-8
-
 require_relative "border_creator"
 
 module Axlsx
-
   # The Worksheet class represents a worksheet in the workbook.
   class Worksheet
     include Axlsx::OptionsParser
@@ -16,12 +13,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,7 +43,21 @@ module Axlsx
     # The name of the worksheet
     # @return [String]
     def name
-      @name ||= "Sheet" + (index+1).to_s
+      @name ||= "Sheet" + (index + 1).to_s
+    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
@@ -102,13 +116,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
@@ -172,10 +186,10 @@ module Axlsx
     # @see #page_setup
     def fit_to_page?
       return false unless Axlsx.instance_values_for(self).keys.include?('page_setup')
+
       page_setup.fit_to_page?
     end
 
-
     # Column info for the sheet
     # @return [SimpleTypedList]
     def column_info
@@ -311,7 +325,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 +343,13 @@ module Axlsx
     # The part name of this worksheet
     # @return [String]
     def pn
-      "#{WORKSHEET_PN % (index+1)}"
+      "#{WORKSHEET_PN % (index + 1)}"
     end
 
     # The relationship part name of this worksheet
     # @return [String]
     def rels_pn
-      "#{WORKSHEET_RELS_PN % (index+1)}"
+      "#{WORKSHEET_RELS_PN % (index + 1)}"
     end
 
     # The relationship id of this worksheet.
@@ -412,7 +426,8 @@ 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 = {})
+      options[:escape_formulas] = escape_formulas if options[:escape_formulas].nil?
       row = Row.new(self, values, options)
       update_column_info row, options.delete(:widths)
       yield row if block_given?
@@ -432,7 +447,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 +468,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,33 +485,33 @@ 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
@@ -510,10 +525,10 @@ module Axlsx
     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)
       end
@@ -530,6 +545,7 @@ module Axlsx
     def column_widths(*widths)
       widths.each_with_index do |value, index|
         next if value == nil
+
         Axlsx::validate_unsigned_numeric(value) unless value == nil
         find_or_create_column_info(index).width = value
       end
@@ -543,7 +559,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,7 +573,7 @@ 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 }
@@ -587,19 +603,30 @@ module Axlsx
     # 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)
+    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
+
       if !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
@@ -610,7 +637,7 @@ module Axlsx
     # 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"?>'
@@ -639,7 +666,7 @@ module Axlsx
     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
@@ -713,7 +740,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
@@ -726,9 +753,11 @@ module Axlsx
       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?
+
       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)
@@ -783,7 +812,6 @@ module Axlsx
       @merged_cells ||= MergedCells.new self
     end
 
-
     # Helper method for parsingout the root node for worksheet
     # @return [String]
     def worksheet_node
@@ -822,8 +850,8 @@ module Axlsx
 
     def add_autofilter_defined_name_to_workbook
       return if !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,12 @@
 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,18 +21,18 @@ 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?
@@ -44,7 +43,7 @@ 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
@@ -52,6 +51,7 @@ module Axlsx
     # @return [String]
     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,15 +1,14 @@
 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
@@ -45,6 +44,7 @@ module Axlsx
     # @return [Relationship]
     def relationship
       return unless has_drawing?
+
       Relationship.new(self, DRAWING_R, "../#{drawing.pn}")
     end
 
@@ -52,6 +52,7 @@ module Axlsx
     # @param [String] str
     def to_xml_string(str = '')
       return unless has_drawing?
+
       str << "<drawing r:id='#{relationship.Id}'/>"
     end
   end