write_xlsx 0.85.3 → 0.85.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 451a49314f7a14e2c9d5bfc5c4df3ca7f54e2718
-  data.tar.gz: 040af462094068f22464c341ea38fa971b5e4403
+SHA256:
+  metadata.gz: 653c8e697dbe8468dd60f4cde55e69a2454ce80192b455e7bb0c88b385aadce0
+  data.tar.gz: 75777d4a17597792871a0b78981e3b359b9113dc749ff7e495b80bf3812b232d
 SHA512:
-  metadata.gz: 47524ba5498e8529ccc789da00036e0cf7a901d116f6661c75d8ee7b74485181aeb5ee7f657844cdbf756a1dfaa6337faf25c307586960fb32465fcca4764249
-  data.tar.gz: b582ea2f76e0bf02a37484581d732c9a329161d606fae13a381cd6541824b0a4ee061f8196385277a4e8b92f0965db79b5d426bf77cc7107201f55f18b1e0b76
+  metadata.gz: 6fc85d45b48b49b1a75a06b53c06a53bf1eb3b03dee67318e88f2a78248b3d75290d82920f41cc28327e676f6bb1c0a4742b816195fafd60f9817fbe7d830aa7
+  data.tar.gz: 934303155838fc8008fa1e560d64d111fccd954b1006744645139124f8e2c403e9aa9ee31fd29e98b0ec2682069ea6293e46fcbe5146c5ac39d1e8dbdea07c8c

data/Changes

@@ -1,5 +1,8 @@
 Change history of write_xlsx rubygem.
 
+2018-04-29 v0.85.3
+   Added option to store hyperlink strings as string (urls_as_strings).
+
 2018-01-07 v0.85.3
    Fix hide first sheet problem #37
 

data/Rakefile

@@ -7,5 +7,5 @@ require 'rake/testtask'
 Rake::TestTask.new do |test|
   test.libs << 'test'
   test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+  test.warning = false
 end

data/lib/write_xlsx/version.rb

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

data/lib/write_xlsx/workbook.rb

@@ -47,6 +47,7 @@ class Workbook
     attr_reader :shared_strings  # :nodoc:
     attr_reader :vba_project  # :nodoc:
     attr_reader :excel2003_style # :nodoc:
+    attr_reader :strings_to_urls # :nodoc:
     #
     # A new Excel workbook is created using the +new+ constructor
     # which accepts either a filename or an IO object as a parameter.
@@ -123,6 +124,7 @@ def initialize(file, *option_params)
       @table_count         = 0
       @image_types         = {}
       @images              = []
+      @strings_to_urls     = (options[:strings_to_urls].nil? || options[:strings_to_urls]) ? true : false
 
       # Structures for the shared strings data.
       @shared_strings = Package::SharedStrings.new

data/lib/write_xlsx/worksheet.rb

@@ -1783,15 +1783,6 @@ def write(*args)
         write_number(*args)
       elsif token =~ /^\d+$/
         write_number(*args)
-      # Match http, https or ftp URL
-      elsif token =~ %r|\A[fh]tt?ps?://|
-        write_url(*args)
-      # Match mailto:
-      elsif token =~ %r|\Amailto:|
-        write_url(*args)
-      # Match internal or external sheet link
-      elsif token =~ %r!\A(?:in|ex)ternal:!
-        write_url(*args)
       # Match formula
       elsif token =~ /^=/
         write_formula(*args)
@@ -1802,6 +1793,19 @@ def write(*args)
       elsif token == ''
         row_col_args.delete_at(2)     # remove the empty string from the parameter list
         write_blank(*row_col_args)
+      elsif @workbook.strings_to_urls
+        # Match http, https or ftp URL
+        if token =~ %r|\A[fh]tt?ps?://|
+          write_url(*args)
+        # Match mailto:
+        elsif token =~ %r|\Amailto:|
+          write_url(*args)
+        # Match internal or external sheet link
+        elsif token =~ %r!\A(?:in|ex)ternal:!
+          write_url(*args)
+        else
+          write_string(*args)
+        end
       else
         write_string(*args)
       end

data/test/regression/test_urls_as_strings.rb

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestUrlsAsStrings < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_urls_as_strings
+    @xlsx = 'urls_as_strings.xlsx'
+    workbook = WriteXLSX.new(@xlsx, urls_as_strings: true)
+    worksheet = workbook.add_worksheet
+    worksheet.write('A1', 'http://www.write_xlsx.com')
+    worksheet.write('A2', 'mailto:write_xlsx@example.com')
+    worksheet.write('A3', 'ftp://ftp.ruby.org/' )
+    worksheet.write('A4', 'internal:Sheet1!A1'  )
+    worksheet.write('A5', 'external:c:\foo.xlsx')
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx), @xlsx)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.85.3
+  version: 0.85.4
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-07 00:00:00.000000000 Z
+date: 2018-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -978,6 +978,7 @@ files:
 - test/regression/test_tutorial01.rb
 - test/regression/test_tutorial02.rb
 - test/regression/test_tutorial03.rb
+- test/regression/test_urls_as_strings.rb
 - test/regression/test_utf8_01.rb
 - test/regression/test_utf8_03.rb
 - test/regression/test_utf8_04.rb
@@ -1560,6 +1561,7 @@ files:
 - test/regression/xlsx_files/tutorial01.xlsx
 - test/regression/xlsx_files/tutorial02.xlsx
 - test/regression/xlsx_files/tutorial03.xlsx
+- test/regression/xlsx_files/urls_as_strings.xlsx
 - test/regression/xlsx_files/utf8_01.xlsx
 - test/regression/xlsx_files/utf8_03.xlsx
 - test/regression/xlsx_files/utf8_04.xlsx
@@ -1708,7 +1710,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.
@@ -2488,6 +2490,7 @@ test_files:
 - test/regression/test_tutorial01.rb
 - test/regression/test_tutorial02.rb
 - test/regression/test_tutorial03.rb
+- test/regression/test_urls_as_strings.rb
 - test/regression/test_utf8_01.rb
 - test/regression/test_utf8_03.rb
 - test/regression/test_utf8_04.rb
@@ -3070,6 +3073,7 @@ test_files:
 - test/regression/xlsx_files/tutorial01.xlsx
 - test/regression/xlsx_files/tutorial02.xlsx
 - test/regression/xlsx_files/tutorial03.xlsx
+- test/regression/xlsx_files/urls_as_strings.xlsx
 - test/regression/xlsx_files/utf8_01.xlsx
 - test/regression/xlsx_files/utf8_03.xlsx
 - test/regression/xlsx_files/utf8_04.xlsx