write_xlsx 1.09.5 → 1.10.0

data/lib/write_xlsx/package/custom.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/metadata.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/packager.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/relationships.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/shared_strings.rb

@@ -27,7 +27,7 @@ module Writexlsx
         unless @strings_index[string]
           # Only first time the string will be append to list
           # next time we only check and not #dup it
-          str = string.dup.freeze
+          str = string.frozen? ? string : string.freeze
           @strings << str
           @strings_index[str] = @strings.size - 1
         end

data/lib/write_xlsx/package/styles.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/table.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/theme.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/vml.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'

data/lib/write_xlsx/package/xml_writer_simple.rb

@@ -13,6 +13,11 @@ module Writexlsx
 
       def initialize
         @io = StringIO.new
+        # Will allocate new string once, then use allocated string
+        # Key is tag name
+        # Only tags without attributes will be cached
+        @tag_start_cache = {}
+        @tag_end_cache = {}
       end
 
       def set_xml_writer(filename = nil)
@@ -41,7 +46,16 @@ module Writexlsx
       end
 
       def start_tag_str(tag, attr = [])
-        "<#{tag}#{key_vals(attr)}>"
+        if attr.empty?
+          result = @tag_start_cache[tag]
+          unless result
+            result = "<#{tag}>"
+            @tag_start_cache[tag] = result
+          end
+        else
+          result = "<#{tag}#{key_vals(attr)}>"
+        end
+        result
       end
 
       def end_tag(tag)
@@ -49,7 +63,12 @@ module Writexlsx
       end
 
       def end_tag_str(tag)
-        "</#{tag}>"
+        result = @tag_end_cache[tag]
+        unless result
+          result = "</#{tag}>"
+          @tag_end_cache[tag] = result
+        end
+        result
       end
 
       def empty_tag(tag, attr = [])

data/lib/write_xlsx/shape.rb

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

data/lib/write_xlsx/sheets.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'delegate'
 require 'write_xlsx/package/xml_writer_simple'

data/lib/write_xlsx/sparkline.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 
 require 'write_xlsx/utility'
 

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
 

data/lib/write_xlsx/version.rb

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

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,18 +48,17 @@ 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
@@ -71,11 +68,11 @@ module Writexlsx
       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