alchemymvc 1.2.5 → 1.2.7

package/lib/app/element/time_ago.js

@@ -1,13 +1,11 @@
 /**
- * The custom time-ago element
+ * The custom al-time-ago element
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.1.0
  * @version  0.1.0
  */
-var TimeAgo = Function.inherits('Alchemy.Element', function TimeAgo() {
-	return TimeAgo.super.call(this);
-});
+const TimeAgo = Function.inherits('Alchemy.Element', 'TimeAgo');
 
 /**
  * Set the time

package/lib/app/helper/alchemy_helper.js

@@ -28,9 +28,9 @@ Alchemy.setStatic(function onScene(scene, options) {
 /**
  * Perform a resource request
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.0.1
- * @version  1.1.3
+ * @version  1.2.7
  *
  * @param    {String|Object}   options
  * @param    {Object}          data
@@ -40,11 +40,7 @@ Alchemy.setStatic(function onScene(scene, options) {
  */
 Alchemy.setMethod(function getResource(options, data, callback) {
 
-	var that = this,
-	    conduit,
-	    config,
-	    pledge,
-	    url;
+	const that = this;
 
 	if (typeof options == 'string') {
 
@@ -70,6 +66,8 @@ Alchemy.setMethod(function getResource(options, data, callback) {
 		options.params = data;
 	}
 
+	let pledge;
+
 	if (!options.name && !options.href) {
 		pledge = Classes.Pledge.reject(new Error('Unable to get alchemy resource, a `name` or `href` option is required'));
 		pledge.done(callback);
@@ -86,7 +84,7 @@ Alchemy.setMethod(function getResource(options, data, callback) {
 	}
 
 	if (Blast.isNode) {
-		conduit = this.view.server_var('conduit');
+		const conduit = this.view.server_var('conduit');
 
 		if (!conduit) {
 			pledge = Classes.Pledge.reject(new Error('Could not find conduit, alchemy resource will not be fetched'));
@@ -102,12 +100,15 @@ Alchemy.setMethod(function getResource(options, data, callback) {
 		return pledge;
 	}
 
+	let method = 'get',
+	    url;
+
 	if (options.href) {
 		url = options.href;
 	} else {
 
 		// See if this is a socket route
-		config = this.view.helpers.Router.routeConfig(options.name, true);
+		let config = this.view.helpers.Router.routeConfig(options.name, true);
 
 		if (config && config.socket_route) {
 			pledge = new Classes.Pledge();
@@ -119,10 +120,18 @@ Alchemy.setMethod(function getResource(options, data, callback) {
 			return pledge;
 		}
 
+		config = this.view.helpers.Router.routeConfig(options.name);
+
+		if (config && config.methods) {
+			if (config.methods.indexOf('get') == -1) {
+				method = config.methods[0];
+			}
+		}
+
 		// Get the url to the resource
 		url = hawkejs.scene.helpers.Router.routeUrl(options.name, options.params);
 
-		if (!url && typeof name == 'string') {
+		if (!url && typeof options.name == 'string') {
 			url = hawkejs.scene.helpers.Router.routeUrl('APIResource', {name: options.name});
 		}
 
@@ -136,7 +145,9 @@ Alchemy.setMethod(function getResource(options, data, callback) {
 	options.href = url;
 
 	if (data) {
-		options.get = data;
+		options[method] = data;
+	} else if (method != 'get') {
+		options[method] = true;
 	}
 
 	pledge = hawkejs.scene.fetch(options);

package/lib/app/helper/router_helper.js

@@ -51,7 +51,7 @@ Router.setProperty(function current_url() {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.5
+ * @version  1.2.7
  *
  * @param    {Element}   element    The element to apply to
  * @param    {String}    name       The route name
@@ -69,7 +69,6 @@ Router.setMethod(function applyDirective(element, name, options) {
 	}
 
 	let attribute_name,
-	    param_source,
 	    params = {},
 	    url;
 
@@ -77,6 +76,10 @@ Router.setMethod(function applyDirective(element, name, options) {
 		Object.assign(params, element.parameters);
 	}
 
+	if (options.parameters) {
+		Object.assign(params, options.parameters);
+	}
+
 	if (config.keys && config.keys.length) {
 
 		let key,
@@ -99,12 +102,13 @@ Router.setMethod(function applyDirective(element, name, options) {
 	}
 
 	if (config.breadcrumb) {
-		element.setAttribute('data-breadcrumb', this.getTrail(name, params));
+		let link_breadcrumb = this.getTrail(name, params);
+		element.setAttribute('data-breadcrumb', link_breadcrumb);
 
-		if (this.renderer) {
+		if (this.renderer && link_breadcrumb) {
 			let page_breadcrumb = this.renderer.internal('breadcrumb');
 
-			if (page_breadcrumb) {
+			if (page_breadcrumb && page_breadcrumb.startsWith(link_breadcrumb)) {
 
 				if (element.parentElement) {
 					// @TODO: We need to make sure the options (classnames & such)
@@ -112,7 +116,13 @@ Router.setMethod(function applyDirective(element, name, options) {
 					this.renderer.ensureElementOptions(element.parentElement);
 				}
 
-				alchemy.markLinkElement(element, 1);
+				let level = 2;
+
+				if (page_breadcrumb == link_breadcrumb) {
+					level = 1;
+				}
+
+				alchemy.markLinkElement(element, level);
 			}
 		}
 	}
@@ -167,7 +177,7 @@ Router.setMethod(function applyDirective(element, name, options) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    0.2.0
- * @version  1.1.0
+ * @version  1.2.7
  *
  * @param    {String}   name
  * @param    {Boolean}  socket_route   Look in the socket routes
@@ -244,6 +254,9 @@ Router.setMethod(function routeConfig(name, socket_route) {
 			result.breadcrumb = route.breadcrumb;
 			result.has_breadcrumb_assignments = route.has_breadcrumb_assignments;
 			result.keys = route.keys;
+			result.methods = route.methods;
+			result.permission = route.permission;
+			result.has_permission_assignments = route.has_permission_assignments;
 		}
 
 		let router_options;