alchemymvc 1.1.10 → 1.2.0

package/lib/class/migration.js

@@ -0,0 +1,138 @@
+const libpath = alchemy.use('path');
+
+/**
+ * Migrations
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.0
+ * @version  1.2.0
+ */
+const Migration = Function.inherits('Alchemy.Base', function Migration(document) {
+	this.document = document;
+});
+
+/**
+ * Start the necesary migrations
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.0
+ * @version  1.2.0
+ */
+Migration.setStatic(async function start() {
+
+	const AlchemyMigration = Model.get('AlchemyMigration');
+
+	console.log('Starting migration task...');
+
+	let dir = new Classes.Alchemy.Inode.Directory(libpath.resolve(PATH_APP, 'migrations'));
+
+	await dir.loadContents();
+
+	for (let entry of dir) {
+
+		let name = entry.name.beforeLast('.js');
+
+		if (!name) {
+			continue;
+		}
+
+		let crit = AlchemyMigration.find();
+		crit.where('name').equals(name);
+
+		let record = await AlchemyMigration.find('first', crit);
+
+		if (record) {
+			if (record.ended) {
+				console.log(' »» Migration "' + name + '" already finished on ' + record.ended.format('Y-m-d H:i'));
+			} else if (record.error) {
+				console.log(' »» Migration "' + name + '" failed with error: ' + record.error);
+				console.log('Migrations stopped');
+				return;
+			} else {
+				console.log(' »» Migration "' + name + '" has not yet finished!');
+				console.log('Migrations stopped');
+				return;
+			}
+
+			continue;
+		}
+
+		record = AlchemyMigration.createDocument();
+		record.name = name;
+		record.path = entry.path;
+
+		await record.save();
+
+		try {
+
+			console.log(' »» Starting migration "' + name + '"');
+
+			let migration = new Migration(record);
+
+			await Blast.require(entry.path, {
+				client: false,
+				async : true,
+				arguments: {
+					names  : [
+						'Blast',
+						'Collection',
+						'Bound',
+						'Obj',
+						'Fn',
+						'migration'
+					],
+					values : [
+						Blast,
+						Blast.Collection,
+						Blast.Bound,
+						Blast.Bound.Object,
+						Blast.Collection.Function,
+						migration,
+					]
+				}
+			});
+
+			record.ended = new Date();
+			await record.save();
+
+		} catch (err) {
+			console.log(' »» Migration error:', err);
+			record.error = err.message + '\n' + err.stack;
+			await record.save();
+			console.log('Migrations stopped');
+			return;
+		}
+	}
+
+	console.log('Executed all migrations');
+});
+
+/**
+ * Migrate methods
+ *
+ * @constructor
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.2.0
+ * @version  1.2.0
+ */
+Migration.setMethod(function processRecords(model_name, fnc) {
+
+	const model = Model.get(model_name);
+
+	let options = {
+		document       : false,
+		parallel_limit : 1,
+	};
+
+	return model.eachRecord(options, async (record, index, next) => {
+		await fnc(model, record[model_name], index);
+		next();
+	}, (err) => {
+		// Done!
+	});
+});

package/lib/class/model.js

@@ -800,7 +800,7 @@ Model.setMethod(function ensureIds(list, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.1.0
+ * @version  1.2.0
  *
  * @param    {Document}   document
  * @param    {Object}     options
@@ -853,7 +853,14 @@ Model.setMethod(function saveRecord(document, options, callback) {
 	}, function doBeforeSave(next) {
 
 		if (typeof that.beforeSave == 'function') {
-			that.beforeSave(document, options, next);
+			let promise = that.beforeSave(document, options, next);
+
+			if (promise) {
+				Pledge.done(promise, next);
+			} else if (that.beforeSave.length < 3) {
+				// If the method accepts no `next` callback, call it now
+				next();
+			}
 		} else {
 			next();
 		}
@@ -1133,21 +1140,6 @@ Model.setMethod(function processDatasourceFormat(ds_data, options, callback) {
 	return pledge;
 });
 
-/**
- * Get a field instance from the schema
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.2.0
- * @version  0.2.0
- *
- * @param    {String}   name   The name of the field
- *
- * @return   {FieldType}
- */
-Model.setMethod(function getField(name) {
-	return this.schema.getField(name);
-});
-
 /**
  * Get the title to display for this record
  *
@@ -1317,7 +1309,7 @@ Model.setMethod(function remove(id, callback) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.5.0
- * @version  1.0.5
+ * @version  1.2.0
  *
  * @param    {Object}    options    Find options
  * @param    {Function}  task       Task to perform on each record
@@ -1382,7 +1374,7 @@ Model.setMethod(function eachRecord(options, task, callback) {
 
 			var record_index = index++;
 
-			last_id = record[that.primary_key];
+			last_id = record[that.model_name][that.primary_key];
 
 			tasks.push(function doSave(next) {
 				pledge.reportProgress(((record_index - 1) / available) * 100);

package/lib/class/schema.js

@@ -184,7 +184,7 @@ Schema.setMethod(function eachAlternateIndex(data, fnc) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.0
  *
  * @return   {Pledge}
  */
@@ -192,20 +192,24 @@ Schema.setMethod(function getDatasource() {
 
 	var that = this;
 
-	return Function.parallel(function waitForModelClass(next) {
-		that.afterOnce('has_model_class', function hasModelClass() {
-			next();
-		});
+	return Function.series(function waitForModelClass(next) {
+		that.afterOnce('has_model_class', next);
 	}, function waitForDatasources(next) {
 
 		alchemy.sputnik.after('datasources', function afterDs() {
 
-			var datasource = Datasource.get(that.model_class.prototype.dbConfig);
+			let datasource;
 
-			if (!datasource) {
-				console.log('Failed to get', that.model_class.prototype.dbConfig, 'datasource?');
-				return next(new Error('Could not get datasource "' + that.model_class.prototype.dbConfig + '"'));
-			}
+			if (that.model_class) {
+				datasource = Datasource.get(that.model_class.prototype.dbConfig);
+
+				if (!datasource) {
+					console.log('Failed to get', that.model_class.prototype.dbConfig, 'datasource?');
+					return next(new Error('Could not get datasource "' + that.model_class.prototype.dbConfig + '"'));
+				}
+			} else {
+				return next(new Error('Unable to get datasource for this sub-schema'));
+			}		
 
 			next(null, datasource);
 		});
@@ -218,8 +222,6 @@ Schema.setMethod(function getDatasource() {
 
 		return result[1];
 	});
-
-	return pledge;
 });
 
 /**