Updated parser for configuration files and resources.

petersirka · petersirka · commit f5820cbfbd06 · 2016-06-09T21:01:33.000+02:00
diff --git a/changes.txt b/changes.txt
@@ -60,6 +60,7 @@
 - updated: `U.send(name, stream, url, callback, [cookies], [headers], [method], [timeout])` supports cookies and timeout
 - updated: `U.request()` supports a new flag `< 200` (kB), it means that the method stores a content with maxixmum size 200 kB.
 - updated: `ErrorBuilder` instance contains a new property `instance.unexpected` when is `instance.push()` a classic Error's instance.
+- updated: configuration files + resources support types like String, Number, Array, Date, etc. via `key (type) : value`
 
 - fixed: Too many open files with `F.log()` and `F.logger()`
 - fixed: `String.isJSON()` the problem with `\n` character
diff --git a/index.js b/index.js
@@ -8413,6 +8413,14 @@ Framework.prototype._configure = function(arr, rewrite) {
 			continue;
 
 		var value = str.substring(index + 1).trim();
+		var subtype;
+
+		index = name.indexOf('(');
+		if (index !== -1) {
+			subtype = name.substring(index + 1, name.indexOf(')')).trim().toLowerCase();
+			name = name.substring(0, index).trim();
+		}
+
 		switch (name) {
 			case 'default-cors-maxage':
 			case 'default-request-length':
@@ -8464,8 +8472,24 @@ Framework.prototype._configure = function(arr, rewrite) {
 				break;
 
 			default:
-				obj[name] = value.isNumber() ? framework_utils.parseInt(value) : value.isNumber(true) ? framework_utils.parseFloat(value) : value.isBoolean() ? value.toLowerCase() === 'true' : value;
+
+				if (subtype === 'string')
+					obj[name] = value;
+				else if (subtype === 'number' || subtype === 'currency' || subtype === 'float' || subtype === 'double')
+					obj[name] = value.isNumber(true) ? value.parseFloat() : value.parseInt();
+				else if (subtype === 'boolean' || subtype === 'bool')
+					obj[name] = value.parseBoolean();
+				else if (subtype === 'eval' || subtype === 'object' || subtype === 'array')
+					obj[name] = new Function('return ' + value)();
+				else if (subtype === 'json')
+					obj[name] = value.parseJSON();
+				else if (subtype === 'date' || subtype === 'datetime' || subtype === 'time')
+					obj[name] = value.parseDate();
+				else
+					obj[name] = value.isNumber() ? framework_utils.parseInt(value) : value.isNumber(true) ? framework_utils.parseFloat(value) : value.isBoolean() ? value.toLowerCase() === 'true' : value;
+
 				break;
+
 		}
 	}
 
diff --git a/test/config-debug b/test/config-debug
@@ -1,2 +1,3 @@
 etag-version		: 1
-secret              : total.js test
+secret              : total.js test
+array     (Array)   : [1, 2, 3, 4]
diff --git a/test/config-release b/test/config-release
@@ -1,2 +1,3 @@
 etag-version		: 1
-secret              : total.js test
+secret              : total.js test
+array     (Array)   : [1, 2, 3, 4]
diff --git a/test/test-framework-debug.js b/test/test-framework-debug.js
@@ -29,6 +29,8 @@ framework.on('ready', function() {
 	t.on('exit', function() {
 		assert.ok(a === true, 'F.load() in worker');
 	});
+
+	assert.ok(F.config.array.length === 4, 'Problem with config sub types.');
 });
 
 framework.onAuthorize = function(req, res, flags, cb) {
diff --git a/test/test-framework-release.js b/test/test-framework-release.js
@@ -29,6 +29,8 @@ framework.on('ready', function() {
 	t.on('exit', function() {
 		assert.ok(a === true, 'F.load() in worker');
 	});
+
+	assert.ok(F.config.array.length === 4, 'Problem with config sub types.');
 });
 
 framework.onAuthorize = function(req, res, flags, cb) {
diff --git a/utils.js b/utils.js
@@ -2860,7 +2860,47 @@ String.prototype.parseConfig = function(def) {
 				continue;
 		}
 
-		obj[str.substring(0, index).trim()] = str.substring(index + 2).trim();
+		var name = str.substring(0, index).trim();
+		var value = str.substring(index + 2).trim();
+		var subtype;
+
+		index = name.indexOf('(');
+		if (index !== -1) {
+			subtype = name.substring(index + 1, name.indexOf(')')).trim().toLowerCase();
+			name = name.substring(0, index).trim();
+		}
+
+		switch (subtype) {
+			case 'string':
+				obj[name] = value;
+				break;
+			case 'number':
+			case 'float':
+			case 'double':
+			case 'currency':
+				obj[name] = value.isNumber(true) ? value.parseFloat() : value.parseInt();
+				break;
+			case 'boolean':
+			case 'bool':
+				obj[name] = value.parseBoolean();
+				break;
+			case 'eval':
+			case 'object':
+			case 'array':
+				obj[name] = new Function('return ' + value)();
+				break;
+			case 'json':
+				obj[name] = value.parseJSON();
+				break;
+			case 'date':
+			case 'time':
+			case 'datetime':
+				obj[name] = value.parseDate();
+				break;
+			default:
+				obj[name] = value;
+				break;
+		}
 	}
 
 	return obj;
@@ -3326,7 +3366,7 @@ String.prototype.isNumber = function(isDecimal) {
 	var self = this;
 	var length = self.length;
 
-	if (length === 0)
+	if (!length)
 		return false;
 
 	isDecimal = isDecimal || false;
