write_xlsx 1.09.1 → 1.09.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc4fb820c659853dbdd8596b1f61f667641b69dbc5c404f81d19acf514f2d905
-  data.tar.gz: 7ff1ff5c651b23c8e9883e23421065e778e6c8ba109f23d46ff1886a33a6852b
+  metadata.gz: f5d16e1b446663bfe7c01e2d2fcf66d7150d08b51b9256e3bdfe531ed855e83b
+  data.tar.gz: 136aa05affaba6706517f4a0e69f8db0a960a235105f82232c9de5c168964009
 SHA512:
-  metadata.gz: 9461389a984b4826addf2dc69c1760cc92b07d456118be8835a982601587eaec02628016e413b496c5a7db5fc59c4c246962afc286707b3371eab06e5c7fbe4a
-  data.tar.gz: a9bdd5e0191277a5097f2f2e0634a0c745a7223c81a1f6116769d8b2a93c5ab67aa10e61e19eb3860d7740f5f90bcf1045066c591f10bb62009d6b0916888df9
+  metadata.gz: eaed0ee8d0590a733194bce357731c6c6883885074552be5d4a1f8b4ecbe0eb24c7718ad4c7afac89cd42389c19dcfc1093525fb264e530d6b0063cec9e91eb5
+  data.tar.gz: 5d0f0e15102d3064256d30274040211a8c4b8877c6551ed6a2a415ffca944071bb7f3c14728db6fb2b3496de93410a6109104ef5a67ff2b02b28744819ccd86e

data/.travis.yml

@@ -1,9 +1,18 @@
 language: ruby
 rvm:
+- 3.0.3
+- 3.0.2
+- 3.0.1
 - 3.0.0
+- 2.7.5
+- 2.7.4
+- 2.7.3
 - 2.7.2
 - 2.7.1
 - 2.7.0
+- 2.6.9
+- 2.6.8
+- 2.6.7
 - 2.6.6
 - 2.6.5
 - 2.6.4
@@ -11,6 +20,7 @@ rvm:
 - 2.6.2
 - 2.6.1
 - 2.6.0
+- 2.5.9
 - 2.5.8
 - 2.5.7
 - 2.5.6

data/Changes

@@ -1,7 +1,19 @@
 Change history of write_xlsx rubygem.
 
+2022-09-02 v1.09.4
+    Remove zip-zip dependency.
+
+    Fix: Object#=~ is called on Integer; it always returns nil
+
+2022-07-08 v1.09.3
+    Fixed issue #47. Dealing with NAN
+
+2022-02-14 v1.09.2
+    Fixed issue #79. Worksheet#write calls the write_number
+    when multi-line string has a line with only numbers.
+
 2021-11-27 v1.09.1
-    Added Worksheet#kee_leading_zeros method to handle '001' as string in
+    Added Worksheet#keep_leading_zeros method to handle '001' as string in
     Worksheet#write, write_row, and write_col method.
 
 2021-11-26 v1.09.0
@@ -251,7 +263,7 @@ Change history of write_xlsx rubygem.
    Fix work well in ms windows.
 
 2018-04-29 v0.85.5
-   Added option to store hyperlink strings as string (strings_as_urls: false).
+   Added option to store hyperlink strings as string (strings_to_urls: false).
 
 2018-04-29 v0.85.4
    Added option to store hyperlink strings as string (urls_as_strings).

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2021 Hideo NAKAMURA
+Copyright (c) 2012-2022 Hideo NAKAMURA
 
 MIT License
 

data/README.md

@@ -85,7 +85,7 @@ the first worksheet in an Excel XML spreadsheet called ruby.xlsx:
 Original Perl module was written by John McNamara(jmcnamara@cpan.org).
 
 Converted to ruby by Hideo NAKAMURA(nakamrua.hideo@gmail.com)
-Copyright (c) 2012-2021 Hideo NAKAMURA.
+Copyright (c) 2012-2022 Hideo NAKAMURA.
 
 See LICENSE.txt for further details.
 

data/bin/extract_vba.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
 
-require 'zip/zipfilesystem'
+require 'zip/filesystem'
 require 'fileutils'
 
   # src  zip filename
@@ -9,7 +9,7 @@ require 'fileutils'
   # options :fs_encoding=[UTF-8,Shift_JIS,EUC-JP]
   def extract_vba_project(src, dest, options = {})
     FileUtils.makedirs(dest)
-    Zip::ZipInputStream.open(src) do |is|
+    Zip::InputStream.open(src) do |is|
       loop do
         entry = is.get_next_entry()
         break if entry.nil?()

data/lib/write_xlsx/chart/series.rb

@@ -347,7 +347,7 @@ module Writexlsx
             property = label.dup
 
             # Convert formula.
-            if property[:value] && property[:value] =~ /^=[^!]+!\$/
+            if property[:value] && property[:value].to_s =~ /^=[^!]+!\$/
               property[:formula] = property[:value]
             end
 

data/lib/write_xlsx/version.rb

@@ -1 +1 @@
-WriteXLSX_VERSION = "1.09.1"
+WriteXLSX_VERSION = "1.09.4"

data/lib/write_xlsx/worksheet.rb

@@ -902,7 +902,7 @@ module Writexlsx
       # Match integer with leading zero(s)
       elsif @leading_zeros && token =~ /^0\d*$/
         write_string(*args)
-      elsif token =~ /^\d+$/
+      elsif token =~ /\A([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?\Z/
         write_number(*args)
       # Match formula
       elsif token =~ /^=/
@@ -2044,6 +2044,8 @@ module Writexlsx
     # Write the cell value <v> element.
     #
     def write_cell_value(value = '') #:nodoc:
+      return write_cell_formula('=NA()') if !value.nil? && value.is_a?(Float) && value.nan?
+
       value ||= ''
       value = value.to_i if value == value.to_i
       @writer.data_element('v', value)
@@ -3543,7 +3545,7 @@ EOS
     # Write the <filters> element.
     #
     def write_filters(*filters) #:nodoc:
-      non_blanks = filters.reject { |filter| filter =~ /^blanks$/i }
+      non_blanks = filters.reject { |filter| filter.to_s =~ /^blanks$/i }
       attributes = []
 
       if filters != non_blanks

data/lib/write_xlsx/zip_file_utils.rb

@@ -3,7 +3,7 @@
 # from http://d.hatena.ne.jp/alunko/20071021
 #
 require 'kconv'
-require 'zip/zipfilesystem'
+require 'zip/filesystem'
 require 'fileutils'
 
 module ZipFileUtils
@@ -15,7 +15,7 @@ module ZipFileUtils
     src = File.expand_path(src)
     dest = File.expand_path(dest)
     File.unlink(dest) if File.exist?(dest)
-    Zip::ZipFile.open(dest, Zip::ZipFile::CREATE) {|zf|
+    Zip::File.open(dest, Zip::File::CREATE) {|zf|
       if(File.file?(src))
         zf.add(encode_path(File.basename(src), options[:fs_encoding]), src)
         break
@@ -37,7 +37,7 @@ module ZipFileUtils
   # options :fs_encoding=[UTF-8,Shift_JIS,EUC-JP]
   def self.unzip(src, dest, options = {})
     FileUtils.makedirs(dest)
-    Zip::ZipInputStream.open(src) do |is|
+    Zip::InputStream.open(src) do |is|
       loop do
         entry = is.get_next_entry()
         break unless entry

data/test/helper.rb

@@ -77,7 +77,7 @@ class Minitest::Test
 
   def entrys(xlsx)
     result = []
-    Zip::ZipFile.foreach(xlsx) { |entry| result << entry }
+    Zip::File.foreach(xlsx) { |entry| result << entry }
     result
   end
 

data/test/test_example_match.rb

@@ -11,6 +11,18 @@ class TestExampleMatch < Minitest::Test
     @tempfile.close
   end
 
+  def test_multi_line
+    @xlsx = 'multi_line.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.write(0, 0, "Hi Excel!\n1234\nHi, again!")
+
+    workbook.close
+    store_to_tempfile
+    compare_xlsx(File.join(@perl_output, @xlsx), @tempfile.path)
+  end
+
   def test_a_simple
     @xlsx = 'a_simple.xlsx'
     # Create a new workbook called simple.xls and add a worksheet

data/write_xlsx.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
   gem.add_runtime_dependency 'rubyzip', '>= 1.0.0'
-  gem.add_runtime_dependency 'zip-zip'
   gem.add_development_dependency 'minitest'
   gem.add_development_dependency 'byebug'
   gem.add_development_dependency 'rake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 1.09.1
+  version: 1.09.4
 platform: ruby
 authors:
 - Hideo NAKAMURA
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-27 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: zip-zip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +161,6 @@ files:
 - examples/tables.rb
 - examples/update_range_format_with_params.rb
 - examples/vbaProject.bin
-- keep_leading_zeros.xlsx
 - lib/write_xlsx.rb
 - lib/write_xlsx/chart.rb
 - lib/write_xlsx/chart/area.rb
@@ -379,6 +364,7 @@ files:
 - test/perl_output/merge4.xlsx
 - test/perl_output/merge5.xlsx
 - test/perl_output/merge6.xlsx
+- test/perl_output/multi_line.xlsx
 - test/perl_output/outline.xlsx
 - test/perl_output/outline_collapsed.xlsx
 - test/perl_output/panes.xlsx
@@ -2166,7 +2152,7 @@ homepage: https://github.com/cxn03651/write_xlsx#readme
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -2181,8 +2167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.
 test_files:
@@ -2338,6 +2324,7 @@ test_files:
 - test/perl_output/merge4.xlsx
 - test/perl_output/merge5.xlsx
 - test/perl_output/merge6.xlsx
+- test/perl_output/multi_line.xlsx
 - test/perl_output/outline.xlsx
 - test/perl_output/outline_collapsed.xlsx
 - test/perl_output/panes.xlsx