caxlsx 3.4.1 → 4.0.0

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Axlsx
+  # This class represents a individual sort condition belonging to the sort state of an auto filter
+  class SortCondition
+    # Creates a new SortCondition object
+    # @param [Integer] column_index Zero-based index indicating the AutoFilter column to which the sorting should be applied to
+    # @param [Symbol] order The order the column should be sorted on, can only be :asc or :desc
+    # @param [Array] custom_list An array containg a custom sorting list in order.
+    def initialize(column_index:, order:, custom_list:)
+      Axlsx.validate_int column_index
+      @column_index = column_index
+
+      RestrictionValidator.validate 'SortCondition.order', [:asc, :desc], order
+      @order = order
+
+      DataTypeValidator.validate :sort_condition_custom_list, Array, custom_list
+      @custom_list = custom_list
+    end
+
+    attr_reader :column_index, :order, :custom_list
+
+    # converts the ref String from the sort_state to a string representing the ref of a single column
+    # for the xml string to be returned.
+    def ref_to_single_column(ref, column_index)
+      first_cell, last_cell = ref.split(':')
+
+      start_point = Axlsx.name_to_indices(first_cell)
+
+      first_row = first_cell[/\d+/]
+      last_row = last_cell[/\d+/]
+
+      first_column = Axlsx.col_ref(column_index + start_point.first)
+      last_column = first_column
+
+      "#{first_column}#{first_row}:#{last_column}#{last_row}"
+    end
+
+    # serialize the object
+    # @return [String]
+    def to_xml_string(str, ref)
+      ref = ref_to_single_column(ref, column_index)
+
+      str << "<sortCondition "
+      str << "descending='1' " if order == :desc
+      str << "ref='#{ref}' "
+      str << "customList='#{custom_list.join(',')}' " unless custom_list.empty?
+      str << "/>"
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'axlsx/workbook/worksheet/auto_filter/sort_condition'
+
+module Axlsx
+  # This class performs sorting on a range in a worksheet
+  class SortState
+    # creates a new SortState object
+    # @param [AutoFilter] auto_filter the auto_filter that this sort_state belongs to
+    def initialize(auto_filter)
+      @auto_filter = auto_filter
+    end
+
+    # A collection of SortConditions for this sort_state
+    # @return [SimpleTypedList]
+    def sort_conditions
+      @sort_conditions ||= SimpleTypedList.new SortCondition
+    end
+
+    # Adds a SortCondition to the sort_state. This is the recommended way to add conditions to it.
+    # It requires a column_index for the sorting, descending and the custom order are optional.
+    # @param [Integer] column_index Zero-based index indicating the AutoFilter column to which the sorting should be applied to
+    # @param [Symbol] order The order the column should be sorted on, can only be :asc or :desc
+    # @param [Array] custom_list An array containg a custom sorting list in order.
+    # @return [SortCondition]
+    def add_sort_condition(column_index:, order: :asc, custom_list: [])
+      sort_conditions << SortCondition.new(column_index: column_index, order: order, custom_list: custom_list)
+      sort_conditions.last
+    end
+
+    # method to increment the String representing the first cell of the range of the autofilter by 1 row for the sortCondition
+    # xml string
+    def increment_cell_value(str)
+      letter = str[/[A-Za-z]+/]
+      number = str[/\d+/].to_i
+
+      incremented_number = number + 1
+
+      "#{letter}#{incremented_number}"
+    end
+
+    # serialize the object
+    # @return [String]
+    def to_xml_string(str = +'')
+      return if sort_conditions.empty?
+
+      ref = @auto_filter.range
+      first_cell, last_cell = ref.split(':')
+      ref = "#{increment_cell_value(first_cell)}:#{last_cell}"
+
+      str << "<sortState xmlns:xlrd2='http://schemas.microsoft.com/office/spreadsheetml/2017/richdata2' ref='#{ref}'>"
+      sort_conditions.each { |sort_condition| sort_condition.to_xml_string(str, ref) }
+      str << "</sortState>"
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   class BorderCreator
     def initialize(worksheet:, cells:, edges: nil, style: nil, color: nil)
@@ -11,12 +13,12 @@ module Axlsx
       if @edges == :all
         @edges = Axlsx::Border::EDGES
       elsif !@edges.is_a?(Array)
-        raise ArgumentError.new("Invalid edges provided, #{@edges}")
+        raise ArgumentError, "Invalid edges provided, #{@edges}"
       else
         @edges = @edges.map { |x| x&.to_sym }.uniq
 
-        if !(@edges - Axlsx::Border::EDGES).empty?
-          raise ArgumentError.new("Invalid edges provided, #{edges}")
+        unless (@edges - Axlsx::Border::EDGES).empty?
+          raise ArgumentError, "Invalid edges provided, #{edges}"
         end
       end
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # The Break class stores the details for row and column page breaks.
   # @see RowBreaks, ColBreaks
@@ -25,7 +27,7 @@ module Axlsx
     serializable_attributes :id, :min, :max, :man, :pt
 
     # serializes the break to xml
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag('brk', str)
     end
   end

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

@@ -1,4 +1,5 @@
-require 'cgi'
+# frozen_string_literal: true
+
 module Axlsx
   # A cell in a worksheet.
   # Cell stores inforamation requried to serialize a single worksheet cell to xml. You must provde the Row that the cell belongs to and the cells value. The data type will automatically be determed if you do not specify the :type option. The default style will be applied if you do not supply the :style option. Changing the cell's type will recast the value to the type specified. Altering the cell's value via the property accessor will also automatically cast the provided value to the cell's type.
@@ -40,12 +41,13 @@ module Axlsx
       self.type = type unless type == :string
 
       val = options.delete(:style)
-      self.style = val unless val.nil? || val == 0
+      self.style = val unless val.nil? || val.zero?
       val = options.delete(:formula_value)
       self.formula_value = val unless val.nil?
+      val = options.delete(:escape_formulas)
+      self.escape_formulas = val unless val.nil?
 
-      parse_options(options)
-      self.escape_formulas = row.worksheet.escape_formulas if escape_formulas.nil?
+      parse_options(options) unless options.empty?
 
       self.value = value
       value.cell = self if contains_rich_text?
@@ -70,15 +72,8 @@ module Axlsx
     CELL_TYPES = [:date, :time, :float, :integer, :richtext,
                   :string, :boolean, :iso_8601, :text].freeze
 
-    # Leading characters that indicate a formula.
-    # See: https://owasp.org/www-community/attacks/CSV_Injection
-    FORMULA_PREFIXES = ['='.freeze].freeze
-
-    # Leading characters that indicate an array formula.
-    ARRAY_FORMULA_PREFIXES = ['{='.freeze].freeze
-
-    # Trailing character that indicates an array formula.
-    ARRAY_FORMULA_SUFFIX = '}'.freeze
+    # A regular expression to match the alpha(column)numeric(row) reference of a cell
+    CELL_REFERENCE_REGEX = /([A-Z]+)([0-9]+)/.freeze
 
     # The index of the cellXfs item to be applied to this cell.
     # @return [Integer]
@@ -87,10 +82,15 @@ module Axlsx
       defined?(@style) ? @style : 0
     end
 
+    # Internal
+    def style_str
+      defined?(@style) ? @style.to_s : '0'
+    end
+
     attr_accessor :raw_style
 
     # The index of the cellXfs item to be applied to this cell.
-    # @param [Hash] styles
+    # @param [Hash] style
     # @see Axlsx::Styles
     def add_style(style)
       self.raw_style ||= {}
@@ -122,7 +122,7 @@ module Axlsx
     # automatically determed.
     # @see Cell#cell_type_from_value
     # @return [Symbol] The type of data this cell's value is cast to.
-    # @raise [ArgumentExeption] Cell.type must be one of [:date, time, :float, :integer, :string, :boolean]
+    # @raise [ArgumentError] Cell.type must be one of [:date, time, :float, :integer, :string, :boolean]
     # @note
     #  If the value provided cannot be cast into the type specified, type is changed to :string and the following logic is applied.
     #   :string to :integer or :float, type conversions always return 0 or 0.0
@@ -143,7 +143,9 @@ module Axlsx
     # 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
+    def escape_formulas
+      defined?(@escape_formulas) ? @escape_formulas : row.worksheet.escape_formulas
+    end
 
     # Sets whether to treat values starting with an equals sign as formulas or as literal strings.
     # @param [Boolean] value The value to set.
@@ -164,7 +166,7 @@ module Axlsx
 
     # Indicates that the cell has one or more of the custom cell styles applied.
     # @return [Boolean]
-    def is_text_run?
+    def is_text_run? # rubocop:disable Naming/PredicateName
       defined?(@is_text_run) && @is_text_run && !contains_rich_text?
     end
 
@@ -174,12 +176,12 @@ module Axlsx
 
     # Indicates if the cell is good for shared string table
     def plain_string?
-      (type == :string || type == :text) &&         # String typed
-        !is_text_run? &&          # No inline styles
-        !@value.nil? &&           # Not nil
-        !@value.empty? &&         # Not empty
-        !is_formula? &&           # Not a formula
-        !is_array_formula?        # Not an array formula
+      (type == :string || type == :text) && # String typed
+        !value.nil? &&
+        !value.empty? &&
+        !is_text_run? && # No inline styles
+        !is_formula? &&
+        !is_array_formula?
     end
 
     # The inline font_name property for the cell
@@ -280,15 +282,13 @@ module Axlsx
     def extend=(v) set_run_style :validate_boolean, :extend, v; end
 
     # The inline underline property for the cell.
-    # It must be one of :none, :single, :double, :singleAccounting, :doubleAccounting, true
+    # It must be one of :none, :single, :double, :singleAccounting, :doubleAccounting
     # @return [Boolean]
     # @return [String]
-    # @note true is for backwards compatability and is reassigned to :single
     attr_reader :u
 
     # @see u
     def u=(v)
-      v = :single if (v == true || v == 1 || v == :true || v == 'true')
       set_run_style :validate_cell_u, :u, v
     end
 
@@ -298,7 +298,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)
       @is_text_run = true
     end
 
@@ -344,20 +344,20 @@ module Axlsx
     # @example Relative Cell Reference
     #   ws.rows.first.cells.first.r #=> "A1"
     def r
-      Axlsx::cell_r index, @row.row_index
+      Axlsx.cell_r index, @row.row_index
     end
 
-    # @return [String] The absolute alpha(column)numeric(row) reference for this sell.
+    # @return [String] The absolute alpha(column)numeric(row) reference for this cell.
     # @example Absolute Cell Reference
     #   ws.rows.first.cells.first.r #=> "$A$1"
     def r_abs
-      "$#{r.match(%r{([A-Z]+)([0-9]+)})[1, 2].join('$')}"
+      "$#{CELL_REFERENCE_REGEX.match(r)[1, 2].join('$')}"
     end
 
     # @return [Integer] The cellXfs item index applied to this cell.
     # @raise [ArgumentError] Invalid cellXfs id if the value provided is not within cellXfs items range.
     def style=(v)
-      Axlsx::validate_unsigned_int(v)
+      Axlsx.validate_unsigned_int(v)
       count = styles.cellXfs.size
       raise ArgumentError, "Invalid cellXfs id" unless v < count
 
@@ -374,11 +374,11 @@ module Axlsx
     # @param [Cell, String] target The last cell, or str ref for the cell in the merge range
     def merge(target)
       start, stop = if target.is_a?(String)
-                      [self.r, target]
+                      [r, target]
                     elsif target.is_a?(Cell)
-                      Axlsx.sort_cells([self, target]).map { |c| c.r }
+                      Axlsx.sort_cells([self, target]).map(&:r)
                     end
-      self.row.worksheet.merge_cells "#{start}:#{stop}" unless stop.nil?
+      row.worksheet.merge_cells "#{start}:#{stop}" unless stop.nil?
     end
 
     # Serializes the cell
@@ -386,21 +386,21 @@ module Axlsx
     # @param [Integer] c_index The cell index in the row.
     # @param [String] str The string index the cell content will be appended to. Defaults to empty string.
     # @return [String] xml text for the cell
-    def to_xml_string(r_index, c_index, str = '')
+    def to_xml_string(r_index, c_index, str = +'')
       CellSerializer.to_xml_string r_index, c_index, self, str
     end
 
-    def is_formula?
+    def is_formula? # rubocop:disable Naming/PredicateName
       return false if escape_formulas
 
-      type == :string && @value.to_s.start_with?(*FORMULA_PREFIXES)
+      type == :string && @value.to_s.start_with?(FORMULA_PREFIX)
     end
 
-    def is_array_formula?
+    def is_array_formula? # rubocop:disable Naming/PredicateName
       return false if escape_formulas
 
       type == :string &&
-        @value.to_s.start_with?(*ARRAY_FORMULA_PREFIXES) &&
+        @value.to_s.start_with?(ARRAY_FORMULA_PREFIX) &&
         @value.to_s.end_with?(ARRAY_FORMULA_SUFFIX)
     end
 
@@ -425,7 +425,7 @@ module Axlsx
     # Attempts to determine the correct width for this cell's content
     # @return [Float]
     def autowidth
-      return if is_formula? || value.nil?
+      return if value.nil? || is_formula?
 
       if contains_rich_text?
         string_width('', font_size) + value.autowidth
@@ -441,12 +441,13 @@ module Axlsx
       end
     end
 
-    # Returns the sanatized value
-    # TODO find a better way to do this as it accounts for 30% of
+    # Returns the sanitized value
+    # TODO: find a better way to do this as it accounts for 30% of
     # processing time in benchmarking...
+    # @return [String] The sanitized value
     def clean_value
-      if (type == :string || type == :text) && !Axlsx::trust_input
-        Axlsx::sanitize(::CGI.escapeHTML(@value.to_s))
+      if (type == :string || type == :text) && !Axlsx.trust_input
+        Axlsx.sanitize(::CGI.escapeHTML(@value.to_s))
       else
         @value.to_s
       end
@@ -481,13 +482,13 @@ 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
       @is_text_run = true
     end
 
     # @see ssti
     def ssti=(v)
-      Axlsx::validate_unsigned_int(v)
+      Axlsx.validate_unsigned_int(v)
       @ssti = v
     end
 
@@ -506,13 +507,11 @@ module Axlsx
         :time
       elsif v.is_a?(TrueClass) || v.is_a?(FalseClass)
         :boolean
-      elsif v.to_s =~ Axlsx::NUMERIC_REGEX && v.respond_to?(:to_i)
+      elsif v.respond_to?(:to_i) && Axlsx::NUMERIC_REGEX.match?(v.to_s)
         :integer
-      elsif v.to_s =~ Axlsx::SAFE_FLOAT_REGEX && v.respond_to?(:to_f)
-        :float
-      elsif (matchdata = v.to_s.match(MAYBE_FLOAT_REGEX)) && (Float::MIN_10_EXP..Float::MAX_10_EXP).cover?(matchdata[:exp].to_i) && v.respond_to?(:to_f)
+      elsif v.respond_to?(:to_f) && (Axlsx::SAFE_FLOAT_REGEX.match?(v.to_s) || ((matchdata = MAYBE_FLOAT_REGEX.match(v.to_s)) && matchdata[:exp].to_i.between?(Float::MIN_10_EXP, Float::MAX_10_EXP)))
         :float
-      elsif v.to_s =~ Axlsx::ISO_8601_REGEX
+      elsif Axlsx::ISO_8601_REGEX.match?(v.to_s)
         :iso_8601
       elsif v.is_a? RichText
         :richtext
@@ -526,18 +525,18 @@ module Axlsx
     #   About Time - Time in OOXML is *different* from what you might expect. The history as to why is interesting, but you can safely assume that if you are generating docs on a mac, you will want to specify Workbook.1904 as true when using time typed values.
     # @see Axlsx#date1904
     def cast_value(v)
-      return v if v.is_a?(RichText) || v.nil?
+      return v if v.nil? || v.is_a?(RichText)
 
       case type
       when :date
-        self.style = STYLE_DATE if self.style == 0
+        self.style = STYLE_DATE if style.zero?
         if !v.is_a?(Date) && v.respond_to?(:to_date)
           v.to_date
         else
           v
         end
       when :time
-        self.style = STYLE_DATE if self.style == 0
+        self.style = STYLE_DATE if style.zero?
         if !v.is_a?(Time) && v.respond_to?(:to_time)
           v.to_time
         else

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # The Cell Serializer class contains the logic for serializing cells based on their type.
   class CellSerializer
@@ -7,28 +9,30 @@ module Axlsx
       # @param [Integer] column_index The index of the cell's column
       # @param [String] str The string to apend serialization to.
       # @return [String]
-      def to_xml_string(row_index, column_index, cell, str = '')
-        str << ('<c r="' << Axlsx::cell_r(column_index, row_index) << '" s="' << cell.style.to_s << '" ')
+      def to_xml_string(row_index, column_index, cell, str = +'')
+        str << '<c r="'
+        str << Axlsx.col_ref(column_index) << Axlsx.row_ref(row_index)
+        str << '" s="' << cell.style_str << '" '
         return str << '/>' if cell.value.nil?
 
         method = cell.type
-        self.send(method, cell, str)
+        send(method, cell, str)
         str << '</c>'
       end
 
       # builds an xml text run based on this cells attributes.
       # @param [String] str The string instance this run will be concated to.
       # @return [String]
-      def run_xml_string(cell, str = '')
+      def run_xml_string(cell, str = +'')
         if cell.is_text_run?
           valid = RichTextRun::INLINE_STYLES - [:value, :type]
-          data = Hash[Axlsx.instance_values_for(cell).map { |k, v| [k.to_sym, v] }]
-          data = data.select { |key, value| valid.include?(key) && !value.nil? }
+          data = Axlsx.instance_values_for(cell).transform_keys(&:to_sym)
+          data = data.select { |key, value| !value.nil? && valid.include?(key) }
           RichText.new(cell.value.to_s, data).to_xml_string(str)
         elsif cell.contains_rich_text?
           cell.value.to_xml_string(str)
         else
-          str << ('<t>' << cell.clean_value << '</t>')
+          str << '<t>' << cell.clean_value << '</t>'
         end
         str
       end
@@ -37,7 +41,7 @@ module Axlsx
       # @param [Cell] cell The cell that is being serialized
       # @param [String] str The string the serialized content will be appended to.
       # @return [String]
-      def iso_8601(cell, str = '')
+      def iso_8601(cell, str = +'')
         value_serialization 'd', cell.value, str
       end
 
@@ -45,23 +49,23 @@ module Axlsx
       # @param [Cell] cell The cell that is being serialized
       # @param [String] str The string the serialized content will be appended to.
       # @return [String]
-      def date(cell, str = '')
-        value_serialization false, DateTimeConverter::date_to_serial(cell.value).to_s, str
+      def date(cell, str = +'')
+        value_serialization false, DateTimeConverter.date_to_serial(cell.value).to_s, str
       end
 
       # Serializes cells that are type time
       # @param [Cell] cell The cell that is being serialized
       # @param [String] str The string the serialized content will be appended to.
       # @return [String]
-      def time(cell, str = '')
-        value_serialization false, DateTimeConverter::time_to_serial(cell.value).to_s, str
+      def time(cell, str = +'')
+        value_serialization false, DateTimeConverter.time_to_serial(cell.value).to_s, str
       end
 
       # Serializes cells that are type boolean
       # @param [Cell] cell The cell that is being serialized
       # @param [String] str The string the serialized content will be appended to.
       # @return [String]
-      def boolean(cell, str = '')
+      def boolean(cell, str = +'')
         value_serialization 'b', cell.value.to_s, str
       end
 
@@ -69,7 +73,7 @@ module Axlsx
       # @param [Cell] cell The cell that is being serialized
       # @param [String] str The string the serialized content will be appended to.
       # @return [String]
-      def float(cell, str = '')
+      def float(cell, str = +'')
         numeric cell, str
       end
 
@@ -77,7 +81,7 @@ module Axlsx
       # @param [Cell] cell The cell that is being serialized
       # @param [String] str The string the serialized content will be appended to.
       # @return [String]
-      def integer(cell, str = '')
+      def integer(cell, str = +'')
         numeric cell, str
       end
 
@@ -85,25 +89,25 @@ module Axlsx
       # @param [Cell] cell The cell that is being serialized
       # @param [String] str The string the serialized content will be appended to.
       # @return [String]
-      def formula_serialization(cell, str = '')
-        str << ('t="str"><f>' << cell.clean_value.to_s.sub('=', '') << '</f>')
-        str << ('<v>' << cell.formula_value.to_s << '</v>') unless cell.formula_value.nil?
+      def formula_serialization(cell, str = +'')
+        str << 't="str"><f>' << cell.clean_value.delete_prefix(FORMULA_PREFIX) << '</f>'
+        str << '<v>' << cell.formula_value.to_s << '</v>' unless cell.formula_value.nil?
       end
 
       # Serializes cells that are type array formula
       # @param [Cell] cell The cell that is being serialized
       # @param [String] str The string the serialized content will be appended to.
       # @return [String]
-      def array_formula_serialization(cell, str = '')
-        str << ('t="str">' << '<f t="array" ref="' << cell.r << '">' << cell.clean_value.to_s.sub('{=', '').sub(/}$/, '') << '</f>')
-        str << ('<v>' << cell.formula_value.to_s << '</v>') unless cell.formula_value.nil?
+      def array_formula_serialization(cell, str = +'')
+        str << 't="str">' << '<f t="array" ref="' << cell.r << '">' << cell.clean_value.delete_prefix(ARRAY_FORMULA_PREFIX).delete_suffix(ARRAY_FORMULA_SUFFIX) << '</f>'
+        str << '<v>' << cell.formula_value.to_s << '</v>' unless cell.formula_value.nil?
       end
 
       # Serializes cells that are type inline_string
       # @param [Cell] cell The cell that is being serialized
       # @param [String] str The string the serialized content will be appended to.
       # @return [String]
-      def inline_string_serialization(cell, str = '')
+      def inline_string_serialization(cell, str = +'')
         str << 't="inlineStr"><is>'
         run_xml_string cell, str
         str << '</is>'
@@ -113,7 +117,7 @@ module Axlsx
       # @param [Cell] cell The cell that is being serialized
       # @param [String] str The string the serialized content will be appended to.
       # @return [String]
-      def string(cell, str = '')
+      def string(cell, str = +'')
         if cell.is_array_formula?
           array_formula_serialization cell, str
         elsif cell.is_formula?
@@ -151,13 +155,13 @@ module Axlsx
 
       private
 
-      def numeric(cell, str = '')
+      def numeric(cell, str = +'')
         value_serialization 'n', cell.value, str
       end
 
-      def value_serialization(serialization_type, serialization_value, str = '')
-        str << ('t="' << serialization_type.to_s << '"') if serialization_type
-        str << ('><v>' << serialization_value.to_s << '</v>')
+      def value_serialization(serialization_type, serialization_value, str = +'')
+        str << 't="' << serialization_type.to_s << '"' if serialization_type
+        str << '><v>' << serialization_value.to_s << '</v>'
       end
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # Conditional Format Value Object
   # Describes the values of the interpolation points in a gradient scale. This object is used by ColorScale, DataBar and IconSet classes
@@ -38,10 +40,10 @@ module Axlsx
     attr_reader :val
 
     # @see type
-    def type=(v); Axlsx::validate_conditional_formatting_value_object_type(v); @type = v end
+    def type=(v); Axlsx.validate_conditional_formatting_value_object_type(v); @type = v end
 
     # @see gte
-    def gte=(v); Axlsx::validate_boolean(v); @gte = v end
+    def gte=(v); Axlsx.validate_boolean(v); @gte = v end
 
     # @see val
     def val=(v)
@@ -53,7 +55,7 @@ module Axlsx
     # serialize the Csvo object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag('cfvo', str)
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # A collection of Cfvo objects that initializes with the required
   # first two items
@@ -9,7 +11,7 @@ module Axlsx
     # Serialize the Cfvo object
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       each { |cfvo| cfvo.to_xml_string(str) }
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Axlsx
   # The Col class defines column attributes for columns in sheets.
   class Col
@@ -86,7 +88,7 @@ module Axlsx
     # @see Col#outline
     def outline_level=(v)
       Axlsx.validate_unsigned_numeric(v)
-      raise ArgumentError, 'outlineLevel must be between 0 and 7' unless 0 <= v && v <= 7
+      raise ArgumentError, 'outlineLevel must be between 0 and 7' unless v >= 0 && v <= 7
 
       @outline_level = v
     end
@@ -112,7 +114,7 @@ module Axlsx
       # current @width value.
       # TODO!!!
       # Axlsx.validate_unsigned_numeric(v) unless v == nil
-      @custom_width = @best_fit = v != nil
+      @custom_width = @best_fit = !v.nil?
       @width = v.nil? ? v : [v, MAX_WIDTH].min
     end
 
@@ -135,7 +137,7 @@ module Axlsx
     # Serialize this columns data to an xml string
     # @param [String] str
     # @return [String]
-    def to_xml_string(str = '')
+    def to_xml_string(str = +'')
       serialized_tag('col', str)
     end
   end