Merge pull request #13 from lwhiteley/master

update

README.md

@@ -1,7 +1,7 @@
 AngularLogExtender
 ==================
 [![Build Status](https://travis-ci.org/lwhiteley/AngularLogExtender.svg?branch=master)](https://travis-ci.org/lwhiteley/AngularLogExtender)
-[![Coverage Status](https://coveralls.io/repos/ferronrsmith/AngularLogExtender/badge.png)](https://coveralls.io/r/ferronrsmith/AngularLogExtender)
+[![Coverage Status](https://coveralls.io/repos/github/ferronrsmith/AngularLogExtender/badge.svg?branch=master)](https://coveralls.io/github/ferronrsmith/AngularLogExtender?branch=master)
 
 This is an extension of the Angular $log functionality.
 It uses the native $decorator to push the $log pass its capabilities and provide new

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-logex",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "main": "./dist/log-ex-unobtrusive.js",
   "dependencies": {
     "angular": ">= 1.1.2"

dist/log-ex-unobtrusive.js

@@ -1,5 +1,5 @@
 /**
- * Log Unobtrusive Extension v0.0.13
+ * Log Unobtrusive Extension v0.0.14
  *
  * Used within AngularJS to enhance functionality within the AngularJS $log service.
  *
@@ -30,6 +30,12 @@ angular.module("log.ex.uo", []).provider('logEx', ['$provide', function($provide
      */
     var enableGlobally = false;
 
+    /**
+     * Used to enable template engine globally
+     * @type {boolean}
+     */
+    var enableTemplatesGlobally = false;
+
     /**
      * Used to enable quiet logger enabling.
      * When this feature is enable the config message is not shown
@@ -140,7 +146,7 @@ angular.module("log.ex.uo", []).provider('logEx', ['$provide', function($provide
      * @returns {String} -  returns a string with the type of the evaluated operand
      */
     var itypeof = function(val) {
-        return Object.prototype.toString.call(val).replace(/(\[|object|\s|\])/g, "").toLowerCase();
+        return Object.prototype.toString.call(val).replace(/(\[|object|\s|])/g, "").toLowerCase();
     };
 
     /**
@@ -314,7 +320,7 @@ angular.module("log.ex.uo", []).provider('logEx', ['$provide', function($provide
         if (criteria1 || criteria2) {
             return Array.prototype.slice.call(arguments);
         }
-        pattern = itypeof(pattern) === 'regexp' ? pattern : /\{([^\{\}]*)\}/g;
+        pattern = itypeof(pattern) === 'regexp' ? pattern : /\{([^{}]*)}/g;
 
         return template.replace(pattern, function(patternToReplace, replacementKey) {
             var replacementKeyList = replacementKey.split('.'),
@@ -486,6 +492,14 @@ angular.module("log.ex.uo", []).provider('logEx', ['$provide', function($provide
                  * @returns {Function} - returns function with specific rules for a log metod
                  */
                 var prepareLogFn = function(logFn, className, override, useOverride, useTemplate, colorCss) {
+
+                    var activateTemplates = useTemplate;
+
+                    // override template activation if templateGlobally is true
+                    if (!useTemplate && enableTemplatesGlobally) {
+                        activateTemplates = enableTemplatesGlobally;
+                    }
+
                     var enhancedLogFn = function() {
                         var activate = (useOverride) ? activateLogs(enabled, override) : enabled;
                         if (activate) {
@@ -496,7 +510,7 @@ angular.module("log.ex.uo", []).provider('logEx', ['$provide', function($provide
                                 args = filterSensitiveValues(args);
                             }
                             var prefix = getLogPrefix(className);
-                            if (validateTemplateInputs(useTemplate, args)) {
+                            if (validateTemplateInputs(activateTemplates, args)) {
                                 var data = (supplant.apply(null, args));
                                 data = (itypeof(data) === 'string') ? [data] : data;
                                 args = data;
@@ -638,6 +652,14 @@ angular.module("log.ex.uo", []).provider('logEx', ['$provide', function($provide
         enabledQuietly = isBoolean(verbose) ? verbose : false;
     };
 
+    /**
+     * Used externally to enable/disable template engine
+     * @param {boolean} flag - flag that sets whether template engine is enabled/disabled
+     */
+    var useTemplates = function(flag) {
+        enableTemplatesGlobally = isBoolean(flag) ? flag : false;
+    };
+
     /**
      * Configure which log functions can be exposed at runtime
      * @param {*[]} arrMethods - list of methods that can be used
@@ -736,15 +758,16 @@ angular.module("log.ex.uo", []).provider('logEx', ['$provide', function($provide
     this.$get = function() {
         return {
             name: 'Log Unobtrusive Extension',
-            version: '0.0.13',
+            version: '0.0.14',
             enableLogging: enableLogging,
             restrictLogMethods: restrictLogMethods,
             overrideLogPrefix: overrideLogPrefix,
             disableDefaultColors: disableDefaultColors,
             setLogMethodColor: setLogMethodColor,
             overrideLogMethodColors: overrideLogMethodColors,
             useDefaultLogPrefix: useDefaultLogPrefix,
-            configureLogFilters: configureLogFilters
+            configureLogFilters: configureLogFilters,
+            useTemplates: useTemplates
         };
     };
 
@@ -757,4 +780,5 @@ angular.module("log.ex.uo", []).provider('logEx', ['$provide', function($provide
     this.overrideLogMethodColors = overrideLogMethodColors;
     this.useDefaultLogPrefix = useDefaultLogPrefix;
     this.configureLogFilters = configureLogFilters;
+    this.useTemplates = useTemplates;
 }]);