write_xlsx 0.85.8 → 0.85.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a8ed1e139d973baf49fc349d874da19de256e10ac34f2b4f5a08ec6dcac1eba
-  data.tar.gz: a553667cbe7443f9c9bbfc74d28a9a30e830c95dec213e2d70ca48862bb0505a
+  metadata.gz: ee225c252867f895e976e92e0cf2d1fa0617c8d1ab08277dced0f8c53037f0ae
+  data.tar.gz: 846527548749de579fc47f7cdd0df9826032fcb1b15cd500c441e6ffd339c3fa
 SHA512:
-  metadata.gz: ec4e891ca22e53564f6a715aca9efce06c19782a4274d71ddb485b2bc34f1bf4f11a5f70b736b5fd4f23d74b47e68235c8ef4781fd3c014cad7cbf7c07501963
-  data.tar.gz: e262a4b65b0da4703894ab831f36a1058dcae5d71d103d7f83c313c0ada4e30db534eaabc3273b4c784c1b06d14de4730506b142ea49c8dc32c283339604f0c3
+  metadata.gz: 89fe866dcb96df87a917ddf9ef666d5583c5ece4c20424020fffbf55a648e1cbc8fa9cd6c6acd25e979528108c653414879fd020533e20740f7024c1a4678e69
+  data.tar.gz: e065e79287b82fe2b423cf119c008d92dc4c7f982acf1d98a4feb3da1d1ead8d8f8a8cc3c40e62162cf6315408875806366eeb6b058cd65f64197492cf0fe0bb

data/Changes

@@ -1,5 +1,8 @@
 Change history of write_xlsx rubygem.
 
+2020-09-07 v0.85.9
+   apply pull-request #59 and #60
+
 2020-09-03 v0.85.8
    apply pull-request #58 and #52
 

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/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,11 +9,13 @@ class SharedStrings
 
       include Writexlsx::Utility
 
+      PRESERVE_SPACE_ATTRIBUTES = ['xml:space', 'preserve'].freeze
+
       def initialize
         @writer        = Package::XMLWriterSimple.new
         @strings       = [] # string table
         @strings_index = {} # string table index
-        @count         = {} # count
+        @count         = 0 # count
       end
 
       def index(string, params = {})
@@ -21,18 +24,18 @@ def index(string, params = {})
       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
           @strings_index[str] = @strings.size - 1
-          @count[str] = 1
         end
+        @count += 1
       end
 
       def string(index)
-        @strings[index].dup
+        @strings[index]
       end
 
       def empty?
@@ -79,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
@@ -102,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>$}
@@ -122,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

@@ -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

@@ -244,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

data/lib/write_xlsx/version.rb

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

data/lib/write_xlsx/workbook.rb

@@ -927,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

data/lib/write_xlsx/worksheet.rb

@@ -721,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
@@ -5811,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)}"
@@ -6100,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
@@ -6129,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}' " +
@@ -6157,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
 
@@ -7635,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/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/test/run_test.rb

@@ -0,0 +1,9 @@
+base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+lib_dir  = File.join(base_dir, "lib")
+test_dir = File.join(base_dir, "test")
+
+$LOAD_PATH.unshift(lib_dir)
+
+require 'test/unit'
+
+exit Test::Unit::AutoRunner.run(true, test_dir)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.85.8
+  version: 0.85.9
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-06 00:00:00.000000000 Z
+date: 2020-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -1578,6 +1578,7 @@ files:
 - test/regression/xlsx_files/vml03.xlsx
 - test/regression/xlsx_files/vml04.xlsx
 - test/republic.png
+- test/run_test.rb
 - test/test_col_name.rb
 - test/test_delete_files.rb
 - test/test_example_match.rb
@@ -3089,6 +3090,7 @@ test_files:
 - test/regression/xlsx_files/vml03.xlsx
 - test/regression/xlsx_files/vml04.xlsx
 - test/republic.png
+- test/run_test.rb
 - test/test_col_name.rb
 - test/test_delete_files.rb
 - test/test_example_match.rb