Merge branch 'development' of github.com:coldbox-modules/cbvalidation into development

Author: lmajano

box.json

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

build/toMaster.boxr

@@ -2,6 +2,7 @@
 
 # Check out master
 !git checkout -f master
+!git pull
 # Merge development into it
 !git merge --no-ff development
 # Tag the master repo with the version in box.json

changelog.md

@@ -1,9 +1,12 @@
 # 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` : Added `constraintProfiles` to allow you to define which fields to validate according to defined profiles: https://github.com/coldbox-modules/cbvalidation/issues/37
+* `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!
+* `feature` : All validators now accept a `rules` argument, which is the struct of constraints for the specific field it's validating on
+* `improvement` : Added `null` support for the `RequiredIf,RequiredUnless` validator values
 
 ## 2.0.0
 
@@ -12,8 +15,8 @@
 * No more manual discovery of validators, automated registration and lookup process, cleaned lots of code on this one!
 * New Validator: `Accepted` - The field under validation must be yes, on, 1, or true. This is useful for validating "Terms of Service" acceptance.
 * New Validator: `Alpha` - Only allows alphabetic characters
-* New Validator: `RequiredUnless` with validation data: `anotherField:value,...`  -  The field under validation must be present and not empty unless the `anotherfield` field is equal to the passed `value`.
-* New Validator: `RequiredIf` with validation data: `anotherField:value,...`  -  The field under validation must be present and not empty if the `anotherfield` field is equal to the passed `value`.
+* New Validator: `RequiredUnless` with validation data as a struct literal `{ anotherField:value, ... }`  -  The field under validation must be present and not empty unless the `anotherfield` field is equal to the passed `value`.
+* New Validator: `RequiredIf` with validation data as a struct literal `{ anotherField:value, ... }`  -  The field under validation must be present and not empty if the `anotherfield` field is equal to the passed `value`.
 * Accelerated validation by removing type checks. ACF chokes on interface checks
 
 ### Improvements
@@ -28,7 +31,6 @@
 * `Bugs` : Fixed lots of wrong type exceptions
 * `Compat` : Remove ACF11 support
 
-`requiredUnless=role,test
 ---
 
 ## 1.5.2

models/Mixins.cfm

@@ -9,6 +9,7 @@
  * @locale The i18n locale to use for validation messages
  * @excludeFields The fields to exclude from the validation
  * @includeFields The fields to include in the validation
+ * @profiles If passed, a list of profile names to use for validation constraints
  *
  * @return cbvalidation.model.result.IValidationResult
  */
@@ -26,6 +27,7 @@ function validate(){
  * @locale The i18n locale to use for validation messages
  * @excludeFields The fields to exclude from the validation
  * @includeFields The fields to include in the validation
+ * @profiles If passed, a list of profile names to use for validation constraints
  *
  * @return The validated object or the structure fields that where validated
  * @throws ValidationException

models/ValidationManager.cfc

@@ -117,6 +117,7 @@ component accessors="true" serialize="false" singleton {
 	 * @locale An optional locale to use for i18n messages
 	 * @excludeFields An optional list of fields to exclude from the validation.
 	 * @IncludeFields An optional list of fields to include in the validation.
+	 * @profiles If passed, a list of profile names to use for validation constraints
 	 *
 	 * @return IValidationResult
 	 */
@@ -126,7 +127,8 @@ component accessors="true" serialize="false" singleton {
 		any constraints      = "",
 		string locale        = "",
 		string excludeFields = "",
-		string includeFields = ""
+		string includeFields = "",
+		string profiles = ""
 	){
 		var targetName = "";
 
@@ -152,10 +154,38 @@ component accessors="true" serialize="false" singleton {
 				locale          : arguments.locale,
 				targetName      : targetName,
 				resourceService : resourceService,
-				constraints     : allConstraints
+				constraints     : allConstraints,
+				profiles		: arguments.profiles
 			}
 		);
 
+		// Discover profiles, and update the includeFields list from it
+		if( len( arguments.profiles ) ){
+			arguments.includeFields = arguments.profiles
+				.listToArray()
+				// Check if profiles defined in target and iterated one exists
+				.filter( function( profileKey ){
+					return structKeyExists( target, "constraintProfiles" ) && structKeyExists( target.constraintProfiles, profileKey );
+				} )
+				// Incorporate fields from each profile
+				.map( function( profileKey ){
+					// iterate all declared profile fields and incorporate into the includeFields
+					return target.constraintProfiles
+						.find( arguments.profileKey )
+						.listToArray();
+				} )
+				// Reduce all fields into a single hashset to do a distinct collection
+				.reduce( function( result, item ){
+					item
+						.each( function( thisField ){
+							result.add( thisField );
+						} );
+					return result;
+				}, createObject( "java", "java.util.HashSet" ) )
+				.toArray();
+			arguments.includeFields = arrayToList( arguments.includeFields );
+		}
+
 		// iterate over constraints defined
 		for ( var thisField in allConstraints ) {
 			var validateField = true;
@@ -193,6 +223,7 @@ component accessors="true" serialize="false" singleton {
 	 * @locale An optional locale to use for i18n messages
 	 * @excludeFields An optional list of fields to exclude from the validation.
 	 * @IncludeFields An optional list of fields to include in the validation.
+	 * @profiles If passed, a list of profile names to use for validation constraints
 	 *
 	 * @throws ValidationException
 	 * @return any,struct: The target object that was validated, or the structure fields that where validated.
@@ -203,7 +234,8 @@ component accessors="true" serialize="false" singleton {
 		any constraints      = "",
 		string locale        = "",
 		string excludeFields = "",
-		string includeFields = ""
+		string includeFields = "",
+		string profiles 	 = ""
 	){
 		var vResults = this.validate( argumentCollection = arguments );
 

models/result/ValidationResult.cfc

@@ -7,43 +7,49 @@
 component accessors="true" {
 
 	/**
-	* A collection of error objects represented in this result object
-	*/
+	 * A collection of error objects represented in this result object
+	 */
 	property name="errors"			type="array";
 
 	/**
-	* Extra metadata you can store in the results object
-	*/
+	 * Extra metadata you can store in the results object
+	 */
 	property name="resultMetadata"	type="struct";
 
 	/**
-	* The locale this result validation is using
-	*/
+	 * The locale this result validation is using
+	 */
 	property name="locale"			type="string";
 
 	/**
-	* The name of the target object
-	*/
+	 * The name of the target object
+	 */
 	property name="targetName"		type="string";
 
 	/**
-	* The constraints evaluated in the validation process
-	*/
+	 * The constraints evaluated in the validation process
+	 */
 	property name="constraints"		type="struct";
 
 	/**
-	* The resource bundle object
-	*/
+	 * The resource bundle object
+	 */
 	property name="resourceService";
 
 	/**
-	* Constructor
-	*/
+	 * The profiles used in the validation
+	 */
+	property name="profiles" type="string";
+
+	/**
+	 * Constructor
+	 */
 	ValidationResult function init(
 		string locale		= "",
 		string targetName	= "",
 		any resourceService	= "",
-		struct constraints	= structNew()
+		struct constraints	= structNew(),
+		string profiles 	= ""
 	){
 		variables.errors 			= [];
 		variables.resultMetadata 	= {};
@@ -53,6 +59,7 @@ component accessors="true" {
 		variables.targetName 		= arguments.targetName;
 		variables.resourceService	= arguments.resourceService;
 		variables.constraints		= arguments.constraints;
+		variables.profiles 			= arguments.profiles;
 		return this;
 	}
 

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 );
 			} )

readme.md

@@ -41,6 +41,7 @@ The module will also register several methods in your handlers/interceptors/layo
  * @locale The i18n locale to use for validation messages
  * @excludeFields The fields to exclude from the validation
  * @includeFields The fields to include in the validation
+ * @profiles If passed, a list of profile names to use for validation constraints
  *
  * @return cbvalidation.model.result.IValidationResult
  */
@@ -56,6 +57,7 @@ function validate()
  * @locale The i18n locale to use for validation messages
  * @excludeFields The fields to exclude from the validation
  * @includeFields The fields to include in the validation
+ * @profiles If passed, a list of profile names to use for validation constraints
  *
  * @return The validated object or the structure fields that where validated
  * @throws ValidationException
@@ -167,6 +169,25 @@ this.constraints = {
 }
 ```
 
+## Constraint Profiles
+
+You can also create profiles or selections of fields that will be targeted for validation if you are defining the constraints in objects.  All you do is create a key called: `this.constraintProfiles` which contains a struct of defined fields:
+
+```js
+this.constraintProfiles = {
+	new = "fname,lname,email,password",
+	update = "fname,lname,email",
+	passUpdate = "password,confirmpassword"
+}
+```
+
+Each key is the name of the profile like `new, update passUpdate`.  The value of the profile is a list of fields to validate within that selected profile.  In order to use it, just pass in one or more profile names into the `validate() or validateOrFail()` methods.
+
+```js
+var results = validateModel( target=model, profiles="update" )
+var results = validateModel( target=model, profiles="update,passUpdate" )
+```
+
 ```
 ********************************************************************************
 Copyright Since 2005 ColdBox Framework by Luis Majano and Ortus Solutions, Corp

test-harness/handlers/Main.cfc

@@ -57,8 +57,8 @@ component{
 	}
 
 	/**
-	* validateOrFailWithObject
-	*/
+	 * validateOrFailWithObject
+	 */
 	function validateOrFailWithObject( event, rc, prc ){
 
 		var oModel = populateModel( "User" );
@@ -69,6 +69,19 @@ component{
 		return "Validated";
 	}
 
+	/**
+	 * validateOrFailWithObjectProfiles
+	 */
+	function validateOrFailWithProfiles( event, rc, prc ){
+
+		var oModel = populateModel( "User" );
+
+		// validate
+		prc.object = validateOrFail( target=oModel, profiles=rc._profiles );
+
+		return "Validated";
+	}
+
 
 	// Run on first init
 	any function onAppInit( event, rc, prc ){