write_xlsx 0.85.4 → 0.85.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 653c8e697dbe8468dd60f4cde55e69a2454ce80192b455e7bb0c88b385aadce0
-  data.tar.gz: 75777d4a17597792871a0b78981e3b359b9113dc749ff7e495b80bf3812b232d
+  metadata.gz: ee225c252867f895e976e92e0cf2d1fa0617c8d1ab08277dced0f8c53037f0ae
+  data.tar.gz: 846527548749de579fc47f7cdd0df9826032fcb1b15cd500c441e6ffd339c3fa
 SHA512:
-  metadata.gz: 6fc85d45b48b49b1a75a06b53c06a53bf1eb3b03dee67318e88f2a78248b3d75290d82920f41cc28327e676f6bb1c0a4742b816195fafd60f9817fbe7d830aa7
-  data.tar.gz: 934303155838fc8008fa1e560d64d111fccd954b1006744645139124f8e2c403e9aa9ee31fd29e98b0ec2682069ea6293e46fcbe5146c5ac39d1e8dbdea07c8c
+  metadata.gz: 89fe866dcb96df87a917ddf9ef666d5583c5ece4c20424020fffbf55a648e1cbc8fa9cd6c6acd25e979528108c653414879fd020533e20740f7024c1a4678e69
+  data.tar.gz: e065e79287b82fe2b423cf119c008d92dc4c7f982acf1d98a4feb3da1d1ead8d8f8a8cc3c40e62162cf6315408875806366eeb6b058cd65f64197492cf0fe0bb

data/.gitignore

@@ -1,4 +1,7 @@
 TAGS
+GPATH
+GRTAGS
+GTAGS
 *.gem
 .bundle
 .config

data/Changes

@@ -1,6 +1,21 @@
 Change history of write_xlsx rubygem.
 
-2018-04-29 v0.85.3
+2020-09-07 v0.85.9
+   apply pull-request #59 and #60
+
+2020-09-03 v0.85.8
+   apply pull-request #58 and #52
+
+2019-06-20 v0.85.7
+   apply pull-request #26
+
+2019-02-10 v0.85.6
+   Fix work well in ms windows.
+
+2018-04-29 v0.85.5
+   Added option to store hyperlink strings as string (strings_as_urls: false).
+
+2018-04-29 v0.85.4
    Added option to store hyperlink strings as string (urls_as_strings).
 
 2018-01-07 v0.85.3

data/lib/write_xlsx/chart.rb

@@ -2631,7 +2631,7 @@ def write_custom_error_base(tag, values, data)
     end
 
     def write_num_ref_or_lit(values, data)
-      if values =~ /^=/                     # '=Sheet1!$A$1:$A$5'
+      if values.to_s =~ /^=/                     # '=Sheet1!$A$1:$A$5'
         write_num_ref(values, data, 'num')
       else                                  # [1, 2, 3]
         write_num_lit(values)

data/lib/write_xlsx/compatibility.rb

@@ -45,7 +45,7 @@ def ascii_only?
 
 unless File.respond_to?(:binread)
   def File.binread(file) #:nodoc:
-    File.open(file,"rb") { |f| f.read }
+    File.open(file,"rb:utf-8:utf-8") { |f| f.read }
   end
 end
 

data/lib/write_xlsx/format.rb

@@ -287,11 +287,10 @@ def set_format_properties(*properties)   # :nodoc:
 
           # Create a sub to set the property.
           if value.respond_to?(:to_str) || !value.respond_to?(:+)
-            s = "set_#{key}('#{value}')"
+            send("set_#{key}", value.to_s)
           else
-            s = "set_#{key}(#{value})"
+            send("set_#{key}", value)
           end
-          eval s
         end
       end
     end

data/lib/write_xlsx/package/conditional_format.rb

@@ -306,7 +306,7 @@ def range_start_cell_for_conditional_formatting(*args)  # :nodoc:
 
       def row_col_param_for_conditional_formatting(*args)
         # Check for a cell reference in A1 notation and substitute row and column
-        if args[0] =~ /^\D/
+        if args[0].to_s =~ /^\D/
           # Check for a user defined multiple range like B3:K6,B8:K11.
           user_range = args[0].sub(/^=/, '').gsub(/\s*,\s*/, ' ').gsub(/\$/, '') if args[0] =~ /,/
         end
@@ -383,7 +383,7 @@ def check_conditional_formatting_parameters(param)  # :nodoc:
       end
 
       def convert_date_time_if_required(val)
-        if val =~ /T/
+        if val.to_s =~ /T/
           date_time = convert_date_time(val)
           raise "Invalid date/time value '#{val}' in conditional_formatting()" unless date_time
           date_time

data/lib/write_xlsx/package/shared_strings.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/utility'
 
@@ -8,29 +9,33 @@ class SharedStrings
 
       include Writexlsx::Utility
 
+      PRESERVE_SPACE_ATTRIBUTES = ['xml:space', 'preserve'].freeze
+
       def initialize
-        @writer  = Package::XMLWriterSimple.new
-        @strings = [] # string table
-        @count   = {} # => count
+        @writer        = Package::XMLWriterSimple.new
+        @strings       = [] # string table
+        @strings_index = {} # string table index
+        @count         = 0 # count
       end
 
       def index(string, params = {})
         add(string) unless params[:only_query]
-        @strings.index(string)
+        @strings_index[string]
       end
 
       def add(string)
-        str = string.dup
-        if @count[str]
-          @count[str] += 1
-        else
+        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
           @strings << str
-          @count[str] = 1
+          @strings_index[str] = @strings.size - 1
         end
+        @count += 1
       end
 
       def string(index)
-        @strings[index].dup
+        @strings[index]
       end
 
       def empty?
@@ -77,7 +82,6 @@ def write_sst_strings
       # Write the <si> element.
       #
       def write_si(string)
-        string = string.dup
         attributes = []
 
         # Excel escapes control characters with _xHHHH_ and also escapes any
@@ -100,7 +104,7 @@ def write_si(string)
         end
 
         # Add attribute to preserve leading or trailing whitespace.
-        attributes << ['xml:space', 'preserve'] if string =~ /\A\s|\s\Z/
+        attributes << PRESERVE_SPACE_ATTRIBUTES if string =~ /\A\s|\s\Z/
 
         # Write any rich strings without further tags.
         if string =~ %r{^<r>} && string =~ %r{</r>$}
@@ -120,7 +124,7 @@ def add_c2_c3(string)
       end
 
       def total_count
-        @count.values.inject(0) { |sum, count| sum += count }
+        @count
       end
 
       def unique_count

data/lib/write_xlsx/package/styles.rb

@@ -49,7 +49,7 @@ def set_style_properties(xf_formats, palette, font_count, num_format_count, bord
       # based on the default or user defined values in the Workbook palette.
       #
       def palette_color(index)
-      if index =~ /^#([0-9A-F]{6})$/i
+      if index.to_s =~ /^#([0-9A-F]{6})$/i
         "FF#{$1.upcase}"
       else
         "FF#{super(index)}"

data/lib/write_xlsx/package/xml_writer_simple.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 #
 # XMLWriterSimple
 #
@@ -29,10 +30,9 @@ def tag_elements(tag, attributes = [])
       end
 
       def tag_elements_str(tag, attributes = [])
-        str = ''
-        str << start_tag_str(tag, attributes)
-        str << yield
-        str << end_tag_str(tag)
+        str = start_tag_str(tag, attributes) +
+              yield +
+              end_tag_str(tag)
       end
 
       def start_tag(tag, attr = [])
@@ -65,7 +65,7 @@ def empty_tag_encoded_str(tag, attr = [])
       end
 
       def data_element(tag, data, attr = [])
-        tag_elements(tag, attr) { io_write("#{escape_data(data)}") }
+        tag_elements(tag, attr) { io_write(escape_data(data)) }
       end
 
       #
@@ -92,7 +92,7 @@ def crlf
 
       def close
         if @filename
-          File.open(@filename, "wb") { |f| f << string }
+          File.open(@filename, "wb:utf-8:utf-8") { |f| f << string }
         end
         @io.close
       end
@@ -118,7 +118,7 @@ def key_vals(attribute)
       end
 
       def escape_attributes(str = '')
-        return str if !(str =~ /["&<>]/)
+        return str if !(str.to_s =~ /["&<>]/)
 
         str.
           gsub(/&/, "&amp;").
@@ -128,7 +128,7 @@ def escape_attributes(str = '')
       end
 
       def escape_data(str = '')
-        if str =~ /[&<>]/
+        if str.to_s =~ /[&<>]/
           str.gsub(/&/, '&amp;').
             gsub(/</, '&lt;').
             gsub(/>/, '&gt;')

data/lib/write_xlsx/utility.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 require 'write_xlsx/col_name'
 
 module Writexlsx
@@ -243,7 +244,7 @@ def put_deprecate_message(method)
 
     # Check for a cell reference in A1 notation and substitute row and column
     def row_col_notation(args)   # :nodoc:
-      if args[0] =~ /^\D/
+      if args[0].to_s =~ /^\D/
         substitute_cellref(*args)
       else
         args
@@ -303,11 +304,12 @@ def write_color(writer, name, value) #:nodoc:
       writer.empty_tag('color', attributes)
     end
 
+    PERL_TRUE_VALUES = [false, nil, 0, "0", "", [], {}].freeze
     #
     # return perl's boolean result
     #
     def ptrue?(value)
-      if [false, nil, 0, "0", "", [], {}].include?(value)
+      if PERL_TRUE_VALUES.include?(value)
         false
       else
         true
@@ -586,7 +588,7 @@ def process_workbook_options(*params)
       when 0
         [{}, {}]
       when 1 # one hash
-        options_keys = [:tempdir, :date_1904, :optimization, :excel2003_style]
+        options_keys = [:tempdir, :date_1904, :optimization, :excel2003_style, :strings_to_urls]
 
         hash = params.first
         options = hash.reject{|k,v| !options_keys.include?(k)}

data/lib/write_xlsx/version.rb

@@ -1 +1 @@
-WriteXLSX_VERSION = "0.85.4"
+WriteXLSX_VERSION = "0.85.9"

data/lib/write_xlsx/workbook.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/package/packager'
 require 'write_xlsx/sheets'
@@ -926,7 +927,7 @@ def set_calc_mode(mode, calc_id = nil)
     #
     def set_custom_color(index, red = 0, green = 0, blue = 0)
       # Match a HTML #xxyyzz style parameter
-      if red =~ /^#(\w\w)(\w\w)(\w\w)/
+      if red.to_s =~ /^#(\w\w)(\w\w)(\w\w)/
         red   = $1.hex
         green = $2.hex
         blue  = $3.hex
@@ -972,8 +973,9 @@ def date_1904? #:nodoc:
     # Add a string to the shared string table, if it isn't already there, and
     # return the string index.
     #
-    def shared_string_index(str, params = {}) #:nodoc:
-      @shared_strings.index(str, params)
+    EMPTY_HASH = {}.freeze
+    def shared_string_index(str) #:nodoc:
+      @shared_strings.index(str, EMPTY_HASH)
     end
 
     def str_unique   # :nodoc:

data/lib/write_xlsx/worksheet.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 require 'write_xlsx/package/xml_writer_simple'
 require 'write_xlsx/package/button'
 require 'write_xlsx/colors'
@@ -720,7 +721,7 @@ def protect_default_settings  # :nodoc:
     #
     def set_column(*args)
       # Check for a cell reference in A1 notation and substitute row and column
-      if args[0] =~ /^\D/
+      if args[0].to_s =~ /^\D/
         row1, firstcol, row2, lastcol, *data = substitute_cellref(*args)
       else
         firstcol, lastcol, *data = args
@@ -2188,7 +2189,7 @@ def write_comment(*args)
     def write_number(*args)
       # Check for a cell reference in A1 notation and substitute row and column
       row, col, num, xf = row_col_notation(args)
-      raise WriteXLSXInsufficientArgumentError if [row, col, num].include?(nil)
+      raise WriteXLSXInsufficientArgumentError if row.nil? || col.nil? || num.nil?
 
       # Check that row and col are valid and store max and min values
       check_dimensions(row, col)
@@ -2230,13 +2231,13 @@ def write_string(*args)
       # Check for a cell reference in A1 notation and substitute row and column
       row, col, str, xf = row_col_notation(args)
       str &&= str.to_s
-      raise WriteXLSXInsufficientArgumentError if [row, col, str].include?(nil)
+      raise WriteXLSXInsufficientArgumentError if row.nil? || col.nil? || str.nil?
 
       # Check that row and col are valid and store max and min values
       check_dimensions(row, col)
       store_row_col_max_min_values(row, col)
 
-      index = shared_string_index(str[0, STR_MAX])
+      index = shared_string_index(str.length > STR_MAX ? str[0, STR_MAX] : str)
 
       store_data_to_table(StringCellData.new(self, row, col, index, xf))
     end
@@ -5810,7 +5811,7 @@ def excel2003_style? # :nodoc:
     # based on the default or user defined values in the Workbook palette.
     #
     def palette_color(index) #:nodoc:
-      if index =~ /^#([0-9A-F]{6})$/i
+      if index.to_s =~ /^#([0-9A-F]{6})$/i
         "FF#{$1.upcase}"
       else
         "FF#{super(index)}"
@@ -5849,10 +5850,11 @@ def prepare_vml_objects(vml_data_id, vml_shape_id, vml_drawing_id, comment_id)
 
       # The VML o:idmap data id contains a comma separated range when there is
       # more than one 1024 block of comments, like this: data="1,2".
+      data = "#{vml_data_id}"
       (1 .. num_comments_block).each do |i|
-        vml_data_id = "#{vml_data_id},#{vml_data_id + i}"
+        data += ",#{vml_data_id + i}"
       end
-      @vml_data_id = vml_data_id
+      @vml_data_id = data
       @vml_shape_id = vml_shape_id
     end
 
@@ -6098,7 +6100,7 @@ def parse_filter_tokens(expression, tokens)     #:nodoc:
       # Special handling of "Top" filter expressions.
       if tokens[0] =~ /^top|bottom$/i
         value = tokens[1]
-        if (value =~ /\D/ or value.to_i < 1 or value.to_i > 500)
+        if (value.to_s =~ /\D/ or value.to_i < 1 or value.to_i > 500)
           raise "The value '#{value}' in expression '#{expression}' " +
           "must be in the range 1 to 500"
         end
@@ -6127,7 +6129,7 @@ def parse_filter_tokens(expression, tokens)     #:nodoc:
       end
 
       # Special handling for Blanks/NonBlanks.
-      if (token =~ /^blanks|nonblanks$/i)
+      if (token.to_s =~ /^blanks|nonblanks$/i)
         # Only allow Equals or NotEqual in this context.
         if (operator != 2 and operator != 5)
           raise "The operator '#{tokens[1]}' in expression '#{expression}' " +
@@ -6155,7 +6157,7 @@ def parse_filter_tokens(expression, tokens)     #:nodoc:
 
       # if the string token contains an Excel match character then change the
       # operator type to indicate a non "simple" equality.
-      if (operator == 2 and token =~ /[*?]/)
+      if (operator == 2 and token.to_s =~ /[*?]/)
         operator = 22
       end
 
@@ -7509,8 +7511,8 @@ def calc_spans(data, row_num, span_min, span_max)
     # Add a string to the shared string table, if it isn't already there, and
     # return the string index.
     #
-    def shared_string_index(str, params = {}) #:nodoc:
-      @workbook.shared_string_index(str, params)
+    def shared_string_index(str) #:nodoc:
+      @workbook.shared_string_index(str)
     end
 
     #
@@ -7633,7 +7635,7 @@ def set_active_pane_and_cell_selections(row, col, top_row, left_col, active_cell
 
     def prepare_filter_column(col) # :nodoc:
       # Check for a column reference in A1 notation and substitute.
-      if col =~ /^\D/
+      if col.to_s =~ /^\D/
         col_letter = col
 
         # Convert col ref to a cell ref and then to a col number.

data/lib/write_xlsx/worksheet/cell_data.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
 module Writexlsx
   class Worksheet
@@ -63,9 +64,10 @@ def data
         { :sst_id => token }
       end
 
+      TYPE_STR_ATTRS = ['t', 's'].freeze
       def write_cell
         attributes = cell_attributes
-        attributes << ['t', 's']
+        attributes << TYPE_STR_ATTRS
         @worksheet.writer.tag_elements('c', attributes) do
           @worksheet.write_cell_value(token)
         end

data/lib/write_xlsx/worksheet/data_validation.rb

@@ -282,7 +282,7 @@ def valid_criteria_type  # :nodoc:
 
       def convert_date_time_value(key)  # :nodoc:
         value = instance_variable_get("@#{key}")
-        if value && value =~ /T/
+        if value && value.to_s =~ /T/
           date_time = convert_date_time(value)
           instance_variable_set("@#{key}", date_time) if date_time
           date_time

data/lib/write_xlsx/worksheet/hyperlink.rb

@@ -24,7 +24,7 @@ def initialize(url, str, tip)
         str ||= url.dup
 
         # Strip the mailto header.
-        str.sub!(/^mailto:/, '')
+        normalized_str = str.sub(/^mailto:/, '')
 
         # Escape URL unless it looks already escaped.
         url = escape_url(url)
@@ -35,7 +35,7 @@ def initialize(url, str, tip)
         end
 
         @url       = url
-        @str       = str
+        @str       = normalized_str
         @url_str   = nil
         @tip       = tip
       end