Skip to content
This repository was archived by the owner on Apr 24, 2021. It is now read-only.

Allow to specify Rules class #9

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions lib/fieldValidator.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
'use strict';

var RequiredRules = require('./requiredRules');
var Rules = require('./rules');
var Filters = require('./filters');

class FieldValidator{
constructor(context, fields, rules, messages, filters){
constructor(context, fields, rules, messages, filters, ruleClass){
this.ctx = context;
this.fields = fields;

this.filters = new Filters(this);
this.rules = new Rules(this);
this.rules = new ruleClass(this);
this.requiredRules = new RequiredRules(this);

this.rule = {};
Expand Down
5 changes: 2 additions & 3 deletions lib/fileValidator.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
'use strict';

var RequiredRules = require('./requiredRules');
var FileRules = require('./fileRules');
var FileActions = require('./fileActions');

class FileValidator{
constructor(context, fields, rules, deleteOnFail, messages, actions) {
constructor(context, fields, rules, deleteOnFail, messages, actions, ruleClass) {
this.ctx = context;
this.fields = fields;

this.requiredRules = new RequiredRules(this);
this.rules = new FileRules(this);
this.rules = new ruleClass(this);
this.actions = new FileActions(this);

this.rule = {};
Expand Down
17 changes: 11 additions & 6 deletions lib/validate.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let Filters = require('./filters');
let FileRules = require('./fileRules');
let FileActions = require('./fileActions');

module.exports = function() {
module.exports = function(rulesClass, fileRulesClass) {
return function * (next) {
let v;
this.validateBody = function *(rules, messages, filters){
Expand All @@ -23,7 +23,8 @@ module.exports = function() {
fields,
rules,
messages || {},
filters || {}
filters || {},
rulesClass || Rules
);

yield v.valid;
Expand All @@ -35,7 +36,8 @@ module.exports = function() {
this.params || {},
rules,
messages || {},
filters || {}
filters || {},
rulesClass || Rules
);

yield v.valid;
Expand All @@ -47,7 +49,8 @@ module.exports = function() {
this.request.query || {},
rules,
messages || {},
filters || {}
filters || {},
rulesClass || Rules
);

yield v.valid;
Expand All @@ -59,7 +62,8 @@ module.exports = function() {
this.headers || {},
rules,
messages || {},
filters || {}
filters || {},
rulesClass || Rules
);

yield v.valid;
Expand All @@ -74,7 +78,8 @@ module.exports = function() {
rules,
deleteOnFail || false,
messages || {},
actions || {}
actions || {},
fileRulesClass || FileRules
);

yield v.valid;
Expand Down