write_xlsx 1.10.0 → 1.10.2

data/examples/watermark.rb

@@ -20,7 +20,7 @@ worksheet = workbook.add_worksheet
 dirname = File.dirname(File.expand_path(__FILE__))
 worksheet.set_header(
   '&C&C&[Picture]', nil,
-  { :image_center => File.join(dirname, 'watermark.png') }
+  { image_center: File.join(dirname, 'watermark.png') }
 )
 
 workbook.close

data/lib/write_xlsx/chart/bar.rb

@@ -86,14 +86,14 @@ module Writexlsx
 
       def axis_defaults_set
         if @x_axis.defaults
-          @x_axis.defaults[:major_gridlines] = { :visible => 1 }
+          @x_axis.defaults[:major_gridlines] = { visible: 1 }
         else
-          @x_axis.defaults = { :major_gridlines => { :visible => 1 } }
+          @x_axis.defaults = { major_gridlines: { visible: 1 } }
         end
         if @y_axis.defaults
-          @y_axis.defaults[:major_gridlines] = { :visible => 0 }
+          @y_axis.defaults[:major_gridlines] = { visible: 0 }
         else
-          @y_axis.defaults = { :major_gridlines => { :visible => 0 } }
+          @y_axis.defaults = { major_gridlines: { visible: 0 } }
         end
         @x_axis.defaults[:num_format] = '0%' if @subtype == 'percent_stacked'
       end

data/lib/write_xlsx/chart/line.rb

@@ -24,7 +24,7 @@ module Writexlsx
       def initialize(subtype)
         super(subtype)
         @subtype ||= 'standard'
-        @default_marker = Marker.new(:type => 'none')
+        @default_marker = Marker.new(type: 'none')
         @smooth_allowed = 1
 
         # Override and reset the default axis values.

data/lib/write_xlsx/chart/radar.rb

@@ -32,10 +32,10 @@ module Writexlsx
       def initialize(subtype)
         super(subtype)
         @subtype = subtype || 'marker'
-        @default_marker = Marker.new(:type => 'none') if @subtype == 'marker'
+        @default_marker = Marker.new(type: 'none') if @subtype == 'marker'
 
         # Override and reset the default axis values.
-        @x_axis.defaults[:major_gridlines] = { :visible => 1 }
+        @x_axis.defaults[:major_gridlines] = { visible: 1 }
         set_x_axis
 
         # Hardcode major_tick_mark for now untill there is an accessor.

data/lib/write_xlsx/chart/scatter.rb

@@ -123,8 +123,8 @@ module Writexlsx
           write_layout(@plotarea.layout, 'plot')
 
           # Write the subclass chart type elements for primary and secondary axes.
-          write_chart_type(:primary_axes => 1)
-          write_chart_type(:primary_axes => 0)
+          write_chart_type(primary_axes: 1)
+          write_chart_type(primary_axes: 0)
 
           # Write c:catAx and c:valAx elements for series using primary axes.
           write_cat_val_axis(@x_axis, @y_axis, @axis_ids, 'b')
@@ -201,7 +201,7 @@ module Writexlsx
           # Go through each series and define default values.
           @series.each do |series|
             # Set a line type unless there is already a user defined type.
-            series.line = line_properties(:width => 2.25, :none => 1, :_defined => 1) unless series.line_defined?
+            series.line = line_properties(width: 2.25, none: 1, _defined: 1) unless series.line_defined?
           end
         end
 
@@ -210,7 +210,7 @@ module Writexlsx
           # Go through each series and define default values.
           @series.each do |series|
             # Set a marker type unless there is already a user defined type.
-            series.marker = Marker.new(:type => 'none', :_defined => 1) unless ptrue?(series.marker)
+            series.marker = Marker.new(type: 'none', _defined: 1) unless ptrue?(series.marker)
           end
         end
       end

data/lib/write_xlsx/chart/series.rb

@@ -77,12 +77,12 @@ module Writexlsx
 
       def types
         {
-          :exponential    => 'exp',
-          :linear         => 'linear',
-          :log            => 'log',
-          :moving_average => 'movingAvg',
-          :polynomial     => 'poly',
-          :power          => 'power'
+          exponential:    'exp',
+          linear:         'linear',
+          log:            'log',
+          moving_average: 'movingAvg',
+          polynomial:     'poly',
+          power:          'power'
         }
       end
     end
@@ -108,20 +108,20 @@ module Writexlsx
 
       def types
         {
-          :automatic  => 'automatic',
-          :none       => 'none',
-          :square     => 'square',
-          :diamond    => 'diamond',
-          :triangle   => 'triangle',
-          :x          => 'x',
-          :star       => 'star',
-          :dot        => 'dot',
-          :short_dash => 'dot',
-          :dash       => 'dash',
-          :long_dash  => 'dash',
-          :circle     => 'circle',
-          :plus       => 'plus',
-          :picture    => 'picture'
+          automatic:  'automatic',
+          none:       'none',
+          square:     'square',
+          diamond:    'diamond',
+          triangle:   'triangle',
+          x:          'x',
+          star:       'star',
+          dot:        'dot',
+          short_dash: 'dot',
+          dash:       'dash',
+          long_dash:  'dash',
+          circle:     'circle',
+          plus:       'plus',
+          picture:    'picture'
         }
       end
     end
@@ -155,11 +155,11 @@ module Writexlsx
 
       def types
         {
-          :fixed              => 'fixedVal',
-          :percentage         => 'percentage',
-          :standard_deviation => 'stdDev',
-          :standard_error     => 'stdErr',
-          :custom             => 'cust'
+          fixed:              'fixedVal',
+          percentage:         'percentage',
+          standard_deviation: 'stdDev',
+          standard_error:     'stdErr',
+          custom:             'cust'
         }
       end
 
@@ -261,8 +261,8 @@ module Writexlsx
 
       def errorbars(x, y)
         {
-          :_x_error_bars => x ? Errorbars.new(x) : nil,
-          :_y_error_bars => y ? Errorbars.new(y) : nil
+          _x_error_bars: x ? Errorbars.new(x) : nil,
+          _y_error_bars: y ? Errorbars.new(y) : nil
         }
       end
 

data/lib/write_xlsx/chart/stock.rb

@@ -104,17 +104,17 @@ module Writexlsx
           if index % 4 != 3
             unless series.line_defined?
               series.line = {
-                :width    => 2.25,
-                :none     => 1,
-                :_defined => 1
+                width:    2.25,
+                none:     1,
+                _defined: 1
               }
             end
 
             unless ptrue?(series.marker)
               series.marker = if index % 4 == 2
-                                Marker.new(:type => 'dot', :size => 3)
+                                Marker.new(type: 'dot', size: 3)
                               else
-                                Marker.new(:type => 'none')
+                                Marker.new(type: 'none')
                               end
             end
           end

data/lib/write_xlsx/chart.rb

@@ -70,7 +70,7 @@ module Writexlsx
       @gradient = gradient_properties(params[:gradient])
 
       # Map deprecated Spreadsheet::WriteExcel fill colour.
-      fill = params[:color] ? { :color => params[:color] } : params[:fill]
+      fill = params[:color] ? { color: params[:color] } : params[:fill]
       @fill = fill_properties(fill)
 
       # Pattern fill overrides solid fill.
@@ -90,13 +90,13 @@ module Writexlsx
 
       # Map deprecated Spreadsheet::WriteExcel line_weight.
       border = params[:border]
-      border = { :width => swe_line_weight(line_weight) } if line_weight
+      border = { width: swe_line_weight(line_weight) } if line_weight
 
       # Map deprecated Spreadsheet::WriteExcel line_pattern.
       if params[:line_pattern]
         pattern = swe_line_pattern(params[:line_pattern])
         if pattern == 'none'
-          border = { :none => 1 }
+          border = { none: 1 }
         else
           border[:dash_type] = pattern
         end
@@ -432,8 +432,8 @@ module Writexlsx
 
       # Set the up and down bar properties.
       @up_down_bars = {
-        :_up   => Chartline.new(params[:up]),
-        :_down => Chartline.new(params[:down])
+        _up:   Chartline.new(params[:up]),
+        _down: Chartline.new(params[:down])
       }
     end
 
@@ -695,33 +695,33 @@ module Writexlsx
 
     def x_axis_defaults
       {
-        :num_format      => 'General',
-        :major_gridlines => { :visible => 0 }
+        num_format:      'General',
+        major_gridlines: { visible: 0 }
       }
     end
 
     def y_axis_defaults
       {
-        :num_format      => 'General',
-        :major_gridlines => { :visible => 1 }
+        num_format:      'General',
+        major_gridlines: { visible: 1 }
       }
     end
 
     def x2_axis_defaults
       {
-        :num_format     => 'General',
-        :label_position => 'none',
-        :crossing       => 'max',
-        :visible        => 0
+        num_format:     'General',
+        label_position: 'none',
+        crossing:       'max',
+        visible:        0
       }
     end
 
     def y2_axis_defaults
       {
-        :num_format      => 'General',
-        :major_gridlines => { :visible => 0 },
-        :position        => 'right',
-        :visible         => 1
+        num_format:      'General',
+        major_gridlines: { visible: 0 },
+        position:        'right',
+        visible:         1
       }
     end
 
@@ -803,8 +803,8 @@ module Writexlsx
         # Write the c:layout element.
         write_layout(@plotarea.layout, 'plot')
         # Write the subclass chart type elements for primary and secondary axes.
-        write_chart_type(:primary_axes => 1)
-        write_chart_type(:primary_axes => 0)
+        write_chart_type(primary_axes: 1)
+        write_chart_type(primary_axes: 0)
 
         # Configure a combined chart if present.
         if second_chart
@@ -823,15 +823,15 @@ module Writexlsx
           second_chart.series_index = @series_index
 
           # Write the subclass chart type elements for combined chart.
-          second_chart.write_chart_type(:primary_axes => 1)
-          second_chart.write_chart_type(:primary_axes => 0)
+          second_chart.write_chart_type(primary_axes: 1)
+          second_chart.write_chart_type(primary_axes: 0)
         end
 
         # Write the category and value elements for the primary axes.
         params = {
-          :x_axis   => @x_axis,
-          :y_axis   => @y_axis,
-          :axis_ids => @axis_ids
+          x_axis:   @x_axis,
+          y_axis:   @y_axis,
+          axis_ids: @axis_ids
         }
 
         if @date_category
@@ -844,9 +844,9 @@ module Writexlsx
 
         # Write the category and value elements for the secondary axes.
         params = {
-          :x_axis   => @x2_axis,
-          :y_axis   => @y2_axis,
-          :axis_ids => @axis2_ids
+          x_axis:   @x2_axis,
+          y_axis:   @y2_axis,
+          axis_ids: @axis2_ids
         }
 
         write_val_axis(@x2_axis, @y2_axis, @axis2_ids)
@@ -855,9 +855,9 @@ module Writexlsx
         if second_chart && second_chart.is_secondary?
 
           params = {
-            :x_axis   => second_chart.x2_axis,
-            :y_axis   => second_chart.y2_axis,
-            :axis_ids => second_chart.axis2_ids
+            x_axis:   second_chart.x2_axis,
+            y_axis:   second_chart.y2_axis,
+            axis_ids: second_chart.axis2_ids
           }
 
           second_chart.write_val_axis(

data/lib/write_xlsx/colors.rb

@@ -4,25 +4,25 @@
 module Writexlsx
   class Colors
     COLORS = {
-      :aqua    => 0x0F,
-      :cyan    => 0x0F,
-      :black   => 0x08,
-      :blue    => 0x0C,
-      :brown   => 0x10,
-      :magenta => 0x0E,
-      :fuchsia => 0x0E,
-      :gray    => 0x17,
-      :grey    => 0x17,
-      :green   => 0x11,
-      :lime    => 0x0B,
-      :navy    => 0x12,
-      :orange  => 0x35,
-      :pink    => 0x21,
-      :purple  => 0x14,
-      :red     => 0x0A,
-      :silver  => 0x16,
-      :white   => 0x09,
-      :yellow  => 0x0D
+      aqua:    0x0F,
+      cyan:    0x0F,
+      black:   0x08,
+      blue:    0x0C,
+      brown:   0x10,
+      magenta: 0x0E,
+      fuchsia: 0x0E,
+      gray:    0x17,
+      grey:    0x17,
+      green:   0x11,
+      lime:    0x0B,
+      navy:    0x12,
+      orange:  0x35,
+      pink:    0x21,
+      purple:  0x14,
+      red:     0x0A,
+      silver:  0x16,
+      white:   0x09,
+      yellow:  0x0D
     }   # :nodoc:
 
     ###############################################################################

data/lib/write_xlsx/package/conditional_format.rb

@@ -409,12 +409,23 @@ module Writexlsx
 
       def row_col_param_for_conditional_formatting(*args)
         # Check for a cell reference in A1 notation and substitute row and column
-        if args[0].to_s =~ (/^\D/) && (args[0] =~ /,/)
-          # Check for a user defined multiple range like B3:K6,B8:K11.
-          user_range = args[0].sub(/^=/, '').gsub(/\s*,\s*/, ' ').gsub(/\$/, '')
+        user_range = if args[0].to_s =~ (/^\D/) && (args[0] =~ /,/)
+                       # Check for a user defined multiple range like B3:K6,B8:K11.
+                       args[0].sub(/^=/, '').gsub(/\s*,\s*/, ' ').gsub(/\$/, '')
+                     end
+
+        if (row_col_array = row_col_notation(args.first))
+          if row_col_array.size == 2
+            row1, col1 = row_col_array
+            row2 = args[1]
+          elsif row_col_array.size == 4
+            row1, col1, row2, col2 = row_col_array
+            param = args[1]
+          end
+        else
+          row1, col1, row2, col2, param = args
         end
 
-        row1, col1, row2, col2, param = row_col_notation(args)
         if row2.respond_to?(:keys)
           param = row2
           row2 = row1
@@ -658,9 +669,9 @@ module Writexlsx
         # Set the default icon properties.
         total_icons.times do
           props << {
-            :criteria => 0,
-            :value    => 0,
-            :type     => 'percent'
+            criteria: 0,
+            value:    0,
+            type:     'percent'
           }
         end
 

data/lib/write_xlsx/package/table.rb

@@ -162,41 +162,50 @@ module Writexlsx
 
       private
 
-      def handle_args(*args)
+      def handle_args(row1, col1 = nil, row2 = nil, col2 = nil, param = nil)
         # Check for a cell reference in A1 notation and substitute row and column
-        row1, col1, row2, col2, param = row_col_notation(args)
+        if (row_col_array = row_col_notation(row1))
+          _row1, _col1, _row2, _col2 = row_col_array
+          _param = col1
+        else
+          _row1 = row1
+          _col1 = col1
+          _row2 = row2
+          _col2 = col2
+          _param = param
+        end
 
         # Check for a valid number of args.
-        raise "Not enough parameters to add_table()" if [row1, col1, row2, col2].include?(nil)
+        raise "Not enough parameters to add_table()" if [_row1, _col1, _row2, _col2].include?(nil)
 
         # Check that row and col are valid without storing the values.
-        check_dimensions_and_update_max_min_values(row1, col1, 1, 1)
-        check_dimensions_and_update_max_min_values(row2, col2, 1, 1)
+        check_dimensions_and_update_max_min_values(_row1, _col1, 1, 1)
+        check_dimensions_and_update_max_min_values(_row2, _col2, 1, 1)
 
         # Swap last row/col for first row/col as necessary.
-        row1, row2 = row2, row1 if row1 > row2
-        col1, col2 = col2, col1 if col1 > col2
+        _row1, _row2 = _row2, _row1 if _row1 > _row2
+        _col1, _col2 = _col2, _col1 if _col1 > _col2
 
         # The final hash contains the validation parameters.
-        param ||= {}
+        _param ||= {}
 
         # Turn on Excel's defaults.
-        param[:banded_rows] ||= 1
-        param[:header_row]  ||= 1
-        param[:autofilter]  ||= 1
+        _param[:banded_rows] ||= 1
+        _param[:header_row]  ||= 1
+        _param[:autofilter]  ||= 1
 
         # Check that there are enough rows.
-        num_rows = row2 - row1
-        num_rows -= 1 if ptrue?(param[:header_row])
+        num_rows = _row2 - _row1
+        num_rows -= 1 if ptrue?(_param[:header_row])
 
         raise "Must have at least one data row in in add_table()" if num_rows < 0
 
         # If the header row if off the default is to turn autofilter off.
-        param[:autofilter] = 0 if param[:header_row] == 0
+        _param[:autofilter] = 0 if _param[:header_row] == 0
 
-        check_parameter(param, valid_table_parameter, 'add_table')
+        check_parameter(_param, valid_table_parameter, 'add_table')
 
-        [row1, row2, col1, col2, param]
+        [_row1, _row2, _col1, _col2, _param]
       end
 
       # List of valid input parameters.
@@ -248,14 +257,14 @@ module Writexlsx
                            .gsub(/\]/, "']")
 
         subtotals = {
-          :average   => 101,
-          :countNums => 102,
-          :count     => 103,
-          :max       => 104,
-          :min       => 105,
-          :stdDev    => 107,
-          :sum       => 109,
-          :var       => 110
+          average:   101,
+          countNums: 102,
+          count:     103,
+          max:       104,
+          min:       105,
+          stdDev:    107,
+          sum:       109,
+          var:       110
         }
 
         unless (func_num = subtotals[function.to_sym])

data/lib/write_xlsx/shape.rb

@@ -204,11 +204,11 @@ module Writexlsx
     def auto_locate_connectors(shapes, shape_hash)
       # Valid connector shapes.
       connector_shapes = {
-        :straightConnector => 1,
-        :Connector         => 1,
-        :bentConnector     => 1,
-        :curvedConnector   => 1,
-        :line              => 1
+        straightConnector: 1,
+        Connector:         1,
+        bentConnector:     1,
+        curvedConnector:   1,
+        line:              1
       }
 
       shape_base = @type.chop.to_sym # Remove the number of segments from end of type.

data/lib/write_xlsx/sheets.rb

@@ -8,7 +8,7 @@ module Writexlsx
   class Sheets < DelegateClass(Array)
     include Writexlsx::Utility
 
-    BASE_NAME = { :sheet => 'Sheet', :chart => 'Chart' }  # :nodoc:
+    BASE_NAME = { sheet: 'Sheet', chart: 'Chart' }  # :nodoc:
 
     def initialize
       super([])