total5 0.0.3 → 0.0.4-2

package/builders.js

@@ -111,6 +111,29 @@ Options.prototype.action = function(schema, payload) {
 	return F.action(schema, payload, this.controller);
 };
 
+Options.prototype.promisify = function(fn, a, b, c) {
+	var $ = this;
+	return new Promise(function(resolve) {
+
+		var callback = function(err, response) {
+			if (err)
+				$.invalid(err);
+			else
+				resolve(response);
+		};
+
+		if (c !== undefined)
+			fn(a, b, c, callback);
+		else if (b !== undefined)
+			fn(a, b, callback);
+		else if (a !== undefined)
+			fn(a, callback);
+		else
+			fn(callback);
+
+	});
+};
+
 Options.prototype.publish = function(value) {
 	var self = this;
 	var name = self.id;
@@ -233,11 +256,15 @@ Options.prototype.output = function(name) {
 	return self;
 };
 
+function $errorhandling(self) {
+	self.$callback(true);
+}
+
 Options.prototype.invalid = function(error, path, index) {
 	var self = this;
 	self.error.push(error, path, index);
-	self.$callback(true);
-	return self;
+	setTimeout($errorhandling, 1, self);
+	return self.error;
 };
 
 Options.prototype.cookie = function(name, value, expire, options) {
@@ -1362,7 +1389,16 @@ ActionCaller.prototype.finish = function(value) {
 	var self = this;
 	self.finish = null;
 	if (self.options.callback) {
-		self.options.callback(self.error.length ? self.error : null, value === undefined ? self.$.response : value);
+
+		if (self.options.callback instanceof Options) {
+			let $ = self.options.callback;
+			if (self.error.length)
+				$.invalid(self.error);
+			else
+				$.callback(value === undefined ? self.$.response : value);
+		} else
+			self.options.callback(self.error.length ? self.error : null, value === undefined ? self.$.response : value);
+
 		self.options.callback = null;
 	}
 };

package/changelog.txt

@@ -1,3 +1,17 @@
+========================
+0.0.4
+========================
+
+- improved `Number.pluralize()` method
+- added `PROMISIFY(fn, [a], [b])` method
+- added `$.promisify(fn, [a], [b])` method
+- added `FILESTORAGE().copy(id, path, [callback(err, meta)])`
+- fixed formatting `0` number in the `Tangular.format` helper
+- improved `$.invalid()` method, now it returns `ErrorBuilder`
+- improved `$.callback()`, it accepts another instance of `$`
+- improved `DATA.query()` method
+- fixed removing existing CRONs by [Marek Mraz](https://github.com/Mrazbb)
+
 ========================
 0.0.3
 ========================

package/controller.js

@@ -319,6 +319,22 @@ Controller.prototype.empty = function() {
 	F.stats.response.empty++;
 };
 
+function $errorhandling(ctrl, err) {
+
+	var response = ctrl.response;
+	response.headers['content-type'] = 'application/json';
+	response.headers['cache-control'] = NOCACHE;
+	response.headers.vary = 'Accept-Encoding, Last-Modified, User-Agent';
+	response.value = JSON.stringify(err.output(ctrl.language));
+	response.status = err.status === 408 ? 503 : err.status;
+	ctrl.flush();
+
+	var key = 'error' + err.status;
+
+	if (F.stats.response[key] != null)
+		F.stats.response[key]++;
+}
+
 Controller.prototype.invalid = function(value) {
 
 	var ctrl = this;
@@ -326,7 +342,6 @@ Controller.prototype.invalid = function(value) {
 	if (ctrl.destroyed)
 		return;
 
-	var response = ctrl.response;
 	var err;
 
 	if (value instanceof F.TBuilders.ErrorBuilder) {
@@ -336,17 +351,7 @@ Controller.prototype.invalid = function(value) {
 		err.push(value);
 	}
 
-	response.headers['content-type'] = 'application/json';
-	response.headers['cache-control'] = NOCACHE;
-	response.headers.vary = 'Accept-Encoding, Last-Modified, User-Agent';
-	response.value = JSON.stringify(err.output(ctrl.language));
-	response.status = err.status === 408 ? 503 : err.status;
-	ctrl.flush();
-
-	var key = 'error' + err.status;
-
-	if (F.stats.response[key] != null)
-		F.stats.response[key]++;
+	setTimeout($errorhandling, 1, ctrl, err);
 };
 
 Controller.prototype.flush = function() {

package/filestorage.js

@@ -373,6 +373,84 @@ FP._read = function(id, callback, nostream) {
 	return self;
 };
 
+FP.copy = function(id, path, callback) {
+	var self = this;
+	if (callback)
+		return self._copy(id, path, callback);
+	else
+		return new Promise((resolve, reject) => self._copy(id, path, (err, res) => err ? reject(err) : resolve(res)));
+};
+
+FP._copy = function(id, path, callback) {
+
+	var self = this;
+
+	if (self.pause) {
+		setTimeout(self._copy, 500, id, path, callback);
+		return self;
+	}
+
+	var filename = Path.join(self.makedirectory(id), id + '.file');
+
+	F.stats.performance.open++;
+	Fs.open(filename, 'r', function(err, fd) {
+
+		if (err) {
+			callback(err);
+			return;
+		}
+
+		var buffer = Buffer.alloc(HEADERSIZE);
+		Fs.read(fd, buffer, 0, HEADERSIZE, 0, function(err) {
+
+			if (err) {
+				Fs.close(fd, NOOP);
+				callback(err);
+				return;
+			}
+
+			var str = buffer.toString('utf8').replace(REGCLEAN, '');
+			if (!str) {
+				// Invalid file
+				Fs.close(fd, function() {
+					if (buffer.length === HEADERSIZE)
+						Fs.unlink(filename, NOOP);
+				});
+				callback('File not found');
+				return;
+			}
+
+			var meta = str.parseJSON(true);
+			if (!meta) {
+				Fs.close(fd, NOOP);
+				callback('Invalid file');
+				return;
+			}
+
+			meta.id = id;
+
+			if (meta.expire && meta.expire < NOW) {
+				Fs.close(fd, NOOP);
+				callback('File is expired');
+				return;
+			}
+
+			F.stats.performance.open++;
+
+			var reader = Fs.createReadStream(filename, { fd: fd, start: HEADERSIZE });
+			var writer = Fs.createWriteStream(path.includes('.') ? path : Path.join(path, meta.name));
+
+			reader.pipe(writer);
+
+			CLEANUP(reader, function() {
+				callback(err, meta);
+				Fs.close(fd, NOOP);
+			});
+
+		});
+	});
+};
+
 FP.readbuffer = function(id, callback) {
 	var self = this;
 	if (callback)

package/global.js

@@ -64,6 +64,27 @@ global.ErrorBuilder = F.TBuilders.ErrorBuilder;
 global.DOWNLOAD = F.download;
 global.OPENCLIENT = (url, id) => require('./openclient').create(url, id);
 global.NEWMACRO = (str, nocompile, isasync) => require('./macros').compile(str, nocompile, isasync);
+global.PROMISIFY = function(fn, a, b, c) {
+	return new Promise(function(resolve, reject) {
+
+		var callback = function(err, response) {
+			if (err)
+				reject(err);
+			else
+				resolve(response);
+		};
+
+		if (c !== undefined)
+			fn(a, b, c, callback);
+		else if (b !== undefined)
+			fn(a, b, callback);
+		else if (a !== undefined)
+			fn(a, callback);
+		else
+			fn(callback);
+
+	});
+};
 
 global.BLOCKED = function($, limit, expire) {
 

package/index.js

@@ -36,7 +36,7 @@ global.DEF = {};
 
 	F.id = '';
 	F.clusterid = '';
-	F.is5 = F.version = 5003;
+	F.is5 = F.version = 5004;
 	F.isBundle = false;
 	F.isLoaded = false;
 	F.version_header = '5';
@@ -1664,7 +1664,7 @@ F.cron = function(line, fn) {
 	obj.remove = function() {
 		let index = F.crons.indexOf(this);
 		if (index !== -1)
-			F.crons.splice(index, 0);
+			F.crons.splice(index, 1);
 	};
 	F.crons.push(obj);
 	return obj;

package/package.json

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

package/querybuilder.js

@@ -335,7 +335,8 @@ CTP.remove = CTP.rem = function(table) {
 
 CTP.query = function(table, query, params) {
 
-	if (query == null) {
+	if (query == null || typeof(query) === 'object') {
+		params = query;
 		query = table;
 		table = 'default/';
 	} else

package/tangular.js

@@ -402,7 +402,7 @@
 	};
 
 	Thelpers.pluralize = function(r,e,t,a,n){ return r||(r=0),'number'!=typeof r&&(r=parseFloat(r.toString().replace(/\s/g,'').replace(',','.'))),r.pluralize(e,t,a,n)};
-	Thelpers.format=function(r,e,t,a){var n=typeof r;if(r==0||r==null)return'';if('number'===n||r instanceof Date)return r.format(e==null?null:e,t,a);'string'!==n&&(r=r.toString()),r=r.trim();for(var i=!1,o=0,f=0,u=0,l=r.length;l>u;u++){var g=r.charCodeAt(u);if(58===g||32===g||84===g){i=!0;break;}if(45===g){if(o++,1===o)continue;i=!0;break;}if(46===g){if(f++,1===f)continue;i=!0;break;}}return i?r.parseDate().format(e||'dd.MM.yyyy'):r.parseFloat().format(e,t,a)};
+	Thelpers.format=function(r,e,t,a){var n=typeof r;if(r==null)return'';if('number'===n||r instanceof Date)return r.format(e==null?null:e,t,a);'string'!==n&&(r=r.toString()),r=r.trim();for(var i=!1,o=0,f=0,u=0,l=r.length;l>u;u++){var g=r.charCodeAt(u);if(58===g||32===g||84===g){i=!0;break;}if(45===g){if(o++,1===o)continue;i=!0;break;}if(46===g){if(f++,1===f)continue;i=!0;break;}}return i?r.parseDate().format(e||'dd.MM.yyyy'):r.parseFloat().format(e,t,a)};
 	Thelpers.empty=Thelpers.def=function(e,n){return e?Thelpers.encode(e):n||'---'};
 	Thelpers.currency=function(e,t){switch(typeof e){case'number':return e.currency(t);case'string':return e.parseFloat().currency(t);default:return''}};
 

package/utils.js

@@ -4256,6 +4256,16 @@ NP.pluralize = function(zero, one, few, other) {
 	var num = this;
 	var value = '';
 
+	if (!one && typeof(zero) === 'string') {
+		zero = zero.split(',');
+		if (zero instanceof Array) {
+			one = zero[1];
+			few = zero[2];
+			other = zero[3];
+			zero = zero[0];
+		}
+	}
+
 	if (num == 0)
 		value = zero || '';
 	else if (num == 1)