Merge pull request #29 from wearelucid/feature/padding-config-disable

[Feature] Make padding and separator configurable

bows.js

@@ -32,6 +32,8 @@
       logger = require('andlog'),
       bind = Function.prototype.bind,
       hue = 0,
+      padding = true,
+      separator = '|',
       padLength = 15,
       noop = function() {},
       // if ls.debugColors is set, use that, otherwise check for support
@@ -56,8 +58,13 @@
 
   bows = function(str) {
     var msg, colorString, logfn;
-    msg = (str.slice(0, padLength));
-    msg += Array(padLength + 3 - msg.length).join(' ') + '|';
+
+    if (padding) {
+      msg = (str.slice(0, padLength));
+      msg += Array(padLength + 3 - msg.length).join(' ') + separator;
+    } else {
+      msg = str + Array(3).join(' ') + separator;
+    }
 
     if (debugRegex) {
         var matches = str.match(debugRegex);
@@ -100,6 +107,16 @@
     if (config.padLength) {
       padLength = config.padLength;
     }
+
+    if (typeof config.padding === 'boolean') {
+      padding = config.padding;
+    }
+
+    if (config.separator) {
+      separator = config.separator;
+    } else if (config.separator === false || config.separator === '') {
+      separator = ''
+    }
   };
 
   if (typeof module !== 'undefined') {

dist/bows.js

@@ -34,6 +34,8 @@
       logger = require('andlog'),
       bind = Function.prototype.bind,
       hue = 0,
+      padding = true,
+      separator = '|',
       padLength = 15,
       noop = function() {},
       // if ls.debugColors is set, use that, otherwise check for support
@@ -58,8 +60,13 @@
 
   bows = function(str) {
     var msg, colorString, logfn;
-    msg = (str.slice(0, padLength));
-    msg += Array(padLength + 3 - msg.length).join(' ') + '|';
+
+    if (padding) {
+      msg = (str.slice(0, padLength));
+      msg += Array(padLength + 3 - msg.length).join(' ') + separator;
+    } else {
+      msg = str + Array(3).join(' ') + separator;
+    }
 
     if (debugRegex) {
         var matches = str.match(debugRegex);
@@ -102,6 +109,16 @@
     if (config.padLength) {
       padLength = config.padLength;
     }
+
+    if (typeof config.padding === 'boolean') {
+      padding = config.padding;
+    }
+
+    if (config.separator) {
+      separator = config.separator;
+    } else if (config.separator === false || config.separator === '') {
+      separator = ''
+    }
   };
 
   if (typeof module !== 'undefined') {

test/index.js

@@ -7,7 +7,10 @@ var scripts = [
     'test/regex.html',
     'test/not-regex.html',
     'test/color-map.html',
+    'test/separator.html',
+    'test/no-separator.html',
     'test/padLength.html',
+    'test/no-padding.html',
     'test/args.html'
 ];
 

test/no-padding.html

@@ -0,0 +1,34 @@
+<script type="text/javascript" src='./helpers/function.bind.js'></script>
+
+<script>
+    localStorage.clear();
+    localStorage.debug = true;
+</script>
+
+<script src="../dist/bows.js"></script>
+
+<script>
+  var mainLog, altLog;
+
+  bows.config({
+      padding: false
+  });
+
+  window.expectedLogs = [
+    'this-is-a-really-long-module-name-thats-more-than-50-chars  | foo',
+    'this-is-a-really-long-module-name-thats-more-than-50-chars  | bar',
+
+    'this-is-a-really-long-module-name  | baz',
+    'this-is-a-really-long-module-name  | buz'
+  ];
+
+  window.onload = function() {
+      mainLog = window.bows('this-is-a-really-long-module-name-thats-more-than-50-chars')
+      mainLog('foo');
+      mainLog('bar');
+
+      altLog = window.bows('this-is-a-really-long-module-name')
+      altLog('baz');
+      altLog('buz');
+  }
+</script>

test/no-separator.html

@@ -0,0 +1,37 @@
+
+<script type="text/javascript" src='./helpers/function.bind.js'></script>
+
+<script>
+    localStorage.clear();
+    localStorage.debug = true;
+</script>
+
+<script src="../dist/bows.js"></script>
+
+<script>
+  var mainLog, altLog;
+
+  bows.config({
+      separator: false
+  });
+
+  window.expectedLogs = [
+    'mainLog           foo',
+    'mainLog           bar',
+    'mainLog           bar',
+
+    'altLog            baz',
+    'altLog            buz'
+  ];
+
+  window.onload = function() {
+      mainLog = window.bows('mainLog')
+      mainLog('foo');
+      mainLog('bar');
+      mainLog.log('bar');
+
+      altLog = window.bows('altLog')
+      altLog('baz');
+      altLog('buz');
+  }
+</script>

test/separator.html

@@ -0,0 +1,36 @@
+<script type="text/javascript" src='./helpers/function.bind.js'></script>
+
+<script>
+    localStorage.clear();
+    localStorage.debug = true;
+</script>
+
+<script src="../dist/bows.js"></script>
+
+<script>
+  var mainLog, altLog;
+
+  bows.config({
+      separator: '//'
+  });
+
+  window.expectedLogs = [
+    'mainLog          // foo',
+    'mainLog          // bar',
+    'mainLog          // bar',
+
+    'altLog           // baz',
+    'altLog           // buz'
+  ];
+
+  window.onload = function() {
+      mainLog = window.bows('mainLog')
+      mainLog('foo');
+      mainLog('bar');
+      mainLog.log('bar');
+
+      altLog = window.bows('altLog')
+      altLog('baz');
+      altLog('buz');
+  }
+</script>

test/test.js

@@ -1,5 +1,3 @@
 window.localStorage = true;
 
 var bows = require('bows');
-
-