alchemymvc 1.3.21 → 1.4.0-alpha.1

package/lib/class/router.js

@@ -10,7 +10,7 @@ var Url = alchemy.use('url'),
 /**
  * The Router Singleton
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.2.5
  */
@@ -61,7 +61,7 @@ var RouterClass = Function.inherits('Alchemy.Base', function Router(name, mount,
 /**
  * Default route settings
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  */
@@ -73,11 +73,11 @@ RouterClass.setProperty('default_route_settings', {
 /**
  * Add a required permission
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.2.5
  *
- * @param    {String|String[]}   permission
+ * @param    {string|string[]}   permission
  */
 RouterClass.setMethod(function requirePermission(permission) {
 
@@ -95,13 +95,13 @@ RouterClass.setMethod(function requirePermission(permission) {
 /**
  * Check the permission
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.2.5
  *
  * @param    {Conduit}   conduit
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 RouterClass.setMethod(function checkPermission(conduit) {
 
@@ -133,7 +133,7 @@ RouterClass.setMethod(function checkPermission(conduit) {
 /**
  * Get the complete section identifier
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.3
  * @version  0.3.3
  */
@@ -160,7 +160,7 @@ RouterClass.setMethod(function generateSectionIdentifier() {
 /**
  * Get and/or create a section
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -187,7 +187,7 @@ RouterClass.setMethod(function section(name, mount) {
 /**
  * Capture vhost requests in the header with the given prefix
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -198,7 +198,7 @@ RouterClass.setMethod(function headerBypass(prefix) {
 /**
  * Get the full mount path of this router
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  */
@@ -221,7 +221,7 @@ RouterClass.setMethod(function getFullMount() {
 /**
  * Get the prefix (locale)
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -247,11 +247,11 @@ RouterClass.setMethod(function getPrefix(path) {
 /**
  * Get the section of the path
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.0
  *
- * @param    {String}   path   The path without prefix
+ * @param    {string}   path   The path without prefix
  *
  * @return   {Router}
  */
@@ -281,11 +281,11 @@ RouterClass.setMethod(function getPathSection(path) {
 /**
  * Get a route by breadcrumb pattern
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  *
- * @param    {String}   breadcrumb_pattern
+ * @param    {string}   breadcrumb_pattern
  *
  * @return   {Alchemy.Route}
  */
@@ -319,11 +319,11 @@ RouterClass.setMethod(function getRouteByBreadcrumb(breadcrumb_pattern) {
 /**
  * Get breadcrumb info by pattern
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  *
- * @param    {String}   breadcrumb_pattern
+ * @param    {string}   breadcrumb_pattern
  *
  * @return   {Object}
  */
@@ -351,13 +351,13 @@ RouterClass.setMethod(function lookupBreadcrumbPath(breadcrumb_pattern) {
 /**
  * Get a route based on information inside the request
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
  * @param    {Conduit}  conduit
- * @param    {String}   path        The path without prefix (but WITH possible router mount)
- * @param    {String}   method
+ * @param    {string}   path        The path without prefix (but WITH possible router mount)
+ * @param    {string}   method
  *
  * @return   {Object}
  */
@@ -371,15 +371,15 @@ RouterClass.setMethod(function getRouteByPath(conduit, path, method) {
 /**
  * Get a route based on information inside the request
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.7
  *
  * @param    {Conduit}        conduit
- * @param    {String|Array}   methods
+ * @param    {string|Array}   methods
  * @param    {Router}         section
- * @param    {String}         path        The path without prefix (but WITH possible router mount)
- * @param    {String}         prefix
+ * @param    {string}         path        The path without prefix (but WITH possible router mount)
+ * @param    {string}         prefix
  * @param    {Route}          last_match  If this is a rematch, skip everything before this
  *
  * @return   {Object}
@@ -441,11 +441,11 @@ RouterClass.setMethod(async function getRouteBySectionPath(conduit, methods, sec
 /**
  * Return the route by the requested name
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.3.0
  *
- * @param    {String}   name   The name of the route to get
+ * @param    {string}   name   The name of the route to get
  *
  * @result   {Route}           The Route instance, or false
  */
@@ -485,14 +485,14 @@ RouterClass.setMethod(function getRouteByName(name) {
 /**
  * Get middleware routes
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.2.5
  *
  * @param    {Conduit}  conduit
  * @param    {Router}   section
- * @param    {String}   path        The full requested path
- * @param    {String}   prefix
+ * @param    {string}   path        The full requested path
+ * @param    {string}   prefix
  *
  * @return   {Array}
  */
@@ -571,7 +571,7 @@ RouterClass.setMethod(async function getMiddleware(conduit, section, path, prefi
 /**
  * Resolve a request
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.3
  */
@@ -582,7 +582,7 @@ RouterClass.setMethod(function resolve(req, res) {
 /**
  * Resolve a request inside an electron app
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.3
  */
@@ -593,7 +593,7 @@ RouterClass.setMethod(function resolveElectron(request, callback) {
 /**
  * Add breadcrumb information
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  */
@@ -627,11 +627,11 @@ RouterClass.setMethod(function addBreadcrumb(pattern, options) {
 /**
  * Add middleware
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.0
  *
- * @param    {String}     paths     Optional path
+ * @param    {string}     paths     Optional path
  * @param    {Function}   fnc       The actual middleware function
  * @param    {Object}     options
  */
@@ -699,11 +699,11 @@ RouterClass.setMethod(function use(_paths, _fnc, _options) {
 /**
  * Serve the file of a dependency
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.3.0
  *
- * @param    {String}   module_name   The name of the dependency
+ * @param    {string}   module_name   The name of the dependency
  * @param    {Object}   options       The options or single string
  */
 RouterClass.setMethod(function serveDependencyFile(module_name, options) {
@@ -751,11 +751,11 @@ RouterClass.setMethod(function serveDependencyFile(module_name, options) {
 /**
  * Set a custom option
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
- * @param    {String}   key
+ * @param    {string}   key
  * @param    {Mixed}    value
  */
 RouterClass.setMethod(function setOption(name, value) {
@@ -765,17 +765,17 @@ RouterClass.setMethod(function setOption(name, value) {
 /**
  * Add a route
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.21
  *
  * @param    {Object}   args
- * @param    {String}   args.name            Optional route name
+ * @param    {string}   args.name            Optional route name
  * @param    {Array}    args.methods         Supported HTTP methods
- * @param    {Number}   args.weight          Importance of this route
- * @param    {String}   args.breadcrumb      String used for breadcrumb
- * @param    {String|Function} args.handler  Route handler
- * @param    {String|Object}   args.paths    The paths of this route
+ * @param    {number}   args.weight          Importance of this route
+ * @param    {string}   args.breadcrumb      String used for breadcrumb
+ * @param    {string|Function} args.handler  Route handler
+ * @param    {string|Object}   args.paths    The paths of this route
  *
  * @return   {Route}
  */
@@ -873,13 +873,13 @@ RouterClass.setMethod(function add(args) {
 /**
  * Add a route
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.3.0
  *
  * @param    {Array}          methods   The methods to listen to (all)
- * @param    {String}         name      The name of the path (timestamp)
- * @param    {String|Object}  paths     Path to listen to
+ * @param    {string}         name      The name of the path (timestamp)
+ * @param    {string|Object}  paths     Path to listen to
  * @param    {Function}       fnc       Optional function to handle route
  * @param    {Object}         options
  */
@@ -947,12 +947,12 @@ RouterClass.setMethod(function _add(_methods, _name, _paths, _fnc, _options) {
 /**
  * Add a get route
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
- * @param    {String}         name      The name of the path (timestamp)
- * @param    {String|Object}  paths     Path to listen to
+ * @param    {string}         name      The name of the path (timestamp)
+ * @param    {string|Object}  paths     Path to listen to
  * @param    {Function}       fnc       Optional function to handle route
  * @param    {Object}         options
  */
@@ -963,12 +963,12 @@ RouterClass.setMethod(function get(name, paths, fnc, options) {
 /**
  * Add a post route
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
- * @param    {String}         name      The name of the path (timestamp)
- * @param    {String|Object}  paths     Path to listen to
+ * @param    {string}         name      The name of the path (timestamp)
+ * @param    {string|Object}  paths     Path to listen to
  * @param    {Function}       fnc       Optional function to handle route
  * @param    {Object}         options
  */
@@ -979,12 +979,12 @@ RouterClass.setMethod(function post(name, paths, fnc, options) {
 /**
  * Add a put route
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
- * @param    {String}         name      The name of the path (timestamp)
- * @param    {String|Object}  paths     Path to listen to
+ * @param    {string}         name      The name of the path (timestamp)
+ * @param    {string|Object}  paths     Path to listen to
  * @param    {Function}       fnc       Optional function to handle route
  * @param    {Object}         options
  */
@@ -995,11 +995,11 @@ RouterClass.setMethod(function put(name, paths, fnc, options) {
 /**
  * Add a socket route
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
- * @param    {String}         name       The name of the socket event
+ * @param    {string}         name       The name of the socket event
  * @param    {Function}       action     The action, as a string or function
  */
 RouterClass.setMethod(function socket(name, action) {
@@ -1018,12 +1018,12 @@ RouterClass.setMethod(function socket(name, action) {
 /**
  * Add a socket linkup route
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
- * @param    {String}         name      The name of the path (timestamp)
- * @param    {String}         type      The message type (name)
+ * @param    {string}         name      The name of the path (timestamp)
+ * @param    {string}         type      The message type (name)
  * @param    {Function}       fnc       Optional function to handle route
  */
 RouterClass.setMethod(function linkup(name, eventname, fnc) {
@@ -1033,12 +1033,12 @@ RouterClass.setMethod(function linkup(name, eventname, fnc) {
 /**
  * Add a delete route
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
- * @param    {String}         name      The name of the path (timestamp)
- * @param    {String|Object}  paths     Path to listen to
+ * @param    {string}         name      The name of the path (timestamp)
+ * @param    {string|Object}  paths     Path to listen to
  * @param    {Function}       fnc       Optional function to handle route
  * @param    {Object}         options
  */
@@ -1049,7 +1049,7 @@ RouterClass.setMethod('delete', function _delete(name, paths, fnc, options) {
 /**
  * Get an object of all the routes in this router and its children
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  */
@@ -1071,7 +1071,7 @@ RouterClass.setMethod(function getFullMount() {
 /**
  * Get the full route object, for internal use
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.0
  * @version  0.5.0
  *
@@ -1135,7 +1135,7 @@ RouterClass.setMethod(function getFullRoutes(result) {
 /**
  * Get an object of all the options in this router and its children
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
@@ -1166,7 +1166,7 @@ RouterClass.setMethod(function getOptions(result) {
 /**
  * Get an object of all the routes in this router and its children
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.21
  *
@@ -1249,7 +1249,7 @@ RouterClass.setMethod(function getRoutes(result) {
 /**
  * Get an object of all the socket routes in this router and its children
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
@@ -1295,7 +1295,7 @@ RouterClass.setMethod(function getSocketRoutes(result) {
 /**
  * Get an object of all the breadcrumbs
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  *
@@ -1324,15 +1324,15 @@ RouterClass.setMethod(function getBreadcrumbInfo(result) {
 /**
  * Create a route url outside of a view
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.1
  * @version  1.0.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Object}   parameters
  * @param    {Object}   options
  *
- * @return   {String}
+ * @return   {string}
  */
 RouterClass.setMethod(function getUrl(name, parameters, options) {
 

package/lib/class/schema.js

@@ -3,7 +3,7 @@
  *
  * @constructor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  *
@@ -38,11 +38,11 @@ var Schema = Function.inherits(['Deck', 'Alchemy.Base'], function Schema(parent)
 /**
  * Add a relation creator method
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.4
  * @version  1.3.4
  *
- * @param    {String}   relation_type
+ * @param    {string}   relation_type
  */
 Schema.setStatic(function addRelationCreator(relation_type, relation_config) {
 
@@ -58,7 +58,7 @@ Schema.setStatic(function addRelationCreator(relation_type, relation_config) {
  *
  * @TODO: Make Client.Schema & Schema use the same implementation
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.3
  * @version  1.1.3
  *
@@ -90,11 +90,11 @@ Schema.setStatic(function unDry(value) {
 /**
  * Add a behaviour to this schema
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.0
  *
- * @param    {String}   behaviour_name
+ * @param    {string}   behaviour_name
  * @param    {Object}   options
  */
 Schema.setMethod(function addBehaviour(behaviour_name, options) {
@@ -138,12 +138,12 @@ Schema.setMethod(function addBehaviour(behaviour_name, options) {
 /**
  * Get all indexes to check for the given record
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.0
  *
  * @param    {Object}   data
- * @param    {String}   hasType   Get indexes with this type only
+ * @param    {string}   hasType   Get indexes with this type only
  *
  * @return   {Object}
  */
@@ -174,7 +174,7 @@ Schema.setMethod(function getRecordIndexes(data, hasType) {
 /**
  * Convenience method for iterating over indexes of a given record
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
@@ -187,7 +187,7 @@ Schema.setMethod(function eachRecordIndex(data, fnc) {
 /**
  * Convenience method for iterating over alternate indexes of a given record
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
@@ -200,9 +200,9 @@ Schema.setMethod(function eachAlternateIndex(data, fnc) {
 /**
  * Get the datasource for this schema
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
- * @version  1.2.0
+ * @version  1.4.0
  *
  * @return   {Pledge}
  */
@@ -214,7 +214,7 @@ Schema.setMethod(function getDatasource() {
 		that.afterOnce('has_model_class', next);
 	}, function waitForDatasources(next) {
 
-		alchemy.sputnik.after('datasources', function afterDs() {
+		STAGES.afterStages('datasource', function afterDs() {
 
 			let datasource;
 
@@ -245,13 +245,13 @@ Schema.setMethod(function getDatasource() {
 /**
  * Add an association
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.4
  *
- * @param    {String}   alias
+ * @param    {string}   alias
  * @param    {Object}   relation_config
- * @param    {String}   modelname
+ * @param    {string}   modelname
  * @param    {Object}   options
  *
  * @return   {Object}
@@ -280,7 +280,7 @@ Schema.setMethod(function addAssociation(type, relation_config, alias, modelName
 	modelName = args.modelName;
 	options = args.options;
 	options.singular = is_singular;
-	className = this.model_name;
+	className = this.model_class_name;
 
 	if (this.namespace) {
 		path = this.namespace + '.' + className;
@@ -343,11 +343,11 @@ Schema.setMethod(function addAssociation(type, relation_config, alias, modelName
  * Add enum values.
  * Modifications to the `values` object will have no effect later.
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Object}   values
  */
 Schema.setMethod(function addEnumValues(name, values) {
@@ -363,11 +363,11 @@ Schema.setMethod(function addEnumValues(name, values) {
  * Set (overwrite) enum values.
  * The given `values` object will be used by reference.
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Object}   values
  */
 Schema.setMethod(function setEnumValues(name, values) {