Add operations + removed TransformBuilder.

petersirka · petersirka · commit 8cd6732caabf · 2017-01-26T09:53:30.000+01:00
diff --git a/builders.js b/builders.js
@@ -35,6 +35,7 @@ const hasOwnProperty = Object.prototype.hasOwnProperty;
 const Qs = require('querystring');
 
 var schemas = {};
+var operations = {};
 var transforms = { pagination: {}, error: {}, transformbuilder: {}, restbuilder: {} };
 
 function SchemaBuilder(name) {
@@ -2387,7 +2388,9 @@ exports.newschema = function(group, name) {
 	if (!schemas[group])
 		schemas[group] = new SchemaBuilder(group);
 
-	return schemas[group].create(name);
+	var o = schemas[group].create(name);
+	o.owner = F.$owner();
+	return o;
 };
 
 /**
@@ -3319,6 +3322,8 @@ function TransformBuilder() {}
 
 TransformBuilder.transform = function(name, obj) {
 
+	OBSOLETE('TransformBuilder', 'Builders.TransformBuilder will be removed in next versions.');
+
 	var index = 2;
 
 	if (obj === undefined) {
@@ -3768,6 +3773,34 @@ function $decodeURIComponent(value) {
 	}
 };
 
+global.NEWOPERATION = function(name, fn) {
+	operations[name] = fn;
+	operations[name].$owner = F.$owner();
+};
+
+global.OPERATION = function(name, model, callback) {
+
+	if (callback === undefined) {
+		callback = model;
+		model = EMPTYOBJECT;
+	}
+
+	var fn = operations[name];
+	var error = new ErrorBuilder();
+	if (fn) {
+		fn(error, function(value) {
+			if (value instanceof Error) {
+				error.push(value);
+				value = EMPTYOBJECT;
+			}
+			callback(error.hasError() ? error : null, value);
+		}, model);
+	} else {
+		error.push('Operation "{0}" not found.'.format(name));
+		callback(error, EMPTYOBJECT);
+	}
+};
+
 // ======================================================
 // EXPORTS
 // ======================================================
@@ -3787,8 +3820,25 @@ global.Page = Page;
 global.UrlBuilder = global.URLBuilder = UrlBuilder;
 global.SchemaBuilder = SchemaBuilder;
 
+// Uninstall owners
+exports.uninstall = function(owner) {
+
+	if (!owner)
+		return;
+
+	Object.keys(operations).forEach(function(key) {
+		if (operations[key].$owner === owner)
+			delete operations[key];
+	});
+
+	eachschema(function(group, name, schema) {
+		schema.owner === owner && schema.destroy();
+	});
+};
+
 exports.restart = function() {
 	schemas = {};
+	operations = {};
 	Object.keys(transforms).forEach(function(key) {
 		if (key.indexOf('_') === -1)
 			transforms[key] = {};
diff --git a/changes.txt b/changes.txt
@@ -18,6 +18,8 @@
 - added: configuration files supports options for all dependencies `module#mymodulename    (Object)   : { name: 'A custom options for dependency' }`
 - added: `U.chunker()` added a new property `chunker.pages` with count of all stored pages
 - added: `U.chunker()` added a new property `chunker.count` with count of all stored items
+- added: `NEWOPERATION(name, fn(error, callback(response), value))` - registers a new operation (same as schemas)
+- added: `OPERATION('name', function(err, response))` - executes an operation (same as schemas)
 
 - updated: new error message `The field "@" is invalid.`
 - updated: `NOSQL().insert(doc, [unique])`
@@ -39,6 +41,7 @@
 
 - removed: behaviours
 - removed: restrictions
+- removed: `TransformBuilder`
 - removed: `F.config['allow-compatibility']` (not used)
 - removed: `controller.date()` method has been useless
 - removed: dynamic view compilation through `.view()` method
diff --git a/index.js b/index.js
@@ -515,7 +515,7 @@ function Framework() {
 
 	this.id = null;
 	this.version = 2400;
-	this.version_header = '2.4.0-21';
+	this.version_header = '2.4.0-22';
 	this.version_node = process.version.toString().replace('v', '').replace(/\./g, '').parseFloat();
 
 	this.config = {
@@ -938,7 +938,7 @@ Framework.prototype.script = function(body, value, callback) {
 	var compilation = value === undefined && callback === undefined;
 
 	try {
-		fn = new Function('next', 'value', 'now', 'var model=value;var global,require,process,GLOBAL,root,clearImmediate,clearInterval,clearTimeout,setImmediate,setInterval,setTimeout,console,$STRING,$VIEWCACHE,framework_internal,TransformBuilder,Pagination,Page,URLBuilder,UrlBuilder,SchemaBuilder,framework_builders,framework_utils,framework_mail,Image,framework_image,framework_nosql,Builders,U,utils,Utils,Mail,WTF,SOURCE,INCLUDE,MODULE,NOSQL,NOBIN,NOCOUNTER,NOSQLMEMORY,NOMEM,DATABASE,DB,CONFIG,INSTALL,UNINSTALL,RESOURCE,TRANSLATOR,LOG,LOGGER,MODEL,GETSCHEMA,CREATE,UID,TRANSFORM,MAKE,SINGLETON,NEWTRANSFORM,NEWSCHEMA,EACHSCHEMA,FUNCTION,ROUTING,SCHEDULE,OBSOLETE,DEBUG,TEST,RELEASE,is_client,is_server,F,framework,Controller,setTimeout2,clearTimeout2,String,Number,Boolean,Object,Function,Date,isomorphic,I,eval;UPTODATE;try{' + body + '}catch(e){next(e)}');
+		fn = new Function('next', 'value', 'now', 'var model=value;var global,require,process,GLOBAL,root,clearImmediate,clearInterval,clearTimeout,setImmediate,setInterval,setTimeout,console,$STRING,$VIEWCACHE,framework_internal,TransformBuilder,Pagination,Page,URLBuilder,UrlBuilder,SchemaBuilder,framework_builders,framework_utils,framework_mail,Image,framework_image,framework_nosql,Builders,U,utils,Utils,Mail,WTF,SOURCE,INCLUDE,MODULE,NOSQL,NOBIN,NOCOUNTER,NOSQLMEMORY,NOMEM,DATABASE,DB,CONFIG,INSTALL,UNINSTALL,RESOURCE,TRANSLATOR,LOG,LOGGER,MODEL,GETSCHEMA,CREATE,UID,TRANSFORM,MAKE,SINGLETON,NEWTRANSFORM,NEWSCHEMA,EACHSCHEMA,FUNCTION,ROUTING,SCHEDULE,OBSOLETE,DEBUG,TEST,RELEASE,is_client,is_server,F,framework,Controller,setTimeout2,clearTimeout2,String,Number,Boolean,Object,Function,Date,isomorphic,I,eval;UPTODATE,NEWOPERATION,OPERATION;try{' + body + '}catch(e){next(e)}');
 	} catch(e) {
 		callback && callback(e);
 		return compilation ? null : F;
@@ -4038,7 +4038,9 @@ Framework.prototype.$uninstall = function(owner, controller) {
 	F.routes.websockets = F.routes.websockets.remove('owner', owner);
 	F.routes.cors = F.routes.cors.remove('owner', owner);
 	F.schedules = F.schedules.remove('owner', owner);
-	F.modificators = F.schedules.remove('$owner', owner);
+	F.modificators = F.modificators.remove('$owner', owner);
+
+	framework_builders.uninstall(owner);
 
 	var owners = [];
 	var redirects = false;
@@ -7280,14 +7282,16 @@ Framework.prototype.mail = function(address, subject, view, model, callback, lan
 		callback = tmp;
 	}
 
-	var controller = new Controller('', null, null, null, '');
+	var controller = EMPTYCONTROLLER;
 	controller.layoutName = '';
 	controller.themeName = U.parseTheme(view);
 
 	if (controller.themeName)
 		view = prepare_viewname(view);
 	else if (this.onTheme)
 		controller.themeName = this.onTheme(controller);
+	else
+		controller.themeName = '';
 
 	var replyTo;
 
@@ -7332,6 +7336,8 @@ Framework.prototype.view = function(name, model, layout, repository, language) {
 		name = prepare_viewname(name);
 	} else if (this.onTheme)
 		controller.themeName = this.onTheme(controller);
+	else
+		controller.themeName = '';
 
 	return controller.view(name, model, true);
 };
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
         "name": "Peter &Scaron;tolc",
         "email": "stolcp@gmail.com"
     }],
-    "version": "2.4.0-21",
+    "version": "2.4.0-22",
     "homepage": "http://www.totaljs.com",
     "bugs": {
         "url": "https://github.com/totaljs/framework/issues",
diff --git a/test/test-builders.js b/test/test-builders.js
@@ -304,7 +304,7 @@ function test_Schema() {
 	});
 
 	var qi = q.create();
-	assert.ok(qi.created.format('yyyyMMddHHmmss') === new Date().format('yyyyMMddHHmmss'), 'A problem with problem a default value of date');
+	assert.ok(qi.created.format('yyyyMMddHHmmss') === F.datetime.format('yyyyMMddHHmmss'), 'A problem with problem a default value of date');
 
 	var xi = x.create();
 	xi.age = 30;
@@ -608,25 +608,34 @@ function test_ErrorBuilder() {
 
 };
 
-function test_TransformBuilder() {
+function test_Operations() {
 
-	TransformBuilder.addTransform('xml', function(obj) {
-		var xml = '';
-		Object.keys(obj).forEach(function(key) {
-			xml += '<' + key + '>' + obj[key] + '</' + key + '>';
-		});
-		return xml;
-	}, true);
+	NEWOPERATION('testA', function(error, callback, value) {
+		callback(SUCCESS(true, value));
+	});
+
+	NEWOPERATION('testB', function(error, callback, value) {
+		error.push('bug');
+		callback();
+	});
 
-	assert.ok(TransformBuilder.transform('xml', { name: 'Peter' }, true) === '<name>Peter</name>', 'TransformBuilder problem');
-	assert.ok(TransformBuilder.transform({ name: 'Peter' }) === '<name>Peter</name>', 'TransformBuilder problem (default)');
+
+	OPERATION('testA', 123456, function(err, response) {
+		assert.ok(err === null, 'OPERATIONS: errors');
+		assert.ok(response.success && response.value === 123456, 'OPERATIONS: response');
+	});
+
+	OPERATION('testB', function(err, response) {
+		assert.ok(err.hasError('bug'), 'OPERATIONS: ErrorHandling 1');
+		assert.ok(response === undefined, 'OPERATIONS: ErrorHandling 2');
+	});
 }
 
 test_PageBuilder();
 test_UrlBuilder();
 test_Schema();
 test_ErrorBuilder();
-test_TransformBuilder();
+test_Operations();
 
 console.log('================================================');
 console.log('success - OK');
