From be9ca57c463bbc317e046261f328a7b27de951d0 Mon Sep 17 00:00:00 2001
From: Jim Cowart <ashbylane@gmail.com>
Date: Thu, 1 Mar 2012 03:42:33 -0500
Subject: [PATCH] Updated build artifacts

---
 example/amd/js/libs/postal/postal.js          | 146 ++++++++----------
 example/standard/js/postal.js                 | 146 ++++++++----------
 lib/browser/amd/postal.diagnostics.min.gz.js  | Bin 243 -> 243 bytes
 lib/browser/amd/postal.js                     | 146 ++++++++----------
 lib/browser/amd/postal.min.gz.js              | Bin 1663 -> 1543 bytes
 lib/browser/amd/postal.min.js                 |   2 +-
 .../standard/postal.diagnostics.min.gz.js     | Bin 220 -> 220 bytes
 lib/browser/standard/postal.js                | 146 ++++++++----------
 lib/browser/standard/postal.min.gz.js         | Bin 1651 -> 1516 bytes
 lib/browser/standard/postal.min.js            |   2 +-
 lib/node/postal.js                            | 146 ++++++++----------
 11 files changed, 342 insertions(+), 392 deletions(-)

diff --git a/example/amd/js/libs/postal/postal.js b/example/amd/js/libs/postal/postal.js
index c2e46ad..5d49000 100644
--- a/example/amd/js/libs/postal/postal.js
+++ b/example/amd/js/libs/postal/postal.js
@@ -10,39 +10,7 @@ var DEFAULT_EXCHANGE = "/",
     DEFAULT_PRIORITY = 50,
     DEFAULT_DISPOSEAFTER = 0,
     SYSTEM_EXCHANGE = "postal",
-    NO_OP = function() { },
-    parsePublishArgs = function(args) {
-        var parsed = { envelope: { } }, env;
-        switch(args.length) {
-            case 3:
-                if(typeof args[1] === "Object" && typeof args[2] === "Object") {
-                    parsed.envelope.exchange = DEFAULT_EXCHANGE;
-                    parsed.envelope.topic = args[0];
-                    parsed.payload = args[1];
-                    env = parsed.envelope;
-                    parsed.envelope = _.extend(env, args[2]);
-                }
-                else {
-                    parsed.envelope.exchange = args[0];
-                    parsed.envelope.topic = args[1];
-                    parsed.payload = args[2];
-                }
-                break;
-            case 4:
-                parsed.envelope.exchange = args[0];
-                parsed.envelope.topic = args[1];
-                parsed.payload = args[2];
-                env = parsed.envelope;
-                parsed.envelope = _.extend(env, args[3]);
-                break;
-            default:
-                parsed.envelope.exchange = DEFAULT_EXCHANGE;
-                parsed.envelope.topic = args[0];
-                parsed.payload = args[1];
-                break;
-        }
-        return parsed;
-    };
+    NO_OP = function() { };
 
 var DistinctPredicate = function() {
     var previous;
@@ -73,12 +41,11 @@ ChannelDefinition.prototype = {
     },
 
     publish: function(data, envelope) {
-        var env = _.extend({
-            exchange: this.exchange,
-            timeStamp: new Date(),
-            topic: this.topic
-        }, envelope);
-        postal.configuration.bus.publish(data, env);
+        var env = envelope || {};
+	    env.exchange = this.exchange;
+	    env.timeStamp = new Date();
+	    env.topic = this.topic;
+        postal.configuration.bus.publish(env, data);
     }
 };
 
@@ -87,12 +54,15 @@ var SubscriptionDefinition = function(exchange, topic, callback) {
     this.topic = topic;
     this.callback = callback;
     this.priority = DEFAULT_PRIORITY;
-    this.constraints = [];
+    this.constraints = new Array(0);
     this.maxCalls = DEFAULT_DISPOSEAFTER;
     this.onHandled = NO_OP;
     this.context = null;
 
-    postal.publish(SYSTEM_EXCHANGE, "subscription.created",
+    postal.publish({
+		    exchange: SYSTEM_EXCHANGE,
+		    topic: "subscription.created"
+	    },
         {
             event: "subscription.created",
             exchange: exchange,
@@ -103,7 +73,10 @@ var SubscriptionDefinition = function(exchange, topic, callback) {
 SubscriptionDefinition.prototype = {
     unsubscribe: function() {
         postal.configuration.bus.unsubscribe(this);
-        postal.publish(SYSTEM_EXCHANGE, "subscription.removed",
+        postal.publish({
+		        exchange: SYSTEM_EXCHANGE,
+	            topic: "subscription.removed"
+            },
             {
                 event: "subscription.removed",
                 exchange: this.exchange,
@@ -215,7 +188,10 @@ var bindingsResolver = {
         if(this.cache[topic] && this.cache[topic][binding]) {
             return true;
         }
-        var rgx = new RegExp("^" + this.regexify(binding) + "$"), // match from start to end of string
+	    //  binding.replace(/\./g,"\\.")             // escape actual periods
+	    //         .replace(/\*/g, ".*")             // asterisks match any value
+	    //         .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
+        var rgx = new RegExp("^" + binding.replace(/\./g,"\\.").replace(/\*/g, ".*").replace(/#/g, "[A-Z,a-z,0-9]*") + "$"),
             result = rgx.test(topic);
         if(result) {
             if(!this.cache[topic]) {
@@ -224,12 +200,6 @@ var bindingsResolver = {
             this.cache[topic][binding] = true;
         }
         return result;
-    },
-
-    regexify: function(binding) {
-        return binding.replace(/\./g,"\\.") // escape actual periods
-                      .replace(/\*/g, ".*") // asterisks match any value
-                      .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
     }
 };
 
@@ -237,10 +207,12 @@ var localBus = {
 
 	subscriptions: {},
 
-	wireTaps: [],
+	wireTaps: new Array(0),
 
-	publish: function(data, envelope) {
-		this.notifyTaps(data, envelope);
+	publish: function(envelope, data) {
+		_.each(this.wireTaps,function(tap) {
+			tap(envelope, data);
+		});
 
 		_.each(this.subscriptions[envelope.exchange], function(topic) {
 			_.each(topic, function(binding){
@@ -257,10 +229,15 @@ var localBus = {
 	},
 
 	subscribe: function(subDef) {
-		var idx, found, fn, exch, subs;
+		var idx, found, fn, exch = this.subscriptions[subDef.exchange], subs;
 
-		exch = this.subscriptions[subDef.exchange] = this.subscriptions[subDef.exchange] || {};
-		subs = this.subscriptions[subDef.exchange][subDef.topic] = this.subscriptions[subDef.exchange][subDef.topic] || [];
+		if(!exch) {
+			exch = this.subscriptions[subDef.exchange] = {};
+		}
+		subs = this.subscriptions[subDef.exchange][subDef.topic]
+		if(!subs) {
+			subs = this.subscriptions[subDef.exchange][subDef.topic] = new Array(0);
+		}
 
 		idx = subs.length - 1;
 		//if(!_.any(subs, function(cfg) { return cfg === subDef; })) {
@@ -277,12 +254,6 @@ var localBus = {
 		//}
 	},
 
-	notifyTaps: function(data, envelope) {
-		_.each(this.wireTaps,function(tap) {
-			tap(data, envelope);
-		});
-	},
-
 	unsubscribe: function(config) {
 		if(this.subscriptions[config.exchange][config.topic]) {
 			var len = this.subscriptions[config.exchange][config.topic].length,
@@ -308,30 +279,42 @@ var localBus = {
 	}
 };
 
+var publishPicker = {
+	"2" : function(envelope, payload) {
+		if(!envelope.exchange) {
+			envelope.exchange = DEFAULT_EXCHANGE;
+		}
+		postal.configuration.bus.publish(envelope, payload);
+	},
+	"3" : function(exchange, topic, payload) {
+		postal.configuration.bus.publish({ exchange: exchange, topic: topic }, payload);
+	}
+};
+
 var postal = {
 	configuration: {
 		bus: localBus,
 		resolver: bindingsResolver
 	},
 
-	channel: function(exchange, topic) {
-		var exch = topic ? exchange : DEFAULT_EXCHANGE,
-			tpc = topic || exchange;
+	channel: function(options) {
+		var exch = options.exchange || DEFAULT_EXCHANGE,
+			tpc = options.topic;
 		return new ChannelDefinition(exch, tpc);
 	},
 
-	subscribe: function(exchange, topic, callback) {
-		var callbk = callback || topic,
-			tpc = callback ? topic : exchange,
-			exch = callback ? exchange : DEFAULT_EXCHANGE;
-		var channel = this.channel(exch, tpc);
-		return channel.subscribe(callbk);
+	subscribe: function(options) {
+		var callback = options.callback,
+			topic = options.topic,
+			exchange = options.exchange || DEFAULT_EXCHANGE;
+		return new ChannelDefinition(exchange, topic).subscribe(callback);
 	},
 
-	publish: function(exchange, topic, payload, envelopeOptions) {
-		var parsedArgs = parsePublishArgs([].slice.call(arguments,0));
-		var channel = this.channel(parsedArgs.envelope.exchange, parsedArgs.envelope.topic);
-		channel.publish(parsedArgs.payload, parsedArgs.envelope);
+	publish: function() {
+		var len = arguments.length;
+		if(publishPicker[len]) {
+			publishPicker[len].apply(this, arguments);
+		}
 	},
 
 	addWireTap: function(callback) {
@@ -339,21 +322,28 @@ var postal = {
 	},
 
 	bindExchanges: function(sources, destinations) {
-		var subscriptions = [];
+		var subscriptions;
 		if(!_.isArray(sources)) {
 			sources = [sources];
 		}
 		if(!_.isArray(destinations)) {
 			destinations = [destinations];
 		}
+		subscriptions = new Array(sources.length * destinations.length);
 		_.each(sources, function(source){
 			var sourceTopic = source.topic || "*";
 			_.each(destinations, function(destination) {
 				var destExchange = destination.exchange || DEFAULT_EXCHANGE;
 				subscriptions.push(
-					postal.subscribe(source.exchange || DEFAULT_EXCHANGE, source.topic || "*", function(msg, env) {
-						var destTopic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic;
-						postal.publish(destExchange, destTopic, msg);
+					postal.subscribe({
+							exchange: source.exchange || DEFAULT_EXCHANGE,
+							topic: source.topic || "*",
+							callback : function(msg, env) {
+								var newEnv = env;
+								newEnv.topic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic;
+								newEnv.exchange = destExchange;
+								postal.publish(newEnv, msg);
+							}
 					})
 				);
 			});
diff --git a/example/standard/js/postal.js b/example/standard/js/postal.js
index 4fc5ba3..be4fc1c 100644
--- a/example/standard/js/postal.js
+++ b/example/standard/js/postal.js
@@ -10,39 +10,7 @@ var DEFAULT_EXCHANGE = "/",
     DEFAULT_PRIORITY = 50,
     DEFAULT_DISPOSEAFTER = 0,
     SYSTEM_EXCHANGE = "postal",
-    NO_OP = function() { },
-    parsePublishArgs = function(args) {
-        var parsed = { envelope: { } }, env;
-        switch(args.length) {
-            case 3:
-                if(typeof args[1] === "Object" && typeof args[2] === "Object") {
-                    parsed.envelope.exchange = DEFAULT_EXCHANGE;
-                    parsed.envelope.topic = args[0];
-                    parsed.payload = args[1];
-                    env = parsed.envelope;
-                    parsed.envelope = _.extend(env, args[2]);
-                }
-                else {
-                    parsed.envelope.exchange = args[0];
-                    parsed.envelope.topic = args[1];
-                    parsed.payload = args[2];
-                }
-                break;
-            case 4:
-                parsed.envelope.exchange = args[0];
-                parsed.envelope.topic = args[1];
-                parsed.payload = args[2];
-                env = parsed.envelope;
-                parsed.envelope = _.extend(env, args[3]);
-                break;
-            default:
-                parsed.envelope.exchange = DEFAULT_EXCHANGE;
-                parsed.envelope.topic = args[0];
-                parsed.payload = args[1];
-                break;
-        }
-        return parsed;
-    };
+    NO_OP = function() { };
 
 var DistinctPredicate = function() {
     var previous;
@@ -73,12 +41,11 @@ ChannelDefinition.prototype = {
     },
 
     publish: function(data, envelope) {
-        var env = _.extend({
-            exchange: this.exchange,
-            timeStamp: new Date(),
-            topic: this.topic
-        }, envelope);
-        postal.configuration.bus.publish(data, env);
+        var env = envelope || {};
+	    env.exchange = this.exchange;
+	    env.timeStamp = new Date();
+	    env.topic = this.topic;
+        postal.configuration.bus.publish(env, data);
     }
 };
 
@@ -87,12 +54,15 @@ var SubscriptionDefinition = function(exchange, topic, callback) {
     this.topic = topic;
     this.callback = callback;
     this.priority = DEFAULT_PRIORITY;
-    this.constraints = [];
+    this.constraints = new Array(0);
     this.maxCalls = DEFAULT_DISPOSEAFTER;
     this.onHandled = NO_OP;
     this.context = null;
 
-    postal.publish(SYSTEM_EXCHANGE, "subscription.created",
+    postal.publish({
+		    exchange: SYSTEM_EXCHANGE,
+		    topic: "subscription.created"
+	    },
         {
             event: "subscription.created",
             exchange: exchange,
@@ -103,7 +73,10 @@ var SubscriptionDefinition = function(exchange, topic, callback) {
 SubscriptionDefinition.prototype = {
     unsubscribe: function() {
         postal.configuration.bus.unsubscribe(this);
-        postal.publish(SYSTEM_EXCHANGE, "subscription.removed",
+        postal.publish({
+		        exchange: SYSTEM_EXCHANGE,
+	            topic: "subscription.removed"
+            },
             {
                 event: "subscription.removed",
                 exchange: this.exchange,
@@ -215,7 +188,10 @@ var bindingsResolver = {
         if(this.cache[topic] && this.cache[topic][binding]) {
             return true;
         }
-        var rgx = new RegExp("^" + this.regexify(binding) + "$"), // match from start to end of string
+	    //  binding.replace(/\./g,"\\.")             // escape actual periods
+	    //         .replace(/\*/g, ".*")             // asterisks match any value
+	    //         .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
+        var rgx = new RegExp("^" + binding.replace(/\./g,"\\.").replace(/\*/g, ".*").replace(/#/g, "[A-Z,a-z,0-9]*") + "$"),
             result = rgx.test(topic);
         if(result) {
             if(!this.cache[topic]) {
@@ -224,12 +200,6 @@ var bindingsResolver = {
             this.cache[topic][binding] = true;
         }
         return result;
-    },
-
-    regexify: function(binding) {
-        return binding.replace(/\./g,"\\.") // escape actual periods
-                      .replace(/\*/g, ".*") // asterisks match any value
-                      .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
     }
 };
 
@@ -237,10 +207,12 @@ var localBus = {
 
 	subscriptions: {},
 
-	wireTaps: [],
+	wireTaps: new Array(0),
 
-	publish: function(data, envelope) {
-		this.notifyTaps(data, envelope);
+	publish: function(envelope, data) {
+		_.each(this.wireTaps,function(tap) {
+			tap(envelope, data);
+		});
 
 		_.each(this.subscriptions[envelope.exchange], function(topic) {
 			_.each(topic, function(binding){
@@ -257,10 +229,15 @@ var localBus = {
 	},
 
 	subscribe: function(subDef) {
-		var idx, found, fn, exch, subs;
+		var idx, found, fn, exch = this.subscriptions[subDef.exchange], subs;
 
-		exch = this.subscriptions[subDef.exchange] = this.subscriptions[subDef.exchange] || {};
-		subs = this.subscriptions[subDef.exchange][subDef.topic] = this.subscriptions[subDef.exchange][subDef.topic] || [];
+		if(!exch) {
+			exch = this.subscriptions[subDef.exchange] = {};
+		}
+		subs = this.subscriptions[subDef.exchange][subDef.topic]
+		if(!subs) {
+			subs = this.subscriptions[subDef.exchange][subDef.topic] = new Array(0);
+		}
 
 		idx = subs.length - 1;
 		//if(!_.any(subs, function(cfg) { return cfg === subDef; })) {
@@ -277,12 +254,6 @@ var localBus = {
 		//}
 	},
 
-	notifyTaps: function(data, envelope) {
-		_.each(this.wireTaps,function(tap) {
-			tap(data, envelope);
-		});
-	},
-
 	unsubscribe: function(config) {
 		if(this.subscriptions[config.exchange][config.topic]) {
 			var len = this.subscriptions[config.exchange][config.topic].length,
@@ -308,30 +279,42 @@ var localBus = {
 	}
 };
 
+var publishPicker = {
+	"2" : function(envelope, payload) {
+		if(!envelope.exchange) {
+			envelope.exchange = DEFAULT_EXCHANGE;
+		}
+		postal.configuration.bus.publish(envelope, payload);
+	},
+	"3" : function(exchange, topic, payload) {
+		postal.configuration.bus.publish({ exchange: exchange, topic: topic }, payload);
+	}
+};
+
 var postal = {
 	configuration: {
 		bus: localBus,
 		resolver: bindingsResolver
 	},
 
-	channel: function(exchange, topic) {
-		var exch = topic ? exchange : DEFAULT_EXCHANGE,
-			tpc = topic || exchange;
+	channel: function(options) {
+		var exch = options.exchange || DEFAULT_EXCHANGE,
+			tpc = options.topic;
 		return new ChannelDefinition(exch, tpc);
 	},
 
-	subscribe: function(exchange, topic, callback) {
-		var callbk = callback || topic,
-			tpc = callback ? topic : exchange,
-			exch = callback ? exchange : DEFAULT_EXCHANGE;
-		var channel = this.channel(exch, tpc);
-		return channel.subscribe(callbk);
+	subscribe: function(options) {
+		var callback = options.callback,
+			topic = options.topic,
+			exchange = options.exchange || DEFAULT_EXCHANGE;
+		return new ChannelDefinition(exchange, topic).subscribe(callback);
 	},
 
-	publish: function(exchange, topic, payload, envelopeOptions) {
-		var parsedArgs = parsePublishArgs([].slice.call(arguments,0));
-		var channel = this.channel(parsedArgs.envelope.exchange, parsedArgs.envelope.topic);
-		channel.publish(parsedArgs.payload, parsedArgs.envelope);
+	publish: function() {
+		var len = arguments.length;
+		if(publishPicker[len]) {
+			publishPicker[len].apply(this, arguments);
+		}
 	},
 
 	addWireTap: function(callback) {
@@ -339,21 +322,28 @@ var postal = {
 	},
 
 	bindExchanges: function(sources, destinations) {
-		var subscriptions = [];
+		var subscriptions;
 		if(!_.isArray(sources)) {
 			sources = [sources];
 		}
 		if(!_.isArray(destinations)) {
 			destinations = [destinations];
 		}
+		subscriptions = new Array(sources.length * destinations.length);
 		_.each(sources, function(source){
 			var sourceTopic = source.topic || "*";
 			_.each(destinations, function(destination) {
 				var destExchange = destination.exchange || DEFAULT_EXCHANGE;
 				subscriptions.push(
-					postal.subscribe(source.exchange || DEFAULT_EXCHANGE, source.topic || "*", function(msg, env) {
-						var destTopic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic;
-						postal.publish(destExchange, destTopic, msg);
+					postal.subscribe({
+							exchange: source.exchange || DEFAULT_EXCHANGE,
+							topic: source.topic || "*",
+							callback : function(msg, env) {
+								var newEnv = env;
+								newEnv.topic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic;
+								newEnv.exchange = destExchange;
+								postal.publish(newEnv, msg);
+							}
 					})
 				);
 			});
diff --git a/lib/browser/amd/postal.diagnostics.min.gz.js b/lib/browser/amd/postal.diagnostics.min.gz.js
index a1b9e18b41b3f8e5caec41b2c8ba4d16c8a44f8a..f79dcd20efdac79eead92ebe5c8dfa40fbc28564 100644
GIT binary patch
delta 15
Wcmey&_?eMizMF#~-^_m^`x^i#^aUCK

delta 15
Wcmey&_?eMizMF%AmCJh~`x^iyj0AuH

diff --git a/lib/browser/amd/postal.js b/lib/browser/amd/postal.js
index c2e46ad..5d49000 100644
--- a/lib/browser/amd/postal.js
+++ b/lib/browser/amd/postal.js
@@ -10,39 +10,7 @@ var DEFAULT_EXCHANGE = "/",
     DEFAULT_PRIORITY = 50,
     DEFAULT_DISPOSEAFTER = 0,
     SYSTEM_EXCHANGE = "postal",
-    NO_OP = function() { },
-    parsePublishArgs = function(args) {
-        var parsed = { envelope: { } }, env;
-        switch(args.length) {
-            case 3:
-                if(typeof args[1] === "Object" && typeof args[2] === "Object") {
-                    parsed.envelope.exchange = DEFAULT_EXCHANGE;
-                    parsed.envelope.topic = args[0];
-                    parsed.payload = args[1];
-                    env = parsed.envelope;
-                    parsed.envelope = _.extend(env, args[2]);
-                }
-                else {
-                    parsed.envelope.exchange = args[0];
-                    parsed.envelope.topic = args[1];
-                    parsed.payload = args[2];
-                }
-                break;
-            case 4:
-                parsed.envelope.exchange = args[0];
-                parsed.envelope.topic = args[1];
-                parsed.payload = args[2];
-                env = parsed.envelope;
-                parsed.envelope = _.extend(env, args[3]);
-                break;
-            default:
-                parsed.envelope.exchange = DEFAULT_EXCHANGE;
-                parsed.envelope.topic = args[0];
-                parsed.payload = args[1];
-                break;
-        }
-        return parsed;
-    };
+    NO_OP = function() { };
 
 var DistinctPredicate = function() {
     var previous;
@@ -73,12 +41,11 @@ ChannelDefinition.prototype = {
     },
 
     publish: function(data, envelope) {
-        var env = _.extend({
-            exchange: this.exchange,
-            timeStamp: new Date(),
-            topic: this.topic
-        }, envelope);
-        postal.configuration.bus.publish(data, env);
+        var env = envelope || {};
+	    env.exchange = this.exchange;
+	    env.timeStamp = new Date();
+	    env.topic = this.topic;
+        postal.configuration.bus.publish(env, data);
     }
 };
 
@@ -87,12 +54,15 @@ var SubscriptionDefinition = function(exchange, topic, callback) {
     this.topic = topic;
     this.callback = callback;
     this.priority = DEFAULT_PRIORITY;
-    this.constraints = [];
+    this.constraints = new Array(0);
     this.maxCalls = DEFAULT_DISPOSEAFTER;
     this.onHandled = NO_OP;
     this.context = null;
 
-    postal.publish(SYSTEM_EXCHANGE, "subscription.created",
+    postal.publish({
+		    exchange: SYSTEM_EXCHANGE,
+		    topic: "subscription.created"
+	    },
         {
             event: "subscription.created",
             exchange: exchange,
@@ -103,7 +73,10 @@ var SubscriptionDefinition = function(exchange, topic, callback) {
 SubscriptionDefinition.prototype = {
     unsubscribe: function() {
         postal.configuration.bus.unsubscribe(this);
-        postal.publish(SYSTEM_EXCHANGE, "subscription.removed",
+        postal.publish({
+		        exchange: SYSTEM_EXCHANGE,
+	            topic: "subscription.removed"
+            },
             {
                 event: "subscription.removed",
                 exchange: this.exchange,
@@ -215,7 +188,10 @@ var bindingsResolver = {
         if(this.cache[topic] && this.cache[topic][binding]) {
             return true;
         }
-        var rgx = new RegExp("^" + this.regexify(binding) + "$"), // match from start to end of string
+	    //  binding.replace(/\./g,"\\.")             // escape actual periods
+	    //         .replace(/\*/g, ".*")             // asterisks match any value
+	    //         .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
+        var rgx = new RegExp("^" + binding.replace(/\./g,"\\.").replace(/\*/g, ".*").replace(/#/g, "[A-Z,a-z,0-9]*") + "$"),
             result = rgx.test(topic);
         if(result) {
             if(!this.cache[topic]) {
@@ -224,12 +200,6 @@ var bindingsResolver = {
             this.cache[topic][binding] = true;
         }
         return result;
-    },
-
-    regexify: function(binding) {
-        return binding.replace(/\./g,"\\.") // escape actual periods
-                      .replace(/\*/g, ".*") // asterisks match any value
-                      .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
     }
 };
 
@@ -237,10 +207,12 @@ var localBus = {
 
 	subscriptions: {},
 
-	wireTaps: [],
+	wireTaps: new Array(0),
 
-	publish: function(data, envelope) {
-		this.notifyTaps(data, envelope);
+	publish: function(envelope, data) {
+		_.each(this.wireTaps,function(tap) {
+			tap(envelope, data);
+		});
 
 		_.each(this.subscriptions[envelope.exchange], function(topic) {
 			_.each(topic, function(binding){
@@ -257,10 +229,15 @@ var localBus = {
 	},
 
 	subscribe: function(subDef) {
-		var idx, found, fn, exch, subs;
+		var idx, found, fn, exch = this.subscriptions[subDef.exchange], subs;
 
-		exch = this.subscriptions[subDef.exchange] = this.subscriptions[subDef.exchange] || {};
-		subs = this.subscriptions[subDef.exchange][subDef.topic] = this.subscriptions[subDef.exchange][subDef.topic] || [];
+		if(!exch) {
+			exch = this.subscriptions[subDef.exchange] = {};
+		}
+		subs = this.subscriptions[subDef.exchange][subDef.topic]
+		if(!subs) {
+			subs = this.subscriptions[subDef.exchange][subDef.topic] = new Array(0);
+		}
 
 		idx = subs.length - 1;
 		//if(!_.any(subs, function(cfg) { return cfg === subDef; })) {
@@ -277,12 +254,6 @@ var localBus = {
 		//}
 	},
 
-	notifyTaps: function(data, envelope) {
-		_.each(this.wireTaps,function(tap) {
-			tap(data, envelope);
-		});
-	},
-
 	unsubscribe: function(config) {
 		if(this.subscriptions[config.exchange][config.topic]) {
 			var len = this.subscriptions[config.exchange][config.topic].length,
@@ -308,30 +279,42 @@ var localBus = {
 	}
 };
 
+var publishPicker = {
+	"2" : function(envelope, payload) {
+		if(!envelope.exchange) {
+			envelope.exchange = DEFAULT_EXCHANGE;
+		}
+		postal.configuration.bus.publish(envelope, payload);
+	},
+	"3" : function(exchange, topic, payload) {
+		postal.configuration.bus.publish({ exchange: exchange, topic: topic }, payload);
+	}
+};
+
 var postal = {
 	configuration: {
 		bus: localBus,
 		resolver: bindingsResolver
 	},
 
-	channel: function(exchange, topic) {
-		var exch = topic ? exchange : DEFAULT_EXCHANGE,
-			tpc = topic || exchange;
+	channel: function(options) {
+		var exch = options.exchange || DEFAULT_EXCHANGE,
+			tpc = options.topic;
 		return new ChannelDefinition(exch, tpc);
 	},
 
-	subscribe: function(exchange, topic, callback) {
-		var callbk = callback || topic,
-			tpc = callback ? topic : exchange,
-			exch = callback ? exchange : DEFAULT_EXCHANGE;
-		var channel = this.channel(exch, tpc);
-		return channel.subscribe(callbk);
+	subscribe: function(options) {
+		var callback = options.callback,
+			topic = options.topic,
+			exchange = options.exchange || DEFAULT_EXCHANGE;
+		return new ChannelDefinition(exchange, topic).subscribe(callback);
 	},
 
-	publish: function(exchange, topic, payload, envelopeOptions) {
-		var parsedArgs = parsePublishArgs([].slice.call(arguments,0));
-		var channel = this.channel(parsedArgs.envelope.exchange, parsedArgs.envelope.topic);
-		channel.publish(parsedArgs.payload, parsedArgs.envelope);
+	publish: function() {
+		var len = arguments.length;
+		if(publishPicker[len]) {
+			publishPicker[len].apply(this, arguments);
+		}
 	},
 
 	addWireTap: function(callback) {
@@ -339,21 +322,28 @@ var postal = {
 	},
 
 	bindExchanges: function(sources, destinations) {
-		var subscriptions = [];
+		var subscriptions;
 		if(!_.isArray(sources)) {
 			sources = [sources];
 		}
 		if(!_.isArray(destinations)) {
 			destinations = [destinations];
 		}
+		subscriptions = new Array(sources.length * destinations.length);
 		_.each(sources, function(source){
 			var sourceTopic = source.topic || "*";
 			_.each(destinations, function(destination) {
 				var destExchange = destination.exchange || DEFAULT_EXCHANGE;
 				subscriptions.push(
-					postal.subscribe(source.exchange || DEFAULT_EXCHANGE, source.topic || "*", function(msg, env) {
-						var destTopic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic;
-						postal.publish(destExchange, destTopic, msg);
+					postal.subscribe({
+							exchange: source.exchange || DEFAULT_EXCHANGE,
+							topic: source.topic || "*",
+							callback : function(msg, env) {
+								var newEnv = env;
+								newEnv.topic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic;
+								newEnv.exchange = destExchange;
+								postal.publish(newEnv, msg);
+							}
 					})
 				);
 			});
diff --git a/lib/browser/amd/postal.min.gz.js b/lib/browser/amd/postal.min.gz.js
index 6d503d28a633eec99f122b5c3d4b3be5f0dc6572..df515675f07a9907230e3562c06b38941aa2cb20 100644
GIT binary patch
literal 1543
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

literal 1663
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
JaUxC=004}4H8KDI

diff --git a/lib/browser/amd/postal.min.js b/lib/browser/amd/postal.min.js
index 0059a3e..1a12081 100644
--- a/lib/browser/amd/postal.min.js
+++ b/lib/browser/amd/postal.min.js
@@ -1 +1 @@
-define(["underscore"],function(a){var b="/",c=50,d=0,e="postal",f=function(){},g=function(c){var d={envelope:{}},e;switch(c.length){case 3:typeof c[1]=="Object"&&typeof c[2]=="Object"?(d.envelope.exchange=b,d.envelope.topic=c[0],d.payload=c[1],e=d.envelope,d.envelope=a.extend(e,c[2])):(d.envelope.exchange=c[0],d.envelope.topic=c[1],d.payload=c[2]);break;case 4:d.envelope.exchange=c[0],d.envelope.topic=c[1],d.payload=c[2],e=d.envelope,d.envelope=a.extend(e,c[3]);break;default:d.envelope.exchange=b,d.envelope.topic=c[0],d.payload=c[1]}return d},h=function(){var b;return function(c){var d=!1;return a.isString(c)?(d=c===b,b=c):(d=a.isEqual(c,b),b=a.clone(c)),!d}},i=function(a,b){this.exchange=a,this.topic=b};i.prototype={subscribe:function(a){var b=new j(this.exchange,this.topic,a);return m.configuration.bus.subscribe(b),b},publish:function(b,c){var d=a.extend({exchange:this.exchange,timeStamp:new Date,topic:this.topic},c);m.configuration.bus.publish(b,d)}};var j=function(a,b,g){this.exchange=a,this.topic=b,this.callback=g,this.priority=c,this.constraints=[],this.maxCalls=d,this.onHandled=f,this.context=null,m.publish(e,"subscription.created",{event:"subscription.created",exchange:a,topic:b})};j.prototype={unsubscribe:function(){m.configuration.bus.unsubscribe(this),m.publish(e,"subscription.removed",{event:"subscription.removed",exchange:this.exchange,topic:this.topic})},defer:function(){var a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(b){if(a.isNaN(b)||b<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var c=this.onHandled,d=a.after(b,a.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){c.apply(this.context,arguments),d()},this},ignoreDuplicates:function(){return this.withConstraint(new h),this},whenHandledThenExecute:function(b){if(!a.isFunction(b))throw"Value provided to 'whenHandledThenExecute' must be a function";return this.onHandled=b,this},withConstraint:function(b){if(!a.isFunction(b))throw"Predicate constraint must be a function";return this.constraints.push(b),this},withConstraints:function(b){var c=this;return a.isArray(b)&&a.each(b,function(a){c.withConstraint(a)}),c},withContext:function(a){return this.context=a,this},withDebounce:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.debounce(c,b),this},withDelay:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=function(a){setTimeout(c,b,a)},this},withPriority:function(b){if(a.isNaN(b))throw"Priority must be a number";return this.priority=b,this},withThrottle:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.throttle(c,b),this}};var k={cache:{},compare:function(a,b){if(this.cache[b]&&this.cache[b][a])return!0;var c=new RegExp("^"+this.regexify(a)+"$"),d=c.test(b);return d&&(this.cache[b]||(this.cache[b]={}),this.cache[b][a]=!0),d},regexify:function(a){return a.replace(/\./g,"\\.").replace(/\*/g,".*").replace(/#/g,"[A-Z,a-z,0-9]*")}},l={subscriptions:{},wireTaps:[],publish:function(b,c){this.notifyTaps(b,c),a.each(this.subscriptions[c.exchange],function(d){a.each(d,function(d){m.configuration.resolver.compare(d.topic,c.topic)&&a.all(d.constraints,function(a){return a(b)})&&typeof d.callback=="function"&&(d.callback.apply(d.context,[b,c]),d.onHandled())})})},subscribe:function(a){var b,c,d,e,f;e=this.subscriptions[a.exchange]=this.subscriptions[a.exchange]||{},f=this.subscriptions[a.exchange][a.topic]=this.subscriptions[a.exchange][a.topic]||[],b=f.length-1;for(;b>=0;b--)if(f[b].priority<=a.priority){f.splice(b+1,0,a),c=!0;break}c||f.unshift(a)},notifyTaps:function(b,c){a.each(this.wireTaps,function(a){a(b,c)})},unsubscribe:function(a){if(this.subscriptions[a.exchange][a.topic]){var b=this.subscriptions[a.exchange][a.topic].length,c=0;for(;c<b;c++)if(this.subscriptions[a.exchange][a.topic][c]===a){this.subscriptions[a.exchange][a.topic].splice(c,1);break}}},addWireTap:function(a){var b=this;return b.wireTaps.push(a),function(){var c=b.wireTaps.indexOf(a);c!==-1&&b.wireTaps.splice(c,1)}}},m={configuration:{bus:l,resolver:k},channel:function(a,c){var d=c?a:b,e=c||a;return new i(d,e)},subscribe:function(a,c,d){var e=d||c,f=d?c:a,g=d?a:b,h=this.channel(g,f);return h.subscribe(e)},publish:function(a,b,c,d){var e=g([].slice.call(arguments,0)),f=this.channel(e.envelope.exchange,e.envelope.topic);f.publish(e.payload,e.envelope)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},bindExchanges:function(c,d){var e=[];return a.isArray(c)||(c=[c]),a.isArray(d)||(d=[d]),a.each(c,function(c){var f=c.topic||"*";a.each(d,function(d){var f=d.exchange||b;e.push(m.subscribe(c.exchange||b,c.topic||"*",function(b,c){var e=a.isFunction(d.topic)?d.topic(c.topic):d.topic||c.topic;m.publish(f,e,b)}))})}),e}};return m})
\ No newline at end of file
+define(["underscore"],function(a){var b="/",c=50,d=0,e="postal",f=function(){},g=function(){var b;return function(c){var d=!1;return a.isString(c)?(d=c===b,b=c):(d=a.isEqual(c,b),b=a.clone(c)),!d}},h=function(a,b){this.exchange=a,this.topic=b};h.prototype={subscribe:function(a){var b=new i(this.exchange,this.topic,a);return m.configuration.bus.subscribe(b),b},publish:function(a,b){var c=b||{};c.exchange=this.exchange,c.timeStamp=new Date,c.topic=this.topic,m.configuration.bus.publish(c,a)}};var i=function(a,b,g){this.exchange=a,this.topic=b,this.callback=g,this.priority=c,this.constraints=new Array(0),this.maxCalls=d,this.onHandled=f,this.context=null,m.publish({exchange:e,topic:"subscription.created"},{event:"subscription.created",exchange:a,topic:b})};i.prototype={unsubscribe:function(){m.configuration.bus.unsubscribe(this),m.publish({exchange:e,topic:"subscription.removed"},{event:"subscription.removed",exchange:this.exchange,topic:this.topic})},defer:function(){var a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(b){if(a.isNaN(b)||b<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var c=this.onHandled,d=a.after(b,a.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){c.apply(this.context,arguments),d()},this},ignoreDuplicates:function(){return this.withConstraint(new g),this},whenHandledThenExecute:function(b){if(!a.isFunction(b))throw"Value provided to 'whenHandledThenExecute' must be a function";return this.onHandled=b,this},withConstraint:function(b){if(!a.isFunction(b))throw"Predicate constraint must be a function";return this.constraints.push(b),this},withConstraints:function(b){var c=this;return a.isArray(b)&&a.each(b,function(a){c.withConstraint(a)}),c},withContext:function(a){return this.context=a,this},withDebounce:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.debounce(c,b),this},withDelay:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=function(a){setTimeout(c,b,a)},this},withPriority:function(b){if(a.isNaN(b))throw"Priority must be a number";return this.priority=b,this},withThrottle:function(b){if(a.isNaN(b))throw"Milliseconds must be a number";var c=this.callback;return this.callback=a.throttle(c,b),this}};var j={cache:{},compare:function(a,b){if(this.cache[b]&&this.cache[b][a])return!0;var c=new RegExp("^"+a.replace(/\./g,"\\.").replace(/\*/g,".*").replace(/#/g,"[A-Z,a-z,0-9]*")+"$"),d=c.test(b);return d&&(this.cache[b]||(this.cache[b]={}),this.cache[b][a]=!0),d}},k={subscriptions:{},wireTaps:new Array(0),publish:function(b,c){a.each(this.wireTaps,function(a){a(b,c)}),a.each(this.subscriptions[b.exchange],function(d){a.each(d,function(d){m.configuration.resolver.compare(d.topic,b.topic)&&a.all(d.constraints,function(a){return a(c)})&&typeof d.callback=="function"&&(d.callback.apply(d.context,[c,b]),d.onHandled())})})},subscribe:function(a){var b,c,d,e=this.subscriptions[a.exchange],f;e||(e=this.subscriptions[a.exchange]={}),f=this.subscriptions[a.exchange][a.topic],f||(f=this.subscriptions[a.exchange][a.topic]=new Array(0)),b=f.length-1;for(;b>=0;b--)if(f[b].priority<=a.priority){f.splice(b+1,0,a),c=!0;break}c||f.unshift(a)},unsubscribe:function(a){if(this.subscriptions[a.exchange][a.topic]){var b=this.subscriptions[a.exchange][a.topic].length,c=0;for(;c<b;c++)if(this.subscriptions[a.exchange][a.topic][c]===a){this.subscriptions[a.exchange][a.topic].splice(c,1);break}}},addWireTap:function(a){var b=this;return b.wireTaps.push(a),function(){var c=b.wireTaps.indexOf(a);c!==-1&&b.wireTaps.splice(c,1)}}},l={2:function(a,c){a.exchange||(a.exchange=b),m.configuration.bus.publish(a,c)},3:function(a,b,c){m.configuration.bus.publish({exchange:a,topic:b},c)}},m={configuration:{bus:k,resolver:j},channel:function(a){var c=a.exchange||b,d=a.topic;return new h(c,d)},subscribe:function(a){var c=a.callback,d=a.topic,e=a.exchange||b;return(new h(e,d)).subscribe(c)},publish:function(){var a=arguments.length;l[a]&&l[a].apply(this,arguments)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},bindExchanges:function(c,d){var e;return a.isArray(c)||(c=[c]),a.isArray(d)||(d=[d]),e=new Array(c.length*d.length),a.each(c,function(c){var f=c.topic||"*";a.each(d,function(d){var f=d.exchange||b;e.push(m.subscribe({exchange:c.exchange||b,topic:c.topic||"*",callback:function(b,c){var e=c;e.topic=a.isFunction(d.topic)?d.topic(c.topic):d.topic||c.topic,e.exchange=f,m.publish(e,b)}}))})}),e}};return m})
\ No newline at end of file
diff --git a/lib/browser/standard/postal.diagnostics.min.gz.js b/lib/browser/standard/postal.diagnostics.min.gz.js
index 5ff2ec4505ba81dba7ff0707ada4eef394a1d932..14b20d441d0ad69fbb1d762e232dcea3f36b7733 100644
GIT binary patch
delta 15
Wcmcb^c!!Z)zMF#~&&+=!`&9rYQv}oi

delta 15
Wcmcb^c!!Z)zMF%Ah0A*)`&9rU>jXLg

diff --git a/lib/browser/standard/postal.js b/lib/browser/standard/postal.js
index 4fc5ba3..be4fc1c 100644
--- a/lib/browser/standard/postal.js
+++ b/lib/browser/standard/postal.js
@@ -10,39 +10,7 @@ var DEFAULT_EXCHANGE = "/",
     DEFAULT_PRIORITY = 50,
     DEFAULT_DISPOSEAFTER = 0,
     SYSTEM_EXCHANGE = "postal",
-    NO_OP = function() { },
-    parsePublishArgs = function(args) {
-        var parsed = { envelope: { } }, env;
-        switch(args.length) {
-            case 3:
-                if(typeof args[1] === "Object" && typeof args[2] === "Object") {
-                    parsed.envelope.exchange = DEFAULT_EXCHANGE;
-                    parsed.envelope.topic = args[0];
-                    parsed.payload = args[1];
-                    env = parsed.envelope;
-                    parsed.envelope = _.extend(env, args[2]);
-                }
-                else {
-                    parsed.envelope.exchange = args[0];
-                    parsed.envelope.topic = args[1];
-                    parsed.payload = args[2];
-                }
-                break;
-            case 4:
-                parsed.envelope.exchange = args[0];
-                parsed.envelope.topic = args[1];
-                parsed.payload = args[2];
-                env = parsed.envelope;
-                parsed.envelope = _.extend(env, args[3]);
-                break;
-            default:
-                parsed.envelope.exchange = DEFAULT_EXCHANGE;
-                parsed.envelope.topic = args[0];
-                parsed.payload = args[1];
-                break;
-        }
-        return parsed;
-    };
+    NO_OP = function() { };
 
 var DistinctPredicate = function() {
     var previous;
@@ -73,12 +41,11 @@ ChannelDefinition.prototype = {
     },
 
     publish: function(data, envelope) {
-        var env = _.extend({
-            exchange: this.exchange,
-            timeStamp: new Date(),
-            topic: this.topic
-        }, envelope);
-        postal.configuration.bus.publish(data, env);
+        var env = envelope || {};
+	    env.exchange = this.exchange;
+	    env.timeStamp = new Date();
+	    env.topic = this.topic;
+        postal.configuration.bus.publish(env, data);
     }
 };
 
@@ -87,12 +54,15 @@ var SubscriptionDefinition = function(exchange, topic, callback) {
     this.topic = topic;
     this.callback = callback;
     this.priority = DEFAULT_PRIORITY;
-    this.constraints = [];
+    this.constraints = new Array(0);
     this.maxCalls = DEFAULT_DISPOSEAFTER;
     this.onHandled = NO_OP;
     this.context = null;
 
-    postal.publish(SYSTEM_EXCHANGE, "subscription.created",
+    postal.publish({
+		    exchange: SYSTEM_EXCHANGE,
+		    topic: "subscription.created"
+	    },
         {
             event: "subscription.created",
             exchange: exchange,
@@ -103,7 +73,10 @@ var SubscriptionDefinition = function(exchange, topic, callback) {
 SubscriptionDefinition.prototype = {
     unsubscribe: function() {
         postal.configuration.bus.unsubscribe(this);
-        postal.publish(SYSTEM_EXCHANGE, "subscription.removed",
+        postal.publish({
+		        exchange: SYSTEM_EXCHANGE,
+	            topic: "subscription.removed"
+            },
             {
                 event: "subscription.removed",
                 exchange: this.exchange,
@@ -215,7 +188,10 @@ var bindingsResolver = {
         if(this.cache[topic] && this.cache[topic][binding]) {
             return true;
         }
-        var rgx = new RegExp("^" + this.regexify(binding) + "$"), // match from start to end of string
+	    //  binding.replace(/\./g,"\\.")             // escape actual periods
+	    //         .replace(/\*/g, ".*")             // asterisks match any value
+	    //         .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
+        var rgx = new RegExp("^" + binding.replace(/\./g,"\\.").replace(/\*/g, ".*").replace(/#/g, "[A-Z,a-z,0-9]*") + "$"),
             result = rgx.test(topic);
         if(result) {
             if(!this.cache[topic]) {
@@ -224,12 +200,6 @@ var bindingsResolver = {
             this.cache[topic][binding] = true;
         }
         return result;
-    },
-
-    regexify: function(binding) {
-        return binding.replace(/\./g,"\\.") // escape actual periods
-                      .replace(/\*/g, ".*") // asterisks match any value
-                      .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
     }
 };
 
@@ -237,10 +207,12 @@ var localBus = {
 
 	subscriptions: {},
 
-	wireTaps: [],
+	wireTaps: new Array(0),
 
-	publish: function(data, envelope) {
-		this.notifyTaps(data, envelope);
+	publish: function(envelope, data) {
+		_.each(this.wireTaps,function(tap) {
+			tap(envelope, data);
+		});
 
 		_.each(this.subscriptions[envelope.exchange], function(topic) {
 			_.each(topic, function(binding){
@@ -257,10 +229,15 @@ var localBus = {
 	},
 
 	subscribe: function(subDef) {
-		var idx, found, fn, exch, subs;
+		var idx, found, fn, exch = this.subscriptions[subDef.exchange], subs;
 
-		exch = this.subscriptions[subDef.exchange] = this.subscriptions[subDef.exchange] || {};
-		subs = this.subscriptions[subDef.exchange][subDef.topic] = this.subscriptions[subDef.exchange][subDef.topic] || [];
+		if(!exch) {
+			exch = this.subscriptions[subDef.exchange] = {};
+		}
+		subs = this.subscriptions[subDef.exchange][subDef.topic]
+		if(!subs) {
+			subs = this.subscriptions[subDef.exchange][subDef.topic] = new Array(0);
+		}
 
 		idx = subs.length - 1;
 		//if(!_.any(subs, function(cfg) { return cfg === subDef; })) {
@@ -277,12 +254,6 @@ var localBus = {
 		//}
 	},
 
-	notifyTaps: function(data, envelope) {
-		_.each(this.wireTaps,function(tap) {
-			tap(data, envelope);
-		});
-	},
-
 	unsubscribe: function(config) {
 		if(this.subscriptions[config.exchange][config.topic]) {
 			var len = this.subscriptions[config.exchange][config.topic].length,
@@ -308,30 +279,42 @@ var localBus = {
 	}
 };
 
+var publishPicker = {
+	"2" : function(envelope, payload) {
+		if(!envelope.exchange) {
+			envelope.exchange = DEFAULT_EXCHANGE;
+		}
+		postal.configuration.bus.publish(envelope, payload);
+	},
+	"3" : function(exchange, topic, payload) {
+		postal.configuration.bus.publish({ exchange: exchange, topic: topic }, payload);
+	}
+};
+
 var postal = {
 	configuration: {
 		bus: localBus,
 		resolver: bindingsResolver
 	},
 
-	channel: function(exchange, topic) {
-		var exch = topic ? exchange : DEFAULT_EXCHANGE,
-			tpc = topic || exchange;
+	channel: function(options) {
+		var exch = options.exchange || DEFAULT_EXCHANGE,
+			tpc = options.topic;
 		return new ChannelDefinition(exch, tpc);
 	},
 
-	subscribe: function(exchange, topic, callback) {
-		var callbk = callback || topic,
-			tpc = callback ? topic : exchange,
-			exch = callback ? exchange : DEFAULT_EXCHANGE;
-		var channel = this.channel(exch, tpc);
-		return channel.subscribe(callbk);
+	subscribe: function(options) {
+		var callback = options.callback,
+			topic = options.topic,
+			exchange = options.exchange || DEFAULT_EXCHANGE;
+		return new ChannelDefinition(exchange, topic).subscribe(callback);
 	},
 
-	publish: function(exchange, topic, payload, envelopeOptions) {
-		var parsedArgs = parsePublishArgs([].slice.call(arguments,0));
-		var channel = this.channel(parsedArgs.envelope.exchange, parsedArgs.envelope.topic);
-		channel.publish(parsedArgs.payload, parsedArgs.envelope);
+	publish: function() {
+		var len = arguments.length;
+		if(publishPicker[len]) {
+			publishPicker[len].apply(this, arguments);
+		}
 	},
 
 	addWireTap: function(callback) {
@@ -339,21 +322,28 @@ var postal = {
 	},
 
 	bindExchanges: function(sources, destinations) {
-		var subscriptions = [];
+		var subscriptions;
 		if(!_.isArray(sources)) {
 			sources = [sources];
 		}
 		if(!_.isArray(destinations)) {
 			destinations = [destinations];
 		}
+		subscriptions = new Array(sources.length * destinations.length);
 		_.each(sources, function(source){
 			var sourceTopic = source.topic || "*";
 			_.each(destinations, function(destination) {
 				var destExchange = destination.exchange || DEFAULT_EXCHANGE;
 				subscriptions.push(
-					postal.subscribe(source.exchange || DEFAULT_EXCHANGE, source.topic || "*", function(msg, env) {
-						var destTopic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic;
-						postal.publish(destExchange, destTopic, msg);
+					postal.subscribe({
+							exchange: source.exchange || DEFAULT_EXCHANGE,
+							topic: source.topic || "*",
+							callback : function(msg, env) {
+								var newEnv = env;
+								newEnv.topic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic;
+								newEnv.exchange = destExchange;
+								postal.publish(newEnv, msg);
+							}
 					})
 				);
 			});
diff --git a/lib/browser/standard/postal.min.gz.js b/lib/browser/standard/postal.min.gz.js
index e82d604fcafc278635b1330c0da65e2c7ac2dc44..1b07ad7c97404363fb637d45ddb1ccc4c4955db6 100644
GIT binary patch
literal 1516
zcmV<I1rz!oiwFR1Hcw9g1HD*XbDTC5{VSMuHpteJbvu11M9pLpcly#a(|FpMZd{Kf
z#4a%l1ccWP%YW|`2oM;r-Iu)BE9vU$=-f}?gk{2IlqL?v3{|%@w>Yt1+BhITt*{^~
z91=TA3rS-eZ%8kVsv2+2q1s9PT*xv{tbV>%d2-&ZUAs~7QRY#yfz{UzCyWq6F(nLn
zFjC7GUrHJ~3{wQt*DjCKM1U~DC%mq4M8=rqHY!|k$G0@u2+-7wWtv5xy7nVC%Tt-k
z`%I9kC|SYthzV~{(IR9d5qs;iGg4-#0xaDH5|^h*7;Va&Dh)0x3%6GcFfprfR<bxM
zw%#1O>~N@RpAV47XL46YJMmG{UDjZFM`bhFT*v@42SXq0D7ba)tMfjO*uwlcU+sX?
zIA)aJ5Z;cnJWBIO-jhJDr%54m8YQx5Ail|Sdhe`IySk%yZ$UvpG=FLG8%=^(1Z2~1
zm*P&6q>N*@MhCj;FnJ+v;CQyCHES-&a{*KYc8x1>D-!w0GVaw-t%lX8_CK3`P$n~;
zfT}r44bjFq(EmW3i(PvAIO1-3Ks@ojM&)20xCRbHC~|KacVuL?&QZs<G-I+5@)DdZ
zEhRX`3S6^pECcGJ0)kz<38i@o#7Go6Dl*^G_b@sf=qs{9a+{}n`*JI+TN;<b0)lU&
zKm?XdEmM)@bS{CcU0Fzr35!}uxnr=lY0Q=bSejU0MV`90-v;E^d9X?iRH*~V*Di~a
zz%giOgdf<dy%s_vMh1U0_A{4eS$yx94vJ~MDR*EuFgka7j-pMH=HgwM#SsVSg=r1*
zoP8v>Z~I7bRG@5;*0JA;4h8U+T-*s>N-<^pL{a|hFsB*+>jB#@=JmZW=<Zb8k8nXd
zWFyqiMD!sSK|_W$q=qNYHnIpr6oeB+vlxn*WUb`Pg3@LniWZA&S5OYRu(^p%jREPg
z$<umTS$lNK1ZR`3OorYGmV&r=JVrD#zeh2o3IRHT;(_yzJpFj|Ub}%lvaO3Il$hRs
zGaUUne3V516O@+Pfb~Jwj3<$Gf-|U01bq!M&2R}Cq>R6%8KgeaFhg5tZ%D<#^MnVT
z5l?p+&Bdhr12C-(#MbO;u^0{4^a{0yo~-<~RZuzOPqDeU%N+Y(`;0=#$YKgU@bZ)U
za)a$ppIjRmlc#FZJvHaPQ&a0V%YQIke#NWh&sVT~W`A!ZXz`$}5CvGTPmsZ4F~)c}
zjK`#^5uU;(Cs6wXXwBlj#cC>Cp}5#bxwxcR;f*?l`36Y`uTG!sK5V)iZ{z@iDLFcF
zP5T0RHQK6o@X_S7;^(4B<6Dut+JX-6+Q0UHlVHFZVBSbycqVmFN8tn$L&K4V79V_w
z*nK_(wuc2>fp}kj*5G1SP<n<e?I6&p+JGaCEao`Cx~V+Ej4!~nPl+|w4xbQOYi>X(
zsC>5csB?s5OhPvn$wqFM=YE*xj?aD}E1xZw2;wFLN9$9-D?<C<s0!UeRbmLpvvcTW
zASmIr0UM#OxT*Q!5URFd8--2M$FrRu9b)ro+-3=ShPb{IfLgWJ;;)#`&(6^EPh108
z@I=y0&NGhGgm8S0G!GD)Gzk7~L+Xio%KFgj%kre(gonZ)1C5xt`y&J~pPvx2JYOt~
zRRf9wu_M(Flb9cF0NyhU2uDYsI87eFKYG*G&9Obz%+o-Xtr{ngyv=Q11^c`hclp4(
z0YTWBh<JuQ^9m4sL>r=iFoL5;P%nbxfeYKZR50j(NFHg|I-ORh0G(*`_?&rqc5j5f
zo7FDq?;v$A7V59j{2EQ~qdqg~jwWmmo0^DIo%)5oKr!<m4(9qe<qAX<L_EwgHOmNO
z0#&+(>_PQ?PMQAESBG&Es16eyuZM$uYWrG_;pqnp0UmC$9<-s57+f39G%|ndSmrUf
zGpl)fu5VA2^7i#T>aCeBIIs1Ot`Z@Sb*j7C6bwNljMr(<d<1AKhN{j!WX<M74oPa{
S?7=MQ9{mR{bQntj5&!_J?9u!H

literal 1651
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

diff --git a/lib/browser/standard/postal.min.js b/lib/browser/standard/postal.min.js
index de9c0f8..44245e5 100644
--- a/lib/browser/standard/postal.min.js
+++ b/lib/browser/standard/postal.min.js
@@ -1 +1 @@
-(function(a,b){var c="/",d=50,e=0,f="postal",g=function(){},h=function(a){var b={envelope:{}},d;switch(a.length){case 3:typeof a[1]=="Object"&&typeof a[2]=="Object"?(b.envelope.exchange=c,b.envelope.topic=a[0],b.payload=a[1],d=b.envelope,b.envelope=_.extend(d,a[2])):(b.envelope.exchange=a[0],b.envelope.topic=a[1],b.payload=a[2]);break;case 4:b.envelope.exchange=a[0],b.envelope.topic=a[1],b.payload=a[2],d=b.envelope,b.envelope=_.extend(d,a[3]);break;default:b.envelope.exchange=c,b.envelope.topic=a[0],b.payload=a[1]}return b},i=function(){var a;return function(b){var c=!1;return _.isString(b)?(c=b===a,a=b):(c=_.isEqual(b,a),a=_.clone(b)),!c}},j=function(a,b){this.exchange=a,this.topic=b};j.prototype={subscribe:function(a){var b=new k(this.exchange,this.topic,a);return n.configuration.bus.subscribe(b),b},publish:function(a,b){var c=_.extend({exchange:this.exchange,timeStamp:new Date,topic:this.topic},b);n.configuration.bus.publish(a,c)}};var k=function(a,b,c){this.exchange=a,this.topic=b,this.callback=c,this.priority=d,this.constraints=[],this.maxCalls=e,this.onHandled=g,this.context=null,n.publish(f,"subscription.created",{event:"subscription.created",exchange:a,topic:b})};k.prototype={unsubscribe:function(){n.configuration.bus.unsubscribe(this),n.publish(f,"subscription.removed",{event:"subscription.removed",exchange:this.exchange,topic:this.topic})},defer:function(){var a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(a){if(_.isNaN(a)||a<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var b=this.onHandled,c=_.after(a,_.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){b.apply(this.context,arguments),c()},this},ignoreDuplicates:function(){return this.withConstraint(new i),this},whenHandledThenExecute:function(a){if(!_.isFunction(a))throw"Value provided to 'whenHandledThenExecute' must be a function";return this.onHandled=a,this},withConstraint:function(a){if(!_.isFunction(a))throw"Predicate constraint must be a function";return this.constraints.push(a),this},withConstraints:function(a){var b=this;return _.isArray(a)&&_.each(a,function(a){b.withConstraint(a)}),b},withContext:function(a){return this.context=a,this},withDebounce:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=_.debounce(b,a),this},withDelay:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=function(c){setTimeout(b,a,c)},this},withPriority:function(a){if(_.isNaN(a))throw"Priority must be a number";return this.priority=a,this},withThrottle:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=_.throttle(b,a),this}};var l={cache:{},compare:function(a,b){if(this.cache[b]&&this.cache[b][a])return!0;var c=new RegExp("^"+this.regexify(a)+"$"),d=c.test(b);return d&&(this.cache[b]||(this.cache[b]={}),this.cache[b][a]=!0),d},regexify:function(a){return a.replace(/\./g,"\\.").replace(/\*/g,".*").replace(/#/g,"[A-Z,a-z,0-9]*")}},m={subscriptions:{},wireTaps:[],publish:function(a,b){this.notifyTaps(a,b),_.each(this.subscriptions[b.exchange],function(c){_.each(c,function(c){n.configuration.resolver.compare(c.topic,b.topic)&&_.all(c.constraints,function(b){return b(a)})&&typeof c.callback=="function"&&(c.callback.apply(c.context,[a,b]),c.onHandled())})})},subscribe:function(a){var b,c,d,e,f;e=this.subscriptions[a.exchange]=this.subscriptions[a.exchange]||{},f=this.subscriptions[a.exchange][a.topic]=this.subscriptions[a.exchange][a.topic]||[],b=f.length-1;for(;b>=0;b--)if(f[b].priority<=a.priority){f.splice(b+1,0,a),c=!0;break}c||f.unshift(a)},notifyTaps:function(a,b){_.each(this.wireTaps,function(c){c(a,b)})},unsubscribe:function(a){if(this.subscriptions[a.exchange][a.topic]){var b=this.subscriptions[a.exchange][a.topic].length,c=0;for(;c<b;c++)if(this.subscriptions[a.exchange][a.topic][c]===a){this.subscriptions[a.exchange][a.topic].splice(c,1);break}}},addWireTap:function(a){var b=this;return b.wireTaps.push(a),function(){var c=b.wireTaps.indexOf(a);c!==-1&&b.wireTaps.splice(c,1)}}},n={configuration:{bus:m,resolver:l},channel:function(a,b){var d=b?a:c,e=b||a;return new j(d,e)},subscribe:function(a,b,d){var e=d||b,f=d?b:a,g=d?a:c,h=this.channel(g,f);return h.subscribe(e)},publish:function(a,b,c,d){var e=h([].slice.call(arguments,0)),f=this.channel(e.envelope.exchange,e.envelope.topic);f.publish(e.payload,e.envelope)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},bindExchanges:function(a,b){var d=[];return _.isArray(a)||(a=[a]),_.isArray(b)||(b=[b]),_.each(a,function(a){var e=a.topic||"*";_.each(b,function(b){var e=b.exchange||c;d.push(n.subscribe(a.exchange||c,a.topic||"*",function(a,c){var d=_.isFunction(b.topic)?b.topic(c.topic):b.topic||c.topic;n.publish(e,d,a)}))})}),d}};a.postal=n})(window)
\ No newline at end of file
+(function(a,b){var c="/",d=50,e=0,f="postal",g=function(){},h=function(){var a;return function(b){var c=!1;return _.isString(b)?(c=b===a,a=b):(c=_.isEqual(b,a),a=_.clone(b)),!c}},i=function(a,b){this.exchange=a,this.topic=b};i.prototype={subscribe:function(a){var b=new j(this.exchange,this.topic,a);return n.configuration.bus.subscribe(b),b},publish:function(a,b){var c=b||{};c.exchange=this.exchange,c.timeStamp=new Date,c.topic=this.topic,n.configuration.bus.publish(c,a)}};var j=function(a,b,c){this.exchange=a,this.topic=b,this.callback=c,this.priority=d,this.constraints=new Array(0),this.maxCalls=e,this.onHandled=g,this.context=null,n.publish({exchange:f,topic:"subscription.created"},{event:"subscription.created",exchange:a,topic:b})};j.prototype={unsubscribe:function(){n.configuration.bus.unsubscribe(this),n.publish({exchange:f,topic:"subscription.removed"},{event:"subscription.removed",exchange:this.exchange,topic:this.topic})},defer:function(){var a=this.callback;return this.callback=function(b){setTimeout(a,0,b)},this},disposeAfter:function(a){if(_.isNaN(a)||a<=0)throw"The value provided to disposeAfter (maxCalls) must be a number greater than zero.";var b=this.onHandled,c=_.after(a,_.bind(function(){this.unsubscribe(this)},this));return this.onHandled=function(){b.apply(this.context,arguments),c()},this},ignoreDuplicates:function(){return this.withConstraint(new h),this},whenHandledThenExecute:function(a){if(!_.isFunction(a))throw"Value provided to 'whenHandledThenExecute' must be a function";return this.onHandled=a,this},withConstraint:function(a){if(!_.isFunction(a))throw"Predicate constraint must be a function";return this.constraints.push(a),this},withConstraints:function(a){var b=this;return _.isArray(a)&&_.each(a,function(a){b.withConstraint(a)}),b},withContext:function(a){return this.context=a,this},withDebounce:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=_.debounce(b,a),this},withDelay:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=function(c){setTimeout(b,a,c)},this},withPriority:function(a){if(_.isNaN(a))throw"Priority must be a number";return this.priority=a,this},withThrottle:function(a){if(_.isNaN(a))throw"Milliseconds must be a number";var b=this.callback;return this.callback=_.throttle(b,a),this}};var k={cache:{},compare:function(a,b){if(this.cache[b]&&this.cache[b][a])return!0;var c=new RegExp("^"+a.replace(/\./g,"\\.").replace(/\*/g,".*").replace(/#/g,"[A-Z,a-z,0-9]*")+"$"),d=c.test(b);return d&&(this.cache[b]||(this.cache[b]={}),this.cache[b][a]=!0),d}},l={subscriptions:{},wireTaps:new Array(0),publish:function(a,b){_.each(this.wireTaps,function(c){c(a,b)}),_.each(this.subscriptions[a.exchange],function(c){_.each(c,function(c){n.configuration.resolver.compare(c.topic,a.topic)&&_.all(c.constraints,function(a){return a(b)})&&typeof c.callback=="function"&&(c.callback.apply(c.context,[b,a]),c.onHandled())})})},subscribe:function(a){var b,c,d,e=this.subscriptions[a.exchange],f;e||(e=this.subscriptions[a.exchange]={}),f=this.subscriptions[a.exchange][a.topic],f||(f=this.subscriptions[a.exchange][a.topic]=new Array(0)),b=f.length-1;for(;b>=0;b--)if(f[b].priority<=a.priority){f.splice(b+1,0,a),c=!0;break}c||f.unshift(a)},unsubscribe:function(a){if(this.subscriptions[a.exchange][a.topic]){var b=this.subscriptions[a.exchange][a.topic].length,c=0;for(;c<b;c++)if(this.subscriptions[a.exchange][a.topic][c]===a){this.subscriptions[a.exchange][a.topic].splice(c,1);break}}},addWireTap:function(a){var b=this;return b.wireTaps.push(a),function(){var c=b.wireTaps.indexOf(a);c!==-1&&b.wireTaps.splice(c,1)}}},m={2:function(a,b){a.exchange||(a.exchange=c),n.configuration.bus.publish(a,b)},3:function(a,b,c){n.configuration.bus.publish({exchange:a,topic:b},c)}},n={configuration:{bus:l,resolver:k},channel:function(a){var b=a.exchange||c,d=a.topic;return new i(b,d)},subscribe:function(a){var b=a.callback,d=a.topic,e=a.exchange||c;return(new i(e,d)).subscribe(b)},publish:function(){var a=arguments.length;m[a]&&m[a].apply(this,arguments)},addWireTap:function(a){return this.configuration.bus.addWireTap(a)},bindExchanges:function(a,b){var d;return _.isArray(a)||(a=[a]),_.isArray(b)||(b=[b]),d=new Array(a.length*b.length),_.each(a,function(a){var e=a.topic||"*";_.each(b,function(b){var e=b.exchange||c;d.push(n.subscribe({exchange:a.exchange||c,topic:a.topic||"*",callback:function(a,c){var d=c;d.topic=_.isFunction(b.topic)?b.topic(c.topic):b.topic||c.topic,d.exchange=e,n.publish(d,a)}}))})}),d}};a.postal=n})(window)
\ No newline at end of file
diff --git a/lib/node/postal.js b/lib/node/postal.js
index 5161cc9..01ef3bd 100644
--- a/lib/node/postal.js
+++ b/lib/node/postal.js
@@ -10,39 +10,7 @@ var DEFAULT_EXCHANGE = "/",
     DEFAULT_PRIORITY = 50,
     DEFAULT_DISPOSEAFTER = 0,
     SYSTEM_EXCHANGE = "postal",
-    NO_OP = function() { },
-    parsePublishArgs = function(args) {
-        var parsed = { envelope: { } }, env;
-        switch(args.length) {
-            case 3:
-                if(typeof args[1] === "Object" && typeof args[2] === "Object") {
-                    parsed.envelope.exchange = DEFAULT_EXCHANGE;
-                    parsed.envelope.topic = args[0];
-                    parsed.payload = args[1];
-                    env = parsed.envelope;
-                    parsed.envelope = _.extend(env, args[2]);
-                }
-                else {
-                    parsed.envelope.exchange = args[0];
-                    parsed.envelope.topic = args[1];
-                    parsed.payload = args[2];
-                }
-                break;
-            case 4:
-                parsed.envelope.exchange = args[0];
-                parsed.envelope.topic = args[1];
-                parsed.payload = args[2];
-                env = parsed.envelope;
-                parsed.envelope = _.extend(env, args[3]);
-                break;
-            default:
-                parsed.envelope.exchange = DEFAULT_EXCHANGE;
-                parsed.envelope.topic = args[0];
-                parsed.payload = args[1];
-                break;
-        }
-        return parsed;
-    };
+    NO_OP = function() { };
 
 var DistinctPredicate = function() {
     var previous;
@@ -73,12 +41,11 @@ ChannelDefinition.prototype = {
     },
 
     publish: function(data, envelope) {
-        var env = _.extend({
-            exchange: this.exchange,
-            timeStamp: new Date(),
-            topic: this.topic
-        }, envelope);
-        postal.configuration.bus.publish(data, env);
+        var env = envelope || {};
+	    env.exchange = this.exchange;
+	    env.timeStamp = new Date();
+	    env.topic = this.topic;
+        postal.configuration.bus.publish(env, data);
     }
 };
 
@@ -87,12 +54,15 @@ var SubscriptionDefinition = function(exchange, topic, callback) {
     this.topic = topic;
     this.callback = callback;
     this.priority = DEFAULT_PRIORITY;
-    this.constraints = [];
+    this.constraints = new Array(0);
     this.maxCalls = DEFAULT_DISPOSEAFTER;
     this.onHandled = NO_OP;
     this.context = null;
 
-    postal.publish(SYSTEM_EXCHANGE, "subscription.created",
+    postal.publish({
+		    exchange: SYSTEM_EXCHANGE,
+		    topic: "subscription.created"
+	    },
         {
             event: "subscription.created",
             exchange: exchange,
@@ -103,7 +73,10 @@ var SubscriptionDefinition = function(exchange, topic, callback) {
 SubscriptionDefinition.prototype = {
     unsubscribe: function() {
         postal.configuration.bus.unsubscribe(this);
-        postal.publish(SYSTEM_EXCHANGE, "subscription.removed",
+        postal.publish({
+		        exchange: SYSTEM_EXCHANGE,
+	            topic: "subscription.removed"
+            },
             {
                 event: "subscription.removed",
                 exchange: this.exchange,
@@ -215,7 +188,10 @@ var bindingsResolver = {
         if(this.cache[topic] && this.cache[topic][binding]) {
             return true;
         }
-        var rgx = new RegExp("^" + this.regexify(binding) + "$"), // match from start to end of string
+	    //  binding.replace(/\./g,"\\.")             // escape actual periods
+	    //         .replace(/\*/g, ".*")             // asterisks match any value
+	    //         .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
+        var rgx = new RegExp("^" + binding.replace(/\./g,"\\.").replace(/\*/g, ".*").replace(/#/g, "[A-Z,a-z,0-9]*") + "$"),
             result = rgx.test(topic);
         if(result) {
             if(!this.cache[topic]) {
@@ -224,12 +200,6 @@ var bindingsResolver = {
             this.cache[topic][binding] = true;
         }
         return result;
-    },
-
-    regexify: function(binding) {
-        return binding.replace(/\./g,"\\.") // escape actual periods
-                      .replace(/\*/g, ".*") // asterisks match any value
-                      .replace(/#/g, "[A-Z,a-z,0-9]*"); // hash matches any alpha-numeric 'word'
     }
 };
 
@@ -237,10 +207,12 @@ var localBus = {
 
 	subscriptions: {},
 
-	wireTaps: [],
+	wireTaps: new Array(0),
 
-	publish: function(data, envelope) {
-		this.notifyTaps(data, envelope);
+	publish: function(envelope, data) {
+		_.each(this.wireTaps,function(tap) {
+			tap(envelope, data);
+		});
 
 		_.each(this.subscriptions[envelope.exchange], function(topic) {
 			_.each(topic, function(binding){
@@ -257,10 +229,15 @@ var localBus = {
 	},
 
 	subscribe: function(subDef) {
-		var idx, found, fn, exch, subs;
+		var idx, found, fn, exch = this.subscriptions[subDef.exchange], subs;
 
-		exch = this.subscriptions[subDef.exchange] = this.subscriptions[subDef.exchange] || {};
-		subs = this.subscriptions[subDef.exchange][subDef.topic] = this.subscriptions[subDef.exchange][subDef.topic] || [];
+		if(!exch) {
+			exch = this.subscriptions[subDef.exchange] = {};
+		}
+		subs = this.subscriptions[subDef.exchange][subDef.topic]
+		if(!subs) {
+			subs = this.subscriptions[subDef.exchange][subDef.topic] = new Array(0);
+		}
 
 		idx = subs.length - 1;
 		//if(!_.any(subs, function(cfg) { return cfg === subDef; })) {
@@ -277,12 +254,6 @@ var localBus = {
 		//}
 	},
 
-	notifyTaps: function(data, envelope) {
-		_.each(this.wireTaps,function(tap) {
-			tap(data, envelope);
-		});
-	},
-
 	unsubscribe: function(config) {
 		if(this.subscriptions[config.exchange][config.topic]) {
 			var len = this.subscriptions[config.exchange][config.topic].length,
@@ -308,30 +279,42 @@ var localBus = {
 	}
 };
 
+var publishPicker = {
+	"2" : function(envelope, payload) {
+		if(!envelope.exchange) {
+			envelope.exchange = DEFAULT_EXCHANGE;
+		}
+		postal.configuration.bus.publish(envelope, payload);
+	},
+	"3" : function(exchange, topic, payload) {
+		postal.configuration.bus.publish({ exchange: exchange, topic: topic }, payload);
+	}
+};
+
 var postal = {
 	configuration: {
 		bus: localBus,
 		resolver: bindingsResolver
 	},
 
-	channel: function(exchange, topic) {
-		var exch = topic ? exchange : DEFAULT_EXCHANGE,
-			tpc = topic || exchange;
+	channel: function(options) {
+		var exch = options.exchange || DEFAULT_EXCHANGE,
+			tpc = options.topic;
 		return new ChannelDefinition(exch, tpc);
 	},
 
-	subscribe: function(exchange, topic, callback) {
-		var callbk = callback || topic,
-			tpc = callback ? topic : exchange,
-			exch = callback ? exchange : DEFAULT_EXCHANGE;
-		var channel = this.channel(exch, tpc);
-		return channel.subscribe(callbk);
+	subscribe: function(options) {
+		var callback = options.callback,
+			topic = options.topic,
+			exchange = options.exchange || DEFAULT_EXCHANGE;
+		return new ChannelDefinition(exchange, topic).subscribe(callback);
 	},
 
-	publish: function(exchange, topic, payload, envelopeOptions) {
-		var parsedArgs = parsePublishArgs([].slice.call(arguments,0));
-		var channel = this.channel(parsedArgs.envelope.exchange, parsedArgs.envelope.topic);
-		channel.publish(parsedArgs.payload, parsedArgs.envelope);
+	publish: function() {
+		var len = arguments.length;
+		if(publishPicker[len]) {
+			publishPicker[len].apply(this, arguments);
+		}
 	},
 
 	addWireTap: function(callback) {
@@ -339,21 +322,28 @@ var postal = {
 	},
 
 	bindExchanges: function(sources, destinations) {
-		var subscriptions = [];
+		var subscriptions;
 		if(!_.isArray(sources)) {
 			sources = [sources];
 		}
 		if(!_.isArray(destinations)) {
 			destinations = [destinations];
 		}
+		subscriptions = new Array(sources.length * destinations.length);
 		_.each(sources, function(source){
 			var sourceTopic = source.topic || "*";
 			_.each(destinations, function(destination) {
 				var destExchange = destination.exchange || DEFAULT_EXCHANGE;
 				subscriptions.push(
-					postal.subscribe(source.exchange || DEFAULT_EXCHANGE, source.topic || "*", function(msg, env) {
-						var destTopic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic;
-						postal.publish(destExchange, destTopic, msg);
+					postal.subscribe({
+							exchange: source.exchange || DEFAULT_EXCHANGE,
+							topic: source.topic || "*",
+							callback : function(msg, env) {
+								var newEnv = env;
+								newEnv.topic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic;
+								newEnv.exchange = destExchange;
+								postal.publish(newEnv, msg);
+							}
 					})
 				);
 			});