write_xlsx 1.10.0 → 1.10.2

data/lib/write_xlsx/utility.rb

@@ -53,7 +53,12 @@ module Writexlsx
 
     def xl_col_to_name(col, col_absolute)
       col_str = ColName.instance.col_str(col)
-      "#{absolute_char(col_absolute)}#{col_str}"
+      if col_absolute
+        "#{absolute_char(col_absolute)}#{col_str}"
+      else
+        # Do not allocate new string
+        col_str
+      end
     end
 
     def xl_range(row_1, row_2, col_1, col_2,
@@ -252,12 +257,8 @@ module Writexlsx
     end
 
     # Check for a cell reference in A1 notation and substitute row and column
-    def row_col_notation(args)   # :nodoc:
-      if args[0].to_s =~ /^\D/
-        substitute_cellref(*args)
-      else
-        args
-      end
+    def row_col_notation(row_or_a1)   # :nodoc:
+      substitute_cellref(row_or_a1) if row_or_a1.to_s =~ /^\D/
     end
 
     #
@@ -267,7 +268,7 @@ module Writexlsx
     # Ex: ("A4", "Hello") is converted to (3, 0, "Hello").
     #
     def substitute_cellref(cell, *args)       # :nodoc:
-      return [*args] if cell.respond_to?(:coerce) # Numeric
+      #      return [*args] if cell.respond_to?(:coerce) # Numeric
 
       normalized_cell = cell.upcase
 
@@ -683,7 +684,7 @@ module Writexlsx
     end
 
     def line_fill_properties(params)
-      return { :_defined => 0 } unless params
+      return { _defined: 0 } unless params
 
       ret = params.dup
       ret[:dash_type] = yield if block_given? && ret[:dash_type]
@@ -693,17 +694,17 @@ module Writexlsx
 
     def dash_types
       {
-        :solid               => 'solid',
-        :round_dot           => 'sysDot',
-        :square_dot          => 'sysDash',
-        :dash                => 'dash',
-        :dash_dot            => 'dashDot',
-        :long_dash           => 'lgDash',
-        :long_dash_dot       => 'lgDashDot',
-        :long_dash_dot_dot   => 'lgDashDotDot',
-        :dot                 => 'dot',
-        :system_dash_dot     => 'sysDashDot',
-        :system_dash_dot_dot => 'sysDashDotDot'
+        solid:               'solid',
+        round_dot:           'sysDot',
+        square_dot:          'sysDash',
+        dash:                'dash',
+        dash_dot:            'dashDot',
+        long_dash:           'lgDash',
+        long_dash_dot:       'lgDashDot',
+        long_dash_dot_dot:   'lgDashDotDot',
+        dot:                 'dot',
+        system_dash_dot:     'sysDashDot',
+        system_dash_dot_dot: 'sysDashDotDot'
       }
     end
 
@@ -766,16 +767,16 @@ module Writexlsx
 
     def params_to_font(params)
       {
-        :_name         => params[:name],
-        :_color        => params[:color],
-        :_size         => params[:size],
-        :_bold         => params[:bold],
-        :_italic       => params[:italic],
-        :_underline    => params[:underline],
-        :_pitch_family => params[:pitch_family],
-        :_charset      => params[:charset],
-        :_baseline     => params[:baseline] || 0,
-        :_rotation     => params[:rotation]
+        _name:         params[:name],
+        _color:        params[:color],
+        _size:         params[:size],
+        _bold:         params[:bold],
+        _italic:       params[:italic],
+        _underline:    params[:underline],
+        _pitch_family: params[:pitch_family],
+        _charset:      params[:charset],
+        _baseline:     params[:baseline] || 0,
+        _rotation:     params[:rotation]
       }
     end
 
@@ -862,7 +863,7 @@ module Writexlsx
 
       if !latin_attributes.empty? || has_color
         @writer.tag_elements(tag, style_attributes) do
-          write_a_solid_fill(:color => font[:_color]) if has_color
+          write_a_solid_fill(color: font[:_color]) if has_color
           write_a_latin(latin_attributes) unless latin_attributes.empty?
         end
       else

data/lib/write_xlsx/version.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-WriteXLSX_VERSION = "1.10.0"
+WriteXLSX_VERSION = "1.10.2"

data/lib/write_xlsx/workbook.rb

@@ -95,18 +95,18 @@ module Writexlsx
 
       if @excel2003_style
         add_format(default_formats.merge(
-                     :xf_index    => 0,
-                     :font_family => 0,
-                     :font        => 'Arial',
-                     :size        => 10,
-                     :theme       => -1
+                     xf_index:    0,
+                     font_family: 0,
+                     font:        'Arial',
+                     size:        10,
+                     theme:       -1
                    ))
       else
-        add_format(default_formats.merge(:xf_index => 0))
+        add_format(default_formats.merge(xf_index: 0))
       end
 
       # Add a default URL format.
-      @default_url_format = add_format(:hyperlink => 1)
+      @default_url_format = add_format(hyperlink: 1)
 
       set_color_palette
     end
@@ -273,7 +273,7 @@ module Writexlsx
     #
     def add_format(property_hash = {})
       properties = {}
-      properties.update(:font => 'Arial', :size => 10, :theme => -1) if @excel2003_style
+      properties.update(font: 'Arial', size: 10, theme: -1) if @excel2003_style
       properties.update(property_hash)
 
       format = Format.new(@formats, properties)
@@ -376,18 +376,18 @@ module Writexlsx
 
       # List of valid input parameters.
       valid = {
-        :title          => 1,
-        :subject        => 1,
-        :author         => 1,
-        :keywords       => 1,
-        :comments       => 1,
-        :last_author    => 1,
-        :created        => 1,
-        :category       => 1,
-        :manager        => 1,
-        :company        => 1,
-        :status         => 1,
-        :hyperlink_base => 1
+        title:          1,
+        subject:        1,
+        author:         1,
+        keywords:       1,
+        comments:       1,
+        last_author:    1,
+        created:        1,
+        category:       1,
+        manager:        1,
+        company:        1,
+        status:         1,
+        hyperlink_base: 1
       }
 
       # Check for valid input parameters.

data/lib/write_xlsx/worksheet/cell_data.rb

@@ -64,7 +64,7 @@ module Writexlsx
       end
 
       def data
-        { :sst_id => token }
+        { sst_id: token }
       end
 
       TYPE_STR_ATTRS = %w[t s].freeze

data/lib/write_xlsx/worksheet/data_validation.rb

@@ -13,7 +13,19 @@ module Writexlsx
 
       def initialize(*args)
         # Check for a cell reference in A1 notation and substitute row and column.
-        row1, col1, row2, col2, options = row_col_notation(args)
+        if (row_col_array = row_col_notation(args.first))
+          case row_col_array.size
+          when 2
+            row1, col1 = row_col_array
+            row2, col2, options = args[1..-1]
+          when 4
+            row1, col1, row2, col2 = row_col_array
+            options = args[1]
+          end
+        else
+          row1, col1, row2, col2, options = args
+        end
+
         if row2.respond_to?(:keys)
           options_to_instance_variable(row2.dup)
           row2 = row1