alchemymvc 1.1.5 → 1.1.9

package/lib/app/behaviour/sluggable_behaviour.js

@@ -1,5 +1,3 @@
-var slug = alchemy.use('mollusc');
-
 /**
  * The Sluggable Behaviour class
  *
@@ -293,7 +291,7 @@ Sluggable.setMethod(function createSlug(record, new_value, callback) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.1.0
- * @version  1.1.0
+ * @version  1.1.8
  *
  * @param    {String}   title
  * @param    {String}   path
@@ -336,7 +334,7 @@ Sluggable.setMethod(function generateSlug(title, key, record, callback) {
 		return callback();
 	}
 
-	baseSlug = slug(title, {replacement: that.replacement || '-'}).toLowerCase();
+	baseSlug = title.slug(that.replacement || '-').toLowerCase();
 	current = baseSlug;
 	model = Model.get(this.model.name);
 	count = 1;

package/lib/app/conduit/http_conduit.js

@@ -1,193 +1,174 @@
-/**
- * The Http Conduit Class
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.2.0
- * @version  1.1.3
- *
- * @param    {IncomingMessage}   req
- * @param    {ServerResponse}    res
- * @param    {Router}            router
- */
-var HttpConduit = Function.inherits('Alchemy.Conduit.Conduit', function Http(req, res, router) {
-
-	// Initialize basic conduit values
-	Http.super.call(this);
-
-	this.initHttp(req, res, router);
-});
-
-/**
- * Has the client aborted the request?
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    1.1.0
- * @version  1.1.0
- *
- * @type     {Boolean}
- */
-HttpConduit.setProperty(function aborted() {
-
-	if (this.request && this.request.aborted != null) {
-		return this.request.aborted;
-	}
-
-	return false;
-});
-
-/**
- * Return the IP address
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    0.2.0
- * @version  1.1.0
- */
-HttpConduit.setProperty(function ip() {
-
-	var req = this.request;
-
-	if (!req) {
-		return null;
-	}
-
-	let forwarded_for = req.headers['x-forwarded-for'] || req.headers['x-real-ip'];
-
-	if (forwarded_for) {
-
-		// Forwarded for can contain multiple ip addresses,
-		// return the first one
-		if (forwarded_for.indexOf(',') > -1) {
-			forwarded_for = forwarded_for.before(',');
-		}
-
-		return forwarded_for;
-	}
-
-	let remote_address;
-
-	if (req.connection) {
-		remote_address = req.connection.remoteAddress;
-	}
-
-	if (!remote_address && req.socket) {
-		remote_address = req.socket.remoteAddress;
-	}
-
-	if (!remote_address && req.connection && req.connection.socket) {
-		remote_address = req.connection.socket.remoteAddress;
-	}
-
-	return remote_address;
-});
-
-/**
- * Get a simple fingerprint of the client
- * based on ip, accept-language & user-agent
- *
- * @author   Jelle De Loecker   <jelle@develry.be>
- * @since    1.1.0
- * @version  1.1.0
- *
- * @type     {String}
- */
-HttpConduit.enforceProperty(function fingerprint() {
-
-	let result,
-	    language = this.headers['accept-language'] || 'all',
-	    ua = this.headers['user-agent'] || 'unknown',
-	    ip = this.ip || '';
-
-	result = Object.checksum(ip + '_' + language + '_' + ua);
-
-	return result;
-});
-
-/**
- * Init
- *
- * @author   Jelle De Loecker   <jelle@kipdola.be>
- * @since    0.3.3
- * @version  1.1.0
- *
- * @param    {IncomingMessage}   req
- * @param    {ServerResponse}    res
- * @param    {Router}            router
- */
-HttpConduit.setMethod(async function initHttp(req, res, router) {
-
-	if (req != null) {
-		// Make conduit available in req
-		req.conduit = this;
-
-		// Basic HTTP objects
-		this.request = req;
-
-		// The HTTP request headers
-		this.headers = req.headers;
-
-		// Parse the original URL without host
-		this.original_url = new RURL(req.url);
-
-		// Is this an AJAX request?
-		this.ajax = null;
-	}
-
-	if (res != null) {
-		this.response = res;
-	}
-
-	if (router) {
-		this.router = router;
-	}
-
-	// The HTTP status
-	this.status = 200;
-
-	this.debugMark('Parse request');
-
-	// Parse the request, get the correct routes and such
-	await this.parseRequest();
-
-	if (this.halt_request) {
-		return;
-	}
-
-	if (alchemy.settings.debug || alchemy.settings.environment != 'live') {
-		this.setHeader('X-Robots-Tag', 'none');
-	}
-
-	this.debugMark(false);
-
-	// Call the middleware, which will call the handler afterwards
-	this.callMiddleware();
-});
-
-/**
- * Get the original url path
- *
- * @author   Jelle De Loecker   <jelle@kipdola.be>
- * @since    1.1.0
- * @version  1.1.0
- *
- * @type     {String}
- */
-HttpConduit.setProperty(function original_path() {
-	return this.original_url.path;
-}, function setPath(value) {
-	return this.original_url.path = value;
-});
-
-/**
- * Get the original url pathname
- *
- * @author   Jelle De Loecker   <jelle@kipdola.be>
- * @since    1.1.0
- * @version  1.1.0
- *
- * @type     {String}
- */
-HttpConduit.setProperty(function original_pathname() {
-	return this.original_url.pathname;
-}, function setPathname(value) {
-	return this.original_url.pathname = value;
+/**
+ * The Http Conduit Class
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    0.2.0
+ * @version  1.1.3
+ *
+ * @param    {IncomingMessage}   req
+ * @param    {ServerResponse}    res
+ * @param    {Router}            router
+ */
+var HttpConduit = Function.inherits('Alchemy.Conduit.Conduit', function Http(req, res, router) {
+
+	// Initialize basic conduit values
+	Http.super.call(this);
+
+	this.initHttp(req, res, router);
+});
+
+/**
+ * Has the client aborted the request?
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    1.1.0
+ * @version  1.1.0
+ *
+ * @type     {Boolean}
+ */
+HttpConduit.setProperty(function aborted() {
+
+	if (this.request && this.request.aborted != null) {
+		return this.request.aborted;
+	}
+
+	return false;
+});
+
+/**
+ * Return the IP address
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    0.2.0
+ * @version  1.1.0
+ */
+HttpConduit.setProperty(function ip() {
+
+	var req = this.request;
+
+	if (!req) {
+		return null;
+	}
+
+	let forwarded_for = req.headers['x-forwarded-for'] || req.headers['x-real-ip'];
+
+	if (forwarded_for) {
+
+		// Forwarded for can contain multiple ip addresses,
+		// return the first one
+		if (forwarded_for.indexOf(',') > -1) {
+			forwarded_for = forwarded_for.before(',');
+		}
+
+		return forwarded_for;
+	}
+
+	let remote_address;
+
+	if (req.connection) {
+		remote_address = req.connection.remoteAddress;
+	}
+
+	if (!remote_address && req.socket) {
+		remote_address = req.socket.remoteAddress;
+	}
+
+	if (!remote_address && req.connection && req.connection.socket) {
+		remote_address = req.connection.socket.remoteAddress;
+	}
+
+	return remote_address;
+});
+
+/**
+ * Get a simple fingerprint of the client
+ * based on ip, accept-language & user-agent
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    1.1.0
+ * @version  1.1.0
+ *
+ * @type     {String}
+ */
+HttpConduit.enforceProperty(function fingerprint() {
+
+	let result,
+	    language = this.headers['accept-language'] || 'all',
+	    ua = this.headers['user-agent'] || 'unknown',
+	    ip = this.ip || '';
+
+	result = Object.checksum(ip + '_' + language + '_' + ua);
+
+	return result;
+});
+
+/**
+ * Init
+ *
+ * @author   Jelle De Loecker   <jelle@kipdola.be>
+ * @since    0.3.3
+ * @version  1.2.0
+ *
+ * @param    {IncomingMessage}   req
+ * @param    {ServerResponse}    res
+ * @param    {Router}            router
+ */
+HttpConduit.setMethod(async function initHttp(req, res, router) {
+
+	this.setReqRes(req, res);
+
+	if (router) {
+		this.router = router;
+	}
+
+	// The HTTP status
+	this.status = 200;
+
+	this.debugMark('Parse request');
+
+	// Parse the request, get the correct routes and such
+	await this.parseRequest();
+
+	if (this.halt_request) {
+		return;
+	}
+
+	if (alchemy.settings.debug || alchemy.settings.environment != 'live') {
+		this.setHeader('X-Robots-Tag', 'none');
+	}
+
+	this.debugMark(false);
+
+	// Call the middleware, which will call the handler afterwards
+	this.callMiddleware();
+});
+
+/**
+ * Get the original url path
+ *
+ * @author   Jelle De Loecker   <jelle@kipdola.be>
+ * @since    1.1.0
+ * @version  1.1.0
+ *
+ * @type     {String}
+ */
+HttpConduit.setProperty(function original_path() {
+	return this.original_url.path;
+}, function setPath(value) {
+	return this.original_url.path = value;
+});
+
+/**
+ * Get the original url pathname
+ *
+ * @author   Jelle De Loecker   <jelle@kipdola.be>
+ * @since    1.1.0
+ * @version  1.1.0
+ *
+ * @type     {String}
+ */
+HttpConduit.setProperty(function original_pathname() {
+	return this.original_url.pathname;
+}, function setPathname(value) {
+	return this.original_url.pathname = value;
 });

package/lib/app/conduit/loopback_conduit.js

@@ -76,9 +76,9 @@ LoopConduit.setMethod(function copyParentProperties(conduit) {
 /**
  * Set the loopback options
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.5
+ * @version  1.1.7
  *
  * @param    {Object}      options
  * @param    {Function}    callback
@@ -93,6 +93,9 @@ LoopConduit.setMethod(function setOptions(options, callback) {
 	    info,
 	    key;
 
+	// Always clone the options
+	options = JSON.clone(options);
+
 	for (key in options) {
 		let set_method = false;
 
@@ -113,17 +116,32 @@ LoopConduit.setMethod(function setOptions(options, callback) {
 		}
 	}
 
-	if (!this.method) {
-		this.method = 'get';
+	if (options.method) {
+		this.method = options.method;
 	}
 
 	if (options.name) {
 		// @TODO: what about path sections?
-		//route = this.getRouteByName(options.name);
+		route = this.getRouteByName(options.name);
+
+		if (route && !this.method) {
+			if (route.methods.length == 1) {
+				this.method = route.methods[0];
+			} else if (options.body && route.methods.indexOf('post') > -1) {
+				this.method = 'post';
+			} else {
+				this.method = route.methods[0];
+			}
+		}
 
 		// @WARNING: It's best to just generate the URL
 		// and let it parse all the information that way
 		options.href = alchemy.routeUrl(options.name, options.params, {extra_get_parameters: false});
+		// @TODO: alchemy.routeUrl will ignore the `keep_get_parameters` option
+	}
+
+	if (!this.method) {
+		this.method = 'get';
 	}
 
 	if (options.href) {

package/lib/app/element/time_ago.js

@@ -83,18 +83,21 @@ TimeAgo.setMethod(function connected() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.1.0
- * @version  0.1.0
+ * @version  0.1.7
  *
  * @param    {Boolean}   reset_timer
  */
 TimeAgo.setMethod(function refresh(reset_timer) {
 
-	var that = this,
+	let that = this,
 	    counter,
 	    timer,
+	    text = this.value,
 	    diff;
 
-	this.innerHTML = this.value;
+	if (this.textContent != text) {
+		this.textContent = text;
+	}
 
 	if (!reset_timer || Blast.isNode) {
 		return;
@@ -106,7 +109,7 @@ TimeAgo.setMethod(function refresh(reset_timer) {
 	}
 
 	if (this.date) {
-		diff = Date.now() - this.date;
+		diff = Math.abs(Date.now() - this.date);
 		counter = 0;
 
 		if (diff < 1000 * 29) {

package/lib/app/helper_datasource/remote_datasource.js

@@ -15,7 +15,7 @@ var Remote = Function.inherits('Alchemy.Datasource', function Remote(name, optio
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.1.7
  */
 Remote.setMethod(async function doServerCommand(action, model, data, callback) {
 
@@ -55,7 +55,8 @@ Remote.setMethod(async function doServerCommand(action, model, data, callback) {
 
 		conduit.loopback({
 			name   : route_name,
-			params : data
+			method : 'post',
+			body   : data
 		}, function gotResult(err, result) {
 
 			if (err) {

package/lib/app/helper_field/05-string_field.js

@@ -20,6 +20,27 @@ var StringField = Function.inherits('Alchemy.Field', function String(schema, nam
  */
 StringField.setDatatype('string');
 
+/**
+ * Cast the given value to this field's type for search in a db
+ *
+ * @author   Jelle De Loecker   <jelle@develry.be>
+ * @since    1.1.7
+ * @version  1.1.7
+ *
+ * @param    {Mixed}   value
+ * @param    {Array}   field_paths   The path to the field
+ *
+ * @return   {Mixed}
+ */
+StringField.setMethod(function _castCondition(value, field_paths) {
+
+	if (typeof value == 'object' && RegExp.isRegExp(value)) {
+		return value;
+	}
+
+	return this.cast(value, true);
+});
+
 /**
  * Cast the given value to this field's type
  *

package/lib/app/helper_field/schema_field.js

@@ -277,7 +277,12 @@ SchemaField.setMethod(function _toApp(query, options, value, callback) {
 
 		name = this.name + 'FieldModel';
 		Dummy = alchemy.getModel('Model', false);
-		Dummy = new Dummy({name: name});
+
+		Dummy = new Dummy({
+			root_model : this.root_model,
+			name       : name
+		});
+
 		item = {};
 
 		item[name] = value;
@@ -338,7 +343,7 @@ SchemaField.setMethod(function _toApp(query, options, value, callback) {
 
 			if (field != null) {
 				tasks[field_name] = function doToDatasource(next) {
-					field.toApp({}, {}, field_value, next);
+					field.toApp({}, {_root_data: options._root_data}, field_value, next);
 				};
 			}
 		});

package/lib/app/helper_model/criteria.js

@@ -510,6 +510,9 @@ Criteria.setMethod(function getCriteriaForAssociation(name, item) {
 		assoc_crit.where(assoc_key).equals(value);
 	}
 
+	assoc_crit.setOption('assoc_key', assoc_key);
+	assoc_crit.setOption('assoc_value', value);
+
 	// Take over the locale option
 	if (options.locale) {
 		assoc_crit.setOption('locale', options.locale);

package/lib/app/helper_model/field_config.js

@@ -1,13 +1,15 @@
 /**
- * The FieldConfig class
+ * Alchemy.Criteria.FieldConfig:
+ * Configuration on what to do with a certain field during a database query
+ * or anywhere data is represented
  *
  * @constructor
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.3
- * @version  1.1.4
+ * @version  1.1.7
  * 
- * @param    {String}   path
+ * @param    {string}   path
  * @param    {Object}   options
  */
 const FieldConfig = Fn.inherits('Alchemy.Base', 'Alchemy.Criteria', function FieldConfig(path, options) {
@@ -54,7 +56,7 @@ FieldConfig.setStatic(function unDry(obj) {
  * @since    1.1.3
  * @version  1.1.3
  *
- * @type     {String}
+ * @type     {string}
  */
 FieldConfig.setProperty(function title() {
 
@@ -107,7 +109,7 @@ FieldConfig.setMethod(function toJSON() {
  * @since    1.1.3
  * @version  1.1.3
  *
- * @param    {String}   path
+ * @param    {string}   path
  */
 FieldConfig.setMethod(function parsePath(path) {
 
@@ -160,4 +162,34 @@ FieldConfig.setMethod(function getValueIn(data) {
 	}
 
 	return Object.path(data, this.path);
+});
+
+/**
+ * Get the display value for the value in the given object
+ *
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @since    1.1.7
+ * @version  1.1.7
+ *
+ * @param    {Object}   data
+ *
+ * @return   {string}
+ */
+FieldConfig.setMethod(function getDisplayValueIn(data) {
+
+	let value = this.getValueIn(data);
+
+	if (value == null) {
+		return '';
+	}
+
+	if (typeof value == 'object') {
+		if (Date.isDate(value)) {
+			value = value.format('y-m-d H:i:s');
+		}
+
+		return value;
+	}
+
+	return '' + value;
 });

package/lib/app/helper_model/model.js

@@ -96,12 +96,18 @@ Model.setProperty(function table() {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    1.0.0
- * @version  1.1.0
+ * @version  1.1.7
  *
  * @type     {Datasource}
  */
 Model.setProperty(function datasource() {
 
+	if (Blast.isNode) {
+		// We use the "remote" type datasource, which will make loopback
+		// requests on the server side
+		return Datasource.get({name: 'loopback', type: 'remote'});
+	}
+
 	if (!fallback_datasource) {
 		fallback_datasource = new Blast.Classes.Alchemy.Datasource.Fallback('default', {
 			upper: {
@@ -1052,6 +1058,26 @@ Model.setMethod(function addAssociatedDataToRecord(criteria, item, callback) {
 			return;
 		}
 
+		// SchemaFields use a dummy Model name, so get the root_model in that case
+		let root_model = (that.options && that.options.root_model) || that.name;
+
+		// Make sure references to the same model don't cause a deadlock
+		// (Can happen when a model refers to itself)
+		if (association.modelName == root_model && criteria.options._root_data) {
+			let assoc_key = assoc_crit.options.assoc_key,
+			    assoc_value = assoc_crit.options.assoc_value,
+			    root = criteria.options._root_data[root_model];
+
+			if (root && root[assoc_key] && Object.alike(root[assoc_key], assoc_value)) {
+
+				aliases[alias] = nextAlias => {
+					nextAlias(null, root[assoc_key]);
+				};
+
+				return;
+			}
+		}
+
 		aliases[alias] = function aliasRecordTask(nextAlias) {
 
 			var key;