* feature : Updated RequiredUnless and RequiredIf to use struct literal notation instead of the weird parsing we did.

* `feature` : Added the `Unique` validator thanks to @elpete!
* `improvement` : Added `null` support for the `RequiredIf,RequiredUnless` validators

Author: lmajano

box.json

@@ -1,7 +1,7 @@
 {
     "name":"ColdBox Validation",
     "author":"Ortus Solutions <[email protected]>",
-    "version":"2.0.1",
+    "version":"2.1.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbvalidation/@build.version@/[email protected]@.zip",
     "slug":"cbvalidation",
     "type":"modules",

changelog.md

@@ -1,9 +1,10 @@
 # CHANGELOG
 
-## 2.0.1
+## 2.1.0
 
-* Updated `RequiredUnless` and `RequiredIf` to use struct literal notation instead of the weird parsing we did.
-* Added the `Unique` validator thanks to @elpete!
+* `feature` : Updated `RequiredUnless` and `RequiredIf` to use struct literal notation instead of the weird parsing we did.
+* `feature` : Added the `Unique` validator thanks to @elpete!
+* `improvement` : Added `null` support for the `RequiredIf,RequiredUnless` validators
 
 ## 2.0.0
 

models/validators/RequiredIfValidator.cfc

@@ -43,6 +43,10 @@ component accessors="true" extends="RequiredValidator" singleton {
 			.map( function( key, value ){
 				// Get comparison values
 				var comparePropertyValue = invoke( target, "get#key#" );
+				// Null checks
+				if( isNull( comparePropertyValue ) ){
+					return isNull( arguments.value );
+				}
 				// Check if the compareValue is the same as the defined one
 				return ( arguments.value == comparePropertyValue ? true : false );
 			} )

models/validators/RequiredUnlessValidator.cfc

@@ -43,6 +43,10 @@ component accessors="true" extends="RequiredValidator" singleton {
 			.map( function( key, value ){
 				// Get comparison values
 				var comparePropertyValue = invoke( target, "get#key#" );
+				// Null checks
+				if( isNull( comparePropertyValue ) ){
+					return isNull( arguments.value );
+				}
 				// Check if the compareValue is the same as the defined one
 				return ( arguments.value == comparePropertyValue ? true : false );
 			} )

test-harness/tests/specs/validators/RequiredIfValidatorTest.cfc

@@ -25,9 +25,16 @@ component extends="coldbox.system.testing.BaseModelTest" model="cbvalidation.mod
 			it( "can make targets required if the properties passed have the right value", function(){
 				var mock = createStub()
 					.$( "getName", "luis" )
-					.$( "getRole", "admin" );
+                    .$( "getRole", "admin" )
+                    .$( "getMissing", javacast( "null", "" ) );
 				var result = createMock( "cbvalidation.models.result.ValidationResult" ).init();
 
+				expect(
+				    model.validate( result, mock, "testField", javacast( "null", "" ), {
+						missing : javaCast( "null", "" )
+					} )
+				).toBeFalse();
+
 				expect(
 					model.validate( result, mock, "testField", "", {
 						name : "luis"
@@ -60,11 +67,14 @@ component extends="coldbox.system.testing.BaseModelTest" model="cbvalidation.mod
 					} )
 				).toBeFalse();
 
-
-
+				expect(
+				    model.validate( result, mock, "testField", "shouldPass", {
+						missing : javaCast( "null", "" )
+					} )
+				).toBeTrue();
 			} );
 
 		});
 	}
 
-	}
+	}

test-harness/tests/specs/validators/RequiredUnlessValidatorTest.cfc

@@ -20,12 +20,13 @@ component extends="coldbox.system.testing.BaseModelTest" model="cbvalidation.mod
 
 	function run( testResults, testBox ){
 		// all your suites go here.
-		describe( "Accepted", function(){
+		describe( "RequiredUnless", function(){
 
 			it( "can make targets required unless the properties passed have the right value", function(){
 				var mock = createStub()
 					.$( "getName", "luis" )
-					.$( "getRole", "admin" );
+                    .$( "getRole", "admin" )
+                    .$( "getMissing", javacast( "null", "" ) );
 				var result = createMock( "cbvalidation.models.result.ValidationResult" ).init();
 
 
@@ -79,9 +80,21 @@ component extends="coldbox.system.testing.BaseModelTest" model="cbvalidation.mod
 					} )
 				).toBeTrue();
 
+				expect(
+					model.validate( result, mock, "testField", javaCast( "null", "" ), {
+						missing : javaCast( "null", "" )
+					} )
+				).toBeFalse();
+
+				expect(
+					model.validate( result, mock, "testField", "not null", {
+						missing : javaCast( "null", "" )
+					} )
+				).toBeTrue();
+
 			} );
 
 		});
 	}
 
-	}
+}