Add Cobalt now/stringify + remove old formatters

diff --git a/lib/cobalt.js b/lib/cobalt.js
index 5ae39f2577490fcfd41cfdb2e5c7299b4e6e23da..9554a04ad248b7f3ef06412448e8aa387de350b1 100644 (file)
--- a/lib/cobalt.js
+++ b/lib/cobalt.js
@@ -19,8 +19,6 @@
   // Load up loggers + formatters
   if (typeof require === 'function') {
     // Formatters
   // Load up loggers + formatters
   if (typeof require === 'function') {
     // Formatters

-    Cobalt.Formatter.Simple = require('./formatters/simple.js').Simple;
-    Cobalt.Formatter.Ansi = require('./formatters/ansi.js').Ansi;

     Cobalt.Formatter.Token = require('./formatters/token.js').Token;
 
     // Loggers
     Cobalt.Formatter.Token = require('./formatters/token.js').Token;
 
     // Loggers


@@ -40,6 +38,23 @@
     return Date.now();
   }
 
     return Date.now();
   }
 

+  // Stringify with circular dereference.
+  Cobalt.stringify = function (object) {
+    var cache = [], stringified;
+    stringified = JSON.stringify(object, function (key, value) {
+      if (typeof value === 'object' && value !== null) {
+        if (cache.indexOf(value) !== -1) {
+          return "[Circular]";
+        }
+        cache.push(value);
+      }
+      return value;
+    });
+    cache = null;
+
+    return stringified;
+  }
+

   Cobalt.Console = Class(Cobalt, 'Console')({
     prototype : {
       from : "Generic Cobalt Logger",
   Cobalt.Console = Class(Cobalt, 'Console')({
     prototype : {
       from : "Generic Cobalt Logger",


@@ -82,7 +97,7 @@
           if (typeof item !== "object") {
             item = {message : item.toString() };
           } else {
           if (typeof item !== "object") {
             item = {message : item.toString() };
           } else {

-            item.message = JSON.stringify(item);
+            item.message = Cobalt.stringify(item);

           }
 
           item._cobaltLog = true;
           }
 
           item._cobaltLog = true;


@@ -274,6 +289,8 @@
     global.Formatter = Cobalt.Formatter;
     global.Logger = Cobalt.Logger;
     global.Console = Cobalt.Console;
     global.Formatter = Cobalt.Formatter;
     global.Logger = Cobalt.Logger;
     global.Console = Cobalt.Console;

+    global.now = Cobalt.now;
+    global.stringify = Cobalt.stringify;

   } else {
     global.Cobalt = Cobalt;
   }
   } else {
     global.Cobalt = Cobalt;
   }