write_xlsx 1.01.0 → 1.02.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7488f5d7a2fb2d8d2538dfad0e469015596350f36b8c92fb6ad92c30413fc76a
-  data.tar.gz: 42633fda58820d75b54c6248796c7dec91e2acfc3016ac7dfbea0331c8531353
+  metadata.gz: cd25c9e7242d84cbaa3f58304d292275f56e89353b61f151e9beb2bf9e740e46
+  data.tar.gz: 6ac71db1cf2089932e2381cb6c20d2b1fa0a82493bc00bafc307d4efbd2da048
 SHA512:
-  metadata.gz: ea3fa967b302439de1ddced9c20011f14eeafd8025b424bf7edd33f34215428fd6f9155264336e36a771ee345f13a4ad764abef8bc4c39a88e2d8aa9d8c769b1
-  data.tar.gz: fd4f6e52efcb4e2163d0346e5b13ec21312c73ad1fb2b1d79ab4f81d51411e15eb9308ec0249e52b1082e97c696f94b3651e6ce1676eb011f7420623eda7530c
+  metadata.gz: aada5fa6d8a1034743af39bcc352b2e15120493c47c4f048006f6db3869c3f1eb8652e437ffb4bdf441b0280596f314bc06d436178c4bd82ea39e8e9dafcc5b8
+  data.tar.gz: db54ce603031240fe4e5081603042f804a9dd4566e6bd4e5d1b7124fd9f064748654552bb7297881cfc72915e959f26c7459777fd4cceddaee27aeb726aec798

data/Changes

@@ -1,5 +1,13 @@
 Change history of write_xlsx rubygem.
 
+2021-02-12 v1.02.0
+
+   Added support for hyperlinks in worksheet images.
+
+   Increased allowable url length from 255 to 2079 characters, as allowed in
+   more recent versions of Excel.
+
+
 2021-02-08 v1.01.0
 
    Added support for stacked and East Asian vertical chart fonts.

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.99](https://github.com/jmcnamara/excel-writer-xlsx) .
+[Excel::Writer::XLSX-1.02](https://github.com/jmcnamara/excel-writer-xlsx/tree/CPAN_1.02)
 
 ## Description
 

data/lib/write_xlsx/drawing.rb

@@ -4,11 +4,12 @@
 
 module Writexlsx
   class Drawing
-    attr_accessor :type, :dimensions, :width, :height, :name, :shape, :anchor
+    attr_accessor :type, :dimensions, :width, :height, :description, :shape, :anchor, :rel_index, :url_rel_index
+    attr_reader :tip
 
-    def initialize(type, dimensions, width, height, name, shape, anchor)
-      @type, @dimensions, @width, @height, @name, @shape, @anchor =
-        type, dimensions, width, height, name, shape, anchor
+    def initialize(type, dimensions, width, height, description, shape, anchor, rel_index = nil, url_rel_index = nil, tip = nil)
+      @type, @dimensions, @width, @height, @description, @shape, @anchor, @rel_index, @url_rel_index, @tip =
+        type, dimensions, width, height, description, shape, anchor, rel_index, url_rel_index, tip
     end
   end
 
@@ -82,12 +83,16 @@ def write_drawing_workspace
     def write_two_cell_anchor(*args)
       index, drawing = args
 
-      type = drawing.type
-      width = drawing.width
-      height = drawing.height
-      description = drawing.name
-      shape = drawing.shape
-      anchor = drawing.anchor
+      type          = drawing.type
+      width         = drawing.width
+      height        = drawing.height
+      description   = drawing.description
+      shape         = drawing.shape
+      anchor        = drawing.anchor
+      rel_index     = drawing.rel_index
+      url_rel_index = drawing.url_rel_index
+      tip           = drawing.tip
+
       col_from, row_from, col_from_offset, row_from_offset,
       col_to, row_to, col_to_offset, row_to_offset, col_absolute, row_absolute = drawing.dimensions
 
@@ -113,10 +118,14 @@ def write_two_cell_anchor(*args)
           # Graphic frame.
 
           # Write the xdr:graphicFrame element for charts.
-          write_graphic_frame(index, description)
+          write_graphic_frame(index, rel_index, description)
         elsif type == 2
           # Write the xdr:pic element.
-          write_pic(index, col_absolute, row_absolute, width, height, description)
+          write_pic(
+            index,        rel_index,      col_absolute,
+            row_absolute, width,          height,
+            description,  url_rel_index , tip
+          )
         else
           # Write the xdr:sp element for shapes.
           write_sp(index, col_absolute, row_absolute, width, height, shape)
@@ -149,7 +158,7 @@ def write_absolute_anchor(index)
         end
 
         # Write the xdr:graphicFrame element.
-        write_graphic_frame(index)
+        write_graphic_frame(index, index)
 
         # Write the xdr:clientData element.
         write_client_data
@@ -223,9 +232,9 @@ def write_row_off(data)
     #
     def write_pos(x, y)
       attributes = [
-                    ['x', x],
-                    ['y', y]
-                   ]
+        ['x', x],
+        ['y', y]
+      ]
 
       @writer.empty_tag('xdr:pos', attributes)
     end
@@ -235,9 +244,9 @@ def write_pos(x, y)
     #
     def write_ext(cx, cy)
       attributes = [
-                    ['cx', cx],
-                    ['cy', cy]
-                   ]
+        ['cx', cx],
+        ['cy', cy]
+      ]
 
       @writer.empty_tag('xdr:ext', attributes)
     end
@@ -245,7 +254,7 @@ def write_ext(cx, cy)
     #
     # Write the <xdr:graphicFrame> element.
     #
-    def write_graphic_frame(index, name = nil)
+    def write_graphic_frame(index, rel_index, name = nil)
       macro  = ''
 
       attributes = [ ['macro', macro] ]
@@ -256,7 +265,7 @@ def write_graphic_frame(index, name = nil)
         # Write the xdr:xfrm element.
         write_xfrm
         # Write the a:graphic element.
-        write_atag_graphic(index)
+        write_atag_graphic(rel_index)
       end
     end
 
@@ -277,18 +286,42 @@ def write_nv_graphic_frame_pr(index, name = nil)
     #
     # Write the <xdr:cNvPr> element.
     #
-    def write_c_nv_pr(id, name, descr = nil)
+    def write_c_nv_pr(index, name, description = nil, url_rel_index = nil, tip = nil)
       attributes = [
-          ['id',   id],
-          ['name', name]
+        ['id',   index],
+        ['name', name]
       ]
 
       # Add description attribute for images.
-      attributes << ['descr', descr] if descr
+      attributes << ['descr', description] if description
 
-      @writer.empty_tag('xdr:cNvPr', attributes)
+      if ptrue?(url_rel_index)
+        @writer.tag_elements('xdr:cNvPr', attributes) do
+          # Write the a:hlinkClick element.
+          write_a_hlink_click(url_rel_index, tip)
+        end
+      else
+        @writer.empty_tag('xdr:cNvPr', attributes)
+      end
     end
 
+    #
+    # Write the <a:hlinkClick> element.
+    #
+    def write_a_hlink_click(index, tip)
+      schema  = 'http://schemas.openxmlformats.org/officeDocument/'
+      xmlns_r = "#{schema}2006/relationships"
+      r_id    = "rId#{index}"
+
+      attributes = [
+        ['xmlns:r', xmlns_r],
+        ['r:id', r_id]
+      ]
+
+      attributes << ['tooltip', tip] if tip
+
+      @writer.empty_tag('a:hlinkClick', attributes)
+    end
 
     #
     # Write the <xdr:cNvGraphicFramePr> element.
@@ -371,7 +404,7 @@ def write_atag_graphic(index)
     # Write the <a:graphicData> element.
     #
     def write_atag_graphic_data(index)
-      uri   = 'http://schemas.openxmlformats.org/drawingml/2006/chart'
+      uri = 'http://schemas.openxmlformats.org/drawingml/2006/chart'
 
       attributes = [ ['uri', uri] ]
 
@@ -494,12 +527,12 @@ def write_nv_sp_pr(index, shape)
     #
     # Write the <xdr:pic> element.
     #
-    def write_pic(index, col_absolute, row_absolute, width, height, description)
+    def write_pic(index, rel_index, col_absolute, row_absolute, width, height, description, url_rel_index, tip)
       @writer.tag_elements('xdr:pic') do
         # Write the xdr:nvPicPr element.
-        write_nv_pic_pr(index, description)
+        write_nv_pic_pr(index, rel_index, description, url_rel_index, tip)
         # Write the xdr:blipFill element.
-        write_blip_fill(index)
+        write_blip_fill(rel_index)
 
         # Pictures are rectangle shapes by default.
         shape = Shape.new
@@ -513,10 +546,13 @@ def write_pic(index, col_absolute, row_absolute, width, height, description)
     #
     # Write the <xdr:nvPicPr> element.
     #
-    def write_nv_pic_pr(index, description)
+    def write_nv_pic_pr(index, rel_index, description, url_rel_index, tip)
       @writer.tag_elements('xdr:nvPicPr') do
         # Write the xdr:cNvPr element.
-        write_c_nv_pr( index + 1, "Picture #{index}", description )
+        write_c_nv_pr(
+          index + 1, "Picture #{index}", description,
+          url_rel_index, tip
+        )
         # Write the xdr:cNvPicPr element.
         write_c_nv_pic_pr
       end

data/lib/write_xlsx/package/relationships.rb

@@ -31,8 +31,8 @@ def assemble_xml_file
       #
       # Add container relationship to XLSX .rels xml files.
       #
-      def add_document_relationship(type, target)
-        @rels.push([Document_schema + type, target])
+      def add_document_relationship(type, target, target_mode = nil)
+        @rels.push([Document_schema + type, target, target_mode])
       end
 
       #

data/lib/write_xlsx/utility.rb

@@ -218,6 +218,25 @@ def convert_date_time(date_time_string)       #:nodoc:
       end
     end
 
+    def escape_url(url)
+      unless url =~ /%[0-9a-fA-F]{2}/
+        # Escape the URL escape symbol.
+        url = url.gsub(/%/, "%25")
+
+        # Escape whitespae in URL.
+        url = url.gsub(/[\s\x00]/, '%20')
+
+        # Escape other special characters in URL.
+        re = /(["<>\[\]`^{}])/
+        while re =~ url
+          match = $~[1]
+          url = url.sub(re, sprintf("%%%x", match.ord))
+        end
+      end
+
+      url
+    end
+
     def absolute_char(absolute)
       absolute ? '$' : ''
     end

data/lib/write_xlsx/version.rb

@@ -1 +1 @@
-WriteXLSX_VERSION = "1.01.0"
+WriteXLSX_VERSION = "1.02.0"

data/lib/write_xlsx/workbook.rb

@@ -49,6 +49,7 @@ class Workbook
     attr_reader :shared_strings  # :nodoc:
     attr_reader :vba_project  # :nodoc:
     attr_reader :excel2003_style # :nodoc:
+    attr_reader :max_url_length # :nodoc:
     attr_reader :strings_to_urls # :nodoc:
     attr_reader :default_url_format # :nodoc:
 
@@ -130,6 +131,12 @@ def initialize(file, *option_params)
       @images              = []
       @strings_to_urls     = (options[:strings_to_urls].nil? || options[:strings_to_urls]) ? true : false
 
+      @max_url_length      = 2079
+      if options[:max_url_length]
+        @max_url_length = options[:max_url_length]
+
+        @max_url_length = 2079 if @max_url_length < 250
+      end
       # Structures for the shared strings data.
       @shared_strings = Package::SharedStrings.new
 
@@ -1935,12 +1942,6 @@ def prepare_drawings #:nodoc:
           has_drawings = true
         end
 
-        # Prepare the worksheet charts.
-        sheet.charts.each_with_index do |chart, index|
-          chart_ref_id += 1
-          sheet.prepare_chart(index, chart_ref_id, drawing_id)
-        end
-
         # Prepare the worksheet images.
         sheet.images.each_with_index do |image, index|
           type, width, height, name, x_dpi, y_dpi = get_image_properties(image[2])
@@ -1948,6 +1949,12 @@ def prepare_drawings #:nodoc:
           sheet.prepare_image(index, image_ref_id, drawing_id, width, height, name, type, x_dpi, y_dpi)
         end
 
+        # Prepare the worksheet charts.
+        sheet.charts.each_with_index do |chart, index|
+          chart_ref_id += 1
+          sheet.prepare_chart(index, chart_ref_id, drawing_id)
+        end
+
         # Prepare the worksheet shapes.
         sheet.shapes.each_with_index do |shape, index|
           sheet.prepare_shape(index, drawing_id)

data/lib/write_xlsx/worksheet.rb

@@ -309,6 +309,7 @@ def initialize(workbook, index, name) #:nodoc:
       @excel_version = 2007
       @palette = workbook.palette
       @default_url_format = workbook.default_url_format
+      @max_url_length = workbook.max_url_length
 
       @page_setup = PageSetup.new
 
@@ -356,6 +357,8 @@ def initialize(workbook, index, name) #:nodoc:
       @sparklines             = []
       @shapes                 = []
       @shape_hash             = {}
+      @drawing_rels           = {}
+      @drawing_rels_id        = 0
       @header_images          = []
       @footer_images          = []
 
@@ -3047,6 +3050,8 @@ def insert_image(*args)
         x_scale  = params[:x_scale]
         y_scale  = params[:y_scale]
         anchor   = params[:object_position]
+        url      = params[:url]
+        tip      = params[:tip]
       else
         x_offset, y_offset, x_scale, y_scale, anchor = options
       end
@@ -3056,7 +3061,10 @@ def insert_image(*args)
       y_scale  ||= 1
       anchor   ||= 2
 
-      @images << [row, col, image, x_offset, y_offset, x_scale, y_scale, anchor]
+      @images << [
+        row, col, image, x_offset, y_offset,
+        x_scale, y_scale, url, tip, anchor
+      ]
     end
 
     #
@@ -5728,7 +5736,7 @@ def prepare_chart(index, chart_id, drawing_id) # :nodoc:
       name = chart.name
 
       # Create a Drawing object to use with worksheet unless one already exists.
-      drawing = Drawing.new(drawing_type, dimensions, 0, 0, name, nil, anchor)
+      drawing = Drawing.new(drawing_type, dimensions, 0, 0, name, nil, anchor, drawing_rel_index, 0, nil)
       if !drawings?
         @drawings = Drawings.new
         @drawings.add_drawing_object(drawing)
@@ -6077,6 +6085,21 @@ def write_sparkline_groups
 
     private
 
+    #
+    # Get the index used to address a drawing rel link.
+    #
+    def drawing_rel_index(target = nil)
+      if !target
+        # Undefined values for drawings like charts will always be unique.
+        @drawing_rels_id += 1
+      elsif ptrue?(@drawing_rels[target])
+        @drawing_rels[target]
+      else
+        @drawing_rels_id += 1
+        @drawing_rels[target] = @drawing_rels_id
+      end
+    end
+
     def hyperlinks_count
       @hyperlinks.keys.inject(0) { |s, n| s += @hyperlinks[n].keys.size }
     end
@@ -6429,7 +6452,8 @@ def prepare_image(index, image_id, drawing_id, width, height, name, image_type,
       y_dpi ||= 96
       drawing_type = 2
 
-      row, col, image, x_offset, y_offset, x_scale, y_scale, anchor = @images[index]
+      row, col, image, x_offset, y_offset,
+      x_scale, y_scale, url, tip, anchor = @images[index]
 
       width  *= x_scale
       height *= y_scale
@@ -6444,7 +6468,7 @@ def prepare_image(index, image_id, drawing_id, width, height, name, image_type,
       height = (0.5 + (height * 9_525)).to_i
 
       # Create a Drawing object to use with worksheet unless one already exists.
-      drawing = Drawing.new(drawing_type, dimensions, width, height, name, nil, anchor)
+      drawing = Drawing.new(drawing_type, dimensions, width, height, name, nil, anchor, 0, 0, tip)
       if !drawings?
         drawings = Drawings.new
         drawings.embedded = 1
@@ -6457,6 +6481,35 @@ def prepare_image(index, image_id, drawing_id, width, height, name, image_type,
       end
       drawings.add_drawing_object(drawing)
 
+      if url
+        rel_type = '/hyperlink'
+        target_mode = 'External'
+        if url =~ %r!^[fh]tt?ps?://! || url =~ /^mailto:/
+          target = escape_url(url)
+        end
+        if url =~ /^external:/
+          target = escape_url(url.sub(/^external:/, 'file:///'))
+          # Additional escape not required in worksheet hyperlinks
+          target = target.gsub(/#/, '%23')
+        end
+        if url =~ /^internal:/
+          target      = url.sub(/^internal:/, '#')
+          target_mode = nil
+        end
+
+        if target.length > 255
+          raise <<"EOS"
+Ignoring URL #{target} where link or anchor > 255 characters since it exceeds Excel's limit for URLS. See LIMITATIONS section of the WriteXLSX documentation.
+EOS
+        end
+
+        if target
+          @drawing_links << [rel_type, target, target_mode]
+        end
+        drawing.url_rel_index = drawing_rel_index
+      end
+
+      drawing.rel_index = drawing_rel_index
       @drawing_links << ['/image', "../media/image#{image_id}.#{image_type}"]
     end
     public :prepare_image
@@ -6575,7 +6628,7 @@ def prepare_shape(index, drawing_id)
       shape.calc_position_emus(self)
 
       drawing_type = 3
-      drawing = Drawing.new(drawing_type, shape.dimensions, shape.width_emu, shape.height_emu, shape.name, shape, shape.anchor)
+      drawing = Drawing.new(drawing_type, shape.dimensions, shape.width_emu, shape.height_emu, shape.name, shape, shape.anchor, drawing_rel_index, 0, nil)
       drawings.add_drawing_object(drawing)
     end
     public :prepare_shape

data/lib/write_xlsx/worksheet/hyperlink.rb

@@ -7,19 +7,19 @@ class Hyperlink   # :nodoc:
 
       attr_reader :str, :tip
 
-      MAXIMUM_URLS_SIZE = 255
+      MAXIMUM_URLS_SIZE = 2079
 
-      def self.factory(url, str = nil, tip = nil)
+      def self.factory(url, str = nil, tip = nil, max_url_length = MAXIMUM_URLS_SIZE)
         if url =~ /^internal:(.+)/
-          InternalHyperlink.new($~[1], str, tip)
+          InternalHyperlink.new($~[1], str, tip, max_url_length)
         elsif url =~ /^external:(.+)/
-          ExternalHyperlink.new($~[1], str, tip)
+          ExternalHyperlink.new($~[1], str, tip, max_url_length)
         else
-          new(url, str, tip)
+          new(url, str, tip, max_url_length)
         end
       end
 
-      def initialize(url, str, tip)
+      def initialize(url, str, tip, max_url_length)
         # The displayed string defaults to the url string.
         str ||= url.dup
 
@@ -33,8 +33,8 @@ def initialize(url, str, tip)
         url = escape_url(url)
 
         # Excel limits the escaped URL and location/anchor to 255 characters.
-        if url.bytesize > 255 || (!@url_str.nil? && @url_str.bytesize > 255)
-          raise "Ignoring URL '#{url}' where link or anchor > 255 characters since it exceeds Excel's limit for URLS. See LIMITATIONS section of the Excel::Writer::XLSX documentation."
+        if url.bytesize > max_url_length || (!@url_str.nil? && @url_str.bytesize > max_url_length)
+          raise "Ignoring URL '#{url}' where link or anchor > #{max_url_length} characters since it exceeds Excel's limit for URLS. See LIMITATIONS section of the Excel::Writer::XLSX documentation."
         end
 
         @url       = url
@@ -61,33 +61,12 @@ def external_hyper_link
       def display_on
         @display = @url_str
       end
-
-      private
-
-      def escape_url(url)
-        unless url =~ /%[0-9a-fA-F]{2}/
-          # Escape the URL escape symbol.
-          url = url.gsub(/%/, "%25")
-
-          # Escape whitespae in URL.
-          url = url.gsub(/[\s\x00]/, '%20')
-
-          # Escape other special characters in URL.
-          re = /(["<>\[\]`^{}])/
-          while re =~ url
-            match = $~[1]
-            url = url.sub(re, sprintf("%%%x", match.ord))
-          end
-        end
-
-        url
-      end
     end
 
     class InternalHyperlink < Hyperlink
       undef external_hyper_link
 
-      def initialize(url, str, tip)
+      def initialize(url, str, tip, max_url_length)
         @url = url
         # The displayed string defaults to the url string.
         str ||= @url.dup
@@ -98,9 +77,9 @@ def initialize(url, str, tip)
         # Copy string for use in hyperlink elements.
         @url_str = @str.dup
 
-        # Excel limits escaped URL to 255 characters.
-        if @url.bytesize > MAXIMUM_URLS_SIZE
-          raise "URL '#{@url}' > #{MAXIMUM_URLS_SIZE} characters, it exceeds Excel's limit for URLS."
+        # Excel limits escaped URL to #{max_url_length} characters.
+        if @url.bytesize > max_url_length
+          raise "URL '#{@url}' > #{max_url_length} characters, it exceeds Excel's limit for URLS."
         end
 
         @tip = tip
@@ -118,7 +97,7 @@ def attributes(row, col, dummy = nil)
     end
 
     class ExternalHyperlink < Hyperlink
-      def initialize(url, str, tip)
+      def initialize(url, str, tip, max_url_length)
         # The displayed string defaults to the url string.
         str ||= url.dup
 
@@ -145,9 +124,9 @@ def initialize(url, str, tip)
         url = url.sub(%r!^.\\!, '')
         @url_str   = url_str
 
-        # Excel limits the escaped URL and location/anchor to 255 characters.
-        if url.bytesize > 255 || (!@url_str.nil? && @url_str.bytesize > 255)
-          raise "Ignoring URL '#{url}' where link or anchor > 255 characters since it exceeds Excel's limit for URLS. See LIMITATIONS section of the Excel::Writer::XLSX documentation."
+        # Excel limits the escaped URL and location/anchor to max_url_length characters.
+        if url.bytesize > max_url_length || (!@url_str.nil? && @url_str.bytesize > max_url_length)
+          raise "Ignoring URL '#{url}' where link or anchor > #{max_url_length} characters since it exceeds Excel's limit for URLS. See LIMITATIONS section of the Excel::Writer::XLSX documentation."
         end
 
         @url       = url

data/test/drawing/test_drawing_chart_01.rb

@@ -7,7 +7,7 @@ def test_drawing_chart_01
     @obj = Writexlsx::Drawings.new
     dimensions = [4, 8, 457200, 104775, 12, 22, 152400, 180975]
     drawing = Writexlsx::Drawing.new(
-      1, dimensions, nil, nil, nil, nil, 1
+      1, dimensions, nil, nil, nil, nil, 1, 1
     )
     @obj.add_drawing_object(drawing)
     @obj.embedded = true

data/test/drawing/test_drawing_image_01.rb

@@ -9,7 +9,7 @@ def test_drawing_image_01
       2, 1, 0, 0, 3, 6, 533257, 190357, 1219200, 190500
     ]
     drawing = Writexlsx::Drawing.new(
-      2, dimensions, 1142857, 1142857, 'republic.png', nil, 2
+      2, dimensions, 1142857, 1142857, 'republic.png', nil, 2, 1
     )
     @obj.add_drawing_object(drawing)
     # @obj.add_drawing_object(

data/test/regression/test_hyperlink32.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink32 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink32
+    @xlsx = 'hyperlink32.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      :url => 'https://github.com/jmcnamara'
+    )
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink33.rb

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink33 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink33
+    @xlsx = 'hyperlink33.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      :url => 'https://github.com/jmcnamara',
+      :tip => 'GitHub'
+    )
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink34.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink34 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink34
+    @xlsx = 'hyperlink34.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image('A1', 'test/regression/images/blue.png')
+    worksheet.insert_image(
+      'B3', 'test/regression/images/red.jpg',
+      :url => 'https://github.com/jmcnamara'
+    )
+    worksheet.insert_image('D5', 'test/regression/images/yellow.jpg')
+    worksheet.insert_image(
+      'F9', 'test/regression/images/grey.png',
+      :url => 'https://github.com'
+    )
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink35.rb

@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink35 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink35
+    @xlsx = 'hyperlink35.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'A1', 'test/regression/images/blue.png',
+      :url => 'https://github.com/foo'
+    )
+    worksheet.insert_image(
+      'B3', 'test/regression/images/red.jpg',
+      :url => 'https://github.com/bar'
+    )
+    worksheet.insert_image(
+      'D5', 'test/regression/images/yellow.jpg',
+      :url => 'https://github.com/baz'
+    )
+    worksheet.insert_image(
+      'F9', 'test/regression/images/grey.png',
+      :url => 'https://github.com/boo'
+    )
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink36.rb

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink36 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink36
+    @xlsx = 'hyperlink36.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+    chart     = workbook.add_chart(:type => 'pie', :embedded => 1)
+
+    worksheet.write('A1', 1)
+    worksheet.write('A2', 2)
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      :url => 'https://github.com/jmcnamara'
+    )
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$2')
+    worksheet.insert_chart('E12', chart)
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink37.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink37 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink37
+    @xlsx = 'hyperlink37.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    textbox = workbook.add_shape
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      :url => 'https://github.com/jmcnamara'
+    )
+
+    worksheet.insert_shape('E12', textbox)
+
+    workbook.close
+
+    compare_for_regression(
+      ['xl/drawings/drawing1.xml'], {}
+    )
+  end
+end

data/test/regression/test_hyperlink38.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink38 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink38
+    @xlsx = 'hyperlink38.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      :url => 'internal:Sheet1!A1'
+    )
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink39.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink39 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink39
+    @xlsx = 'hyperlink39.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      :url => 'external:c:\temp\foo.xlsx'
+    )
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink40.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink40 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink40
+    @xlsx = 'hyperlink40.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      :url => 'https://github.com/jmcnamara#foo'
+    )
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink41.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink41 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink41
+    @xlsx = 'hyperlink41.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      :url => 'https://github.com/jmcnamara<foo>'
+    )
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink42.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink42 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink42
+    @xlsx = 'hyperlink42.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      :url => 'mailto:jmcnamara@cpan.org'
+    )
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink43.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink43 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink43
+    @xlsx = 'hyperlink43.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      :url => 'external:c:\te mp\foo.xlsx'
+    )
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink44.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink44 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink44
+    @xlsx = 'hyperlink44.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet('Sheet 1')
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      :url => "internal:'Sheet 1'!A1"
+    )
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink45.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink45 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink45
+    @xlsx = 'hyperlink45.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9', 'test/regression/images/red.png',
+      :url => %q(external:\\\\Vboxsvr\share\foo bar.xlsx#'Some Sheet'!A1)
+    )
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink47.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink47 < Minitest::Test
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink47
+    @xlsx = 'hyperlink47.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.write_url(
+      'A1',
+      'http://foo.com/this_is_a_long_hyperlink_that_exceeds_a_limit_of_255_characters_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
+    )
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_image06.rb

@@ -17,13 +17,13 @@ def test_image06
     chart     = workbook.add_chart(:type => 'bar', :embedded => 1)
 
     # For testig, copy the randomly generated axis ids in the target xlsx file.
-    chart.instance_variable_set(:@axis_ids, [46335488, 46364544])
+    chart.instance_variable_set(:@axis_ids, [87089152, 87093632])
 
     data = [
-            [1, 2, 3,  4,  5],
-            [2, 4, 6,  8, 10],
-            [3, 6, 9, 12, 15]
-           ]
+      [1, 2, 3,  4,  5],
+      [2, 4, 6,  8, 10],
+      [3, 6, 9, 12, 15]
+    ]
 
     worksheet.write('A1', data)
     chart.add_series(:values => '=Sheet1!$A$1:$A$5')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 1.01.0
+  version: 1.02.0
 platform: ruby
 authors:
 - Hideo NAKAMURA
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -900,6 +900,21 @@ files:
 - test/regression/test_hyperlink28.rb
 - test/regression/test_hyperlink29.rb
 - test/regression/test_hyperlink30.rb
+- test/regression/test_hyperlink32.rb
+- test/regression/test_hyperlink33.rb
+- test/regression/test_hyperlink34.rb
+- test/regression/test_hyperlink35.rb
+- test/regression/test_hyperlink36.rb
+- test/regression/test_hyperlink37.rb
+- test/regression/test_hyperlink38.rb
+- test/regression/test_hyperlink39.rb
+- test/regression/test_hyperlink40.rb
+- test/regression/test_hyperlink41.rb
+- test/regression/test_hyperlink42.rb
+- test/regression/test_hyperlink43.rb
+- test/regression/test_hyperlink44.rb
+- test/regression/test_hyperlink45.rb
+- test/regression/test_hyperlink47.rb
 - test/regression/test_image01.rb
 - test/regression/test_image02.rb
 - test/regression/test_image03.rb
@@ -1585,6 +1600,23 @@ files:
 - test/regression/xlsx_files/hyperlink29.xlsx
 - test/regression/xlsx_files/hyperlink30.xlsx
 - test/regression/xlsx_files/hyperlink31.xlsx
+- test/regression/xlsx_files/hyperlink32.xlsx
+- test/regression/xlsx_files/hyperlink33.xlsx
+- test/regression/xlsx_files/hyperlink34.xlsx
+- test/regression/xlsx_files/hyperlink35.xlsx
+- test/regression/xlsx_files/hyperlink36.xlsx
+- test/regression/xlsx_files/hyperlink37.xlsx
+- test/regression/xlsx_files/hyperlink38.xlsx
+- test/regression/xlsx_files/hyperlink39.xlsx
+- test/regression/xlsx_files/hyperlink40.xlsx
+- test/regression/xlsx_files/hyperlink41.xlsx
+- test/regression/xlsx_files/hyperlink42.xlsx
+- test/regression/xlsx_files/hyperlink43.xlsx
+- test/regression/xlsx_files/hyperlink44.xlsx
+- test/regression/xlsx_files/hyperlink45.xlsx
+- test/regression/xlsx_files/hyperlink47.xlsx
+- test/regression/xlsx_files/hyperlink48.xlsx
+- test/regression/xlsx_files/hyperlink49.xlsx
 - test/regression/xlsx_files/image01.xlsx
 - test/regression/xlsx_files/image02.xlsx
 - test/regression/xlsx_files/image03.xlsx
@@ -1925,7 +1957,7 @@ homepage: https://github.com/cxn03651/write_xlsx#readme
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -1940,8 +1972,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: write_xlsx is a gem to create a new file in the Excel 2007+ XLSX format.
 test_files:
@@ -2638,6 +2670,21 @@ test_files:
 - test/regression/test_hyperlink28.rb
 - test/regression/test_hyperlink29.rb
 - test/regression/test_hyperlink30.rb
+- test/regression/test_hyperlink32.rb
+- test/regression/test_hyperlink33.rb
+- test/regression/test_hyperlink34.rb
+- test/regression/test_hyperlink35.rb
+- test/regression/test_hyperlink36.rb
+- test/regression/test_hyperlink37.rb
+- test/regression/test_hyperlink38.rb
+- test/regression/test_hyperlink39.rb
+- test/regression/test_hyperlink40.rb
+- test/regression/test_hyperlink41.rb
+- test/regression/test_hyperlink42.rb
+- test/regression/test_hyperlink43.rb
+- test/regression/test_hyperlink44.rb
+- test/regression/test_hyperlink45.rb
+- test/regression/test_hyperlink47.rb
 - test/regression/test_image01.rb
 - test/regression/test_image02.rb
 - test/regression/test_image03.rb
@@ -3323,6 +3370,23 @@ test_files:
 - test/regression/xlsx_files/hyperlink29.xlsx
 - test/regression/xlsx_files/hyperlink30.xlsx
 - test/regression/xlsx_files/hyperlink31.xlsx
+- test/regression/xlsx_files/hyperlink32.xlsx
+- test/regression/xlsx_files/hyperlink33.xlsx
+- test/regression/xlsx_files/hyperlink34.xlsx
+- test/regression/xlsx_files/hyperlink35.xlsx
+- test/regression/xlsx_files/hyperlink36.xlsx
+- test/regression/xlsx_files/hyperlink37.xlsx
+- test/regression/xlsx_files/hyperlink38.xlsx
+- test/regression/xlsx_files/hyperlink39.xlsx
+- test/regression/xlsx_files/hyperlink40.xlsx
+- test/regression/xlsx_files/hyperlink41.xlsx
+- test/regression/xlsx_files/hyperlink42.xlsx
+- test/regression/xlsx_files/hyperlink43.xlsx
+- test/regression/xlsx_files/hyperlink44.xlsx
+- test/regression/xlsx_files/hyperlink45.xlsx
+- test/regression/xlsx_files/hyperlink47.xlsx
+- test/regression/xlsx_files/hyperlink48.xlsx
+- test/regression/xlsx_files/hyperlink49.xlsx
 - test/regression/xlsx_files/image01.xlsx
 - test/regression/xlsx_files/image02.xlsx
 - test/regression/xlsx_files/image03.xlsx