verdnatura-mirror
/
loopback-datasource-juggler
mirror of https://github.com/loopbackio/loopback-datasource-juggler
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hookable validations without breaking functionality

This commit is contained in:
Anatoliy Chakkaev 2011-11-17 14:00:12 +07:00
parent dd1e54ffec
commit 894a924488
3 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/abstract-class.js
View File

@ -111,14 +111,12 @@ AbstractClass.create = function (data) {
obj = new this(data); obj = new this(data);
// validation required // validation required
obj.trigger("validation", function(){ if (!obj.isValid()) {
if (!obj.isValid()) { return callback(new Error('Validation error'), obj);
return callback(new Error('Validation error'), obj); }
}
});
} }
obj.trigger("create", function(){ obj.trigger("create", function () {
this._adapter().create(modelName, data, function (err, id) { this._adapter().create(modelName, data, function (err, id) {
if (id) { if (id) {
defineReadonlyProp(obj, 'id', id); defineReadonlyProp(obj, 'id', id);
@ -220,15 +218,14 @@ AbstractClass.prototype.save = function (options, callback) {
if (!('throws' in options)) { if (!('throws' in options)) {
options.throws = false; options.throws = false;
} }
this.trigger("validation", function(){
if (options.validate && !this.isValid()) { if (options.validate && !this.isValid()) {
var err = new Error('Validation error'); var err = new Error('Validation error');
if (options.throws) { if (options.throws) {
throw err; throw err;
}
return callback && callback(err);
} }
}); return callback && callback(err);
}
this.trigger("save", function(){ this.trigger("save", function(){
var modelName = this.constructor.modelName; var modelName = this.constructor.modelName;
@ -295,12 +292,11 @@ AbstractClass.prototype.updateAttributes = function updateAttributes(data, cb) {
Object.keys(data).forEach(function (key) { Object.keys(data).forEach(function (key) {
this[key] = data[key]; this[key] = data[key];
}.bind(this)); }.bind(this));
this.trigger("validation", function(){
if (!this.isValid()) { if (!this.isValid()) {
var err = new Error('Validation error'); var err = new Error('Validation error');
return cb && cb(err); return cb && cb(err);
} }
});
this.trigger("update", function(){ this.trigger("update", function(){
this._adapter().updateAttributes(model, this.id, data, function (err) { this._adapter().updateAttributes(model, this.id, data, function (err) {

24
lib/hookable.js
View File

@ -16,17 +16,17 @@ Hookable.afterUpdate = function(){};
Hookable.beforeDestroy = function(){}; Hookable.beforeDestroy = function(){};
Hookable.afterDestroy = function(){}; Hookable.afterDestroy = function(){};
Hookable.prototype.trigger = function(action, work){ Hookable.prototype.trigger = function (action, work){
if(work){ if (work) {
bHook = this.constructor["before" + capitalize(action)]; bHook = this.constructor["before" + capitalize(action)];
if(bHook) bHook.call( this ); if (bHook) bHook.call(this);
work.call(this) work.call(this);
} }
aHook = this.constructor["after" + capitalize(action)]; aHook = this.constructor["after" + capitalize(action)];
if(aHook) aHook.call( this ); if (aHook) aHook.call(this);
};
function capitalize(string) {
return string.charAt(0).toUpperCase() + string.slice(1);
} }
function capitalize(string){
return string.charAt(0).toUpperCase() + string.slice(1);
}

10
lib/validatable.js
View File

@ -102,10 +102,12 @@ Validatable.prototype.isValid = function () {
value: new Errors value: new Errors
}); });
this.constructor._validations.forEach(function (v) { this.trigger('validation', function () {
if (validationFailed(inst, v)) { this.constructor._validations.forEach(function (v) {
valid = false; if (validationFailed(inst, v)) {
} valid = false;
}
});
}); });
if (valid) cleanErrors(this); if (valid) cleanErrors(this);
return valid; return valid;