alchemymvc 1.3.21 → 1.4.0-alpha.1

package/lib/app/helper/router_helper.js

@@ -1,7 +1,7 @@
 /**
  * The router helper
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.0
  *
@@ -14,7 +14,7 @@ var Router = Function.inherits('Alchemy.Helper', function Router(renderer) {
 /**
  * Also make it available under the Route name
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
@@ -27,7 +27,7 @@ var Route = Function.inherits('Alchemy.Helper.Router', function Route(renderer)
 /**
  * Get the current url we're on
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.2.5
  *
@@ -49,7 +49,7 @@ Router.setProperty(function current_url() {
 /**
  * Get the current riyte we're on
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.10
  * @version  1.3.10
  *
@@ -73,13 +73,13 @@ Router.setProperty(function current_route() {
 /**
  * Check if the given URL is a local one
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.0
- * @version  1.3.0
+ * @version  1.4.0
  *
- * @param    {String|RURL}    url
+ * @param    {string|RURL}    url
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 Router.setMethod(function isLocalUrl(url) {
 
@@ -89,9 +89,9 @@ Router.setMethod(function isLocalUrl(url) {
 		return true;
 	}
 
-	if (Blast.isNode && alchemy.settings.url) {
+	if (Blast.isNode && alchemy.settings.network.main_url) {
 		// @TODO: Would be nice to not have to parse this every time
-		let server_url = RURL.parse(alchemy.settings.url);
+		let server_url = RURL.parse(alchemy.settings.network.main_url);
 
 		if (server_url.hostname == url.hostname) {
 			return true;
@@ -110,12 +110,12 @@ Router.setMethod(function isLocalUrl(url) {
 /**
  * Apply directive to an element
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.3.1
  *
  * @param    {Element}   element    The element to apply to
- * @param    {String}    name       The route name
+ * @param    {string}    name       The route name
  * @param    {Object}    options
  *
  * @return   {Object}
@@ -270,12 +270,12 @@ Router.setMethod(function applyDirective(element, name, options) {
 /**
  * Return route name info
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.7
  *
- * @param    {String}   name
- * @param    {Boolean}  socket_route   Look in the socket routes
+ * @param    {string}   name
+ * @param    {boolean}  socket_route   Look in the socket routes
  *
  * @return   {Object}
  */
@@ -373,11 +373,11 @@ Router.setMethod(function routeConfig(name, socket_route) {
 /**
  * Return the plain url for the given url name & parameters object
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.10
+ * @version  1.4.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Object}   parameters
  *
  * @return   {RURL}
@@ -528,7 +528,7 @@ Router.setMethod(function routeUrl(name, parameters, options) {
 			if (Blast.isBrowser) {
 				base_url = RURL.parse(window.location);
 			} else {
-				base_url = RURL.parse(alchemy.settings.url);
+				base_url = RURL.parse(alchemy.settings.network.main_url);
 			}
 		}
 
@@ -549,11 +549,11 @@ Router.setMethod(function routeUrl(name, parameters, options) {
 /**
  * Get a route's trail
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  1.3.8
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Object}   parameters
  * @param    {Object}   options
  *
@@ -625,7 +625,7 @@ Router.setMethod(function getTrail(name, parameters, options) {
 /**
  * Print a breadcrumb trail
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  */
@@ -636,7 +636,7 @@ Router.setMethod(function printBreadcrumb() {
 /**
  * Set breadcrumb info, if it hasn't happened yet during this render
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  *
@@ -654,11 +654,11 @@ Router.setMethod(function setBreadcrumb(entries) {
 /**
  * Print out an anchor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Object}   parameters
  */
 Router.setMethod(function printRoute(name, parameters, options) {
@@ -674,7 +674,7 @@ Router.setMethod(function printRoute(name, parameters, options) {
 /**
  * Close the current open route
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.0
  * @version  0.5.0
  */
@@ -691,11 +691,11 @@ Router.setMethod(function closeRoute() {
 /**
  * Return the route anchor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.0
  * @version  0.4.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Object}   parameters
  */
 Router.setMethod(function getAnchor(name, parameters, options) {
@@ -782,7 +782,7 @@ Router.setMethod(function getAnchor(name, parameters, options) {
 /**
  * Get the current route variables
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.2.5
  *
@@ -810,7 +810,7 @@ Router.setMethod(function getRouteVariables() {
 /**
  * Update language switcher info
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.3.0
  *
@@ -837,11 +837,11 @@ Router.setMethod(function updateLanguageSwitcher(element, variables) {
 /**
  * Get a translated URL for the current route
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.3.8
  *
- * @param    {String}   prefix    The prefix to use
+ * @param    {string}   prefix    The prefix to use
  * @param    {Object}   variables
  */
 Router.setMethod(function translateCurrentRoute(prefix, variables) {
@@ -911,12 +911,12 @@ Router.setMethod(function translateCurrentRoute(prefix, variables) {
 /**
  * Turn the given element into a language switcher
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.3.0
  *
  * @param    {Element}   element    The element to apply to
- * @param    {String}    language   The actual language
+ * @param    {string}    language   The actual language
  * @param    {Object}    options
  */
 Router.setMethod(function languageSwitcherDirective(element, language, options) {
@@ -932,7 +932,7 @@ Router.setMethod(function languageSwitcherDirective(element, language, options)
 /**
  * The switch language element
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.1
  * @version  1.1.0
  */

package/lib/app/helper/socket_helper.js

@@ -1,11 +1,11 @@
 /**
  * See if the given object is a stream
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.5
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 function isStream(obj) {
 	return obj && (typeof obj._read == 'function' || typeof obj._write == 'function') && typeof obj.on === 'function';
@@ -14,11 +14,11 @@ function isStream(obj) {
 /**
  * The Linkup class
  *
- * @author    Jelle De Loecker   <jelle@develry.be>
- * @since     0.2.0
- * @version   1.3.10
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.2.0
+ * @version  1.3.10
  *
- * @param    {String}   type
+ * @param    {string}   type
  */
 var Linkup = Blast.Collection.Function.inherits('Informer', function ClientLinkup(client, type, data) {
 
@@ -69,9 +69,9 @@ var Linkup = Blast.Collection.Function.inherits('Informer', function ClientLinku
 /**
  * Add a reference to its scene_id
  *
- * @author    Jelle De Loecker   <jelle@elevenways.be>
- * @since     1.3.10
- * @version   1.3.10
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.10
+ * @version  1.3.10
  */
 Linkup.setProperty(function scene_id() {
 
@@ -85,11 +85,11 @@ Linkup.setProperty(function scene_id() {
 /**
  * Submit a message to the server on this link
  *
- * @author    Jelle De Loecker   <jelle@develry.be>
- * @since     0.2.0
- * @version   1.3.10
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.2.0
+ * @version  1.3.10
  *
- * @param    {String}   type
+ * @param    {string}   type
  * @param    {Object}   data
  * @param    {Function} callback
  */
@@ -100,11 +100,11 @@ Linkup.setAfterMethod('ready', function submit(type, data, stream, callback) {
 /**
  * Submit a message to the server on this link and return a promise
  *
- * @author    Jelle De Loecker   <jelle@elevenways.be>
- * @since     1.1.2
- * @version   1.1.2
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.1.2
+ * @version  1.1.2
  *
- * @param    {String}   type
+ * @param    {string}   type
  * @param    {Object}   data
  */
 Linkup.setMethod(function demand(type, data, stream) {
@@ -133,9 +133,9 @@ Linkup.setMethod(function demand(type, data, stream) {
 /**
  * Create a stream
  *
- * @author    Jelle De Loecker   <jelle@develry.be>
- * @since     0.2.0
- * @version   0.2.0
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.2.0
+ * @version  0.2.0
  */
 Linkup.setMethod(function createStream() {
 	return this.client.createStream();
@@ -144,9 +144,9 @@ Linkup.setMethod(function createStream() {
 /**
  * Destroy this linkup (and tell the server)
  *
- * @author    Jelle De Loecker   <jelle@develry.be>
- * @since     0.2.0
- * @version   1.3.10
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.2.0
+ * @version  1.3.10
  */
 Linkup.setMethod(function destroy() {
 	this.submit('__destroy__');
@@ -157,9 +157,9 @@ Linkup.setMethod(function destroy() {
 /**
  * Make sure the linkup is removed
  *
- * @author    Jelle De Loecker   <jelle@elevenways.be>
- * @since     1.3.10
- * @version   1.3.10
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.3.10
+ * @version  1.3.10
  */
 Linkup.setMethod(function _destroy() {
 	delete this.client.linkups[this.id];
@@ -170,13 +170,13 @@ Linkup.setMethod(function _destroy() {
  * Actually make the socket.io connection,
  * this requires the socket.io js to be loaded
  *
- * @author    Jelle De Loecker   <jelle@develry.be>
- * @since     0.0.1
- * @version   0.2.0
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.0.1
+ * @version  0.2.0
  *
- * @param     {String}   address     Address to connect to
- * @param     {Object}   data        Announcement data
- * @param     {Function} callback
+ * @param    {string}   address     Address to connect to
+ * @param    {Object}   data        Announcement data
+ * @param    {Function} callback
  */
 var Client = Blast.Collection.Function.inherits('Informer', function ClientSocket() {
 
@@ -232,11 +232,11 @@ var Client = Blast.Collection.Function.inherits('Informer', function ClientSocke
 /**
  * Get an offset-corrected timestamp
  *
- * @author    Jelle De Loecker   <jelle@develry.be>
- * @since     0.2.1
- * @version   0.2.1
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.2.1
+ * @version  0.2.1
  *
- * @return    {Number}
+ * @return   {number}
  */
 Client.setMethod(function now() {
 	return Date.now() + (this.offset || 0);
@@ -245,9 +245,9 @@ Client.setMethod(function now() {
 /**
  * Low level socket emit
  *
- * @author    Jelle De Loecker   <jelle@develry.be>
- * @since     0.2.0
- * @version   1.1.0
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.2.0
+ * @version  1.1.0
  */
 Client.setMethod(function _submit() {
 	var that = this,
@@ -261,11 +261,11 @@ Client.setMethod(function _submit() {
 /**
  * Submit method
  *
- * @author    Jelle De Loecker   <jelle@develry.be>
- * @since     0.2.0
- * @version   0.2.0
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.2.0
+ * @version  0.2.0
  *
- * @param    {String}   type
+ * @param    {string}   type
  * @param    {Object}   data
  * @param    {IOStream} stream
  * @param    {Function} callback
@@ -330,9 +330,9 @@ Client.setMethod(function submit(type, data, stream, callback) {
 /**
  * Create a stream we can send through a websocket connection
  *
- * @author    Jelle De Loecker   <jelle@develry.be>
- * @since     0.2.0
- * @version   0.2.0
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.2.0
+ * @version  0.2.0
  */
 Client.setMethod(function createStream() {
 
@@ -350,9 +350,9 @@ Client.setMethod(function createStream() {
 /**
  * Make the actual connection
  *
- * @author    Jelle De Loecker   <jelle@elevenways.be>
- * @since     0.2.0
- * @version   1.3.12
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.2.0
+ * @version  1.3.12
  *
  * @param    {Function} callback
  */
@@ -618,11 +618,11 @@ Client.setMethod(function connect(address, data, callback) {
 /**
  * Create a namespace and inform the server
  *
- * @author    Jelle De Loecker   <jelle@develry.be>
- * @since     0.2.0
- * @version   0.2.0
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.2.0
+ * @version  0.2.0
  *
- * @param    {String}   type    The typename of link to create
+ * @param    {string}   type    The typename of link to create
  * @param    {Object}   data    The initial data to submit
  * @param    {Function} cb      Called when link isready
  *
@@ -649,11 +649,11 @@ Client.setMethod(function linkup(type, data, cb) {
 /**
  * Listen for specific server-initiated linkups
  *
- * @author    Jelle De Loecker   <jelle@develry.be>
- * @since     0.2.0
- * @version   0.2.0
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    0.2.0
+ * @version  0.2.0
  *
- * @param    {String}   type    The typename of link to listen to
+ * @param    {string}   type    The typename of link to listen to
  * @param    {Function} callback
  */
 Client.setMethod(function onLinkup(type, callback) {