Updated diagnostics wiretap with ability to use regex for testing mat…

…ches
maestrojs · Apr 26, 2012 · 3441008 · 3441008
1 parent ccb4706
commit 3441008
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 14 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/build-all.sh b/build-all.sh
@@ -22,5 +22,5 @@ cp ./lib/standard/postal.* ./example/standard/js
 cp ./lib/amd/postal.* ./example/amd/js/libs/postal
 cp ./lib/amd/postal.js ./example/node/client/js/lib
 cp ./lib/amd/postal.diagnostics.js ./example/node/client/js/lib
-cp ./lib/node/postal.diagnostics.js ./example/node/messaging
+cp ./lib/node/diags/postal.diagnostics.js ./example/node/messaging
 cp ./lib/node/postal.js ./example/node/messaging
diff --git a/example/amd/js/libs/postal/postal.diagnostics.js b/example/amd/js/libs/postal/postal.diagnostics.js
@@ -8,7 +8,10 @@ define( [ "postal", "underscore" ], function ( postal, _, undefined ) {
 			_.each( filter, function ( item, key ) {
 				if ( env[key] ) {
 					possible++;
-					if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
+					if ( _.isRegExp( item ) && item.test( env[key] ) ) {
+						match++;
+					}
+					else if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
 						if ( applyFilter( item, env[key] ) ) {
 							match++;
 						}

diff --git a/example/amd/js/libs/postal/postal.diagnostics.min.js b/example/amd/js/libs/postal/postal.diagnostics.min.js
diff --git a/example/node/client/js/lib/postal.diagnostics.js b/example/node/client/js/lib/postal.diagnostics.js
@@ -8,7 +8,10 @@ define( [ "postal", "underscore" ], function ( postal, _, undefined ) {
 			_.each( filter, function ( item, key ) {
 				if ( env[key] ) {
 					possible++;
-					if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
+					if ( _.isRegExp( item ) && item.test( env[key] ) ) {
+						match++;
+					}
+					else if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
 						if ( applyFilter( item, env[key] ) ) {
 							match++;
 						}

diff --git a/example/node/messaging/postal.diagnostics.js b/example/node/messaging/postal.diagnostics.js
@@ -5,7 +5,10 @@ module.exports = function ( _, postal ) {
 			_.each( filter, function ( item, key ) {
 				if ( env[key] ) {
 					possible++;
-					if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
+					if ( _.isRegExp( item ) && item.test( env[key] ) ) {
+						match++;
+					}
+					else if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
 						if ( applyFilter( item, env[key] ) ) {
 							match++;
 						}

diff --git a/example/standard/js/postal.diagnostics.js b/example/standard/js/postal.diagnostics.js
@@ -8,7 +8,10 @@
 			_.each( filter, function ( item, key ) {
 				if ( env[key] ) {
 					possible++;
-					if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
+					if ( _.isRegExp( item ) && item.test( env[key] ) ) {
+						match++;
+					}
+					else if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
 						if ( applyFilter( item, env[key] ) ) {
 							match++;
 						}

diff --git a/example/standard/js/postal.diagnostics.min.js b/example/standard/js/postal.diagnostics.min.js
diff --git a/lib/amd/postal.diagnostics.js b/lib/amd/postal.diagnostics.js
@@ -8,7 +8,10 @@ define( [ "postal", "underscore" ], function ( postal, _, undefined ) {
 			_.each( filter, function ( item, key ) {
 				if ( env[key] ) {
 					possible++;
-					if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
+					if ( _.isRegExp( item ) && item.test( env[key] ) ) {
+						match++;
+					}
+					else if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
 						if ( applyFilter( item, env[key] ) ) {
 							match++;
 						}

diff --git a/lib/amd/postal.diagnostics.min.js b/lib/amd/postal.diagnostics.min.js
diff --git a/lib/node/diags/package.json b/lib/node/diags/package.json
@@ -1,7 +1,7 @@
 {
     "name" : "postal.diagnostics",
     "description" : "Wiretap add-on for postal.js allowing configurable console.logging output of messages being published through postal's message bus.",
-    "version" : "0.6.0",
+    "version" : "0.6.1",
     "homepage" : "http://github.com/ifandelse/postal.js",
     "repository" : {
         "type" : "git",

diff --git a/lib/node/diags/postal.diagnostics.js b/lib/node/diags/postal.diagnostics.js
@@ -5,7 +5,10 @@ module.exports = function ( _, postal ) {
 			_.each( filter, function ( item, key ) {
 				if ( env[key] ) {
 					possible++;
-					if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
+					if ( _.isRegExp( item ) && item.test( env[key] ) ) {
+						match++;
+					}
+					else if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
 						if ( applyFilter( item, env[key] ) ) {
 							match++;
 						}

diff --git a/lib/standard/postal.diagnostics.js b/lib/standard/postal.diagnostics.js
@@ -8,7 +8,10 @@
 			_.each( filter, function ( item, key ) {
 				if ( env[key] ) {
 					possible++;
-					if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
+					if ( _.isRegExp( item ) && item.test( env[key] ) ) {
+						match++;
+					}
+					else if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
 						if ( applyFilter( item, env[key] ) ) {
 							match++;
 						}

diff --git a/lib/standard/postal.diagnostics.min.js b/lib/standard/postal.diagnostics.min.js
diff --git a/src/diags/postal.diagnostics.js b/src/diags/postal.diagnostics.js
@@ -4,7 +4,10 @@ var filters = [],
 		_.each( filter, function ( item, key ) {
 			if ( env[key] ) {
 				possible++;
-				if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
+				if ( _.isRegExp( item ) && item.test( env[key] ) ) {
+					match++;
+				}
+				else if ( _.isObject( env[key] ) && !_.isArray( env[key] ) ) {
 					if ( applyFilter( item, env[key] ) ) {
 						match++;
 					}