CCM-20 #resolve #close

CCM-21 #resolve #close

ValidationManager missing singleton persistence

Author: lmajano

config/Coldbox.cfc

@@ -48,7 +48,7 @@
 		};
 
 		// Activate WireBox
-		wirebox = { enabled = true, singletonReload=true };
+		wirebox = { enabled = true, singletonReload=false };
 
 		// Module Directives
 		modules = {
@@ -80,6 +80,14 @@
 			}
 		];
 
+		validation = {
+			sharedConstraints = {
+				"sharedUser" = { 
+					username = {required=true, size="6..20"},
+					password = {required=true, size="6..20"}
+				}
+			}
+		};
 	}
 </cfscript>
 </cfcomponent>

handlers/Main.cfc

@@ -26,6 +26,19 @@ component{
 
 	}
 
+	any function saveShared( event, rc, prc){
+		// validation
+		var result = validateModel( target=rc, constraints="sharedUser" );
+
+		if( !result.hasErrors() ){
+			flash.put( "User info validated!" );
+			setNextEvent('main');
+		} else {
+			flash.put( "notice", result.getAllErrors().tostring() );
+			return index(event,rc,prc);
+		}
+	}
+
 	// Run on first init
 	any function onAppInit( event, rc, prc ){
 

modules/cbvalidation/ModuleConfig.cfc

@@ -11,7 +11,7 @@ component{
 	this.author 			= "Luis Majano";
 	this.webURL 			= "http://www.ortussolutions.com";
 	this.description 		= "This module provides server-side validation to ColdBox applications";
-	this.version			= "1.0.0[email protected]@";
+	this.version			= "1.0.1[email protected]@";
 	// If true, looks for views in the parent first, if not found, then in the module. Else vice-versa
 	this.viewParentLookup 	= true;
 	// If true, looks for layouts in the parent first, if not found, then in module. Else vice-versa
@@ -22,7 +22,9 @@ component{
 	this.modelNamespace		= "cbvalidation";
 	// CF Mapping
 	this.cfmapping			= "cbvalidation";
-		// Module Dependencies That Must Be Loaded First, use internal names or aliases
+	// Auto-map models
+	this.autoMapModels		= true;
+	// Module Dependencies That Must Be Loaded First, use internal names or aliases
 	this.dependencies		= [ "cbi18n" ];
 	// ColdBox Static path to validation manager
 	this.COLDBOX_VALIDATION_MANAGER = "cbvalidation.models.ValidationManager";
@@ -31,22 +33,8 @@ component{
 	* Configure module
 	*/
 	function configure(){
-
 		// Mixin our own methods on handlers, interceptors and views via the ColdBox UDF Library File setting
 		arrayAppend( controller.getSetting( "ApplicationHelper" ), "#moduleMapping#/models/Mixins.cfm" );
-
-		// Validation Settings
-		settings = {
-			// Change if overriding
-			manager = this.COLDBOX_VALIDATION_MANAGER,
-			// Setup shared constraints below
-			sharedConstraints = {
-				name = {
-					// field = { constraints here }
-				}
-			}
-		};
-
 	}
 
 	/**
@@ -58,14 +46,13 @@ component{
 		parseParentSettings();
 		// Did you change the validation manager?
 		if( configSettings.validation.manager != this.COLDBOX_VALIDATION_MANAGER ){
-			binder.map( "validationManager@cbvalidation" )
+			binder.map( alias="validationManager@cbvalidation", force=true )
 				.to( configSettings.validation.manager )
 				.asSingleton();
 		}
 		// setup shared constraints
 		wirebox.getInstance( "validationManager@cbvalidation" )
 			.setSharedConstraints( configSettings.validation.sharedConstraints );
-
 	}
 
 	/**
@@ -110,7 +97,6 @@ component{
 		if( structKeyExists( validationDSL, "sharedConstraints" ) ){
 			structAppend( configStruct.validation.sharedConstraints, validationDSL.sharedConstraints, true );
 		}
-
 	}
 
 }

modules/cbvalidation/changelog.md

@@ -1,5 +1,9 @@
 CHANGELOG
 =========
 
-##1.0.0
+## 1.0.1
+* Force the validation manager binder mapping
+* ValidationManager missing singleton persistance
+
+## 1.0.0
 * Create first module version

modules/cbvalidation/models/ValidationManager.cfc

@@ -50,7 +50,7 @@ vResults = validateModel(target=model);
 */
 import cbvalidation.models.*;
 import cbvalidation.models.result.*;
-component accessors="true" serialize="false" implements="IValidationManager"{
+component accessors="true" serialize="false" implements="IValidationManager" singleton{
 
 	/**
 	* WireBox Object Factory
@@ -67,16 +67,18 @@ component accessors="true" serialize="false" implements="IValidationManager"{
 	*/
 	property name="sharedConstraints" type="struct";
 
+	this.id = createUUID();
+
 	/**
 	* Constructor
 	* @sharedConstraints.hint A structure of shared constraints
 	*/
-	ValidationManager function init(struct sharedConstraints=structNew()){
-
+	ValidationManager function init( struct sharedConstraints=structNew() ){
 		// valid validator registrations
-		validValidators = "required,type,size,range,regex,sameAs,sameAsNoCase,inList,discrete,udf,method,validator,min,max";
+		variables.validValidators = "required,type,size,range,regex,sameAs,sameAsNoCase,inList,discrete,udf,method,validator,min,max";
 		// store shared constraints if passed
 		variables.sharedConstraints = arguments.sharedConstraints;
+		
 		return this;
 	}
 
@@ -185,24 +187,24 @@ component accessors="true" serialize="false" implements="IValidationManager"{
 	* Retrieve the shared constraints, all of them or by name
 	* @name.hint Filter by name or not
 	*/
-	struct function getSharedConstraints(string name){
-		return ( structKeyExists(arguments,"name") ? sharedConstraints[arguments.name] : sharedConstraints );
+	struct function getSharedConstraints( string name ){
+		return ( structKeyExists( arguments, "name" ) ? variables.sharedConstraints[ arguments.name ] : variables.sharedConstraints );
 	}
 
 	/**
 	* Check if a shared constraint exists by name
 	* @name.hint The shared constraint to check
 	*/
-	boolean function sharedConstraintsExists(required string name){
-		return structKeyExists( sharedConstraints, arguments.name );
+	boolean function sharedConstraintsExists( required string name ){
+		return structKeyExists( variables.sharedConstraints, arguments.name );
 	}
 
 
 	/**
 	* Set the entire shared constraints structure
 	* @constraints.hint Filter by name or not
 	*/
-	IValidationManager function setSharedConstraints(struct constraints){
+	IValidationManager function setSharedConstraints( struct constraints ){
 		variables.sharedConstraints = arguments.constraints;
 		return this;
 	}
@@ -212,8 +214,8 @@ component accessors="true" serialize="false" implements="IValidationManager"{
 	* @name.hint Filter by name or not
 	* @constraint.hint The constraint to store.
 	*/
-	IValidationManager function addSharedConstraint(required string name, required struct constraint){
-		sharedConstraints[ arguments.name ] = arguments.constraints;
+	IValidationManager function addSharedConstraint( required string name, required struct constraint ){
+		variables.sharedConstraints[ arguments.name ] = arguments.constraints;
 	}
 
 	/************************************** private *********************************************/

views/main/index.cfm

@@ -5,6 +5,26 @@
 	#flash.get( "notice", "" )#
 
 	<form method="post" action="#event.buildLink('main/save')#">
+		<h1>Local Constraint</h1>
+		<div class="clearfix">
+			<label for="name">Username (Required, Length: 6-20)</label>
+			<div class="input">
+				#html.passwordField(name="username", value=event.getValue("username",""), size="30")#
+			</div>
+		</div>
+		<div class="clearfix">
+			<label for="description">Password (Required, Length: 6-20)</label>
+			<div class="input">
+				#html.passwordField(name="password", value=event.getValue("password",""), size="30")#
+			</div>
+		</div>
+		<div class="actions">
+			<input type="submit" class="btn primary" value="Save" tabindex="4">
+		</div>
+	</form>
+
+	<form method="post" action="#event.buildLink('main/saveShared')#">
+		<h1>Shared Constraint</h1>
 		<div class="clearfix">
 			<label for="name">Username (Required, Length: 6-20)</label>
 			<div class="input">