Merge branch 'develop'

cfsimplicity · Sep 9, 2020 · 3ed87cf · 3ed87cf
2 parents 758b61a + 98754a0
commit 3ed87cf
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.11.1 - 9 September 202
+
+- \#202 Bugfix for isHex regex
+
 ## 2.11.0 - 4 September 2020
 
 - Enhancements

diff --git a/ModuleConfig.cfc b/ModuleConfig.cfc
@@ -4,7 +4,7 @@ component{
     this.author = "Julian Halliwell";
     this.webURL = "https://github.com/cfsimplicity/lucee-spreadsheet";
     this.description = "Spreadsheet Library for Lucee";
-    this.version = "2.11.0";
+    this.version = "2.11.1";
     this.autoMapModels = false;
 
     function configure(){

diff --git a/Spreadsheet.cfc b/Spreadsheet.cfc
@@ -1,7 +1,7 @@
 component accessors="true"{
 
 	//static
-	property name="version" default="2.11.0" setter="false";
+	property name="version" default="2.11.1" setter="false";
 	property name="exceptionType" default="cfsimplicity.lucee.spreadsheet" setter="false";
 	//commonly invoked POI class names
 	property name="HSSFWorkbookClassName" default="org.apache.poi.hssf.usermodel.HSSFWorkbook" setter="false";
@@ -3179,7 +3179,7 @@ component accessors="true"{
 	}
 
 	private boolean function isHexColor( required string inputString ){
-		return arguments.inputString.REFindNoCase( "^##?[a-f]{6,6}$" );
+		return arguments.inputString.REFind( "^##?[0-9A-Fa-f]{6,6}$" );
 	}
 
 	private string function hexToRGB( required string hexColor ){
@@ -3370,4 +3370,4 @@ component accessors="true"{
 		return q;
 	}
 
-}
+}
diff --git a/box.json b/box.json
@@ -1,10 +1,10 @@
 {
     "name" : "LuceeSpreadsheet",
     "slug" : "lucee-spreadsheet",
-    "version" : "2.11.0",
+    "version" : "2.11.1",
     "shortDescription" : "Spreadsheet Library for Lucee",
     "author" : "Julian Halliwell",
-    "location" : "https://github.com/cfsimplicity/lucee-spreadsheet/archive/v2.11.0.zip",
+    "location" : "https://github.com/cfsimplicity/lucee-spreadsheet/archive/v2.11.1.zip",
     "homepage" : "https://github.com/cfsimplicity/lucee-spreadsheet",
     "projectURL" : "https://github.com/cfsimplicity/lucee-spreadsheet",
     "documentation" : "https://github.com/cfsimplicity/lucee-spreadsheet/blob/master/README.md",

diff --git a/test/specs/formatCell.cfm b/test/specs/formatCell.cfm
@@ -321,7 +321,7 @@ describe( "formatCell", function(){
 
 	it( "Throws an exception if an invalid hex value is passed",function() {
 		expect( function(){
-			var hex = "FF22BB";
+			var hex = "GGHHII";
 			var format = { color: hex, bottombordercolor: hex };
 			var cellFormat = setAndGetFormat( xlsx, format );
 		}).toThrow( regex="Invalid color" );