alchemymvc 1.4.0-alpha.1 → 1.4.0-alpha.10

package/lib/app/assets/stylesheets/{alchemy-info.less → alchemy-info.scss}

@@ -1,3 +1,5 @@
+@use "alchemy";
+
 html {
 	font-family: sans-serif;
 	text-size-adjust: 100%;

package/lib/app/behaviour/publishable_behaviour.js

@@ -8,9 +8,7 @@
  * @since    0.1.0
  * @version  0.3.0
  */
-var Publish = Function.inherits('Alchemy.Behaviour', function PublishableBehaviour(model, options) {
-	PublishableBehaviour.super.call(this, model, options);
-});
+var Publish = Function.inherits('Alchemy.Behaviour', 'PublishableBehaviour');
 
 /**
  * Listen to attachments to schema's

package/lib/app/behaviour/revision_behaviour.js

@@ -12,26 +12,49 @@ var jsondiffpatch = alchemy.use('jsondiffpatch'),
  * @since    0.0.1
  * @version  0.2.0
  */
-var Revision = Function.inherits('Alchemy.Behaviour', function RevisionBehaviour(model, options) {
-	Behaviour.call(this, model, options);
-});
+const Revision = Function.inherits('Alchemy.Behaviour', 'RevisionBehaviour');
 
 /**
- * Get the Revision Model class for the attached model
+ * Get the Revision model class for the given main model
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    1.0.3
- * @version  1.1.0
+ * @since    1.4.0
+ * @version  1.4.0
+ *
+ * @param    {Schema}    schema
+ * @param    {Object}    options
  */
-Revision.setProperty(function revision_model_class() {
+Revision.setStatic(function getRevisionModel(model) {
 
-	var class_name = this.model.name + 'DataRevision';
+	if (typeof model == 'function') {
+		model = model.model_name;
+	}
 
-	if (Classes.Alchemy.Model[class_name]) {
-		return Classes.Alchemy.Model[class_name];
+	if (typeof model == 'string') {
+		model = Model.get(model);
 	}
 
-	let model_class = Function.inherits('Alchemy.Model', Function.create(class_name, function DataRevision(options) {
+	if (!model) {
+		throw new Error('Unable to add Revision behaviour to undefined model');
+	}
+
+	let revision_model_name = model.model_name + 'DataRevision',
+	    revision_model;
+
+	try {
+		revision_model = Model.get(revision_model_name, false);
+	} catch (err) {
+		// Ignore
+	}
+
+	if (revision_model) {
+		return revision_model;
+	}
+	
+	let namespace = model.constructor.namespace,
+	    class_name = model.name + 'DataRevision';
+
+	let model_class = Function.inherits('Alchemy.Model', namespace, Function.create(class_name, function DataRevision(options) {
 		Model.call(this, options);
 	}));
 
@@ -42,12 +65,18 @@ Revision.setProperty(function revision_model_class() {
 		this.schema.remove('updated');
 
 		this.addField('record_id', 'ObjectId');
-		this.addField('revision', 'Number');
+		this.addField('revision', 'Integer');
 		this.addField('delta', 'Object');
 
 		if (Classes.Alchemy.Model.User) {
 			this.belongsTo('User');
 		}
+
+		// Add an index on the record_id
+		this.addIndex('record_id', {
+			unique : false,
+			sparse : false,
+		});
 	});
 
 	// Force the constitutors to load now
@@ -56,6 +85,39 @@ Revision.setProperty(function revision_model_class() {
 	return model_class;
 });
 
+/**
+ * Listen to attachments to schema's
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.0.3
+ * @version  1.4.0
+ *
+ * @param    {Schema}    schema
+ * @param    {Object}    options
+ */
+Revision.setStatic(function attached(schema, new_options) {
+
+	const context = schema.model_class;
+
+	// Add the revision number to the main model
+	context.addField('__r', 'Integer', {
+		title: 'Revision',
+	});
+
+	Revision.getRevisionModel(schema.model_class);
+});
+
+/**
+ * Get the Revision Model class for the attached model
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.0.3
+ * @version  1.4.0
+ */
+Revision.setProperty(function revision_model_class() {
+	return Revision.getRevisionModel(this.model);
+});
+
 /**
  * Get the revision model for the attached model
  *
@@ -122,24 +184,6 @@ Revision.setProperty(function diff_patcher() {
 	return diff_patch_instance;
 });
 
-/**
- * Listen to attachments to schema's
- *
- * @author   Jelle De Loecker <jelle@elevenways.be>
- * @since    1.0.3
- * @version  1.0.3
- *
- * @param    {Schema}    schema
- * @param    {Object}    options
- */
-Revision.setStatic(function attached(schema, new_options) {
-
-	var context = schema.model_class;
-
-	// Add the revision
-	context.addField('__r', 'Number', {title: 'Revision'});
-});
-
 /**
  * Compare 2 objects
  *
@@ -157,14 +201,14 @@ Revision.setMethod(function compare(left, right) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.0.5
+ * @version  1.4.0
  */
 Revision.setMethod(function beforeSave(record, options, creating) {
 
-	let main = record[this.model.name];
+	let main = record.$main;
 
 	if (!main) {
-		throw new Error('Unable to find main "' + this.model.name + '" data');
+		throw new Error('Unable to find main "' + this.model.model_name + '" data');
 	}
 
 	// No revision to save when creating a record
@@ -173,32 +217,42 @@ Revision.setMethod(function beforeSave(record, options, creating) {
 		return;
 	}
 
-	let that = this,
-	    next = this.wait('series');
-
-	// Find the original record
-	Model.get(that.model.name).findById(main._id, async function gotRecord(err, result) {
+	let that = this;
 
-		var ori;
+	let pledge = new Swift();
 
-		if (result) {
+	// Find the original record
+	Model.get(this.model.model_name).findById(record.$pk, function gotRecord(err, result) {
 
-			// Get the original data
-			ori = await that.model.convertRecordToDatasourceFormat(result);
+		if (err || !result) {
+			return pledge.resolve();
+		}
 
-			// Store the original data in a weakmap for later
-			revision_before.set(options, ori);
+		let conversion;
 
-			// Increase the revision count by 1
-			if (ori.__r) {
-				main.__r = ori.__r+1;
-			} else {
-				main.__r = 1;
-			}
+		try {
+			conversion = that.model.convertRecordToDatasourceFormat(result);
+		} catch (err) {
+			return pledge.reject(err);
 		}
 
-		next();
+		pledge.resolve(Swift.waterfall(
+			conversion,
+			ori => {
+				// Store the original data in a weakmap for later
+				revision_before.set(options, ori);
+
+				// Increase the revision count by 1
+				if (ori.__r) {
+					main.__r = ori.__r+1;
+				} else {
+					main.__r = 1;
+				}
+			}
+		));
 	});
+
+	return pledge;
 });
 
 /**
@@ -206,17 +260,11 @@ Revision.setMethod(function beforeSave(record, options, creating) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.1.0
+ * @version  1.4.0
  */
 Revision.setMethod(function afterSave(record, options, created) {
 
-	var that = this,
-	    earlier_data,
-	    right,
-	    main,
-	    that,
-	    left,
-	    next;
+	let earlier_data;
 
 	if (created) {
 		earlier_data = {};
@@ -229,11 +277,13 @@ Revision.setMethod(function afterSave(record, options, created) {
 		return;
 	}
 
-	next = this.wait();
-	main = record[that.model.name] || record;
+	let doc = this.model.createDocument(record);
+	const that = this;
+
+	let pledge = new Swift();
 
 	// Find the complete saved item
-	Model.get(that.model.name).findById(main._id, async function gotRecord(err, result) {
+	Model.get(this.model.model_name).findByPk(doc.$pk, async function gotRecord(err, result) {
 
 		if (result) {
 
@@ -243,8 +293,8 @@ Revision.setMethod(function afterSave(record, options, created) {
 			if (new_data) {
 
 				// Convert the objects so they can be diffed properly
-				left = JSON.toDryObject(earlier_data);
-				right = JSON.toDryObject(new_data);
+				let left = JSON.toDryObject(earlier_data),
+				    right = JSON.toDryObject(new_data);
 
 				// Diff them
 				let delta = that.compare(left, right);
@@ -267,7 +317,7 @@ Revision.setMethod(function afterSave(record, options, created) {
 
 				// Add the delta information
 				revision_data = {
-					[that.revision_model.name] : revision_data
+					[that.revision_model.model_name] : revision_data
 				};
 
 				// Save the data
@@ -275,6 +325,8 @@ Revision.setMethod(function afterSave(record, options, created) {
 			}
 		}
 
-		next();
+		pledge.resolve();
 	});
+
+	return pledge;
 });

package/lib/app/behaviour/sluggable_behaviour.js

@@ -153,8 +153,7 @@ Sluggable.setMethod(async function beforeSave(data, options, creating) {
 	    has_new_value,
 	    old_record,
 	    new_value,
-	    old_value,
-	    next;
+	    old_value;
 
 	// Get the actual record data
 	if (data[that.model.name]) {
@@ -170,9 +169,6 @@ Sluggable.setMethod(async function beforeSave(data, options, creating) {
 		has_new_value = true;
 	}
 
-	// Let other event callbacks wait for this one
-	next = this.wait('series');
-
 	if (!creating) {
 		old_record = await this.model.findById(data._id);
 
@@ -186,7 +182,7 @@ Sluggable.setMethod(async function beforeSave(data, options, creating) {
 	// and we're not explicitly setting a new slug value,
 	// then do nothing
 	if (!creating && old_value && !has_new_value) {
-		return next();
+		return;
 	}
 
 	let new_data = {};
@@ -198,19 +194,23 @@ Sluggable.setMethod(async function beforeSave(data, options, creating) {
 		Object.assign(new_data, data);
 	}
 
+	let pledge = new Swift();
+
 	// Try creating a new slug
 	that.createSlug(new_data, new_value, function createdSlug(err, result) {
 
 		if (err) {
-			return next(err);
+			return pledge.reject(err);
 		}
 
 		if (!Object.isEmpty(result)) {
 			data[that.target_field.name] = result;
 		}
 
-		next();
+		pledge.resolve();
 	});
+
+	return pledge;
 });
 
 /**

package/lib/app/conduit/loopback_conduit.js

@@ -89,7 +89,7 @@ LoopConduit.setMethod(function copyParentProperties(conduit) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.3.0
+ * @version  1.4.0
  *
  * @param    {Object}      options
  * @param    {Function}    callback
@@ -108,17 +108,20 @@ LoopConduit.setMethod(function setOptions(options, callback) {
 	options = JSON.clone(options);
 
 	for (key in options) {
-		let set_method = false;
+
+		// Keep track if a request method has been set
+		let got_method = false;
 
 		info = Classes.Develry.Request.getMethodInfo(key);
 
 		if (info && options[key]) {
 
-			if (info.method == 'get' && set_method) {
-				// Ignore
+			if (info.method == 'get' && got_method) {
+				// If a request method has already been set,
+				// do not let `get` options overwrite it!
 			} else {
 				this.method = key;
-				set_method = true;
+				got_method = true;
 			}
 
 			if (info.has_body && typeof options[key] == 'object') {
@@ -131,6 +134,8 @@ LoopConduit.setMethod(function setOptions(options, callback) {
 		this.method = options.method;
 	}
 
+	let route_params = options.params;
+
 	if (options.name) {
 		// @TODO: what about path sections?
 		route = this.getRouteByName(options.name);
@@ -147,7 +152,7 @@ LoopConduit.setMethod(function setOptions(options, callback) {
 
 		// @WARNING: It's best to just generate the URL
 		// and let it parse all the information that way
-		options.href = this.routeUrl(options.name, options.params, {extra_get_parameters: false});
+		options.href = this.routeUrl(options.name, route_params, {extra_get_parameters: false});
 	}
 
 	if (!this.method) {
@@ -158,6 +163,10 @@ LoopConduit.setMethod(function setOptions(options, callback) {
 
 		this.original_url = RURL.parse(options.href);
 
+		if (options.get && typeof options.get == 'object') {
+			this.original_url.addQuery(options.get);
+		}
+
 		this.url = this.original_url;
 		this.original_path = this.url.path;
 		this.original_pathname = this.url.pathname;
@@ -169,14 +178,20 @@ LoopConduit.setMethod(function setOptions(options, callback) {
 		this.parseSection();
 
 		promise = this.parseRoute();
+	} else if (options.get && typeof options.get == 'object') {
+		if (!this.params) {
+			this.params = {};
+		}
+
+		Object.assign(this.params, options.get);
 	}
 
 	if (options.body) {
 		this.body = options.body;
 	}
 
-	if (options.params) {
-		this.setRouteParameters(options.params);
+	if (route_params) {
+		this.setRouteParameters(route_params);
 	}
 
 	if (options.arguments) {