Merge pull request #29 from angel-chrystian/master

UDFValidator added rejectedValue to newError arguments

Author: lmajano

.module.properties

@@ -1,3 +1,3 @@
 project.name=cbvalidation
-project.version=1.3.1
+project.version=1.4.0
 module.name=cbvalidation

modules/cbvalidation/models/Mixins.cfm

@@ -16,7 +16,7 @@ function validateModel(
 	string fields="*",
 	any constraints,
 	string locale="",
-	string excludeFields=""
+	string excludeFields="",
 	string includeFields=""
 ){
 	return getValidationManager().validate( argumentCollection=arguments );
@@ -29,4 +29,4 @@ function getValidationManager(){
 	return wirebox.getInstance( "ValidationManager@cbvalidation" );	
 } 
 
-</cfscript>
+</cfscript>

modules/cbvalidation/models/ValidationManager.cfc

@@ -172,11 +172,11 @@ component accessors="true" serialize="false" implements="IValidationManager" sin
 			// had to use nasty evaluate until adobe cf get's their act together on invoke.
 			getValidator( validatorType=key, validationData=arguments.rules[ key ] )
 				.validate(
-					validationResult	= results,
-					target				= arguments.target,
-					field				= arguments.field,
-					targetValue			= evaluate( "arguments.target.get#arguments.field#()" ),
-					validationData		= arguments.rules[ key ]
+					validationResult = results,
+					target           = arguments.target,
+					field            = arguments.field,
+					targetValue      = invoke( arguments.target, "get" & arguments.field ),
+					validationData   = arguments.rules[ key ]
 				);
 
 		}
@@ -311,4 +311,4 @@ component accessors="true" serialize="false" implements="IValidationManager" sin
 		return {};
 	}
 
-}
+}

modules/cbvalidation/models/validators/UDFValidator.cfc

@@ -28,7 +28,7 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
 			return true;
 		}
 
-		var args = {message="The '#arguments.field#' value does not validate",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
+		var args = {message="The '#arguments.field#' value does not validate",field=arguments.field,validationType=getName(),rejectedValue=( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),validationData=arguments.validationData};
 		validationResult.addError( validationResult.newError(argumentCollection=args) );
 		return false;
 	}