alchemymvc 1.2.7 → 1.3.0

package/lib/app/helper_model/model.js

@@ -142,6 +142,19 @@ Model.setProperty(function datasource() {
 	return fallback_datasource;
 });
 
+/**
+ * Does this model have translatable fields?
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.0
+ * @version  1.3.0
+ *
+ * @type     {Boolean}
+ */
+Model.setProperty(function has_translatable_fields() {
+	return this.schema.has_translatable_fields;
+});
+
 /**
  * The conduit
  *
@@ -349,7 +362,7 @@ Model.setProperty(function name() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.3.0
  *
  * @param    {Object}   options
  */
@@ -371,7 +384,7 @@ Model.setMethod(function init(options) {
 	}
 
 	// Initialize behaviours
-	if (this.schema && this.schema.hasBehaviours && this.initBehaviours) {
+	if (this.schema && this.schema.has_behaviours && this.initBehaviours) {
 		this.initBehaviours();
 	}
 });
@@ -568,7 +581,7 @@ Model.setMethod(function getAliasModel(alias) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.0.1
- * @version  1.2.5
+ * @version  1.3.0
  *
  * @param    {String}     type       The type of find (first, all)
  * @param    {Criteria}   criteria   The criteria object
@@ -626,10 +639,17 @@ Model.setMethod(function find(type, criteria, callback) {
 		return pledge;
 	}
 
+	if (this.conduit) {
+		criteria.conduit = this.conduit;
+	}
+
+	if (!criteria.options.locale && this.conduit) {
+		criteria.setOption('locale', this.conduit.prefix);
+	}
+
 	let that = this,
 	    available,
 	    records,
-	    query,
 	    Type;
 
 	// The criteria instance has to know about the model
@@ -1310,8 +1330,7 @@ Model.setMethod(function save(data, _options, _callback) {
 		return iter.hasNext();
 	}, function saveData(next) {
 
-		var document = iter.next().value,
-		    temp;
+		var document = iter.next().value;
 
 		// Skip invalid items
 		if (!document) {
@@ -1360,9 +1379,9 @@ Model.setMethod(function save(data, _options, _callback) {
  * Create a new document.
  * If data is given, the document is populated
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.3.0
  *
  * @param    {Object}    data     Optional data
  * @param    {Object}    options
@@ -1371,13 +1390,15 @@ Model.setMethod(function save(data, _options, _callback) {
  */
 Model.setMethod(function createDocument(data, options) {
 
-	var doc;
+	let original_record;
 
 	if (!options) {
 		options = {};
 	}
 
 	if (data && this.constructor.Document.isDocument(data)) {
+		original_record = data.$attributes.original_record;
+
 		data = {
 			[data.$model_alias] : data.$main,
 		};
@@ -1385,7 +1406,11 @@ Model.setMethod(function createDocument(data, options) {
 
 	options.model = this;
 
-	doc = new this.constructor.Document(data, options);
+	let doc = new this.constructor.Document(data, options);
+
+	if (original_record) {
+		doc.$attributes.original_record = original_record;
+	}
 
 	return doc;
 });

package/lib/app/view/alchemy/{info.ejs → info.hwk}

@@ -11,7 +11,7 @@
 		<header>
 			<div class="header-image">
 				<img class="alchemy-logo" src="/alchemy-logo.png">
-				<h1 class="alchemy-name">Alchemy<br>v<%= versions.alchemy %></h1>
+				<h1 class="alchemy-name">Alchemy<br>v{{ versions.alchemy }}</h1>
 			</div>
 			<div class="content">
 
@@ -20,22 +20,22 @@
 				<div class="row">
 					<article class="engine col">
 						<span>You are running</span>
-						<span class="engine-name"><%= engine %></span>
+						<span class="engine-name">{{ engine }}</span>
 						<span>version</span>
-						<span class="engine-version"><%= versions.node %></span>
+						<span class="engine-version">{{ versions.node }}</span>
 					</article>
 
 					<article class="modules col">
 						<h1>Modules</h1>
 						<div class="table-wrap">
 							<table>
-								<% modules.forEach(function eachModule(module) { %>
+								{% each modules as module %}
 									<tr class=<% module.failed ? 'failed' : '' %>>
-										<td class="package-name"><%= module.name %></td>
-										<td class="package-version"><%= module.package ? module.package.version : '' %></td>
-										<td class="package-description"><%= module.package ? module.package.description : '' %></td>
+										<td class="package-name">{{ module.name }}</td>
+										<td class="package-version">{{ module.package.version }}</td>
+										<td class="package-description">{{ module.package.description }}</td>
 									</tr>
-								<% }) %>
+								{% /each %}
 							</table>
 						</div>
 					</article>
@@ -43,15 +43,20 @@
 					<article class="datasources col">
 						<h1>Datasources</h1>
 						<ul class="checklist">
-						<% Object.each(data_sources, function eachDatasource(datasource, key) { %>
-							<% if (datasource.error) { %>
-								<li class="failed">Could not connect to
-							<% } else { %>
-								<li class="success">Connected to
-							<% } %>
-							 <%= datasource.type %> <strong><%= key %></strong
-							</li>
-						<% }) %>
+							{% each data_sources as key, datasource %}
+								<li>
+									{% if datasource.error %}
+										{% $0.classList.add('failed') %}
+										Could not connect to
+									{% else %}
+										{% $0.classList.add('success') %}
+										Connected to
+									{% /if %}
+
+									{{ datasource.type }}
+									<strong>{{ key }}</strong>
+								</li>
+							{% /each %}
 						</ul>
 					</article>
 				</div>
@@ -60,9 +65,9 @@
 					<article class="plugins col">
 						<h1>Plugins</h1>
 						<ul>
-						<% plugins.forEach(function eachPlugin(plugin) { %>
-							<li><%= plugin %></li>
-						<% }) %>
+							{% each plugins as plugin %}
+								<li>{{ plugin }}</li>
+							{% /each %}
 						</ul>
 					</article>
 
@@ -79,79 +84,79 @@
 
 							<tr>
 								<td>cache</td>
-								<td><%= settings.cache %></td>
+								<td>{{ settings.cache }}</td>
 								<td>Cache has been <%= ['disabled', 'enabled'][Number(!!settings.cache)] %></td>
 							</tr>
 
 							<tr>
 								<td>compression</td>
-								<td><%= settings.compression %></td>
+								<td>{{ settings.compression }}</td>
 								<td>Compression has been <%= ['disabled', 'enabled'][Number(!!settings.compression)] %></td>
 							</tr>
 
 							<tr>
 								<td>cookies</td>
-								<td><%= settings.cookies %></td>
+								<td>{{ settings.cookies }}</td>
 								<td>Cookies have been <%= ['disabled', 'enabled'][Number(!!settings.cookies)] %></td>
 							</tr>
 
 							<tr>
 								<td>debug</td>
-								<td><%= settings.debug %></td>
+								<td>{{ settings.debug }}</td>
 								<td>Debugging has been <%= ['disabled', 'enabled'][Number(!!settings.debug)] %></td>
 							</tr>
 
 							<tr>
 								<td>minify_js</td>
-								<td><%= settings.minify_js %></td>
+								<td>{{ settings.minify_js }}</td>
 								<td>JavaScript minification has been <%= ['disabled', 'enabled'][Number(!!settings.minify_js)] %></td>
 							</tr>
 
 							<tr>
 								<td>model_query_cache_duration</td>
-								<td><%= settings.model_query_cache_duration %></td>
+								<td>{{ settings.model_query_cache_duration }}</td>
 								<td>
-									<% if (settings.model_query_cache_duration) { %>
-										Database query results are cached for <%= settings.model_query_cache_duration %>
-									<% } else { %>
+									{% if settings.model_query_cache_duration %}
+										Database query results are cached for {{ settings.model_query_cache_duration }}
+									{% else %}
 										Database query results are not cached
-									<% } %>
+									{% /else %}
 								</td>
 							</tr>
 
 							<tr>
 								<td>port</td>
-								<td><%= settings.port %></td>
-								<td>The server runs on port <%= settings.port %></td>
+								<td>{{ settings.port }}</td>
+								<td>The server runs on port {{ settings.port }}</td>
 							</tr>
 
 							<tr>
 								<td>kill_on_file_change</td>
-								<td><%= settings.kill_on_file_change %></td>
+								<td>{{ settings.kill_on_file_change }}</td>
 								<td>The process <%= ['will', 'won\'t'][Number(!settings.kill_on_file_change)] %> be killed when a node.js file changes</td>
 							</tr>
 
 							<tr>
 								<td>kill_extensions</td>
-								<td><%= settings.kill_extensions %></td>
+								<td>{{ settings.kill_extensions }}</td>
 								<td></td>
 							</tr>
 
 							<tr>
 								<td>sessions</td>
-								<td><%= settings.session_key %></td>
+								<td>{{ settings.session_key }}</td>
 								<td>Session cookie name</td>
 							</tr>
 
 							<tr>
 								<td>session_length</td>
-								<td><%= settings.session_length %></td>
-								<td>A session lasts for <%= settings.session_length %></td>
+								<td>{{ settings.session_length }}</td>
+								<td>A session lasts for {{ settings.session_length }}</td>
 							</tr>
 
 							<tr>
 								<td>websockets</td>
-								<td><%= settings.websockets %></td>
+								<td>{{ settings.websockets }}</td>
 								<td>Websockets have been <%= ['disabled', 'enabled'][Number(!!settings.websockets)] %></td>
 							</tr>
 						</table>

package/lib/bootstrap.js

@@ -160,6 +160,7 @@ hawkejs_options.server = false;
  * @version  1.1.0
  */
 alchemy.hawkejs.load(libpath.resolve(PATH_CORE, 'class', 'path_definition.js'), hawkejs_options);
+alchemy.hawkejs.load(libpath.resolve(PATH_CORE, 'class', 'path_param_definition.js'), hawkejs_options);
 
 /**
  * Require the element class on the client side too