write_xlsx 0.85.11 → 0.86.0

data/lib/write_xlsx/worksheet/data_validation.rb

@@ -32,11 +32,17 @@ def initialize(*args)
         @value = @minimum if @minimum
 
         @validate = valid_validation_type[@validate.downcase]
-        if @validate == 'none'
+
+        # No action is required for validate type 'any'
+        # unless there are input messages.
+        if @validate == 'none' && !@input_message && !@input_title
           @validate_none = true
           return
         end
-        if ['list', 'custom'].include?(@validate)
+
+        # The any, list and custom validations don't have a criteria
+        # so we use a default of 'between'
+        if ['none', 'list', 'custom'].include?(@validate)
           @criteria  = 'between'
           @maximum   = nil
         end
@@ -59,7 +65,7 @@ def initialize(*args)
         end
         set_some_defaults
 
-      # A (for now) undocumented parameter to pass additional cell ranges.
+        # A (for now) undocumented parameter to pass additional cell ranges.
         @other_cells.each { |cells| @cells << cells } if has_key?(:other_cells)
       end
 
@@ -82,11 +88,15 @@ def validate_none?
       #
       def write_data_validation(writer) #:nodoc:
         @writer = writer
-        @writer.tag_elements('dataValidation', attributes) do
-          # Write the formula1 element.
-          write_formula_1(@value)
-          # Write the formula2 element.
-          write_formula_2(@maximum) if @maximum
+        if @validate == 'none'
+          @writer.empty_tag('dataValidation', attributes)
+        else
+          @writer.tag_elements('dataValidation', attributes) do
+            # Write the formula1 element.
+            write_formula_1(@value)
+            # Write the formula2 element.
+            write_formula_2(@maximum) if @maximum
+          end
         end
       end
 
@@ -136,8 +146,10 @@ def attributes
           end
         end
 
-        attributes << ['type', @validate]
-        attributes << ['operator', @criteria] if @criteria != 'between'
+        if @validate != 'none'
+          attributes << ['type', @validate]
+          attributes << ['operator', @criteria] if @criteria != 'between'
+        end
 
         if @error_type
           attributes << ['errorStyle', 'warning'] if @error_type == 1

data/lib/write_xlsx/worksheet/hyperlink.rb

@@ -26,17 +26,20 @@ def initialize(url, str, tip)
         # Strip the mailto header.
         normalized_str = str.sub(/^mailto:/, '')
 
+        # Split url into the link and optional anchor/location.
+        url, @url_str = url.split(/#/)
+        url  ||= ''
+
         # Escape URL unless it looks already escaped.
         url = escape_url(url)
 
-        # Excel limits escaped URL to 255 characters.
-        if url.bytesize > 255
-          raise "URL '#{url}' > 255 characters, it exceeds Excel's limit for URLS."
+        # 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."
         end
 
         @url       = url
         @str       = normalized_str
-        @url_str   = nil
         @tip       = tip
       end
 
@@ -144,14 +147,15 @@ def initialize(url, str, tip)
 
         # Convert a ./dir/file.xlsx link to dir/file.xlsx.
         url = url.sub(%r!^.\\!, '')
+        @url_str   = url_str
 
-        # Excel limits escaped URL to 255 characters.
-        if url.bytesize > 255
-          raise "URL '#{url}' > 255 characters, it exceeds Excel's limit for URLS."
+        # 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."
         end
+
         @url       = url
         @str       = str
-        @url_str   = url_str
         @tip       = tip
       end
     end

data/test/regression/test_data_validation08.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestDataValidation08 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def test_data_validation08
+    @xlsx = 'data_validation08.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.data_validation(
+      'C2',
+      validate:      'any',
+      input_title:   'This is the input title',
+      input_message: 'This is the input message'
+    )
+    workbook.close
+    
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink22.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink22 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_hyperlink22
+    @xlsx = 'hyperlink22.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.write_url('A1', 'external:\\\\Vboxsvr\share\foo bar.xlsx')
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink23.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink23 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink23
+    @xlsx = 'hyperlink23.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.write_url('A1', 'https://en.wikipedia.org/wiki/Microsoft_Excel#Data_storage_and_communication', 'Display text')
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_hyperlink24.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionHyperlink24 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true) if @tempfile
+  end
+
+  def test_hyperlink24
+    @xlsx = 'hyperlink24.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.write_url('A1', 'http://www.example.com/some_long_url_that_is_255_characters_long_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_z#some_long_location_that_is_255_characters_long_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_abcdefgh_z')
+
+    workbook.close
+
+    compare_for_regression
+  end
+end

data/test/regression/test_image28.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage28 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_image28
+    @xlsx = 'image28.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      0, 6, 
+      File.join(@test_dir, 'regression', 'images/red_208.png'),
+      46, 1
+    )
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_image29.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage29 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_image29
+    @xlsx = 'image29.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      0, 10, 
+      File.join(@test_dir, 'regression', 'images/red_208.png'),
+      -210, 1
+    )
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_image30.rb

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage30 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_image30
+    @xlsx = 'image30.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.insert_image(
+      'E9',
+      File.join(@test_dir, 'regression', 'images/red.png'),
+      -2, -1
+    )
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_image31.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage31 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_image31
+    @xlsx = 'image31.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.set_column('D:D', 3.86)
+    worksheet.set_row(7, 7.5)
+
+    worksheet.insert_image(
+      'E9',
+      File.join(@test_dir, 'regression', 'images/red.png'),
+      -2, -1
+    )
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_image32.rb

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage32 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_image32
+    @xlsx = 'image32.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    # Negative offset should be ignored.
+    worksheet.insert_image(
+      'B1',
+      File.join(@test_dir, 'regression', 'images/red.png'),
+      -100, -100
+    )
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_image33.rb

@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionImage33 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_image33
+    @xlsx = 'image33.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    worksheet.set_column('D:D', 3.86)
+    worksheet.set_column('E:E', 1.43)
+    worksheet.set_row(7, 7.5)
+    worksheet.set_row(8, 9.75)
+    
+    worksheet.insert_image(
+      'E9',
+      File.join(@test_dir, 'regression', 'images/red.png'),
+      -2, -1
+    )
+
+    workbook.close
+    compare_for_regression
+  end
+end

data/test/regression/test_properties02.rb

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionProperties02 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    @tempfile.close(true)
+  end
+
+  def test_properties02
+    @xlsx = 'properties02.xlsx'
+    workbook  = WriteXLSX.new(@io)
+    worksheet = workbook.add_worksheet
+
+    workbook.set_properties(
+      :hyperlink_base => 'C:\\'
+    )
+
+    workbook.close
+    compare_for_regression(
+      nil,
+      { 'xl/workbook.xml' => ['<workbookView'] }
+    )
+  end
+end