write_xlsx 1.09.5 → 1.10.1

data/lib/write_xlsx/utility.rb

@@ -458,11 +458,10 @@ module Writexlsx
       [left, top, width, height]
     end
 
-    def v_shape_attributes_base(id, z_index)
+    def v_shape_attributes_base(id)
       [
         ['id',    "_x0000_s#{id}"],
-        ['type',  type],
-        ['style', (v_shape_style_base(z_index, vertices) + style_addition).join]
+        ['type',  type]
       ]
     end
 
@@ -684,7 +683,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]
@@ -694,17 +693,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
 
@@ -767,16 +766,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
 
@@ -863,7 +862,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 +1,3 @@
-WriteXLSX_VERSION = "1.09.5"
+# frozen_string_literal: true
+
+WriteXLSX_VERSION = "1.10.1"

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

@@ -6,14 +6,13 @@ module Writexlsx
     class CellData   # :nodoc:
       include Writexlsx::Utility
 
-      attr_reader :row, :col, :token, :xf
-      attr_reader :result, :range, :link_type, :url, :tip
+      attr_reader :xf
 
       #
       # attributes for the <cell> element. This is the innermost loop so efficiency is
       # important where possible.
       #
-      def cell_attributes # :nodoc:
+      def cell_attributes(worksheet, row, col) # :nodoc:
         xf_index = xf ? xf.get_xf_index : 0
         attributes = [
           ['r', xl_rowcol_to_cell(row, col)]
@@ -22,11 +21,11 @@ module Writexlsx
         # Add the cell format index.
         if xf_index != 0
           attributes << ['s', xf_index]
-        elsif @worksheet.set_rows[row] && @worksheet.set_rows[row][1]
-          row_xf = @worksheet.set_rows[row][1]
+        elsif worksheet.set_rows[row] && worksheet.set_rows[row][1]
+          row_xf = worksheet.set_rows[row][1]
           attributes << ['s', row_xf.get_xf_index]
-        elsif @worksheet.col_formats[col]
-          col_xf = @worksheet.col_formats[col]
+        elsif worksheet.col_formats[col]
+          col_xf = worksheet.col_formats[col]
           attributes << ['s', col_xf.get_xf_index]
         end
         attributes
@@ -38,10 +37,9 @@ module Writexlsx
     end
 
     class NumberCellData < CellData # :nodoc:
-      def initialize(worksheet, row, col, num, xf)
-        @worksheet = worksheet
-        @row = row
-        @col = col
+      attr_reader :token
+
+      def initialize(num, xf)
         @token = num
         @xf = xf
       end
@@ -50,32 +48,31 @@ module Writexlsx
         @token
       end
 
-      def write_cell
-        @worksheet.writer.tag_elements('c', cell_attributes) do
-          @worksheet.write_cell_value(token)
+      def write_cell(worksheet, row, col)
+        worksheet.writer.tag_elements('c', cell_attributes(worksheet, row, col)) do
+          worksheet.write_cell_value(token)
         end
       end
     end
 
     class StringCellData < CellData # :nodoc:
-      def initialize(worksheet, row, col, index, xf)
-        @worksheet = worksheet
-        @row = row
-        @col = col
+      attr_reader :token
+
+      def initialize(index, xf)
         @token = index
         @xf = xf
       end
 
       def data
-        { :sst_id => token }
+        { sst_id: token }
       end
 
       TYPE_STR_ATTRS = %w[t s].freeze
-      def write_cell
-        attributes = cell_attributes
+      def write_cell(worksheet, row, col)
+        attributes = cell_attributes(worksheet, row, col)
         attributes << TYPE_STR_ATTRS
-        @worksheet.writer.tag_elements('c', attributes) do
-          @worksheet.write_cell_value(token)
+        worksheet.writer.tag_elements('c', attributes) do
+          worksheet.write_cell_value(token)
         end
       end
 
@@ -85,10 +82,9 @@ module Writexlsx
     end
 
     class FormulaCellData < CellData # :nodoc:
-      def initialize(worksheet, row, col, formula, xf, result)
-        @worksheet = worksheet
-        @row = row
-        @col = col
+      attr_reader :token, :result, :range, :link_type, :url
+
+      def initialize(formula, xf, result)
         @token = formula
         @xf = xf
         @result = result
@@ -98,11 +94,11 @@ module Writexlsx
         @result || 0
       end
 
-      def write_cell
+      def write_cell(worksheet, row, col)
         truefalse = { 'TRUE' => 1, 'FALSE' => 0 }
         error_code = ['#DIV/0!', '#N/A', '#NAME?', '#NULL!', '#NUM!', '#REF!', '#VALUE!']
 
-        attributes = cell_attributes
+        attributes = cell_attributes(worksheet, row, col)
         if @result && !(@result.to_s =~ /^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/)
           if truefalse[@result]
             attributes << %w[t b]
@@ -113,18 +109,17 @@ module Writexlsx
             attributes << %w[t str]
           end
         end
-        @worksheet.writer.tag_elements('c', attributes) do
-          @worksheet.write_cell_formula(token)
-          @worksheet.write_cell_value(result || 0)
+        worksheet.writer.tag_elements('c', attributes) do
+          worksheet.write_cell_formula(token)
+          worksheet.write_cell_value(result || 0)
         end
       end
     end
 
     class FormulaArrayCellData < CellData # :nodoc:
-      def initialize(worksheet, row, col, formula, xf, range, result)
-        @worksheet = worksheet
-        @row = row
-        @col = col
+      attr_reader :token, :result, :range, :link_type, :url
+
+      def initialize(formula, xf, range, result)
         @token = formula
         @xf = xf
         @range = range
@@ -135,19 +130,18 @@ module Writexlsx
         @result || 0
       end
 
-      def write_cell
-        @worksheet.writer.tag_elements('c', cell_attributes) do
-          @worksheet.write_cell_array_formula(token, range)
-          @worksheet.write_cell_value(result)
+      def write_cell(worksheet, row, col)
+        worksheet.writer.tag_elements('c', cell_attributes(worksheet, row, col)) do
+          worksheet.write_cell_array_formula(token, range)
+          worksheet.write_cell_value(result)
         end
       end
     end
 
     class DynamicFormulaArrayCellData < CellData # :nodoc:
-      def initialize(worksheet, row, col, formula, xf, range, result)
-        @worksheet = worksheet
-        @row = row
-        @col = col
+      attr_reader :token, :result, :range, :link_type, :url
+
+      def initialize(formula, xf, range, result)
         @token = formula
         @xf = xf
         @range = range
@@ -158,23 +152,22 @@ module Writexlsx
         @result || 0
       end
 
-      def write_cell
+      def write_cell(worksheet, row, col)
         # Add metadata linkage for dynamic array formulas.
-        attributes = cell_attributes
+        attributes = cell_attributes(worksheet, row, col)
         attributes << %w[cm 1]
 
-        @worksheet.writer.tag_elements('c', attributes) do
-          @worksheet.write_cell_array_formula(token, range)
-          @worksheet.write_cell_value(result)
+        worksheet.writer.tag_elements('c', attributes) do
+          worksheet.write_cell_array_formula(token, range)
+          worksheet.write_cell_value(result)
         end
       end
     end
 
     class BooleanCellData < CellData # :nodoc:
-      def initialize(worksheet, row, col, val, xf)
-        @worksheet = worksheet
-        @row = row
-        @col = col
+      attr_reader :token
+
+      def initialize(val, xf)
         @token = val
         @xf = xf
       end
@@ -183,21 +176,18 @@ module Writexlsx
         @token
       end
 
-      def write_cell
-        attributes = cell_attributes
+      def write_cell(worksheet, row, col)
+        attributes = cell_attributes(worksheet, row, col)
 
         attributes << %w[t b]
-        @worksheet.writer.tag_elements('c', attributes) do
-          @worksheet.write_cell_value(token)
+        worksheet.writer.tag_elements('c', attributes) do
+          worksheet.write_cell_value(token)
         end
       end
     end
 
     class BlankCellData < CellData # :nodoc:
-      def initialize(worksheet, row, col, xf)
-        @worksheet = worksheet
-        @row = row
-        @col = col
+      def initialize(xf)
         @xf = xf
       end
 
@@ -205,8 +195,8 @@ module Writexlsx
         ''
       end
 
-      def write_cell
-        @worksheet.writer.empty_tag('c', cell_attributes)
+      def write_cell(worksheet, row, col)
+        worksheet.writer.empty_tag('c', cell_attributes(worksheet, row, col))
       end
     end
   end

data/lib/write_xlsx/worksheet/data_validation.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
 module Writexlsx
   class Worksheet

data/lib/write_xlsx/worksheet/hyperlink.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
 module Writexlsx
   class Worksheet
@@ -99,10 +100,10 @@ module Writexlsx
 
         # For external links change the directory separator from Unix to Dos.
         url = url.gsub(%r{/}, '\\')
-        str.gsub!(%r{/}, '\\')
+        str = str.gsub(%r{/}, '\\')
 
         # Strip the mailto header.
-        str.sub!(/^mailto:/, '')
+        str = str.sub(/^mailto:/, '')
 
         # Split url into the link and optional anchor/location.
         url, url_str = url.split(/#/, 2)

data/lib/write_xlsx/worksheet/page_setup.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
 module Writexlsx
   class Worksheet