alchemymvc 1.2.5 → 1.2.6

package/lib/core/base.js

@@ -35,7 +35,7 @@ __Protoblast.getGroup = function getGroup(name) {
  *
  * @author   Jelle De Loecker <jelle@develry.be>
  * @since    0.3.0
- * @version  1.0.0
+ * @version  1.2.6
  */
 Base.constitute(function setBasicBehaviour() {
 
@@ -79,12 +79,12 @@ Base.constitute(function setBasicBehaviour() {
 
 		// Set the title on the class itself, don't let children inherit it
 		if (!this.hasOwnProperty('title')) {
-			this.setStatic('title', this.name.titleize(), false);
+			this.setStatic('title', this.createClassTitle(), false);
 		}
 
 		// See if the type_name needs to be set automatically
 		if (!this.hasOwnProperty('type_name')) {
-			this.setStatic('type_name', this.name.underscore(), false);
+			this.setStatic('type_name', this.createClassTypeName(), false);
 		}
 
 		return;
@@ -98,12 +98,12 @@ Base.constitute(function setBasicBehaviour() {
 
 		// See if the type_name needs to be set automatically
 		if (!this.hasOwnProperty('type_name')) {
-			this.setStatic('type_name', this.name.underscore(), false);
+			this.setStatic('type_name', this.createClassTypeName(), false);
 		}
 
 		// Do the same for the title
 		if (!this.hasOwnProperty('title')) {
-			this.setStatic('title', this.name.titleize(), false);
+			this.setStatic('title', this.createClassTitle(), false);
 		}
 
 		return;
@@ -126,18 +126,59 @@ Base.constitute(function setBasicBehaviour() {
 
 	// See if the type_name needs to be set automatically
 	if (!this.hasOwnProperty('type_name')) {
-		this.setStatic('type_name', name.underscore(), false);
+		this.setStatic('type_name', this.createClassTypeName(name), false);
 	}
 
 	// Do the same for the title
 	if (!this.hasOwnProperty('title')) {
-		this.setStatic('title', name.titleize(), false);
+		this.setStatic('title', this.createClassTitle(name), false);
 	}
 
 	// Add this class to the shared group
 	shared_group[this.type_name] = this;
 });
 
+/**
+ * Create a type name for this class
+ * (An underscored key used in shared groups & enums)
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.6
+ * @version  1.2.6
+ *
+ * @param    {string}   suggested_root
+ *
+ * @return   {string}
+ */
+Base.setStatic(function createClassTypeName(suggested_root) {
+
+	if (!suggested_root) {
+		suggested_root = this.name;
+	}
+
+	return suggested_root.underscore();
+});
+
+/**
+ * Create a title for this class
+ *
+ * @author   Jelle De Loecker <jelle@elevenways.be>
+ * @since    1.2.6
+ * @version  1.2.6
+ *
+ * @param    {string}   suggested_root
+ *
+ * @return   {string}
+ */
+Base.setStatic(function createClassTitle(suggested_root) {
+
+	if (!suggested_root) {
+		suggested_root = this.name;
+	}
+
+	return suggested_root.titleize();
+});
+
 /**
  * Make this an abstract class
  *
@@ -345,7 +386,7 @@ Base.setStatic('starts_new_group', false);
  *
  * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.8
- * @version  1.2.4
+ * @version  1.2.6
  *
  * @type     {Conduit}
  */
@@ -359,7 +400,7 @@ Base.setProperty(function conduit() {
 	    result;
 	
 	if (Blast.isBrowser || !(this instanceof Classes.Alchemy.Controller)) {
-		renderer = this.renderer || this.view || this.hawkejs_view;
+		renderer = this.hawkejs_renderer || this.hawkejs_view || this.renderer || this.view;
 	}
 
 	if (renderer?.conduit) {

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('@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;
+'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;
 });