Skip to content

Commit 769f028

Browse files
lmajanolmajano
committed
Merge branch 'development'
2 parents 6826656 + e87a317 commit 769f028

15 files changed

+153
-45
lines changed

‎.cfformat.json‎

Lines changed: 48 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,56 @@
11
{
2-
"brackets.padding": true,
3-
"strings.quote": "double",
4-
"strings.attributes.quote": "double",
2+
"array.empty_padding": false,
3+
"array.padding": true,
4+
"array.multiline.min_length": 40,
5+
"array.multiline.element_count": 4,
6+
"array.multiline.leading_comma.padding": true,
7+
"array.multiline.leading_comma": false,
8+
"alignment.consecutive.assignments": true,
9+
"alignment.consecutive.properties": true,
10+
"alignment.consecutive.params": true,
11+
"brackets.padding": true,
12+
"comment.asterisks": "align",
13+
"binary_operators.padding": true,
14+
"for_loop_semicolons.padding": true,
515
"function_call.empty_padding": false,
6-
"function_call.padding": true,
7-
"function_declaration.padding": true,
16+
"function_call.padding": true,
817
"function_call.multiline.leading_comma.padding": true,
9-
"function_declaration.multiline.leading_comma.padding" : true,
18+
"function_call.casing.builtin": "cfdocs",
19+
"function_call.casing.userdefined": "",
20+
"function_call.multiline.element_count": 4,
21+
"function_call.multiline.leading_comma": false,
22+
"function_call.multiline.min_length": 40,
23+
"function_declaration.padding": true,
1024
"function_declaration.empty_padding": false,
25+
"function_declaration.multiline.leading_comma": false,
26+
"function_declaration.multiline.leading_comma.padding": true,
27+
"function_declaration.multiline.element_count": 4,
28+
"function_declaration.multiline.min_length": 40,
1129
"function_declaration.group_to_block_spacing": "compact",
30+
"function_anonymous.empty_padding": false,
31+
"function_anonymous.group_to_block_spacing": "compact",
32+
"function_anonymous.multiline.element_count": 4,
33+
"function_anonymous.multiline.leading_comma": false,
34+
"function_anonymous.multiline.leading_comma.padding": true,
35+
"function_anonymous.multiline.min_length": 40,
36+
"function_anonymous.padding": true,
37+
"indent_size": 4,
38+
"keywords.block_to_keyword_spacing": "spaced",
39+
"keywords.group_to_block_spacing": "spaced",
40+
"keywords.padding_inside_group": true,
41+
"keywords.spacing_to_block": "spaced",
42+
"keywords.spacing_to_group": true,
43+
"keywords.empty_group_spacing": false,
44+
"max_columns": 120,
45+
"parentheses.padding": true,
46+
"strings.quote": "double",
47+
"strings.attributes.quote": "double",
48+
"struct.separator": " : ",
1249
"struct.padding": true,
1350
"struct.empty_padding": false,
14-
"struct.multiline.leading_comma.padding" : true,
15-
"array.empty_padding":false,
16-
"array.padding":true,
17-
"array.multiline.leading_comma.padding":true,
18-
"binary_operators.padding":true,
19-
"for_loop_semicolons.padding":true,
20-
"indent_size":4,
21-
"parentheses.padding":true,
22-
"struct.separator":" : ",
23-
"tab_indent":true,
24-
"keywords.block_to_keyword_spacing" : "spaced",
25-
"keywords.group_to_block_spacing" : "spaced",
26-
"keywords.padding_inside_group" : true,
27-
"keywords.spacing_to_block" : "compact",
28-
"keywords.spacing_to_group" : true
51+
"struct.multiline.leading_comma": false,
52+
"struct.multiline.leading_comma.padding": true,
53+
"struct.multiline.element_count": 4,
54+
"struct.multiline.min_length": 40,
55+
"tab_indent": true
2956
}

‎box.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name":"ColdBox Validation",
33
"author":"Ortus Solutions <[email protected]>",
4-
"version":"1.5.1",
4+
"version":"1.5.2",
55
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbvalidation/@build.version@/[email protected]@.zip",
66
"slug":"cbvalidation",
77
"type":"modules",

‎changelog.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# CHANGELOG
22

3+
## 1.5.2
4+
5+
* `bug` : Added `float` to the type validator which was missing
6+
37
## 1.5.1
48

59
* `bug` : This version's mixin is causing errors because its looking for this.validate() and its looking in the handler, not in the mixin file itself.

‎models/validators/DiscreteValidator.cfc‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,13 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
5050
}
5151

5252
if( !r ){
53-
var args = {message="The '#arguments.field#' value is #operation# than #operationValue#",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
53+
var args = {
54+
message = "The '#arguments.field#' value is #operation# than #operationValue#",
55+
field = arguments.field,
56+
validationType = getName(),
57+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
58+
validationData = arguments.validationData
59+
};
5460
var error = validationResult.newError(argumentCollection=args).setErrorMetadata({operation=operation, operationValue=operationValue});
5561
validationResult.addError( error );
5662
}

‎models/validators/InListValidator.cfc‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,29 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
2323
* @validationDataThe validation data the validator was created with
2424
*/
2525
boolean function validate(required cbvalidation.models.result.IValidationResult validationResult, required any target, required string field, any targetValue, any validationData){
26+
if ( isNull( arguments.targetValue ) ) {
27+
return true;
28+
}
2629

27-
if( !isNull(arguments.targetValue) AND listFindNoCase(arguments.validationData, arguments.targetValue)){
30+
if ( listFindNoCase( arguments.validationData, arguments.targetValue ) ) {
2831
return true;
2932
}
3033

31-
var args = {message="The '#arguments.field#' value is not in the constraint list: #arguments.validationData#",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
32-
var error = validationResult.newError(argumentCollection=args).setErrorMetadata({inlist=arguments.validationData});
33-
validationResult.addError( error );
34+
var args = {
35+
message = "The '#arguments.field#' value is not in the constraint list: #arguments.validationData#",
36+
field = arguments.field,
37+
validationType = getName(),
38+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
39+
validationData = arguments.validationData
40+
};
41+
42+
var error = validationResult
43+
.newError( argumentCollection = args )
44+
.setErrorMetadata( {
45+
"inlist" = arguments.validationData
46+
} );
47+
48+
validationResult.addError( error );
3449
return false;
3550
}
3651

@@ -41,4 +56,4 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
4156
return name;
4257
}
4358

44-
}
59+
}

‎models/validators/MaxValidator.cfc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,13 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
2828
if( !isNull(arguments.targetValue) AND arguments.targetValue <= arguments.validationData ){
2929
return true;
3030
}
31-
32-
var args = {message="The '#arguments.field#' value is not less than or equal to #arguments.validationData#",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
31+
var args = {
32+
message = "The '#arguments.field#' value is not less than or equal to #arguments.validationData#",
33+
field = arguments.field,
34+
validationType = getName(),
35+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
36+
validationData = arguments.validationData
37+
};
3338
var error = validationResult.newError(argumentCollection=args).setErrorMetadata({max=arguments.validationData});
3439
validationResult.addError( error );
3540
return false;

‎models/validators/MethodValidator.cfc‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,14 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
3535
if( evaluate("arguments.target.#arguments.validationData#( arguments.targetValue )") ){
3636
return true;
3737
}
38+
var args = {
39+
message = "The '#arguments.field#' value does not validate",
40+
field = arguments.field,
41+
validationType = getName(),
42+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
43+
validationData = arguments.validationData
44+
};
3845

39-
var args = {message="The '#arguments.field#' value does validate",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
4046
validationResult.addError( validationResult.newError(argumentCollection=args) );
4147
return false;
4248
}

‎models/validators/MinValidator.cfc‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,13 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
2929
return true;
3030
}
3131

32-
var args = {message="The '#arguments.field#' value is not greater than or equal to #arguments.validationData#",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
32+
var args = {
33+
message = "The '#arguments.field#' value is not greater than or equal to #arguments.validationData#",
34+
field = arguments.field,
35+
validationType = getName(),
36+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
37+
validationData = arguments.validationData
38+
};
3339
var error = validationResult.newError(argumentCollection=args).setErrorMetadata({min=arguments.validationData});
3440
validationResult.addError( error );
3541
return false;

‎models/validators/RangeValidator.cfc‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,13 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
3838
if( !isNull(arguments.targetValue) AND targetValue >= min AND ( !len(max) OR targetValue <= max ) ) {
3939
return true;
4040
}
41-
42-
var args = {message="The '#arguments.field#' value is not the value field range (#arguments.validationData#)",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
41+
var args = {
42+
message = "The '#arguments.field#' value is not the value field range (#arguments.validationData#)",
43+
field = arguments.field,
44+
validationType = getName(),
45+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
46+
validationData = arguments.validationData
47+
};
4348
var error = validationResult.newError(argumentCollection=args).setErrorMetadata({range=arguments.validationData,min=min,max=max});
4449
validationResult.addError( error );
4550
return false;

‎models/validators/RegexValidator.cfc‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,13 @@ component accessors="true" implements="cbvalidation.models.validators.IValidator
2929
return true;
3030
}
3131

32-
var args = {message="The '#arguments.field#' value does not match the regular expression: #arguments.validationData#",field=arguments.field,validationType=getName(),validationData=arguments.validationData};
32+
var args = {
33+
message = "The '#arguments.field#' value does not match the regular expression: #arguments.validationData#",
34+
field = arguments.field,
35+
validationType = getName(),
36+
rejectedValue = ( isSimpleValue( arguments.targetValue ) ? arguments.targetValue : '' ),
37+
validationData = arguments.validationData
38+
};
3339
var error = validationResult.newError(argumentCollection=args).setErrorMetadata({regex=arguments.validationData});
3440
validationResult.addError( error );
3541
return false;

0 commit comments

Comments
 (0)