Merge pull request #153 from ball-hayden/master

Test for invalid characters in the sheet name

3 files changed, 11 insertions, 5 deletions

diff --git a/lib/axlsx/util/constants.rb b/lib/axlsx/util/constants.rb
index 437de6db..f9bffa87 100644
--- a/lib/axlsx/util/constants.rb
+++ b/lib/axlsx/util/constants.rb
@@ -285,9 +285,8 @@ module Axlsx
   # error message for sheets that use a name which is longer than 31 bytes
   ERR_SHEET_NAME_TOO_LONG = "Your worksheet name '%s' is too long. Worksheet names must be 31 characters (bytes) or less"
 
-  # error message for sheets that use a name which includes a colon
-
-  ERR_SHEET_NAME_COLON_FORBIDDEN = "Your worksheet name '%s' contains a colon, which is not allowed by MS Excel and will cause repair warnings. Please change the name of your sheet."
+  # error message for sheets that use a name which include invalid characters
+  ERR_SHEET_NAME_CHARACTER_FORBIDDEN = "Your worksheet name '%s' contains a character which is not allowed by MS Excel and will cause repair warnings. Please change the name of your sheet."
 
   # error message for duplicate sheet names
   ERR_DUPLICATE_SHEET_NAME = "There is already a worksheet in this workbook named '%s'. Please use a unique name"
diff --git a/lib/axlsx/workbook/worksheet/worksheet.rb b/lib/axlsx/workbook/worksheet/worksheet.rb
index 832b6f37..af2b2dfd 100644
--- a/lib/axlsx/workbook/worksheet/worksheet.rb
+++ b/lib/axlsx/workbook/worksheet/worksheet.rb
@@ -614,7 +614,7 @@ module Axlsx
     def validate_sheet_name(name)
       DataTypeValidator.validate "Worksheet.name", String, name
       raise ArgumentError, (ERR_SHEET_NAME_TOO_LONG % name) if name.size > 31
-      raise ArgumentError, (ERR_SHEET_NAME_COLON_FORBIDDEN % name) if name.include? ':'
+      raise ArgumentError, (ERR_SHEET_NAME_CHARACTER_FORBIDDEN % name) if '[]*/\?:'.chars.any? { |char| name.include? char }
       name = Axlsx::coder.encode(name)
       sheet_names = @workbook.worksheets.map { |s| s.name }
       raise ArgumentError, (ERR_DUPLICATE_SHEET_NAME % name) if sheet_names.include?(name)
diff --git a/test/workbook/worksheet/tc_worksheet.rb b/test/workbook/worksheet/tc_worksheet.rb
index 5d5e14a4..0311018b 100644
--- a/test/workbook/worksheet/tc_worksheet.rb
+++ b/test/workbook/worksheet/tc_worksheet.rb
@@ -19,9 +19,16 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(@ws.name, '&lt;foo&gt; &amp; &lt;bar&gt;')
   end
 
-  def test_name_exception_on_colon
+  def test_name_exception_on_invalid_character
     assert_raises(ArgumentError) { @ws.name = 'foo:bar' }
+    assert_raises(ArgumentError) { @ws.name = 'foo[bar' }
+    assert_raises(ArgumentError) { @ws.name = 'foo]bar' }
+    assert_raises(ArgumentError) { @ws.name = 'foo*bar' }
+    assert_raises(ArgumentError) { @ws.name = 'foo/bar' }
+    assert_raises(ArgumentError) { @ws.name = 'foo\bar' }
+    assert_raises(ArgumentError) { @ws.name = 'foo?bar' }
   end
+
   def test_page_margins
     assert(@ws.page_margins.is_a? Axlsx::PageMargins)
   end