alchemymvc 1.1.7 → 1.2.0

package/lib/class/reciprocal.js

@@ -1,11 +1,17 @@
 /**
- * The Reciprocal class
+ * A Reciprocal instance creates a named channel on an IPC link.
+ *
+ * This link instance has to implement the `message` event and the `send` method,
+ * this will most probably be a ChildProcess but can also be used for socket.io
  *
  * @constructor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
+ *
+ * @param    {ChildProcess}   link
+ * @param    {string}         identifier
  */
 const Reciprocal = Function.inherits('Alchemy.Base', 'Alchemy.Reciprocal', function Reciprocal(link, identifier) {
 

package/lib/class/schema.js

@@ -184,7 +184,7 @@ Schema.setMethod(function eachAlternateIndex(data, fnc) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.1.0
- * @version  1.1.0
+ * @version  1.2.0
  *
  * @return   {Pledge}
  */
@@ -192,20 +192,24 @@ Schema.setMethod(function getDatasource() {
 
 	var that = this;
 
-	return Function.parallel(function waitForModelClass(next) {
-		that.afterOnce('has_model_class', function hasModelClass() {
-			next();
-		});
+	return Function.series(function waitForModelClass(next) {
+		that.afterOnce('has_model_class', next);
 	}, function waitForDatasources(next) {
 
 		alchemy.sputnik.after('datasources', function afterDs() {
 
-			var datasource = Datasource.get(that.model_class.prototype.dbConfig);
+			let datasource;
 
-			if (!datasource) {
-				console.log('Failed to get', that.model_class.prototype.dbConfig, 'datasource?');
-				return next(new Error('Could not get datasource "' + that.model_class.prototype.dbConfig + '"'));
-			}
+			if (that.model_class) {
+				datasource = Datasource.get(that.model_class.prototype.dbConfig);
+
+				if (!datasource) {
+					console.log('Failed to get', that.model_class.prototype.dbConfig, 'datasource?');
+					return next(new Error('Could not get datasource "' + that.model_class.prototype.dbConfig + '"'));
+				}
+			} else {
+				return next(new Error('Unable to get datasource for this sub-schema'));
+			}		
 
 			next(null, datasource);
 		});
@@ -218,8 +222,6 @@ Schema.setMethod(function getDatasource() {
 
 		return result[1];
 	});
-
-	return pledge;
 });
 
 /**

package/lib/core/base.js

@@ -1,4 +1,5 @@
 'use strict';
+const CONDUIT = Symbol('conduit');
 
 /**
  * Alchemy's Base class
@@ -339,6 +340,40 @@ Base.setStatic('is_abstract_class', true, false);
  */
 Base.setStatic('starts_new_group', false);
 
+/**
+ * Get the attached conduit
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.1.8
+ * @version  1.1.8
+ *
+ * @type     {Conduit}
+ */
+Base.setProperty(function conduit() {
+
+	if (this[CONDUIT]) {
+		return this[CONDUIT];
+	}
+
+	let renderer = this.renderer || this.view || this.hawkejs_view,
+	    result;
+
+	if (renderer && renderer.conduit) {
+		result = renderer.conduit;
+	} else if (renderer && renderer.root_renderer && renderer.root_renderer.conduit) {
+		result = renderer.root_renderer.conduit;
+	}
+
+	if (!conduit && renderer && renderer.server_var) {
+		result = renderer.server_var('conduit');
+	}
+
+	return result;
+
+}, function setConduit(conduit) {
+	return this[CONDUIT] = conduit;
+});
+
 /**
  * Enable all inherited classes to get a class group
  *
@@ -420,9 +455,9 @@ Base.setMethod(function attachConduit(conduit) {
 /**
  * Get a model, attach a conduit if possible
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker   <jelle@elevenways.be>
  * @since    0.3.0
- * @version  1.1.0
+ * @version  1.1.8
  *
  * @param   {String}   name      The name of the model to get
  * @param   {Boolean}  init      Initialize the class [true]
@@ -457,14 +492,6 @@ Base.setMethod(function getModel(name, init, options) {
 
 	let conduit = this.conduit;
 
-	if (!conduit) {
-		if (this.view && this.view.conduit) {
-			conduit = this.view.conduit;
-		} else if (this.view && this.view.root_renderer && this.view.root_renderer.conduit) {
-			conduit = this.view.root_renderer.conduit;
-		}
-	}
-
 	// If an instance already exists on this item,
 	// and it has the same conduit (or none), return that
 	if (instance && (instance.conduit == conduit)) {

package/lib/core/client_base.js

@@ -233,7 +233,7 @@ ClientBase.setStatic(function mapEventToMethod(event_name, method_name) {
  *
  * @author   Jelle De Loecker   <jelle@develry.be>
  * @since    1.0.0
- * @version  1.1.3
+ * @version  1.1.8
  *
  * @param   {String}   name
  * @param   {Object}   options
@@ -272,14 +272,6 @@ ClientBase.setMethod(function getModel(name, init, options) {
 
 	let conduit = this.conduit;
 
-	if (!conduit) {
-		if (this.view && this.view.conduit) {
-			conduit = this.view.conduit;
-		} else if (this.view && this.view.root_renderer && this.view.root_renderer.conduit) {
-			conduit = this.view.root_renderer.conduit;
-		}
-	}
-
 	if (conduit) {
 		instance.conduit = conduit;
 	}

package/lib/core/middleware.js

@@ -22,19 +22,15 @@ var publicDirs = alchemy.shared('public.directories', new Deck()),
     postcss,
     babel,
     sass,
-    temp = alchemy.use('temp'),
     less,
     fs = alchemy.use('fs');
 
-// Remove temporary files on exit
-temp.track();
-
 if (alchemy.settings.css_less !== false) {
 	less = alchemy.use('less');
 }
 
 if (alchemy.settings.css_sass) {
-	sass = alchemy.use('node-sass');
+	sass = alchemy.use('sass');
 }
 
 if (alchemy.settings.css_post !== false) {
@@ -410,7 +406,7 @@ Alchemy.setMethod(function minifyScript(path, options, callback) {
 		}
 
 		// Open a temp js file
-		temp.open({suffix: '.js'}, function getTempFile(err, info) {
+		Blast.openTempFile({suffix: '.js'}, function getTempFile(err, info) {
 
 			var js_buffer;
 
@@ -900,7 +896,7 @@ Alchemy.setMethod(function getCompiledLessPath(lessPath, options, callback) {
 			// @todo: add minify options
 			css = cssTree.css;
 
-			temp.open({suffix: '.css'}, function getTempFile(err, info) {
+			Blast.openTempFile({suffix: '.css'}, function getTempFile(err, info) {
 
 				var cssBuffer;
 
@@ -989,7 +985,7 @@ Alchemy.setMethod(function getCompiledSassPath(sassPath, options, callback) {
 		});
 
 		function writeToTemp(content) {
-			temp.open({suffix: '.css'}, function getTempFile(err, info) {
+			Blast.openTempFile({suffix: '.css'}, function getTempFile(err, info) {
 
 				if (err) {
 					return callback(err);

package/lib/core/socket.js

@@ -1,160 +1,160 @@
-'use strict';
-
-var types     = alchemy.shared('Socket.types'),
-    iostream,
-    path      = alchemy.use('path'),
-    fs        = alchemy.use('fs');
-
-/**
- * The "socket" stage:
- * 
- * Create the socket.io listener
- *
- * @author        Jelle De Loecker   <jelle@develry.be>
- * @since         0.1.0
- * @version       1.1.3
- */
-alchemy.sputnik.add(function socket() {
-
-	var clientPath,
-	    streamPath,
-	    io;
-
-	if (!alchemy.settings.websockets) {
-		log.info('Websockets have been disabled');
-		return;
-	} else {
-		if (alchemy.settings.websockets == 'optional') {
-			log.info('Websockets have been enabled optionally');
-		} else {
-			log.info('Websockets have been enabled, clients will automatically connect');
-		}
-	}
-
-	io = alchemy.use('socket.io');
-
-	if (!io) {
-		return log.error('Could not load socket.io!');
-	}
-
-	iostream = alchemy.use('socket.io-stream');
-
-	// Create the Socket.io listener
-	alchemy.io = io.listen(alchemy.server, {serveClient: false});
-
-	// Get the core client path
-	clientPath = path.dirname(alchemy.findModule('socket.io-client').module_path);
-	clientPath = path.resolve(clientPath, '..', 'dist', 'socket.io.slim.js');
-
-	// Get the stream client path
-	streamPath = path.dirname(alchemy.findModule('socket.io-stream').module_path);
-	streamPath = path.resolve(streamPath, 'socket.io-stream.js');
-
-	// Serve the socket io core file
-	Router.use('/scripts/socket.io.js', function getSocketIo(req, res, next) {
-		alchemy.minifyScript(clientPath, function gotMinifiedPath(err, mpath) {
-			req.conduit.serveFile(mpath || clientPath);
-		});
-	});
-
-	// Serve the socket io stream file
-	Router.use('/scripts/socket.io-stream.js', function getSocketStream(req, res, next) {
-		alchemy.minifyScript(streamPath, function gotMinifiedPath(err, mpath) {
-			req.conduit.serveFile(mpath || streamPath);
-		});
-	});
-
-	/**
-	 * Handle connections
-	 *
-	 * @author   Jelle De Loecker   <jelle@develry.be>
-	 * @since    0.0.1
-	 * @version  0.2.0
-	 */
-	alchemy.io.sockets.on('connection', function onConnect(socket){
-
-		var syncs = {},
-		    latencies = [],
-		    latency_avg = 2,
-		    offset = 0;
-
-		socket.on('timesync', function gotTimesyncRequest(data) {
-
-			var received = Date.now(),
-			    latency;
-
-			// This is the initial request
-			if (data.count == null) {
-				data.count = 0;
-				data.latency_trip = 0;
-
-				// Reset the latencies array
-				latencies.length = 0;
-			}
-
-			// Do 8 round trips to determine latency
-			if (data.latency_trip <= 8) {
-
-				if (data.last_sent) {
-
-					// Latency is the timestamp when we received the response
-					// minus the timestamp when we sent the request
-					latency = received - data.last_sent;
-					latencies.push(latency);
-				}
-
-				// Wait before responding
-				setTimeout(function waitForLatency() {
-					data.last_sent = Date.now();
-					socket.emit('timesync', data);
-				}, 100 + (data.latency_trip * 150));
-
-				data.latency_trip++;
-			} else if (data.latency_trip) {
-
-				latency_avg = ~~(Math.median(latencies) / 2);
-				offset = (received - latency_avg) - data.client_time;
-
-				socket.emit('timesync', {offset: offset, latency: latency_avg});
-			}
-		});
-
-		// Wait for the announcement
-		socket.once('announce', function gotAnnouncement(data) {
-
-			var SocketClass,
-			    class_name;
-
-			// Try getting the socket class of this type
-			if (typeof data.type == 'string') {
-				class_name = data.type.classify();
-				SocketClass = Classes.Alchemy.Conduit[class_name + 'Socket'];
-			}
-
-			// If no socket class was found get the regular class
-			if (!SocketClass) {
-				SocketClass = Classes.Alchemy.Conduit.Socket;
-			}
-
-			new SocketClass(socket, data);
-		});
-	});
-});
-
-/**
- * Connect to another alchemy instance
- *
- * @author        Jelle De Loecker   <jelle@develry.be>
- * @since         0.1.0
- * @version       0.4.0
- */
-Alchemy.setMethod(function callServer(address, data, callback) {
-
-	var server = new Classes.ClientSocket();
-
-	server.reconnect = false;
-
-	server.connect(address, data, callback);
-
-	return server;
+'use strict';
+
+var types     = alchemy.shared('Socket.types'),
+    iostream,
+    path      = alchemy.use('path'),
+    fs        = alchemy.use('fs');
+
+/**
+ * The "socket" stage:
+ * 
+ * Create the socket.io listener
+ *
+ * @author        Jelle De Loecker   <jelle@develry.be>
+ * @since         0.1.0
+ * @version       1.1.3
+ */
+alchemy.sputnik.add(function socket() {
+
+	var clientPath,
+	    streamPath,
+	    io;
+
+	if (!alchemy.settings.websockets) {
+		log.info('Websockets have been disabled');
+		return;
+	} else {
+		if (alchemy.settings.websockets == 'optional') {
+			log.info('Websockets have been enabled optionally');
+		} else {
+			log.info('Websockets have been enabled, clients will automatically connect');
+		}
+	}
+
+	io = alchemy.use('socket.io');
+
+	if (!io) {
+		return log.error('Could not load socket.io!');
+	}
+
+	iostream = alchemy.use('socket.io-stream');
+
+	// Create the Socket.io listener
+	alchemy.io = io.listen(alchemy.server, {serveClient: false});
+
+	// Get the core client path
+	clientPath = path.dirname(alchemy.findModule('socket.io-client').module_path);
+	clientPath = path.resolve(clientPath, '..', 'dist', 'socket.io.slim.js');
+
+	// Get the stream client path
+	streamPath = path.dirname(alchemy.findModule('@11ways/socket.io-stream').module_path);
+	streamPath = path.resolve(streamPath, 'socket.io-stream.js');
+
+	// Serve the socket io core file
+	Router.use('/scripts/socket.io.js', function getSocketIo(req, res, next) {
+		alchemy.minifyScript(clientPath, function gotMinifiedPath(err, mpath) {
+			req.conduit.serveFile(mpath || clientPath);
+		});
+	});
+
+	// Serve the socket io stream file
+	Router.use('/scripts/socket.io-stream.js', function getSocketStream(req, res, next) {
+		alchemy.minifyScript(streamPath, function gotMinifiedPath(err, mpath) {
+			req.conduit.serveFile(mpath || streamPath);
+		});
+	});
+
+	/**
+	 * Handle connections
+	 *
+	 * @author   Jelle De Loecker   <jelle@develry.be>
+	 * @since    0.0.1
+	 * @version  0.2.0
+	 */
+	alchemy.io.sockets.on('connection', function onConnect(socket){
+
+		var syncs = {},
+		    latencies = [],
+		    latency_avg = 2,
+		    offset = 0;
+
+		socket.on('timesync', function gotTimesyncRequest(data) {
+
+			var received = Date.now(),
+			    latency;
+
+			// This is the initial request
+			if (data.count == null) {
+				data.count = 0;
+				data.latency_trip = 0;
+
+				// Reset the latencies array
+				latencies.length = 0;
+			}
+
+			// Do 8 round trips to determine latency
+			if (data.latency_trip <= 8) {
+
+				if (data.last_sent) {
+
+					// Latency is the timestamp when we received the response
+					// minus the timestamp when we sent the request
+					latency = received - data.last_sent;
+					latencies.push(latency);
+				}
+
+				// Wait before responding
+				setTimeout(function waitForLatency() {
+					data.last_sent = Date.now();
+					socket.emit('timesync', data);
+				}, 100 + (data.latency_trip * 150));
+
+				data.latency_trip++;
+			} else if (data.latency_trip) {
+
+				latency_avg = ~~(Math.median(latencies) / 2);
+				offset = (received - latency_avg) - data.client_time;
+
+				socket.emit('timesync', {offset: offset, latency: latency_avg});
+			}
+		});
+
+		// Wait for the announcement
+		socket.once('announce', function gotAnnouncement(data) {
+
+			var SocketClass,
+			    class_name;
+
+			// Try getting the socket class of this type
+			if (typeof data.type == 'string') {
+				class_name = data.type.classify();
+				SocketClass = Classes.Alchemy.Conduit[class_name + 'Socket'];
+			}
+
+			// If no socket class was found get the regular class
+			if (!SocketClass) {
+				SocketClass = Classes.Alchemy.Conduit.Socket;
+			}
+
+			new SocketClass(socket, data);
+		});
+	});
+});
+
+/**
+ * Connect to another alchemy instance
+ *
+ * @author        Jelle De Loecker   <jelle@develry.be>
+ * @since         0.1.0
+ * @version       0.4.0
+ */
+Alchemy.setMethod(function callServer(address, data, callback) {
+
+	var server = new Classes.ClientSocket();
+
+	server.reconnect = false;
+
+	server.connect(address, data, callback);
+
+	return server;
 });