write_xlsx 0.89.0 → 0.90.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 980d940d4b7386abe4429d994fdb89621a410b7dee208f931e0571034c40b7df
-  data.tar.gz: 376c1bd91e9d4139af09b69a35509125566a3a44a072f91e27cfd38524f579ae
+  metadata.gz: 94c163c93be013a57cc4a4edba4cea1ac35f91ecbed56443d535fa1d6e1a464f
+  data.tar.gz: 29fecf270f9b3382e0adae5f9f8ffd3b15ca97a84fc9da8bc24d0402de9a7ce7
 SHA512:
-  metadata.gz: 2be6712f3085f77b124f8ce6a400acf9a9c3edea9e27bcefcdef0926af29b29f2cb31eb3b82f5291bf1a6294afd4c504a1e2f32602f7fbbd1aeacc54d79fb9a2
-  data.tar.gz: 15cf003eb84c5312b01f4890e8be4299faf88f92710706f3c01a98c28ad35fb9ec1fbbcab253724804e1b4bfdcfa7c4cf0378d8304685f49c60bfa30651737b0
+  metadata.gz: da03548ba5d54019f9a69b2aa6ca70042b4d27824d784996ebdd7109f8c54626609f007d099acffb8a0d09448d5fdd2ea49e491e729b2b075d2e142fd0b36dc7
+  data.tar.gz: ba23f9b7be254784821b0bae59134bfa53a1cb2afa22e21576a054c718532f34753701d001d46f52871d770db0af4a6027705c22d28c18f658eb082b49172eeb

data/Changes

@@ -1,5 +1,18 @@
 Change history of write_xlsx rubygem.
 
+2020-12-28 v0.90.0
+
+   Added worksheet_by_name() workbook method to retrieve a worksheet
+   in a workbook by name.
+
+   Fixed issue where internal file creation and modification dates where
+   in the local timezone instead of UTC.
+
+   Fixed issue with "external:" urls with space in sheetname.
+
+   Fixed issue where Unicode full-width number strings were treated as
+   numbers in write().
+
 2020-12-27 v0.89.0
 
    Added write_boolean() worksheet method to write Excel boolean values.

data/README.md

@@ -5,7 +5,7 @@
 
 gem to create a new file in the Excel 2007+ XLSX format, and you can use the
 same interface as writeexcel gem. write_xlsx is converted from Perl's module
-[Excel::Writer::XLSX-0.89](https://github.com/jmcnamara/excel-writer-xlsx) .
+[Excel::Writer::XLSX-0.90](https://github.com/jmcnamara/excel-writer-xlsx) .
 
 ## Description
 

data/lib/write_xlsx/package/core.rb

@@ -14,7 +14,7 @@ class Core
       def initialize
         @writer = Package::XMLWriterSimple.new
         @properties = {}
-        @localtime  = [Time.now]
+        @createtime  = [Time.now.gmtime]
       end
 
       def set_xml_writer(filename)
@@ -47,12 +47,14 @@ def write_cp_core_properties_base
       end
 
       #
-      # Convert a localtime() date to a ISO 8601 style "2010-01-01T00:00:00Z" date.
+      # Convert a gmtime/localtime() date to a ISO 8601 style
+      # "2010-01-01T00:00:00Z" date. Excel always treats this as
+      # a utc date/time.
       #
-      def localtime_to_iso8601_date(local_time = nil)
-        local_time ||= Time.now
+      def datetime_to_iso8601_date(gm_time = nil)
+        gm_time ||= Time.now.gmtime
 
-        local_time.strftime('%Y-%m-%dT%H:%M:%SZ')
+        gm_time.strftime('%Y-%m-%dT%H:%M:%SZ')
       end
 
       #
@@ -109,7 +111,7 @@ def write_dcterms(tag)
       end
 
       def dcterms_date
-        localtime_to_iso8601_date(@properties[:created])
+        datetime_to_iso8601_date(@properties[:created])
       end
 
       #

data/lib/write_xlsx/version.rb

@@ -1 +1 @@
-WriteXLSX_VERSION = "0.89.0"
+WriteXLSX_VERSION = "0.90.0"

data/lib/write_xlsx/workbook.rb

@@ -203,6 +203,14 @@ def sheets(*args)
       end
     end
 
+    #
+    # Return a worksheet object in the workbook using the sheetname.
+    #
+    def worksheet_by_name(sheetname = nil)
+      sheets.select { |s| s.name == sheetname }.first
+    end
+    alias get_worksheet_by_name worksheet_by_name
+
     #
     # Set the date system: false = 1900 (the default), true = 1904
     #
@@ -806,7 +814,7 @@ def set_properties(params)
       end
 
       # Set the creation time unless specified by the user.
-      params[:created] = @local_time unless params.has_key?(:created)
+      params[:created] = @createtime unless params.has_key?(:created)
 
       @doc_properties = params.dup
     end

data/lib/write_xlsx/worksheet/hyperlink.rb

@@ -27,13 +27,7 @@ def initialize(url, str, tip)
         normalized_str = str.sub(/^mailto:/, '')
 
         # Split url into the link and optional anchor/location.
-        url, *anchors = url.split(/#/)
-        url  ||= ''
-        if anchors.empty?
-          @url_str = nil
-        else
-          @url_str = anchors.join('#')
-        end
+        url, @url_str = url.split(/#/, 2)
 
         # Escape URL unless it looks already escaped.
         url = escape_url(url)
@@ -135,15 +129,12 @@ def initialize(url, str, tip)
         # Strip the mailto header.
         str.sub!(/^mailto:/, '')
 
+        # Split url into the link and optional anchor/location.
+        url, url_str = url.split(/#/, 2)
+
         # Escape URL unless it looks already escaped.
         url = escape_url(url)
 
-        # External Workbook links need to be modified into the right format.
-        # The URL will look something like 'c:\temp\file.xlsx#Sheet!A1'.
-        # We need the part to the left of the # as the URL and the part to
-        # the right as the "location" string (if it exists).
-        url, url_str = url.split(/#/)
-
         # Add the file:/// URI to the url if non-local.
         if url =~ %r![:]! ||        # Windows style "C:/" link.
             url =~ %r!^\\\\!        # Network share.

data/test/regression/test_hyperlink27.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink27 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink27
+    @xlsx = 'hyperlink27.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.write_url('A1', %q(external:\\\\Vboxsvr\share\foo bar.xlsx#'Some Sheet'!A1))
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_utf8_11.rb

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionUtf8_11 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_utf8_11
+    @xlsx = 'utf8_11.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.write( 'A1', '１２３４５' )
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/workbook/test_worksheet_by_name.rb

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestWorksheeByName < Minitest::Test
+  def test_worksheet_by_name
+    io = StringIO.new
+    workbook = WriteXLSX.new(io)
+
+    # Test a valid explicit name.
+    expected = workbook.add_worksheet
+    result   = workbook.worksheet_by_name('Sheet1')
+    assert_equal(expected, result)
+    result   = workbook.get_worksheet_by_name('Sheet1')
+    assert_equal(expected, result)
+
+    # Test a valid explicit name.
+    expected = workbook.add_worksheet('Sheet 2')
+    result   = workbook.worksheet_by_name('Sheet 2')
+    assert_equal(expected, result)
+    result   = workbook.get_worksheet_by_name('Sheet 2')
+    assert_equal(expected, result)
+
+    # Test an invalid name.
+    result   = workbook.worksheet_by_name('Sheet3')
+    assert_nil(result)
+    result   = workbook.get_worksheet_by_name('Sheet3')
+    assert_nil(result)
+
+    # Test an invalid name.
+    result   = workbook.worksheet_by_name()
+    assert_nil(result)
+    result   = workbook.get_worksheet_by_name()
+    assert_nil(result)
+  end
+end

data/test/worksheet/test_write_hyperlink.rb

@@ -9,13 +9,6 @@ def setup
     @worksheet = @workbook.add_worksheet('')
   end
 
-  def test_attributes
-    hyperlink = Writexlsx::Worksheet::Hyperlink.factory('')
-    result    = hyperlink.attributes(0, 0, 1)
-    expected  = [ ['ref', 'A1'], ['r:id', 'rId1']]
-    assert_equal(expected, result)
-  end
-
   def test_write_hyperlink_internal_sheet2
     hyperlink = Writexlsx::Worksheet::Hyperlink.factory('internal:Sheet2!A1', 'Sheet2!A1')
     result = hyperlink.attributes(0, 0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.89.0
+  version: 0.90.0
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-27 00:00:00.000000000 Z
+date: 2020-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -851,6 +851,7 @@ files:
 - test/regression/test_hyperlink24.rb
 - test/regression/test_hyperlink25.rb
 - test/regression/test_hyperlink26.rb
+- test/regression/test_hyperlink27.rb
 - test/regression/test_image01.rb
 - test/regression/test_image02.rb
 - test/regression/test_image03.rb
@@ -1027,6 +1028,7 @@ files:
 - test/regression/test_utf8_08.rb
 - test/regression/test_utf8_09.rb
 - test/regression/test_utf8_10.rb
+- test/regression/test_utf8_11.rb
 - test/regression/test_vml01.rb
 - test/regression/test_vml02.rb
 - test/regression/test_vml03.rb
@@ -1472,6 +1474,7 @@ files:
 - test/regression/xlsx_files/hyperlink24.xlsx
 - test/regression/xlsx_files/hyperlink25.xlsx
 - test/regression/xlsx_files/hyperlink26.xlsx
+- test/regression/xlsx_files/hyperlink27.xlsx
 - test/regression/xlsx_files/image01.xlsx
 - test/regression/xlsx_files/image02.xlsx
 - test/regression/xlsx_files/image03.xlsx
@@ -1649,6 +1652,7 @@ files:
 - test/regression/xlsx_files/utf8_08.xlsx
 - test/regression/xlsx_files/utf8_09.xlsx
 - test/regression/xlsx_files/utf8_10.xlsx
+- test/regression/xlsx_files/utf8_11.xlsx
 - test/regression/xlsx_files/vbaProject01.bin
 - test/regression/xlsx_files/vbaProject02.bin
 - test/regression/xlsx_files/vml01.xlsx
@@ -1668,6 +1672,7 @@ files:
 - test/workbook/test_workbook_01.rb
 - test/workbook/test_workbook_02.rb
 - test/workbook/test_workbook_03.rb
+- test/workbook/test_worksheet_by_name.rb
 - test/workbook/test_write_calc_pr.rb
 - test/workbook/test_write_defined_name.rb
 - test/workbook/test_write_defined_names.rb
@@ -2439,6 +2444,7 @@ test_files:
 - test/regression/test_hyperlink24.rb
 - test/regression/test_hyperlink25.rb
 - test/regression/test_hyperlink26.rb
+- test/regression/test_hyperlink27.rb
 - test/regression/test_image01.rb
 - test/regression/test_image02.rb
 - test/regression/test_image03.rb
@@ -2615,6 +2621,7 @@ test_files:
 - test/regression/test_utf8_08.rb
 - test/regression/test_utf8_09.rb
 - test/regression/test_utf8_10.rb
+- test/regression/test_utf8_11.rb
 - test/regression/test_vml01.rb
 - test/regression/test_vml02.rb
 - test/regression/test_vml03.rb
@@ -3060,6 +3067,7 @@ test_files:
 - test/regression/xlsx_files/hyperlink24.xlsx
 - test/regression/xlsx_files/hyperlink25.xlsx
 - test/regression/xlsx_files/hyperlink26.xlsx
+- test/regression/xlsx_files/hyperlink27.xlsx
 - test/regression/xlsx_files/image01.xlsx
 - test/regression/xlsx_files/image02.xlsx
 - test/regression/xlsx_files/image03.xlsx
@@ -3237,6 +3245,7 @@ test_files:
 - test/regression/xlsx_files/utf8_08.xlsx
 - test/regression/xlsx_files/utf8_09.xlsx
 - test/regression/xlsx_files/utf8_10.xlsx
+- test/regression/xlsx_files/utf8_11.xlsx
 - test/regression/xlsx_files/vbaProject01.bin
 - test/regression/xlsx_files/vbaProject02.bin
 - test/regression/xlsx_files/vml01.xlsx
@@ -3256,6 +3265,7 @@ test_files:
 - test/workbook/test_workbook_01.rb
 - test/workbook/test_workbook_02.rb
 - test/workbook/test_workbook_03.rb
+- test/workbook/test_worksheet_by_name.rb
 - test/workbook/test_write_calc_pr.rb
 - test/workbook/test_write_defined_name.rb
 - test/workbook/test_write_defined_names.rb