total5 0.0.3-2 → 0.0.3

package/changelog.txt

@@ -18,6 +18,9 @@
 - added support for inheriting inline schemas in the form e.g. `id:String,@address,@products`
 - added `ctrl.image(opt)` method
 - extended `ctrl.filefs()` method by returing `opt` object
+- extended `QueryBuilder.userid()` by supporting `$` options/controller instance
+- added `controller.action()`
+- improved `controller.authorize()` it assigns `controller.user` automatically
 
 ========================
 0.0.2

package/controller.js

@@ -1069,11 +1069,19 @@ Controller.prototype.authorize = function(callback) {
 		opt.TYPE = 'auth';
 		opt.query = ctrl.query;
 		opt.next = opt.callback;
-		opt.$callback = (err, response) => callback(null, response);
+		opt.$callback = function(err, response) {
+			if (response)
+				ctrl.user = response;
+			callback(null, response);
+		};
 		F.def.onAuthorize(opt);
 	} else
 		callback();
-}
+};
+
+Controller.prototype.action = function(name, model) {
+	return F.action(name, model, this);
+};
 
 Controller.prototype.notmodified = function(date) {
 	var ctrl = this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "total5",
-  "version": "0.0.3-2",
+  "version": "0.0.3",
   "description": "Total.js framework v5",
   "main": "index.js",
   "directories": {

package/querybuilder.js

@@ -558,7 +558,7 @@ QBP.id = function(id) {
 };
 
 QBP.userid = function(id) {
-	return id instanceof Array ? this.in('userid', id) : this.where('userid', id);
+	return id instanceof Array ? this.in('userid', id) : this.where('userid', typeof(id) === 'string' ? id : (id.user ? id.user.id : id.id));
 };
 
 QBP.equal = function(obj) {

package/routing.js

@@ -451,6 +451,9 @@ function compareflags(ctrl, routes, auth) {
 
 	for (let route of routes) {
 
+		if (route.ext && !route.ext[ctrl.ext])
+			continue;
+
 		if (auth && route.auth && route.auth !== auth)
 			continue;
 
@@ -663,6 +666,7 @@ exports.lookupfile = function(ctrl, auth = 0) {
 		let key = '';
 		for (let i = 0; i < ctrl.split2.length - 1; i++)
 			key += (i ? '/' : '') + ctrl.split2[i];
+
 		let routes = F.routes.filescache[key];
 		if (routes)
 			return compareflags(ctrl, routes, auth);