Merge pull request #21 from elpete/custom_validators_by_key_with_arbitrary_data

Allow custom validators to be specified just by key and the payload to be passed in as validation data

Author: lmajano

modules/cbvalidation/models/ValidationManager.cfc

@@ -140,9 +140,7 @@ component accessors="true" serialize="false" implements="IValidationManager" sin
 		// process the incoming rules
 		for( var key in arguments.rules ){
 			// if message validators, just ignore
-			if( reFindNoCase( "^(#replace( variables.validValidators, ",", "|", "all" )#)Message$", key ) ){ continue; }
-			// if not in list, ignore
-			if( !listFindNoCase( variables.validValidators, key ) ){ continue; }
+			if( reFindNoCase( "Message$", key ) ){ continue; }
 
 			// had to use nasty evaluate until adobe cf get's their act together on invoke.
 			getValidator( validatorType=key, validationData=arguments.rules[ key ] )
@@ -181,6 +179,7 @@ component accessors="true" serialize="false" implements="IValidationManager" sin
 				return wirebox.getInstance( arguments.validationData );
 			}
 			default : {
+				if ( wirebox.getBinder().mappingExists( validatorType ) ) { return wirebox.getInstance( validatorType ); }
 				throw(message="The validator you requested #arguments.validatorType# is not a valid validator",type="ValidationManager.InvalidValidatorType");
 			}
 		}

tests/specs/ValidationManagerTest.cfc

@@ -33,10 +33,12 @@ component extends="coldbox.system.testing.BaseModelTest" model="cbvalidation.mod
 
 	}
 
-	function testProcessRulesIgnoresInvalidValidators(){
-		results = getMockBox().createMock( "cbvalidation.models.result.ValidationResult" ).init();
+	function testIgnoresAllKeysEndingInMessage(){
+		var results = getMockBox()
+			.createMock( "cbvalidation.models.result.ValidationResult" )
+			.init();
 
-		mockRule = {
+		var mockRule = {
 			required = true,
 			testMessage="Hello",
 			uniqueMessage="Not Unique Man",
@@ -47,7 +49,41 @@ component extends="coldbox.system.testing.BaseModelTest" model="cbvalidation.mod
 		model.processRules( results=results, rules=mockRule, target=mock, field="name" );
 
 		assertEquals( 0, results.getErrorCount() );
+	}
+
+	function testProcessRulesLooksForWireBoxMappingOfKeyIfNotAValidValidator() {
+		var results = getMockBox()
+			.createMock( "cbvalidation.models.result.ValidationResult" )
+			.init();
+
+		var customValidatorMock = getMockBox()
+			.createStub( implements = "cbvalidation.models.validators.IValidator" );
+		customValidatorMock.$( "validate", true );
+
+		var mockBinder = getMockBox()
+			.createMock( "coldbox.system.ioc.config.Binder" );
+		mockBinder.$( "mappingExists" )
+			.$args( "customValidator" )
+			.$results( true );
+
+		mockWireBox.$( "getBinder", mockBinder )
+		mockWireBox
+			.$( "getInstance" )
+			.$args( "customValidator" )
+			.$results( customValidatorMock );
+
+		var mockRule = {
+			customValidator = {
+				customField = "hi"
+			}
+		};
+
+		var mock = createStub().$( "getName","luis" );
+		model.processRules( results=results, rules=mockRule, target=mock, field="name" );
 
+		assertTrue( customValidatorMock.$once( "validate" ), "[validate] should have been called on [customValidator]" );
+		var args = customValidatorMock.$callLog().validate[ 1 ];
+		assertEquals( args.validationData, { customField = "hi" }, "validationData was not passed through correctly to [customValidator]" );
 	}
 
 	function testGetConstraints(){