Added: a route with schema binding can contain filter

petersirka · petersirka · commit f143bae97e22 · 2015-11-13T10:29:42.000+01:00
diff --git a/builders.js b/builders.js
@@ -979,7 +979,7 @@ SchemaBuilderEntity.prototype.query = function(helper, callback) {
  * @param {ErrorBuilder} builder ErrorBuilder, INTERNAL.
  * @return {ErrorBuilder}
  */
-SchemaBuilderEntity.prototype.validate = function(model, resourcePrefix, resourceName, builder) {
+SchemaBuilderEntity.prototype.validate = function(model, resourcePrefix, resourceName, builder, filter) {
 
 	var self = this;
 	var fn = self.onValidation;
@@ -1007,7 +1007,12 @@ SchemaBuilderEntity.prototype.validate = function(model, resourcePrefix, resourc
 
 	// self._setStateToModel(model, 1, 1);
 	//return framework_utils.validate.call(self, model, self.name, fn, builder, undefined, self.name, self.parent.collection);
-	return framework_utils.validate_builder.call(self, model, builder, self.name, self.parent.collection, self.name);
+
+	if (filter)
+		filter = self.filter(filter);
+
+
+	return framework_utils.validate_builder.call(self, model, builder, self.name, self.parent.collection, self.name, undefined, filter);
 };
 
 /**
@@ -1335,7 +1340,7 @@ SchemaBuilderEntity.prototype.default = function() {
 	return self.$make(item);
 };
 
-SchemaBuilderEntity.prototype.make = SchemaBuilderEntity.prototype.load = function(model, callback) {
+SchemaBuilderEntity.prototype.make = SchemaBuilderEntity.prototype.load = function(model, callback, filter) {
 
 	var self = this;
 
@@ -1350,7 +1355,7 @@ SchemaBuilderEntity.prototype.make = SchemaBuilderEntity.prototype.load = functi
 		return output;
 	}
 
-	var builder = self.validate(output);
+	var builder = self.validate(output, undefined, undefined, undefined, filter);
 	if (builder.hasError()) {
 
 		if (self.onError)
diff --git a/changes.txt b/changes.txt
@@ -1,6 +1,7 @@
 BETA ======= 1.9.3 (HOTFIX)
 
 - added: (IMPORTANT) merging supports BLOCKS (.js,.css), e.g. F.merge('merge.js', 'fileA.js#management,common', 'fileB.js#management')
+- added: (IMPORTANT) a route with schema binding can contain filter e.g. `*Schema#update` or `*Group\Schema#create` --> the framework validates only fields by filter
 - added: MAKE([transform], function(obj))
 - added: TRANSFORM([transform], obj)
 - added: NEWTRANSFORM(name, fn, [isDefault]) --> alias for TransformBuilder.addTransform()
diff --git a/index.js b/index.js
@@ -1105,6 +1105,12 @@ Framework.prototype.route = function(url, funcExecute, flags, length, middleware
 					schema[1] = schema[0];
 					schema[0] = 'default';
 				}
+
+				index = schema[1].indexOf('#');
+				if (index !== -1) {
+					schema[2] = schema[1].substring(index + 1);
+					schema[1] = schema[1].substring(0, index);
+				}
 				continue;
 			}
 
@@ -3085,7 +3091,7 @@ Framework.prototype.onValidation = null;
  * @param {String} name
  * @param {Function(err, body)} callback
  */
-Framework.prototype.onSchema = function(req, group, name, callback) {
+Framework.prototype.onSchema = function(req, group, name, callback, filter) {
 
 	var schema = GETSCHEMA(group, name);
 
@@ -3099,7 +3105,7 @@ Framework.prototype.onSchema = function(req, group, name, callback) {
 			callback(err);
 		else
 			callback(null, result);
-	});
+	}, filter);
 };
 
 /**
@@ -9116,7 +9122,7 @@ Subscribe.prototype.doEnd = function() {
 
 			req.body = body;
 			self.prepare(req.flags, req.uri.pathname);
-		});
+		}, route.schema[2]);
 
 		return self;
 	}
@@ -9174,7 +9180,7 @@ Subscribe.prototype.doEnd = function() {
 
 		req.body = body;
 		self.prepare(req.flags, req.uri.pathname);
-	});
+	}, route.schema[2]);
 
 	return self;
 };
diff --git a/test/controllers/default.js b/test/controllers/default.js
@@ -37,6 +37,7 @@ exports.install = function() {
     framework.route('/html-compressor/', view_compressor);
     framework.route('/html-nocompress/', view_nocompress);
     framework.route('/sync/', synchronize);
+    framework.route('/schema-filter/', ['post', '*filter#update']);
     framework.route('/package/', '@testpackage/test');
     framework.route('/precompile/', view_precomile);
     framework.route('/homepage/', view_homepage);
diff --git a/test/models/user.js b/test/models/user.js
@@ -4,4 +4,12 @@ var User = SCHEMA('test').add('User');
 User.define('name', 'string(10)', true);
 User.setValidation(function(name, value) {
 	return value.length > 0;
+});
+
+NEWSCHEMA('filter').make(function(schema) {
+	schema.define('name', String, true, 'create');
+	schema.define('age', Number, true, 'update');
+	schema.setValidation(function() {
+		return false;
+	});
 });
diff --git a/test/test-framework-debug.js b/test/test-framework-debug.js
@@ -395,6 +395,15 @@ function test_routing(next) {
 		});
 	});
 
+	async.await('post-schema-filter', function(complete) {
+		utils.request(url + 'schema-filter/', ['post'], 'EMPTY', function(error, data, code, headers) {
+			if (error)
+				throw error;
+			assert(data === '[{"name":"age","error":"The field \\"age\\" is required.","path":"filter.age"}]', 'schema filter');
+			complete();
+		});
+	});
+
 	async.await('post-schema', function(complete) {
 		utils.request(url + 'post/schema/', ['post'], 'name=Peter123456789012345678901234567890#', function(error, data, code, headers) {
 			if (error)
diff --git a/test/test-framework-release.js b/test/test-framework-release.js
@@ -395,6 +395,15 @@ function test_routing(next) {
 		});
 	});
 
+	async.await('post-schema-filter', function(complete) {
+		utils.request(url + 'schema-filter/', ['post'], 'EMPTY', function(error, data, code, headers) {
+			if (error)
+				throw error;
+			assert(data === '[{"name":"age","error":"The field \\"age\\" is required.","path":"filter.age"}]', 'schema filter');
+			complete();
+		});
+	});
+
 	async.await('post-schema', function(complete) {
 		utils.request(url + 'post/schema/', ['post'], 'name=Peter123456789012345678901234567890#', function(error, data, code, headers) {
 			if (error)
diff --git a/utils.js b/utils.js
@@ -1524,7 +1524,7 @@ exports.validate = function(model, properties, prepare, builder, resource, path,
 	return error;
 };
 
-exports.validate_builder = function(model, error, schema, collection, path, index) {
+exports.validate_builder = function(model, error, schema, collection, path, index, fields) {
 
 	var entity = collection[schema];
 	var prepare = entity.onValidation || framework.onValidation;
@@ -1541,6 +1541,9 @@ exports.validate_builder = function(model, error, schema, collection, path, inde
 	for (var i = 0; i < properties.length; i++) {
 
 		var name = properties[i].toString();
+		if (fields && fields.indexOf(name) === -1)
+			continue;
+
 		var value = model[name];
 		var type = typeof(value);
 
