Merge branch 'master' of https://github.com/RocksonZeta/koa-validate

Author: RocksonZeta

lib/validate.js

@@ -9,26 +9,30 @@ module.exports = function() {
 
 	return function * (next) {
 		debug('init koa-validate');
+		this.checkQuery = function(key) {
+			return new Validator(this, key, this.request.query[key], key in this.request.query,this.request.query);
+		};
+		this.checkParams = function(key) {
+			return new Validator(this, key, this.params[key], key in this.params,this.params);
+		};
 		this.checkBody = function(key) {
-			if('undefined' == typeof this.request.body) {
+			var body = this.request.body;
+
+			if(!body) {
 				if(!this.errors){
 					this.errors = ['no body to check'];
 				}
+				return new Validator(this, null, null,false, null ,false ); 
 			}
-			var body =  this.request.body.fields || this.request.body;	// koa-body fileds
-			return new Validator(this, key, body[key], key in body , body );
-		};
-		this.checkQuery = function(key) {
-			return new Validator(this, key, this.request.query[key], key in this.request.query,this.request.query );
-		};
-		this.checkParams = function(key) {
-			return new Validator(this, key, this.params[key], key in this.params,this.params);
+			var body =  body.fields || body;	// koa-body fileds. multipart fields in body.fields
+			return new Validator(this, key, body[key], key in body , body);
 		};
 		this.checkFile = function(key , deleteOnCheckFailed) {
 			if('undefined' == typeof this.request.body || 'undefined' == typeof this.request.body.files ) {
 				if(!this.errors){
-					this.errors = ['no body to check'];
+					this.errors = ['no file to check'];
 				}
+				return new Validator(this, null, null,false, null,false );
 			}
 			deleteOnCheckFailed = ('undefined' == typeof deleteOnCheckFailed?true :false);
 			var files = this.request.body.files;
@@ -42,17 +46,14 @@ module.exports = function() {
 
 var v = require('validator');
 
-function Validator(context, key, value, exists, params) {
+function Validator(context, key, value, exists, params , goOn) {
 	debug('validate for %s %s', key, value);
 	this.params = params;
 	this.context = context;
 	this.key = key;
 	this.value = value;
 	this.exists = exists;
-	//	this.status = 0;
-	//this.context.errors = [];
-	//this.isNumber = false;
-	this.goOn = true;
+	this.goOn = (false===goOn?false:true);
 	if(this.value && this instanceof FileValidator && 'goOn' in this.value ){
 		this.goOn = this.value.goOn;
 	}
@@ -674,7 +675,7 @@ function formatSize(size){
 use koa-body ,file object will be {type:"image/jpeg",path:"",name:"",size:"",mtile:""}
 */
 function FileValidator(context, key, value, exists, params,deleteOnCheckFailed){
-	Validator.call(this,context, key, value, exists, params);
+	Validator.call(this,context, key, value, exists, params ,true);
 	this.deleteOnCheckFailed = deleteOnCheckFailed;
 }
 require("util").inherits(FileValidator, Validator);

test/test_nobody.js

@@ -0,0 +1,33 @@
+'use strict';
+
+var koa = require('koa'),
+request = require('supertest');
+require('should');
+
+
+function create_app(){
+	var app = koa();
+	// app.use(require('koa-body')({multipart:true , formidable:{keepExtensions:true}}));
+	app.use(require('../lib/validate.js')());
+	app.use(require('koa-router')(app));
+	return app;
+}
+
+describe('koa-validate' , function(){
+	it("nobody to check" , function(done){
+		var app = create_app();
+		app.post('/nobody',function*(){
+			this.checkBody('body').notEmpty();
+			if(this.errors) {
+				this.status=500;
+			}else{
+				this.status=200;
+			}
+		});
+		var req = request(app.listen());
+		req.post('/nobody')
+		.send({body:"no"})
+		.expect(500 , done);
+	});
+
+});