alchemymvc 1.4.0-alpha.2 → 1.4.0-alpha.4

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

@@ -65,7 +65,7 @@ Revision.setStatic(function getRevisionModel(model) {
 		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) {
@@ -100,7 +100,7 @@ Revision.setStatic(function attached(schema, new_options) {
 	const context = schema.model_class;
 
 	// Add the revision number to the main model
-	context.addField('__r', 'Number', {
+	context.addField('__r', 'Integer', {
 		title: 'Revision',
 	});
 
@@ -217,30 +217,42 @@ Revision.setMethod(function beforeSave(record, options, creating) {
 		return;
 	}
 
-	let that = this,
-	    next = this.wait('series');
+	let that = this;
 
-	// Find the original record
-	Model.get(this.model.model_name).findById(record.$pk, async function gotRecord(err, result) {
+	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
-			let 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;
 });
 
 /**
@@ -266,9 +278,10 @@ Revision.setMethod(function afterSave(record, options, created) {
 	}
 
 	let doc = this.model.createDocument(record);
-	let next = this.wait();
 	const that = this;
 
+	let pledge = new Swift();
+
 	// Find the complete saved item
 	Model.get(this.model.model_name).findByPk(doc.$pk, async function gotRecord(err, result) {
 
@@ -312,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) {