alchemymvc 1.4.0-alpha.8 → 1.4.0-alpha.9

package/lib/class/conduit.js

@@ -511,7 +511,7 @@ Conduit.setMethod(function time() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.18
+ * @version  1.4.0
  *
  * @param    {IncomingMessage}   req
  * @param    {ServerResponse}    res
@@ -541,7 +541,7 @@ Conduit.setMethod(async function parseRequest() {
 	}
 
 	if (this.rewritten_request_route_param) {
-		let params = Object.assign({}, this.route_string_parameters, this.rewritten_request_route_param);
+		let params = Object.assign({...this.url.query}, this.route_string_parameters, this.rewritten_request_route_param);
 		let new_url = this.route.generateUrl(params, this);
 		this.overrideResponseUrl(new_url);
 	}

package/lib/class/model.js

@@ -679,21 +679,26 @@ Model.setMethod(function disableTranslations() {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.0
- * @version  0.5.0
+ * @version  1.4.0
  *
  * @param    {Array}    pipeline
  * @param    {Function} callback
  */
-Model.setMethod(function aggregate(pipeline, callback) {
+Model.setMethod(async function aggregate(pipeline, callback) {
 
-	this.datasource.collection(this.table, function gotCollection(err, collection) {
+	let collection = await this.datasource.collection(this.table);
 
-		if (err) {
-			return callback(err);
-		}
+	if (err) {
+		return pledge.reject(err);
+	}
 
-		collection.aggregate(pipeline, callback);
-	});
+	let cursor = collection.aggregate(pipeline);
+
+	if (typeof callback == 'function') {
+		callback(null, cursor);
+	}
+
+	return cursor;
 });
 
 /**

package/lib/core/alchemy_functions.js

@@ -1159,7 +1159,7 @@ function convertDataUriToFile(data_uri) {
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.0
- * @version  1.3.0
+ * @version  1.4.0
  *
  * @param    {string}   url
  *
@@ -1226,10 +1226,14 @@ Alchemy.setMethod(function download(url, options) {
 			}
 
 			if (!name) {
-				name = alchemy.ObjectId();
+				name = alchemy.ObjectId() + '';
 			}
 		}
 
+		if (!name || typeof name != 'string') {
+			name = alchemy.ObjectId() + '';
+		}
+
 		if (name.indexOf('/') > -1) {
 			name = name.replaceAll('/', '-');
 		}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "alchemymvc",
 	"description": "MVC framework for Node.js",
-	"version": "1.4.0-alpha.8",
+	"version": "1.4.0-alpha.9",
 	"author": "Jelle De Loecker <jelle@elevenways.be>",
 	"keywords": [
 		"alchemy",