quotation mark style and domain constructor fixes

Author: manuelkiessling

application/chatserver/controller/connectionController.js

@@ -1,10 +1,10 @@
-Room = require("../../../domain/room.js")["Room"];
-User = require("../../../domain/user.js")["User"];
-UserCommunication = require("../../../domain/communication.js")["UserCommunication"];
-SystemCommunication = require("../../../domain/communication.js")["SystemCommunication"];
-DownloadCommunication = require("../../../domain/communication.js")["DownloadCommunication"];
+var Room = require('../../../domain/room.js')['Room'];
+var User = require('../../../domain/user.js')['User'];
+var UserCommunication = require('../../../domain/communication.js')['UserCommunication'];
+var SystemCommunication = require('../../../domain/communication.js')['SystemCommunication'];
+var DownloadCommunication = require('../../../domain/communication.js')['DownloadCommunication'];
 
-var room = new Room("default");
+var room = new Room('default', SystemCommunication);
 var userId = 0;
 var outgoingHandlers = {};
 var renderer = null;

application/chatserver/renderer/objectRenderer.js

@@ -1,11 +1,14 @@
 var render = function(communication) {
-  var renderedCommunication;
-  if (communication instanceof UserCommunication) {
-    renderedCommunication = { type: 'user', username: communication.user.name, message: communication.message };
-  } else if (communication instanceof SystemCommunication) {
-    renderedCommunication = { type: 'system', message: communication.message };
-  } else if (communication instanceof DownloadCommunication) {
-    renderedCommunication = { type: 'download', filename: communication.filename, filetype: communication.filetype, url: communication.url };
+  var renderedCommunication = {};
+  if (communication.type === 'user') {
+    renderedCommunication = { type: communication.type, username: communication.user.name, message: communication.message };
+  } else {
+    for (field in communication) {
+      if (communication.hasOwnProperty(field)) {
+        renderedCommunication[field] = communication[field];
+      }
+      renderedCommunication.type = communication.type;
+    }
   }
 
   return renderedCommunication;

application/client/css/index.css

@@ -1,4 +1,4 @@
-@import url("/vendor/bootstrap/css/bootstrap.min.css");
+@import url('/vendor/bootstrap/css/bootstrap.min.css');
 
 .navbar-inner {
   border-radius: 0;

application/filesharing/filesharing.js

@@ -1,12 +1,12 @@
 var util = require('util');
 var fs = require('fs');
 var mime = require('mime');
-var formidable = require("formidable");
+var formidable = require('formidable');
 
 var handleUpload = function(request, response, inform) {
   var form = new formidable.IncomingForm();
   form.parse(request, function(error, fields, files) {
-    fs.rename(files.file.path, "/tmp/bivouac_upload_" + files.file.name, function(err) {
+    fs.rename(files.file.path, '/tmp/bivouac_upload_' + files.file.name, function(err) {
       inform(files.file.name, files.file.type);
       response.writeHead(200, {'content-type': 'text/plain'});
       response.end('ok');
@@ -15,16 +15,16 @@ var handleUpload = function(request, response, inform) {
 }
 
 var handleDownload = function(filename, response) {
-  var path = "/tmp/bivouac_upload_" + filename;
-  fs.readFile(path, "binary", function(error, file) {
+  var path = '/tmp/bivouac_upload_' + filename;
+  fs.readFile(path, 'binary', function(error, file) {
     if(error) {
       response.writeHead(500, {'content-type': 'text/plain'});
-      response.end(error + "\n");
+      response.end(error + '\n');
     } else {
       response.writeHead(200, {
         'content-type': mime.lookup(path)
       });
-      response.end(file, "binary");
+      response.end(file, 'binary');
     }
   });
 }

application/webserver/webserver.js

@@ -9,42 +9,42 @@ var start = function(documentRoot, handleUpload, uploadCallback, handleDownload)
     var filename;
 
     if (uriPath == '/upload' && request.method.toLowerCase() == 'post') {
-      console.log("Handling upload...");
+      console.log('Handling upload...');
       handleUpload(request, response, uploadCallback);
       return;
     }
 
     if (uriPath.match(/\/download/) && request.method.toLowerCase() == 'get') {
       var parts = uriPath.match(/\/download\/(.*)/);
       filename = parts[1];
-      console.log("Handling download of '" + filename + "'...");
+      console.log('Handling download of "' + filename + '"...');
       handleDownload(filename, response);
       return;
     }
 
     filename = path.join(documentRoot, uriPath);
-    console.log(uriPath + " -> " + filename);
+    console.log(uriPath + ' -> ' + filename);
 
     path.exists(filename, function(exists) {
       if (!exists) {
-        response.writeHead(404, {"Content-Type": "text/plain"});
-        response.write("404 Not Found\n");
+        response.writeHead(404, {'Content-Type': 'text/plain'});
+        response.write('404 Not Found\n');
         response.end();
         return;
       }
 
       if (fs.statSync(filename).isDirectory()) filename += '/index.html';
 
-      fs.readFile(filename, "binary", function(err, file) {
+      fs.readFile(filename, 'binary', function(err, file) {
         if (err) {
-          response.writeHead(500, {"Content-Type": "text/plain"});
-          response.write(err + "\n");
+          response.writeHead(500, {'Content-Type': 'text/plain'});
+          response.write(err + '\n');
           response.end();
           return;
         }
 
         response.writeHead(200);
-        response.write(file, "binary");
+        response.write(file, 'binary');
         response.end();
       });
     });

bivouac.js

@@ -1,11 +1,11 @@
 (function () {
-  var filesharing = require("./application/filesharing/filesharing.js");
-  var webserver = require("./application/webserver/webserver.js");
-  var chatserver = require("./application/chatserver/server/socketioserver.js");
-  var renderer = require("./application/chatserver/renderer/objectRenderer.js");
-  var connectionController = require("./application/chatserver/controller/connectionController.js");
+  var filesharing = require('./application/filesharing/filesharing.js');
+  var webserver = require('./application/webserver/webserver.js');
+  var chatserver = require('./application/chatserver/server/socketioserver.js');
+  var renderer = require('./application/chatserver/renderer/objectRenderer.js');
+  var connectionController = require('./application/chatserver/controller/connectionController.js');
 
   connectionController.attachRenderer(renderer);
   connectionController.attachServer(chatserver);
-  chatserver.start(webserver.start(process.cwd() + "/application/client", filesharing.handleUpload, connectionController.handleUpload, filesharing.handleDownload));
+  chatserver.start(webserver.start(process.cwd() + '/application/client', filesharing.handleUpload, connectionController.handleUpload, filesharing.handleDownload));
 })();

domain/communication.js

@@ -2,16 +2,19 @@ var UserCommunication = function(user, message) {
   this.user = user;
   this.message = message;
 }
+UserCommunication.prototype.type = 'user';
 
 var SystemCommunication = function(message) {
   this.message = message;
 }
+SystemCommunication.prototype.type = 'system';
 
 var DownloadCommunication = function(filename, filetype, url) {
   this.filename = filename;
   this.filetype = filetype;
   this.url = url;
 }
+DownloadCommunication.prototype.type = 'download';
 
 exports.UserCommunication = UserCommunication;
 exports.SystemCommunication = SystemCommunication;

domain/room.js

@@ -1,15 +1,16 @@
 var util = require('util');
 
-var Room = function(name) {
+var Room = function(name, SystemCommunication) {
   this.name = name;
+  this.SystemCommunication = SystemCommunication;
   this.users = [];
   this.communications = [];
 }
 
 Room.prototype.addUser = function(user) {
-  console.log("Entered room: " + user.name);
+  console.log('Entered room: ' + user.name);
   this.users.push(user);
-  var communication = new SystemCommunication("User " + user.name + " entered the chat.");
+  var communication = new this.SystemCommunication('User ' + user.name + ' entered the chat.');
   this.addCommunication(communication);
 }