caxlsx 3.4.0 → 4.0.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A simple list of merged cells
   class MergedCells < SimpleTypedList
@@ -10,23 +12,21 @@ module Axlsx
     end
 
     # adds cells to the merged cells collection
-    # @param [Array||String] cells The cells to add to the merged cells
+    # @param [Array|String] cells The cells to add to the merged cells
     # collection. This can be an array of actual cells or a string style
     # range like 'A1:C1'
     def add(cells)
       self << if cells.is_a?(String)
                 cells
               elsif cells.is_a?(Array)
-                Axlsx::cell_range(cells, false)
-              elsif cells.is_a?(Row)
-                Axlsx::cell_range(cells, false)
+                Axlsx.cell_range(cells, false)
               end
     end
 
     # serialize the object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       return if empty?
 
       str << "<mergeCells count='#{size}'>"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # The OutlinePr class manages serialization of a worksheet's outlinePr element, which provides various
   # options to control outlining.
@@ -25,8 +27,10 @@ module Axlsx
     # Serialize the object
     # @param [String] str serialized output will be appended to this object if provided.
     # @return [String]
-    def to_xml_string(str = '')
-      str << "<outlinePr #{serialized_attributes} />"
+    def to_xml_string(str = +'')
+      str << '<outlinePr '
+      serialized_attributes(str)
+      str << '/>'
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # PageMargins specify the margins when printing a worksheet.
   #
@@ -27,7 +29,10 @@ module Axlsx
       parse_options options
     end
 
-    serializable_attributes :left, :right, :bottom, :top, :header, :footer
+    # Possible margins to set
+    MARGIN_KEYS = [:left, :right, :top, :bottom, :header, :footer].freeze
+
+    serializable_attributes(*MARGIN_KEYS)
 
     # Default left and right margin (in inches)
     DEFAULT_LEFT_RIGHT = 0.75
@@ -63,34 +68,34 @@ module Axlsx
     attr_reader :footer
 
     # Set some or all margins at once.
-    # @param [Hash] margins the margins to set (possible keys are :left, :right, :top, :bottom, :header and :footer).
+    # @param [Hash] margins the margins to set. See {MARGIN_KEYS} for a list of possible keys.
     def set(margins)
       margins.select do |k, v|
-        next unless [:left, :right, :top, :bottom, :header, :footer].include? k
+        next unless MARGIN_KEYS.include? k
 
         send("#{k}=", v)
       end
     end
 
     # @see left
-    def left=(v); Axlsx::validate_unsigned_numeric(v); @left = v end
+    def left=(v); Axlsx.validate_unsigned_numeric(v); @left = v end
     # @see right
-    def right=(v); Axlsx::validate_unsigned_numeric(v); @right = v end
+    def right=(v); Axlsx.validate_unsigned_numeric(v); @right = v end
     # @see top
-    def top=(v); Axlsx::validate_unsigned_numeric(v); @top = v end
+    def top=(v); Axlsx.validate_unsigned_numeric(v); @top = v end
     # @see bottom
-    def bottom=(v); Axlsx::validate_unsigned_numeric(v); @bottom = v end
+    def bottom=(v); Axlsx.validate_unsigned_numeric(v); @bottom = v end
     # @see header
-    def header=(v); Axlsx::validate_unsigned_numeric(v); @header = v end
+    def header=(v); Axlsx.validate_unsigned_numeric(v); @header = v end
     # @see footer
-    def footer=(v); Axlsx::validate_unsigned_numeric(v); @footer = v end
+    def footer=(v); Axlsx.validate_unsigned_numeric(v); @footer = v end
 
     # Serializes the page margins element
     # @param [String] str
     # @return [String]
     # @note For compatibility, this is a noop unless custom margins have been specified.
     # @see #custom_margins_specified?
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag('pageMargins', str)
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # Page setup properties of the worksheet
   # This class name is not a typo, its spec.
@@ -35,8 +37,10 @@ module Axlsx
     end
 
     # serialize to xml
-    def to_xml_string(str = '')
-      str << ('<pageSetUpPr ' << serialized_attributes << '/>')
+    def to_xml_string(str = +'')
+      str << '<pageSetUpPr '
+      serialized_attributes(str)
+      str << '/>'
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # Page setup settings for printing a worksheet. All settings are optional.
   #
@@ -196,17 +198,17 @@ module Axlsx
     end
 
     # @see fit_to_height
-    def fit_to_height=(v); Axlsx::validate_unsigned_int(v); @fit_to_height = v; end
+    def fit_to_height=(v); Axlsx.validate_unsigned_int(v); @fit_to_height = v; end
     # @see fit_to_width
-    def fit_to_width=(v); Axlsx::validate_unsigned_int(v); @fit_to_width = v; end
+    def fit_to_width=(v); Axlsx.validate_unsigned_int(v); @fit_to_width = v; end
     # @see orientation
-    def orientation=(v); Axlsx::validate_page_orientation(v); @orientation = v; end
+    def orientation=(v); Axlsx.validate_page_orientation(v); @orientation = v; end
     # @see paper_height
-    def paper_height=(v); Axlsx::validate_number_with_unit(v); @paper_height = v; end
+    def paper_height=(v); Axlsx.validate_number_with_unit(v); @paper_height = v; end
     # @see paper_width
-    def paper_width=(v); Axlsx::validate_number_with_unit(v); @paper_width = v; end
+    def paper_width=(v); Axlsx.validate_number_with_unit(v); @paper_width = v; end
     # @see scale
-    def scale=(v); Axlsx::validate_scale_10_400(v); @scale = v; end
+    def scale=(v); Axlsx.validate_scale_10_400(v); @scale = v; end
 
     # convenience method to achieve sanity when setting fit_to_width and fit_to_height
     # as they both default to 1 if only their counterpart is specified.
@@ -223,14 +225,14 @@ module Axlsx
     # We treat any page set up that has a value set for fit_to_width or fit_to_height value as fit_to_page.
     # @return [Boolean]
     def fit_to_page?
-      # is there some better what to express this?
-      (fit_to_width != nil || fit_to_height != nil)
+      # is there some better way to express this?
+      (!fit_to_width.nil? || !fit_to_height.nil?)
     end
 
     # Serializes the page settings element.
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag('pageSetup', str)
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # Pane options for a worksheet.
   #
@@ -94,33 +96,33 @@ module Axlsx
 
     # @see active_pane
     def active_pane=(v)
-      Axlsx::validate_pane_type(v)
-      @active_pane = Axlsx::camel(v.to_s, false)
+      Axlsx.validate_pane_type(v)
+      @active_pane = Axlsx.camel(v.to_s, false)
     end
 
     # @see state
     def state=(v)
-      Axlsx::validate_split_state_type(v)
-      @state = Axlsx::camel(v.to_s, false)
+      Axlsx.validate_split_state_type(v)
+      @state = Axlsx.camel(v.to_s, false)
     end
 
     # @see top_left_cell
     def top_left_cell=(v)
-      cell = (v.class == Axlsx::Cell ? v.r_abs : v)
-      Axlsx::validate_string(cell)
+      cell = (v.instance_of?(Axlsx::Cell) ? v.r_abs : v)
+      Axlsx.validate_string(cell)
       @top_left_cell = cell
     end
 
     # @see x_split
-    def x_split=(v); Axlsx::validate_unsigned_int(v); @x_split = v end
+    def x_split=(v); Axlsx.validate_unsigned_int(v); @x_split = v end
 
     # @see y_split
-    def y_split=(v); Axlsx::validate_unsigned_int(v); @y_split = v end
+    def y_split=(v); Axlsx.validate_unsigned_int(v); @y_split = v end
 
     # Serializes the data validation
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       finalize
       serialized_tag 'pane', str
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # Table
   # @note Worksheet#add_pivot_table is the recommended way to create tables for your worksheets.
@@ -122,7 +124,7 @@ module Axlsx
       @data = []
       v.each do |data_field|
         if data_field.is_a? String
-          data_field = { :ref => data_field }
+          data_field = { ref: data_field }
         end
         data_field.each do |key, value|
           if key == :num_fmt
@@ -133,7 +135,6 @@ module Axlsx
         end
         @data << data_field
       end
-      @data
     end
 
     # The pages
@@ -158,13 +159,13 @@ module Axlsx
     # The part name for this table
     # @return [String]
     def pn
-      "#{PIVOT_TABLE_PN % (index + 1)}"
+      format(PIVOT_TABLE_PN, index + 1)
     end
 
     # The relationship part name of this pivot table
     # @return [String]
     def rels_pn
-      "#{PIVOT_TABLE_RELS_PN % (index + 1)}"
+      format(PIVOT_TABLE_RELS_PN, index + 1)
     end
 
     # The cache_definition for this pivot table
@@ -184,13 +185,13 @@ 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 << ('<pivotTableDefinition xmlns="' << XML_NS << '" name="' << name << '" cacheId="' << cache_definition.cache_id.to_s << '"' << (data.size <= 1 ? ' dataOnRows="1"' : '') << ' applyNumberFormats="0" applyBorderFormats="0" applyFontFormats="0" applyPatternFormats="0" applyAlignmentFormats="0" applyWidthHeightFormats="1" dataCaption="Data" showMultipleLabel="0" showMemberPropertyTips="0" useAutoFormatting="1" indent="0" compact="0" compactData="0" gridDropZones="1" multipleFieldFilters="0">')
+      str << '<pivotTableDefinition xmlns="' << XML_NS << '" name="' << name << '" cacheId="' << cache_definition.cache_id.to_s << '"' << (data.size <= 1 ? ' dataOnRows="1"' : '') << ' applyNumberFormats="0" applyBorderFormats="0" applyFontFormats="0" applyPatternFormats="0" applyAlignmentFormats="0" applyWidthHeightFormats="1" dataCaption="Data" showMultipleLabel="0" showMemberPropertyTips="0" useAutoFormatting="1" indent="0" compact="0" compactData="0" gridDropZones="1" multipleFieldFilters="0">'
 
-      str << ('<location firstDataCol="1" firstDataRow="1" firstHeaderRow="1" ref="' << ref << '"/>')
-      str << ('<pivotFields count="' << header_cells_count.to_s << '">')
+      str << '<location firstDataCol="1" firstDataRow="1" firstHeaderRow="1" ref="' << ref << '"/>'
+      str << '<pivotFields count="' << header_cells_count.to_s << '">'
 
       header_cell_values.each do |cell_value|
         subtotal = !no_subtotals_on_headers.include?(cell_value)
@@ -203,13 +204,13 @@ module Axlsx
         str << '<rowFields count="1"><field x="-2"/></rowFields>'
         str << '<rowItems count="2"><i><x/></i> <i i="1"><x v="1"/></i></rowItems>'
       else
-        str << ('<rowFields count="' << rows.size.to_s << '">')
+        str << '<rowFields count="' << rows.size.to_s << '">'
         rows.each do |row_value|
-          str << ('<field x="' << header_index_of(row_value).to_s << '"/>')
+          str << '<field x="' << header_index_of(row_value).to_s << '"/>'
         end
         str << '</rowFields>'
-        str << ('<rowItems count="' << rows.size.to_s << '">')
-        rows.size.times do |i|
+        str << '<rowItems count="' << rows.size.to_s << '">'
+        rows.size.times do
           str << '<i/>'
         end
         str << '</rowItems>'
@@ -219,7 +220,7 @@ module Axlsx
           str << '<colFields count="1"><field x="-2"/></colFields>'
           str << "<colItems count=\"#{data.size}\">"
           str << '<i><x/></i>'
-          data[1..-1].each_with_index do |datum_value, i|
+          (data.size - 1).times do |i|
             str << "<i i=\"#{i + 1}\"><x v=\"#{i + 1}\"/></i>"
           end
           str << '</colItems>'
@@ -227,16 +228,16 @@ module Axlsx
           str << '<colItems count="1"><i/></colItems>'
         end
       else
-        str << ('<colFields count="' << columns.size.to_s << '">')
+        str << '<colFields count="' << columns.size.to_s << '">'
         columns.each do |column_value|
-          str << ('<field x="' << header_index_of(column_value).to_s << '"/>')
+          str << '<field x="' << header_index_of(column_value).to_s << '"/>'
         end
         str << '</colFields>'
       end
       unless pages.empty?
-        str << ('<pageFields count="' << pages.size.to_s << '">')
+        str << '<pageFields count="' << pages.size.to_s << '">'
         pages.each do |page_value|
-          str << ('<pageField fld="' << header_index_of(page_value).to_s << '"/>')
+          str << '<pageField fld="' << header_index_of(page_value).to_s << '"/>'
         end
         str << '</pageFields>'
       end
@@ -244,7 +245,7 @@ module Axlsx
         str << "<dataFields count=\"#{data.size}\">"
         data.each do |datum_value|
           # The correct name prefix in ["Sum","Average", etc...]
-          str << "<dataField name='#{(datum_value[:subtotal] || '')} of #{datum_value[:ref]}' fld='#{header_index_of(datum_value[:ref])}' baseField='0' baseItem='0'"
+          str << "<dataField name='#{datum_value[:subtotal] || ''} of #{datum_value[:ref]}' fld='#{header_index_of(datum_value[:ref])}' baseField='0' baseItem='0'"
           str << " numFmtId='#{datum_value[:num_fmt]}'" if datum_value[:num_fmt]
           str << " subtotal='#{datum_value[:subtotal]}' " if datum_value[:subtotal]
           str << "/>"
@@ -265,7 +266,7 @@ module Axlsx
     # References for header cells
     # @return [Array]
     def header_cell_refs
-      Axlsx::range_to_a(header_range).first
+      Axlsx.range_to_a(header_range).first
     end
 
     # The header cells for the pivot table

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # Table
   # @note Worksheet#add_pivot_table is the recommended way to create tables for your worksheets.
@@ -24,7 +26,7 @@ module Axlsx
     # The part name for this table
     # @return [String]
     def pn
-      "#{PIVOT_TABLE_CACHE_DEFINITION_PN % (index + 1)}"
+      format(PIVOT_TABLE_CACHE_DEFINITION_PN, index + 1)
     end
 
     # The identifier for this cache
@@ -43,15 +45,15 @@ 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 << ('<pivotCacheDefinition xmlns="' << XML_NS << '" xmlns:r="' << XML_NS_R << '" invalid="1" refreshOnLoad="1" recordCount="0">')
+      str << '<pivotCacheDefinition xmlns="' << XML_NS << '" xmlns:r="' << XML_NS_R << '" invalid="1" refreshOnLoad="1" recordCount="0">'
       str << '<cacheSource type="worksheet">'
-      str << ('<worksheetSource ref="' << pivot_table.range << '" sheet="' << pivot_table.data_sheet.name << '"/>')
+      str << '<worksheetSource ref="' << pivot_table.range << '" sheet="' << pivot_table.data_sheet.name << '"/>'
       str << '</cacheSource>'
-      str << ('<cacheFields count="' << pivot_table.header_cells_count.to_s << '">')
+      str << '<cacheFields count="' << pivot_table.header_cells_count.to_s << '">'
       pivot_table.header_cells.each do |cell|
-        str << ('<cacheField name="' << cell.clean_value << '" numFmtId="0">')
+        str << '<cacheField name="' << cell.clean_value << '" numFmtId="0">'
         str <<     '<sharedItems count="0">'
         str <<     '</sharedItems>'
         str << '</cacheField>'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A simple, self serializing class for storing pivot tables
   class PivotTables < SimpleTypedList

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # Options for printing a worksheet. All options are boolean and false by default.
   #
@@ -31,7 +33,7 @@ module Axlsx
     # @note As all attributes default to "false" according to the xml schema definition, the generated xml includes only those attributes that are set to true.
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag 'printOptions', str
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # The Protected Range class represents a set of cells in the worksheet
   # @note the recommended way to manage protected ranges with via Worksheet#protect_range
@@ -39,7 +41,7 @@ module Axlsx
     # @param [String] str if this string object is provided we append
     # our output to that object. Use this - it helps limit the number of
     # objects created during serialization
-    def to_xml_string(str = "")
+    def to_xml_string(str = +'')
       serialized_tag 'protectedRange', str
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A self serializing collection of ranges that should be protected in
   # the worksheet
@@ -17,16 +19,16 @@ module Axlsx
       sqref = if cells.is_a?(String)
                 cells
               elsif cells.is_a?(SimpleTypedList) || cells.is_a?(Array)
-                Axlsx::cell_range(cells, false)
+                Axlsx.cell_range(cells, false)
               end
-      self << ProtectedRange.new(:sqref => sqref, :name => "Range#{size}")
+      self << ProtectedRange.new(sqref: sqref, name: "Range#{size}")
       last
     end
 
     # Serializes the protected ranges
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       return if empty?
 
       str << '<protectedRanges>'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A simple, self serializing class for storing TextRuns
   class RichText < SimpleTypedList
@@ -45,7 +47,7 @@ module Axlsx
     # renders the RichTextRuns in this collection
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       each { |run| run.to_xml_string(str) }
       str
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # The RichTextRun class creates and self serializing text run.
   class RichTextRun
@@ -128,7 +130,7 @@ module Axlsx
 
     # @see u
     def u=(v)
-      v = :single if (v == true || v == 1 || v == :true || v == 'true')
+      v = :single if v == true || v == 1 || v == :true || v == 'true'
       set_run_style :validate_cell_u, :u, v
     end
 
@@ -138,7 +140,7 @@ module Axlsx
 
     # @param [String] v The 8 character representation for an rgb color #FFFFFFFF"
     def color=(v)
-      @color = v.is_a?(Color) ? v : Color.new(:rgb => v)
+      @color = v.is_a?(Color) ? v : Color.new(rgb: v)
     end
 
     # The inline sz property for the cell
@@ -197,30 +199,30 @@ module Axlsx
       return unless INLINE_STYLES.include?(attr.to_sym)
 
       Axlsx.send(validator, value) unless validator.nil?
-      self.instance_variable_set :"@#{attr.to_s}", value
+      instance_variable_set :"@#{attr}", value
     end
 
     # Serializes the RichTextRun
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       valid = RichTextRun::INLINE_STYLES
-      data = Hash[Axlsx.instance_values_for(self).map { |k, v| [k.to_sym, v] }]
-      data = data.select { |key, value| valid.include?(key) && !value.nil? }
+      data = Axlsx.instance_values_for(self).transform_keys(&:to_sym)
+      data = data.select { |key, value| !value.nil? && valid.include?(key) }
 
       str << '<r><rPr>'
-      data.keys.each do |key|
+      data.each do |key, val|
         case key
         when :font_name
-          str << ('<rFont val="' << font_name << '"/>')
+          str << '<rFont val="' << font_name << '"/>'
         when :color
-          str << data[key].to_xml_string
+          str << val.to_xml_string
         else
-          str << ('<' << key.to_s << ' val="' << xml_value(data[key]) << '"/>')
+          str << '<' << key.to_s << ' val="' << xml_value(val) << '"/>'
         end
       end
-      clean_value = Axlsx::trust_input ? @value.to_s : ::CGI.escapeHTML(Axlsx::sanitize(@value.to_s))
-      str << ('</rPr><t>' << clean_value << '</t></r>')
+      clean_value = Axlsx.trust_input ? @value.to_s : ::CGI.escapeHTML(Axlsx.sanitize(@value.to_s))
+      str << '</rPr><t>' << clean_value << '</t></r>'
     end
 
     private
@@ -240,7 +242,7 @@ module Axlsx
       return sz if sz
 
       font = styles.fonts[styles.cellXfs[style].fontId] || styles.fonts[0]
-      (font.b || (defined?(@b) && @b)) ? (font.sz * 1.5) : font.sz
+      font.b || (defined?(@b) && @b) ? (font.sz * 1.5) : font.sz
     end
 
     def style
@@ -253,7 +255,7 @@ module Axlsx
 
     # Converts the value to the correct XML representation (fixes issues with
     # Numbers)
-    def xml_value value
+    def xml_value(value)
       if value == true
         1
       elsif value == false

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A Row is a single row in a worksheet.
   # @note The recommended way to manage rows and cells is to use Worksheet#add_row
@@ -86,12 +88,9 @@ module Axlsx
     # @param [Integer] r_index The row index, 0 based.
     # @param [String] str The string this rows xml will be appended to.
     # @return [String]
-    def to_xml_string(r_index, str = '')
-      serialized_tag('row', str, :r => r_index + 1) do
-        tmp = '' # time / memory tradeoff, lots of calls to rubyzip costs more
-                 # time..
-        each_with_index { |cell, c_index| cell.to_xml_string(r_index, c_index, tmp) }
-        str << tmp
+    def to_xml_string(r_index, str = +'')
+      serialized_tag('row', str, r: Axlsx.row_ref(r_index)) do
+        each_with_index { |cell, c_index| cell.to_xml_string(r_index, c_index, str) }
       end
     end
 
@@ -130,7 +129,7 @@ module Axlsx
     # @see height
     def height=(v)
       unless v.nil?
-        Axlsx::validate_unsigned_numeric(v)
+        Axlsx.validate_unsigned_numeric(v)
         @custom_height = true
         @ht = v
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A collection of break objects that define row breaks (page breaks) for printing and preview
 
@@ -11,8 +13,8 @@ module Axlsx
     # max and man values are fixed.
     # @see Break
     def add_break(options)
-      # force feed the excel default
-      self << Break.new(options.merge(:max => 16383, :man => true))
+      # force feed the Excel default
+      self << Break.new(options.merge(max: 16383, man: true))
       last
     end
 
@@ -21,10 +23,10 @@ module Axlsx
     # <brk id="7" max="16383" man="1"/>
     # <brk id="13" max="16383" man="1"/>
     # </rowBreaks>
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       return if empty?
 
-      str << ('<rowBreaks count="' << self.size.to_s << '" manualBreakCount="' << self.size.to_s << '">')
+      str << '<rowBreaks count="' << size.to_s << '" manualBreakCount="' << size.to_s << '">'
       each { |brk| brk.to_xml_string(str) }
       str << '</rowBreaks>'
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # Selection options for worksheet panes.
   #
@@ -72,27 +74,27 @@ module Axlsx
 
     # @see active_cell
     def active_cell=(v)
-      cell = (v.class == Axlsx::Cell ? v.r_abs : v)
-      Axlsx::validate_string(cell)
+      cell = (v.instance_of?(Axlsx::Cell) ? v.r_abs : v)
+      Axlsx.validate_string(cell)
       @active_cell = cell
     end
 
     # @see active_cell_id
-    def active_cell_id=(v); Axlsx::validate_unsigned_int(v); @active_cell_id = v end
+    def active_cell_id=(v); Axlsx.validate_unsigned_int(v); @active_cell_id = v end
 
     # @see pane
     def pane=(v)
-      Axlsx::validate_pane_type(v)
-      @pane = Axlsx::camel(v, false)
+      Axlsx.validate_pane_type(v)
+      @pane = Axlsx.camel(v, false)
     end
 
     # @see sqref
-    def sqref=(v); Axlsx::validate_string(v); @sqref = v end
+    def sqref=(v); Axlsx.validate_string(v); @sqref = v end
 
     # Serializes the data validation
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag 'selection', str
     end
   end