Fixeds #62

Author: auser

lib/firestack.js

@@ -35,7 +35,9 @@ export class Firestack extends Singleton {
 
     instance.options = options || {};
     instance._debug = instance.options.debug || false;
-    log = instance._log = new Log('firestack', instance._debug);
+
+    Log.enable(instance._debug);
+    log = instance._log = new Log('firestack');
 
     log.info('Creating new firestack instance');
 

lib/modules/database.js

@@ -337,7 +337,7 @@ class DatabaseRef extends ReferenceBase {
   }
 
   get namespace() {
-    return `firestack:dbRef:${this.dbPath()}`
+    return `firestack:dbRef`
   }
 }
 

lib/utils/log.js

@@ -1,58 +1,44 @@
 // document hack
 import root from './window-or-global'
+
+let bows;
 (function (base) {
   window = base || window
-  if (!window.document) {
-    window.document = { documentElement: { style: { WebkitAppearance: true } } }
-  }
   if(!window.localStorage) window.localStorage = {};
 })(root);
 
-let debug = () => {};
+const levels = [
+  'warn', 'info', 'error', 'debug'
+];
 
 export class Log {
-  constructor(namespace, enable) {
+  constructor(namespace) {
     this._namespace = namespace || 'firestack';
-    this.l = null;
     this.loggers = {};
-    this.enabled = false;
-    this.enable(enable);
+    // Add the logging levels for each level
+    levels
+      .forEach(level => this[level] = (...args) => this._log(level)(...args));
   }
 
-  enable(booleanOrStringDebug) {
-    window.localStorage.debug = 
+  static enable(booleanOrStringDebug) {
+    window.localStorage.debug =
       typeof booleanOrStringDebug === 'string' ? 
-        booleanOrStringDebug : 
-        (booleanOrStringDebug ? '*' : booleanOrStringDebug);
-
-    this.enabled = !!window.localStorage.debug;
-  }
-
-  info(...args) {
-    this._logger('info')(...args);
-  }
+        (booleanOrStringDebug === '*' ? true : booleanOrStringDebug) : 
+        (booleanOrStringDebug instanceof RegExp ? booleanOrStringDebug.toString() : booleanOrStringDebug);
 
-  error(...args) {
-    this._logger('error')(...args);
+    window.localStorage.debugColors = !!window.localStorage.debug;
   }
 
-  debug(...args) {
-    this._logger('debug')(...args);
-  }
-
-  _logger(level) {
+  _log(level) {
     if (!this.loggers[level]) {
-      this.loggers[level] = this._debug()(`${this._namespace}:${level}`)
+      (function() {
+        const bows = require('bows');
+        bows.config({ padLength: 20 });
+        this.loggers[level] = bows(this._namespace, `[${level}]`);
+      }.bind(this))();
     }
     return this.loggers[level];
   }
-
-  _debug() {
-    if (!this.l) {
-      this.l = debug = require('debug');
-    }
-    return this.l;
-  }
 }
 
 export default Log;

package.json

@@ -67,6 +67,7 @@
     "sinon": "^2.0.0-pre.2"
   },
   "dependencies": {
+    "bows": "^1.6.0",
     "es6-symbol": "^3.1.0"
   }
 }