Cobalt 2.0 -> Now with neon 2.0

2 files changed, 81 insertions, 132 deletions

diff --git a/lib/loggers/console.js b/lib/loggers/console.js
index c8e3036..c4031eb 100644
--- a/lib/loggers/console.js
+++ b/lib/loggers/console.js
@@ -1,97 +1,70 @@
-(function (global) {
-  var Module, Class;
+Class(Cobalt.Logger, 'JsConsole')({
+  prototype : {
+    console : null,
+    formatterOpts : {},
 
-  // Load up dependencies
-  if (typeof require === 'function') {
-    var Ne = require('neon');
-    Module = Ne.Module;
-    Class = Ne.Class;
-  } else {
-    Module = global.Module;
-    Class = global.Class;
-  }
-
-  var Cobalt = {};
-  Module(Cobalt, 'Logger')({});
-
-  Cobalt.Logger.JsConsole = Class(Cobalt.Logger, 'JsConsole')({
-    prototype : {
-      console : null,
-      formatterOpts : {},
+    init : function (config) {
+      var logger = this,
+          property;
 
-      init : function (config) {
-        var logger = this,
-            property;
-
-        if (config) {
-          for (property in config) {
-            logger[property] = config[property];
-          }
+      if (config) {
+        for (property in config) {
+          logger[property] = config[property];
         }
+      }
 
-        if (!logger.console) {
-          logger.console = console;
-        }
-      },
+      if (!logger.console) {
+        logger.console = console;
+      }
+    },
 
-      log : function () {
-        var i, message = [], severity;
+    log : function () {
+      var i, message = [], severity;
 
-        for (i = 0; i < arguments.length; i++) {
-          // We're not formatting objects for now.
+      for (i = 0; i < arguments.length; i++) {
+        // We're not formatting objects for now.
 
-          if (!arguments[i].__skipConsole && !arguments[i].message.__skipConsole) {
-            if (typeof arguments[i].message === 'object') {
-              message.push(arguments[i].message);
-            } else {
-              message.push(this.format(arguments[i]));
-            }
-            if (!severity) {
-              severity = arguments[i]._level
-            }
+        if (!arguments[i].__skipConsole && !arguments[i].message.__skipConsole) {
+          if (typeof arguments[i].message === 'object') {
+            message.push(arguments[i].message);
+          } else {
+            message.push(this.format(arguments[i]));
+          }
+          if (!severity) {
+            severity = arguments[i]._level
           }
         }
+      }
 
-        switch (severity){
-          case 0:
-          case 1:
-          case 2:
-          case 3:
-            this.console.error.apply(this.console, message);
-            break;
-          case 4:
-            this.console.warn.apply(this.console, message);
-            break;
-          case 5:
-          case 6:
-            this.console.info.apply(this.console, message);
-            break;
-          case 7:
-          default:
-            this.console.log.apply(this.console, message);
-            break;
-        }
-      },
-
-      format : function (logObject) {
-        // Usually what you want to do here is format. Preferably using
-        // someone inside Cobalt.Formatter
-        if (this.formatter) {
-          return this.formatter.format(logObject, this.formatterOpts);
-        }
-
-        return logObject.message;
+      switch (severity){
+        case 0:
+        case 1:
+        case 2:
+        case 3:
+          this.console.error.apply(this.console, message);
+          break;
+        case 4:
+          this.console.warn.apply(this.console, message);
+          break;
+        case 5:
+        case 6:
+          this.console.info.apply(this.console, message);
+          break;
+        case 7:
+        default:
+          this.console.log.apply(this.console, message);
+          break;
       }
-    }
-  });
+    },
 
-  if (Cobalt.Logger.JsConsole.__objectSpy) {
-    Cobalt.Logger.JsConsole.__objectSpy.destroy();
-  }
+    format : function (logObject) {
+      // Usually what you want to do here is format. Preferably using
+      // someone inside Cobalt.Formatter
+      if (this.formatter) {
+        return this.formatter.format(logObject, this.formatterOpts);
+      }
 
-  if (typeof require === 'function') {
-    global.JsConsole = Cobalt.Logger.JsConsole;
-  } else {
-    global.Cobalt.Logger.JsConsole = Cobalt.Logger.JsConsole;
+      return logObject.message;
+    }
   }
-}(typeof window !== 'undefined' ? window : (typeof exports !== 'undefined' ? exports : self)));
+});
diff --git a/lib/loggers/socket.js b/lib/loggers/socket.js
index b057d77..7066274 100644
--- a/lib/loggers/socket.js
+++ b/lib/loggers/socket.js
@@ -1,61 +1,37 @@
-(function (global) {
-  var Module, Class;
+if (typeof require === 'function') {
+  var ioClient = require('socket.io-client');
+}
 
-  // Load up dependencies
-  if (typeof require === 'function') {
-    var Ne = require('neon');
-    var ioClient = require('socket.io-client');
-    Module = Ne.Module;
-    Class = Ne.Class;
-  } else {
-    Module = global.Module;
-    Class = global.Class;
-  }
-
-  var Cobalt = {};
-  Module(Cobalt, 'Logger')({});
-
-  Cobalt.Logger.Socket = Class(Cobalt.Logger, 'Socket')({
-    prototype : {
-      serverUrl : '/',
+Class(Cobalt.Logger, 'Socket')({
+  prototype : {
+    serverUrl : '/',
 
-      init : function (config) {
-        var logger = this;
+    init : function (config) {
+      var logger = this;
 
-        if (config) {
-          for (property in config) {
-            logger[property] = config[property];
-          }
+      if (config) {
+        for (property in config) {
+          logger[property] = config[property];
         }
+      }
 
-        if (!logger.socketIo) {
-          logger.socketIo = ioClient;
-        }
+      if (!logger.socketIo) {
+        logger.socketIo = ioClient;
+      }
 
-        logger._socket = logger.socketIo.connect(logger.serverUrl);
-      },
+      logger._socket = logger.socketIo.connect(logger.serverUrl);
+    },
 
-      log : function () {
-        var i, messageArray = [];
+    log : function () {
+      var i, messageArray = [];
 
-        for (i = 0; i < arguments.length; i++) {
-          messageArray.push(arguments[i]);
-        }
+      for (i = 0; i < arguments.length; i++) {
+        messageArray.push(arguments[i]);
+      }
 
-        if (this._socket) {
-          this._socket.emit('log', messageArray);
-        }
+      if (this._socket) {
+        this._socket.emit('log', messageArray);
       }
     }
-  });
-
-  if (Cobalt.Logger.Socket.__objectSpy) {
-    Cobalt.Logger.Socket.__objectSpy.destroy();
-  }
-
-  if (typeof require === 'function') {
-    global.Socket = Cobalt.Logger.Socket;
-  } else {
-    global.Cobalt.Logger.Socket = Cobalt.Logger.Socket;
   }
-}(typeof window !== 'undefined' ? window : (typeof exports !== 'undefined' ? exports : self)));
+});