Updated GROUP() by adding prefixes.

petersirka · petersirka · commit 3ab19837e65a · 2018-02-16T22:15:20.000+01:00
diff --git a/changes.txt b/changes.txt
@@ -6,6 +6,8 @@
 - added: `CONVERT(obj, schema)` for quick converting values like Schema (more in docs.)
 - added: `Capitalize2` schema type which converts only the first char
 
+- updated: `GROUP()` by adding a new argument `url_prefix`
+
 - fixed: mail `message.manually()`
 
 ======= 2.9.3 (HOTFIX)
diff --git a/index.js b/index.js
@@ -269,6 +269,7 @@ var IMAGEMAGICK = false;
 var _controller = '';
 var _owner = '';
 var _flags;
+var _prefix;
 
 // GO ONLINE MODE
 !global.framework_internal && (global.framework_internal = require('./internal'));
@@ -305,7 +306,6 @@ global.FINISHED = framework_internal.onFinished;
 global.DESTROY = framework_internal.destroyStream;
 global.UID = () => UIDGENERATOR.date + (++UIDGENERATOR.index).padLeft(4, '0') + UIDGENERATOR.instance + (UIDGENERATOR.index % 2 ? 1 : 0);
 global.ROUTE = (a, b, c, d, e) => F.route(a, b, c, d, e);
-global.GROUP = (a, b) => F.group(a, b);
 global.WEBSOCKET = (a, b, c, d) => F.websocket(a, b, c, d);
 global.FILE = (a, b, c) => F.file(a, b, c);
 global.REDIRECT = (a, b, c, d) => F.redirect(a, b, c, d);
@@ -1530,9 +1530,35 @@ global.CORS = F.cors = function(url, flags, credentials) {
 	return F;
 };
 
-F.group = function(flags, fn) {
-	_flags = flags;
-	fn.call(F);
+global.GROUP = F.group = function() {
+
+	var fn = null;
+
+	_flags = null;
+	_prefix = null;
+
+	for (var i = 0; i < arguments.length; i++) {
+		var o = arguments[i];
+
+		if (o instanceof Array) {
+			_flags = o;
+			continue;
+		}
+
+		switch (typeof(o)) {
+			case 'string':
+				if (o.endsWith('/'))
+					o = o.substring(0, o.length - 1);
+				_prefix = o;
+				break;
+			case 'function':
+				fn = o;
+				break;
+		}
+	}
+
+	fn && fn.call(F);
+	_prefix = undefined;
 	_flags = undefined;
 	return F;
 };
@@ -1610,6 +1636,9 @@ F.web = F.route = function(url, funcExecute, flags, length, language) {
 	if (url[0] !== '[' && url[0] !== '/')
 		url = '/' + url;
 
+	if (_prefix)
+		url = _prefix + url;
+
 	if (url.endsWith('/'))
 		url = url.substring(0, url.length - 1);
 
diff --git a/package.json b/package.json
@@ -90,7 +90,7 @@
         "name": "Tema Smirnov",
         "email": "github.tema@smirnov.one"
     }],
-    "version": "3.0.0-1",
+    "version": "3.0.0-2",
     "homepage": "http://www.totaljs.com",
     "bugs": {
         "url": "https://github.com/totaljs/framework/issues",
diff --git a/test/controllers/default.js b/test/controllers/default.js
@@ -26,6 +26,18 @@ exports.install = function() {
 		this.plain('ROBOT');
 	}, ['robot']);
 
+	GROUP(['get'], '/prefix1/', function() {
+		ROUTE('/test/', function() {
+			this.plain('PREFIX1TEST');
+		});
+	});
+
+	GROUP('prefix2', ['get'], function() {
+		ROUTE('/test/', function() {
+			this.plain('PREFIX2TEST');
+		});
+	});
+
 	F.route('#route');
 	F.route('/view-in-modules/', '.' + F.path.modules('someview'));
 	F.route('/options/', plain_options, ['options']);
diff --git a/test/test-framework-debug.js b/test/test-framework-debug.js
@@ -397,6 +397,24 @@ function test_routing(next) {
 		});
 	});
 
+	async.await('prefix -- 1', function(complete) {
+		utils.request(url + 'prefix1/test/', ['get'], function(error, data) {
+			if (error)
+				throw error;
+			assert.ok(data === 'PREFIX1TEST', 'Group + Prefix 1');
+			complete();
+		});
+	});
+
+	async.await('prefix -- 2', function(complete) {
+		utils.request(url + 'prefix2/test/', ['get'], function(error, data) {
+			if (error)
+				throw error;
+			assert.ok(data === 'PREFIX2TEST', 'Group + Prefix 2');
+			complete();
+		});
+	});
+
 	async.await('package/', function(complete) {
 		utils.request(url + 'package/', ['get'], function(error, data, code, headers) {
 			if (error)
