write_xlsx 0.85.7 → 0.85.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9321ad366de31af18f34ce1898368f6d754759b9
-  data.tar.gz: 7ad3e41824e5e9443d211766fb285ca56550ff0b
+SHA256:
+  metadata.gz: 1a8ed1e139d973baf49fc349d874da19de256e10ac34f2b4f5a08ec6dcac1eba
+  data.tar.gz: a553667cbe7443f9c9bbfc74d28a9a30e830c95dec213e2d70ca48862bb0505a
 SHA512:
-  metadata.gz: 7aa745d393ba1664d8e59bcbf56c3eaf2430d4000dda9b4e929c6766bdf852ea1686af0fb0e30e7cec90fa94e49432ef0383aa871bec7c0ae45f13c4cc53f1ce
-  data.tar.gz: f321d7ddd751e9a4e757b75c519859be73cee90966f31ad1089e15cd8f2ce97b2f03a0d6abc89931d68862facd442000b88fc2177e421c488ed31d91db370aef
+  metadata.gz: ec4e891ca22e53564f6a715aca9efce06c19782a4274d71ddb485b2bc34f1bf4f11a5f70b736b5fd4f23d74b47e68235c8ef4781fd3c014cad7cbf7c07501963
+  data.tar.gz: e262a4b65b0da4703894ab831f36a1058dcae5d71d103d7f83c313c0ada4e30db534eaabc3273b4c784c1b06d14de4730506b142ea49c8dc32c283339604f0c3

data/Changes

@@ -1,5 +1,8 @@
 Change history of write_xlsx rubygem.
 
+2020-09-03 v0.85.8
+   apply pull-request #58 and #52
+
 2019-06-20 v0.85.7
    apply pull-request #26
 

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/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
 
       #

data/lib/write_xlsx/utility.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# frozen_string_literal: true
 require 'write_xlsx/col_name'
 
 module Writexlsx
@@ -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

data/lib/write_xlsx/version.rb

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

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'
@@ -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'
@@ -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
@@ -7510,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
 
     #

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

data/test/test_xml_writer_simple.rb

@@ -23,11 +23,11 @@ def test_empty_tag_with_xml_decl
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <foo/>
 EOS
-    assert_equal(expected, @obj.xml_decl << @obj.empty_tag('foo') << "\n")
+    assert_equal(expected, @obj.xml_decl + @obj.empty_tag('foo') + "\n")
   end
 
   def test_start_end_tag
-    assert_equal("<foo></foo>", @obj.start_tag('foo') << @obj.end_tag('foo'))
+    assert_equal("<foo></foo>", @obj.start_tag('foo') + @obj.end_tag('foo'))
   end
 
   def test_attribute
@@ -39,7 +39,7 @@ def test_attribute
   def test_character_data
     assert_equal(
       "<foo>&lt;tag&gt;&amp;amp;&lt;/tag&gt;</foo>",
-      @obj.start_tag('foo') << @obj.characters("<tag>&amp;</tag>") << @obj.end_tag('foo')
+      @obj.start_tag('foo') + @obj.characters("<tag>&amp;</tag>") + @obj.end_tag('foo')
     )
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.85.7
+  version: 0.85.8
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2020-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -1709,8 +1709,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.
@@ -3201,4 +3200,3 @@ test_files:
 - test/worksheet/test_write_tab_color.rb
 - test/worksheet/test_write_url.rb
 - test/worksheet/test_write_worksheet_attributes.rb
-has_rdoc: