Updated build artifacts

example/amd/js/libs/postal/postal.js

@@ -35,9 +35,7 @@ var ChannelDefinition = function(exchange, topic) {
 
 ChannelDefinition.prototype = {
     subscribe: function(callback) {
-        var subscription = new SubscriptionDefinition(this.exchange, this.topic, callback);
-        postal.configuration.bus.subscribe(subscription);
-        return subscription;
+	    return postal.configuration.bus.subscribe(new SubscriptionDefinition(this.exchange, this.topic, callback));
     },
 
     publish: function(data, envelope) {
@@ -252,6 +250,7 @@ var localBus = {
 				subs.unshift(subDef);
 			}
 		//}
+		return subDef;
 	},
 
 	unsubscribe: function(config) {

example/standard/js/postal.js

@@ -35,9 +35,7 @@ var ChannelDefinition = function(exchange, topic) {
 
 ChannelDefinition.prototype = {
     subscribe: function(callback) {
-        var subscription = new SubscriptionDefinition(this.exchange, this.topic, callback);
-        postal.configuration.bus.subscribe(subscription);
-        return subscription;
+	    return postal.configuration.bus.subscribe(new SubscriptionDefinition(this.exchange, this.topic, callback));
     },
 
     publish: function(data, envelope) {
@@ -252,6 +250,7 @@ var localBus = {
 				subs.unshift(subDef);
 			}
 		//}
+		return subDef;
 	},
 
 	unsubscribe: function(config) {

lib/browser/amd/postal.js

@@ -35,9 +35,7 @@ var ChannelDefinition = function(exchange, topic) {
 
 ChannelDefinition.prototype = {
     subscribe: function(callback) {
-        var subscription = new SubscriptionDefinition(this.exchange, this.topic, callback);
-        postal.configuration.bus.subscribe(subscription);
-        return subscription;
+	    return postal.configuration.bus.subscribe(new SubscriptionDefinition(this.exchange, this.topic, callback));
     },
 
     publish: function(data, envelope) {
@@ -252,6 +250,7 @@ var localBus = {
 				subs.unshift(subDef);
 			}
 		//}
+		return subDef;
 	},
 
 	unsubscribe: function(config) {

lib/browser/amd/postal.min.js

@@ -1 +1 @@
-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})
+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){return m.configuration.bus.subscribe(new i(this.exchange,this.topic,a))},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}return c||f.unshift(a),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})

lib/browser/standard/postal.js

@@ -35,9 +35,7 @@ var ChannelDefinition = function(exchange, topic) {
 
 ChannelDefinition.prototype = {
     subscribe: function(callback) {
-        var subscription = new SubscriptionDefinition(this.exchange, this.topic, callback);
-        postal.configuration.bus.subscribe(subscription);
-        return subscription;
+	    return postal.configuration.bus.subscribe(new SubscriptionDefinition(this.exchange, this.topic, callback));
     },
 
     publish: function(data, envelope) {
@@ -252,6 +250,7 @@ var localBus = {
 				subs.unshift(subDef);
 			}
 		//}
+		return subDef;
 	},
 
 	unsubscribe: function(config) {

lib/browser/standard/postal.min.js

@@ -1 +1 @@
-(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)
+(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){return n.configuration.bus.subscribe(new j(this.exchange,this.topic,a))},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}return c||f.unshift(a),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)

lib/node/postal.js

@@ -35,9 +35,7 @@ var ChannelDefinition = function(exchange, topic) {
 
 ChannelDefinition.prototype = {
     subscribe: function(callback) {
-        var subscription = new SubscriptionDefinition(this.exchange, this.topic, callback);
-        postal.configuration.bus.subscribe(subscription);
-        return subscription;
+	    return postal.configuration.bus.subscribe(new SubscriptionDefinition(this.exchange, this.topic, callback));
     },
 
     publish: function(data, envelope) {
@@ -252,6 +250,7 @@ var localBus = {
 				subs.unshift(subDef);
 			}
 		//}
+		return subDef;
 	},
 
 	unsubscribe: function(config) {

src/main/ChannelDefinition.js

@@ -5,9 +5,7 @@ var ChannelDefinition = function(exchange, topic) {
 
 ChannelDefinition.prototype = {
     subscribe: function(callback) {
-        var subscription = new SubscriptionDefinition(this.exchange, this.topic, callback);
-        postal.configuration.bus.subscribe(subscription);
-        return subscription;
+	    return postal.configuration.bus.subscribe(new SubscriptionDefinition(this.exchange, this.topic, callback));
     },
 
     publish: function(data, envelope) {

src/main/LocalBus.js

@@ -47,6 +47,7 @@ var localBus = {
 				subs.unshift(subDef);
 			}
 		//}
+		return subDef;
 	},
 
 	unsubscribe: function(config) {