write_xlsx 0.77.1 → 0.77.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d84fbde72d5ae92bdabc292730d086aeb5881437
-  data.tar.gz: eb113ebb668a2efe7b9357b4e15f94c370aa3c6e
+  metadata.gz: 4fff0ad728ab04118c85e81ac51f896a2977b5dc
+  data.tar.gz: 0c47ce7030705137f1f737c52586a75134a3fad0
 SHA512:
-  metadata.gz: defcb8385cf355374a7687ff2d8ce3914cf736ff317e77ef767e38f6beef76f96560c89ed2aeaf26fb572f2afbd8810127f8cd1ec807e5dd5b87f41171b5e8b1
-  data.tar.gz: d8a35bdc7167e7a45cafec89c0188ed68e7139d093ad7107f73c8849ec409bae8c5637114db5a7d5e908e90723c173ec3b631fcd1cd4165bb6e092e9d344fa23
+  metadata.gz: bd8f0752cfd08e0ce6fa02d73f9652e811f47a06f96b5ca3e6c1c4e99a35cf8f7490d9f23497f688cb8c6270d16f45c0de8920aec9e06f68404f169a7a22e7b7
+  data.tar.gz: a1a9bdd2c569b3b81773f08b911e044501d29534d05f9b9c0d10b34fad8b240bb1df3c73e8e6666cfa4841fe6b974b1296354a87bc648965228006b9a54d5d82

data/Changes

@@ -1,4 +1,7 @@
 Change history of write_xlsx rubygem.
+2014-08-19 v0.77.2
+   Fix for issue #16.
+
 2014-07-02 v0.77.1
    Fix for issue #14. thanks leonid-pavlov.
 

data/lib/write_xlsx/version.rb

@@ -1,5 +1,5 @@
 require 'write_xlsx/workbook'
 
 class WriteXLSX < Writexlsx::Workbook
-  VERSION = "0.77.1"
+  VERSION = "0.77.2"
 end

data/lib/write_xlsx/worksheet.rb

@@ -1680,13 +1680,13 @@ def write(*args)
       elsif token =~ /^\d+$/
         write_number(*args)
       # Match http, https or ftp URL
-      elsif token =~ %r|^[fh]tt?ps?://|
+      elsif token =~ %r|\A[fh]tt?ps?://|
         write_url(*args)
       # Match mailto:
-      elsif token =~ %r|^mailto:|
+      elsif token =~ %r|\Amailto:|
         write_url(*args)
       # Match internal or external sheet link
-      elsif token =~ %r!^(?:in|ex)ternal:!
+      elsif token =~ %r!\A(?:in|ex)ternal:!
         write_url(*args)
       # Match formula
       elsif token =~ /^=/
@@ -3216,21 +3216,22 @@ def merge_range_type(type, *args)
         others << format
       end
 
-      if type == 'string'
+      case type
+      when 'string'
         write_string(row_first, col_first, token, format, *others)
-      elsif type == 'number'
+      when 'number'
         write_number(row_first, col_first, token, format, *others)
-      elsif type == 'blank'
+      when 'blank'
         write_blank(row_first, col_first, *others)
-      elsif type == 'date_time'
+      when 'date_time'
         write_date_time(row_first, col_first, token, format, *others)
-      elsif type == 'rich_string'
+      when 'rich_string'
         write_rich_string(row_first, col_first, *others)
-      elsif type == 'url'
+      when 'url'
         write_url(row_first, col_first, token, format, *others)
-      elsif type == 'formula'
+      when 'formula'
         write_formula(row_first, col_first, token, format, *others)
-      elsif type == 'array_formula'
+      when 'array_formula'
         write_formula_array(row_first, col_first, *others)
       else
         raise "Unknown type '#{type}'"

data/lib/write_xlsx/worksheet/hyperlink.rb

@@ -7,6 +7,8 @@ class Hyperlink   # :nodoc:
 
       attr_reader :str, :tip
 
+      MAXIMUM_URLS_SIZE = 255
+
       def self.factory(url, str = nil, tip = nil)
         if url =~ /^internal:(.+)/
           InternalHyperlink.new($~[1], str, tip)
@@ -87,8 +89,8 @@ def initialize(url, str, tip)
         @url_str = @str.dup
 
         # Excel limits escaped URL to 255 characters.
-        if @url.bytesize > 255
-          raise "URL '#{@url}' > 255 characters, it exceeds Excel's limit for URLS."
+        if @url.bytesize > MAXIMUM_URLS_SIZE
+          raise "URL '#{@url}' > #{MAXIMUM_URLS_SIZE} characters, it exceeds Excel's limit for URLS."
         end
 
         @tip = tip

data/test/worksheet/test_write_multiline_string_with_url.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+require 'write_xlsx'
+require 'stringio'
+
+class TestWriteMultilineStringWithUrl < Test::Unit::TestCase
+  def setup
+    @workbook = WriteXLSX.new(StringIO.new)
+    @worksheet = @workbook.add_worksheet('')
+  end
+
+  def test_write_with_url_after_cr_string
+    url_strings = %w(http:// https:// ftp:// ftps:// mailto: internal: external:)
+    col = 0
+    row = 0
+
+    url_strings.each do |url_string|
+      assert_nothing_raised do
+        @worksheet.write(row, col, long_string(url_string))
+        row += 1
+      end
+    end
+  end
+
+  def long_string(url_string)
+    "*" * Writexlsx::Worksheet::Hyperlink::MAXIMUM_URLS_SIZE <<
+      "\n" <<
+      url_string
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.77.1
+  version: 0.77.2
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -1347,6 +1347,7 @@ files:
 - test/worksheet/test_write_merge_cell.rb
 - test/worksheet/test_write_merge_cells.rb
 - test/worksheet/test_write_methods.rb
+- test/worksheet/test_write_multiline_string_with_url.rb
 - test/worksheet/test_write_page_margins.rb
 - test/worksheet/test_write_page_set_up_pr.rb
 - test/worksheet/test_write_page_setup.rb
@@ -2579,6 +2580,7 @@ test_files:
 - test/worksheet/test_write_merge_cell.rb
 - test/worksheet/test_write_merge_cells.rb
 - test/worksheet/test_write_methods.rb
+- test/worksheet/test_write_multiline_string_with_url.rb
 - test/worksheet/test_write_page_margins.rb
 - test/worksheet/test_write_page_set_up_pr.rb
 - test/worksheet/test_write_page_setup.rb