Interim commit: Fixes all of the errors thrown when building via buil…

…dbug

[airbug/airbug#89] Airbug. Airbug MVP Part I: Chat Basics

buildbug.js

@@ -70,8 +70,10 @@ buildProperties({
             "../bugunit/projects/bugunit/js/scripts"
         ],
         testPaths: [
+            "../bugjs/projects/bugflow/js/test",
             "../bugjs/projects/bugjs/js/test",
-            '../bugjs/projects/bugroutes/js/test'
+            "../bugjs/projects/bugtrace/js/test",
+            "../bugjs/projects/bugroutes/js/test"
         ],
 
         //TODO BRN: These static paths are temporary until we get the client js server working.
@@ -92,7 +94,8 @@ buildProperties({
             "../bugjs/projects/bugioc/js/src",
             "../bugjs/projects/bugjs/js/src",
             "../bugjs/projects/carapace/js/src",
-            '../bugpack/projects/bugpack-client/js/src'
+            '../bugpack/projects/bugpack-client/js/src',
+            '../bugjs/projects/bugroutes/js/src'
         ]
     },
     client: {

projects/airbugserver/js/src/AirBugConfiguration.js

@@ -249,14 +249,14 @@ var AirBugConfiguration = Class.extend(Obj, {
 // Interfaces
 //-------------------------------------------------------------------------------
 
-Class.implement(AirBugServerConfiguration, IConfiguration);
+Class.implement(AirBugConfiguration, IConfiguration);
 
 
 //-------------------------------------------------------------------------------
 // Annotate
 //-------------------------------------------------------------------------------
 
-annotate(AirBugServerConfiguration).with(
+annotate(AirBugConfiguration).with(
     configuration().modules([
 
         //-------------------------------------------------------------------------------
@@ -276,7 +276,7 @@ annotate(AirBugServerConfiguration).with(
         module("expressApp")
             .properties([
                 property("config").ref("config"),
-                property("expressRoutes").re("expressRoutes"),
+                property("expressRoutes").ref("expressRoutes"),
                 property("sessionStore").ref("sessionStore")
             ]),
         module("expressRoutes"),

projects/airbugserver/js/src/Models/Conversation.js

@@ -4,9 +4,9 @@
 
 //@Package('airbugserver')
 
-//@Export('Coversation')
+//@Export('Conversation')
 
-//@Require('airbugserver.CoversationSchema')
+//@Require('airbugserver.ConversationSchema')
 
 
 //-------------------------------------------------------------------------------
@@ -21,17 +21,17 @@ var mongoose            = require('mongoose');
 // Bugpack Modules
 //-------------------------------------------------------------------------------
 
-var ConversationSchema  = bugpack.require('airbugserver.CoversationSchema');
+var ConversationSchema  = bugpack.require('airbugserver.ConversationSchema');
 
 
 //-------------------------------------------------------------------------------
 // Declare Class
 //-------------------------------------------------------------------------------
 
-var Conversation = mongoose.model("Coversation", CoversationSchema);
+var Conversation = mongoose.model("Conversation", ConversationSchema);
 
 //-------------------------------------------------------------------------------
 // Exports
 //-------------------------------------------------------------------------------
 
-bugpack.export('airbugserver.Coversation', Coversation);
+bugpack.export('airbugserver.Conversation', Conversation);

projects/airbugserver/js/src/Routes/ExpressRoutes/ExpressRoutes.js

@@ -6,11 +6,10 @@
 
 //@Export('ExpressRoutes')
 
-//@Require('Class')
-//@Require('Obj')
 //@Require('bugroutes.ExpressRoute')
 //@Require('bugroutes.Routes')
 
+
 //-------------------------------------------------------------------------------
 // Common Modules
 //-------------------------------------------------------------------------------
@@ -22,8 +21,8 @@ var bugpack     = require('bugpack').context();
 // BugPack
 //-------------------------------------------------------------------------------
 
-var Routes          = require('bugroutes.Routes');
-var ExpressRoute    = require('bugroutes.ExpressRoute');
+var Routes          = bugpack.require('bugroutes.Routes');
+var ExpressRoute    = bugpack.require('bugroutes.ExpressRoute');
 
 
 //-------------------------------------------------------------------------------

projects/airbugserver/js/src/Routes/SocketRoutes/EstablishedUserRoutes.js

@@ -6,29 +6,56 @@
 
 //@Export('EstablishedUserRoutes')
 
-//@Require('Class')
-//@Require('Obj')
-//@Require('airbugserver.Route')
+//@Require('airbugserver.ChatMessagesApi')
+//@Require('airbugserver.ConversationsApi')
+//@Require('airbugserver.RoomsApi')
+//@Require('airbugserver.UsersApi')
+//@Require('bugroutes.ExpressRoute')
+//@Require('bugroutes.Routes')
 
 
 //-------------------------------------------------------------------------------
 // Common Modules
 //-------------------------------------------------------------------------------
-var UsersApi, RoomsApi, ConversationsApi, ChatMessagesApi;
 
+var bugpack     = require('bugpack').context();
+
+
+//-------------------------------------------------------------------------------
+// BugPack
+//-------------------------------------------------------------------------------
+
+var Routes              = bugpack.require('bugroutes.Routes');
+var ExpressRoute        = bugpack.require('bugroutes.ExpressRoute');
+var UsersApi            = bugpack.require('airbugserver.UsersApi');
+var RoomsApi            = bugpack.require('airbugserver.RoomsApi');
+var ConversationsApi    = bugpack.require('airbugserver.ConversationsApi');
+var ChatMessagesApi     = bugpack.require('airbugserver.ChatMessagesApi');
+
+
+//-------------------------------------------------------------------------------
+// Routes
+//-------------------------------------------------------------------------------
+var getAlpha = new ExpressRoute('get', '/alpha', function(req, res){
+    res.render('alpha', {
+        title: 'airbug',
+        production: config.production
+    });
+});
+
+var routes = [getAlpha];
+//-------------------------------------------------------------------------------
+// Declare Class
+//-------------------------------------------------------------------------------
+
+var UsersApi, RoomsApi, ConversationsApi, ChatMessagesApi;
 
-EstablishedUserRoutes = {
-    enableAllOnSocket: function(socket){
-        EstablishedUserRoutes.routes.forEach(function(route){
-            route.enableOnSocket(socket);
-        })
-    },
+var routes: [
+    new Route("addUserToRoom", RoomsApi.addUserToRoom),
+    new Route("newChatMessage", ChatMessagesApi.newChatMessage)
+];
 
-    routes: [
-        new Route("addUserToRoom", RoomsApi.addUserToRoom),
-        new Route("newChatMessage", ChatMessagesApi.newChatMessage)
-    ]
-};
+EstablishedUserRoutes = new Routes(routes);
 
 //-------------------------------------------------------------------------------
 // Exports

projects/airbugserver/js/src/Routes/SocketRoutes/GlobalSocketRoutes.js

@@ -6,30 +6,48 @@
 
 //@Export('GlobalSocketRoutes')
 
-//@Require('Class')
-//@Require('Obj')
-//@Require('airbugserver.Route')
+//@Require('airbugserver.ChatMessagesApi')
+//@Require('airbugserver.ConversationsApi')
+//@Require('airbugserver.RoomsApi')
+//@Require('airbugserver.UsersApi')
+//@Require('bugroutes.ExpressRoute')
+//@Require('bugroutes.Routes')
 
 
 //-------------------------------------------------------------------------------
 // Common Modules
 //-------------------------------------------------------------------------------
-var UsersApi, RoomsApi, ConversationsApi, ChatMessagesApi;
 
+var bugpack     = require('bugpack').context();
 
-GlobalSocketRoutes = {
-    enableAllOnSocket: function(socket){
-        GlobalSocketRoutes.routes.forEach(function(route){
-            route.enableOnSocket(socket);
-        })
-    },
 
-    routes: [
-        new Route("establishUser", UsersApi.establishUser),
-        new Route("error", function(){}),
-        new Route("disconnect", function(){})
-    ]
-};
+//-------------------------------------------------------------------------------
+// BugPack
+//-------------------------------------------------------------------------------
+
+var ChatMessagesApi     = bugpack.require('airbugserver.ChatMessagesApi');
+var ConversationsApi    = bugpack.require('airbugserver.ConversationsApi');
+var RoomsApi            = bugpack.require('airbugserver.RoomsApi');
+var UsersApi            = bugpack.require('airbugserver.UsersApi');
+var ExpressRoute        = bugpack.require('bugroutes.ExpressRoute');
+var Routes              = bugpack.require('bugroutes.Routes');
+
+//-------------------------------------------------------------------------------
+// Declare Routes
+//-------------------------------------------------------------------------------
+
+var routes = routes: [
+    new Route("establishUser", UsersApi.establishUser),
+    new Route("error", function(){}),
+    new Route("disconnect", function(){})
+];
+
+
+//-------------------------------------------------------------------------------
+// Declare Class
+//-------------------------------------------------------------------------------
+
+var GlobalSocketRoutes = new Routes(routes);
 
 //-------------------------------------------------------------------------------
 // Exports

projects/airbugserver/js/src/Routes/SocketRoutes/SocketRoutes.js

@@ -6,23 +6,19 @@
 
 //@Export('SocketRoutes')
 
-//@Require('Class')
-//@Require('Obj')
+//@Require('bugroutes.Routes')
 
 
 //-------------------------------------------------------------------------------
 // Common Modules
 //-------------------------------------------------------------------------------
 
-var SocketRoutes = Class.extend(Obj, {
-
-    _constructor: function(){
+var bugpack     = require('bugpack').context();
 
-        this._super();
-
-
-    }
-});
+var Routes      = bugpack.require('bugroutes.Routes');
+
+
+var SocketRoutes = new Routes();
 
 //-------------------------------------------------------------------------------
 // Exports

projects/airbugserver/js/src/SocketAPIs/ChatMessagesApi.js

@@ -23,7 +23,8 @@ var bugpack     = require('bugpack').context();
 //-------------------------------------------------------------------------------
 
 var ChatMessage = bugpack.require('airbugserver.ChatMessage');
-
+var Class       = bugpack.require('Class');
+var Obj         = bugpack.require('Obj');
 
 //-------------------------------------------------------------------------------
 // Declare Class
@@ -34,7 +35,7 @@ var ChatMessagesApi = Class.extend(Obj, {
     create: function(message){
         var newChatMessage = ChatMessage.create(message, function(){});
         RoomApi.sendMessage(newChatMessage);
-    }
+    },
 
     update: function(){
 

projects/airbugserver/js/src/SocketAPIs/ConversationsApi.js

@@ -22,8 +22,9 @@ var bugpack         = require('bugpack').context();
 // Bugpack Modules
 //-------------------------------------------------------------------------------
 
+var Class           = bugpack.require('Class');
 var Conversation    = bugpack.require('airbugserver.Conversation');
-
+var Obj             = bugpack.require('Obj');
 
 //-------------------------------------------------------------------------------
 // Declare Class
@@ -33,7 +34,7 @@ var ConversationsApi = Class.extend(Obj, {
 
     create: function(){
 
-    }
+    },
 
     update: function(){
 

projects/airbugserver/js/src/SocketAPIs/RoomsApi.js

@@ -21,24 +21,30 @@ var bugpack     = require('bugpack').context();
 // Bugpack Modules
 //-------------------------------------------------------------------------------
 
+var Class       = bugpack.require('Class');
+var Obj         = bugpack.require('Obj');
 var Room        = bugpack.require('airbugserver.Room');
 
 
 //-------------------------------------------------------------------------------
 // Declare Class
 //-------------------------------------------------------------------------------
 
-var RoomsApi = Class.extend({
+var RoomsApi = Class.extend(Obj, {
 
     _constructor: function(){
-        this.super();
+
+        this._super();
 
         this.socketsMap = null;
     },
 
+    /*
+     * @param {Room} room
+     **/
     create: function(room){
-        var room = Room.create();
-    }
+        var room = Room.create(room);
+    },
 
     update: function(){
 

projects/airbugserver/js/src/SocketAPIs/UsersApi.js

@@ -21,6 +21,8 @@ var bugpack     = require('bugpack').context();
 // Bugpack Modules
 //-------------------------------------------------------------------------------
 
+var Class       = bugpack.require('Class');
+var Obj         = bugpack.require('Obj');
 var User        = bugpack.require('airbugserver.User');
 
 //-------------------------------------------------------------------------------
@@ -29,6 +31,12 @@ var User        = bugpack.require('airbugserver.User');
 
 var UsersApi = Class.extend(Obj, {
 
+    _constructor: function(){
+
+        this._super();
+
+    },
+
     /*
      * @param {{
      *      name: string,
@@ -60,11 +68,11 @@ var UsersApi = Class.extend(Obj, {
             }
         });
 
-    }
+    },
 
     updateName: function(data){
 
-    },
+    }
 
 });
 

projects/airbugserver/js/src/Sockets/SocketsMap.js

@@ -4,7 +4,7 @@
 
 //@Package('airbugserver')
 
-//@Export('SessionToSocketsMap')
+//@Export('SocketsMap')
 
 //@Require('Class')
 //@Require('Map')