Hopiu/postal.js
1
0
Fork 0
mirror of https://github.com/Hopiu/postal.js.git synced 2026-05-20 12:51:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

initial pass for perf cleanup

Browse source
This commit is contained in:
Jim Cowart 2012-03-01 03:40:47 -05:00
parent c0f25ea4b4
commit e59d3ab07a
19 changed files with 171 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
example/amd/js/libs/postal/postal.js
View file

@ -315,15 +315,15 @@ var postal = {
}, },
channel: function(exchange, topic) { channel: function(exchange, topic) {
var exch = arguments.length === 2 ? exchange : DEFAULT_EXCHANGE, var exch = topic ? exchange : DEFAULT_EXCHANGE,
tpc = arguments.length === 2 ? topic : exchange; tpc = topic || exchange;
return new ChannelDefinition(exch, tpc); return new ChannelDefinition(exch, tpc);
}, },
subscribe: function(exchange, topic, callback) { subscribe: function(exchange, topic, callback) {
var exch = arguments.length === 3 ? exchange : DEFAULT_EXCHANGE, var callbk = callback || topic,
tpc = arguments.length === 3 ? topic : exchange, tpc = callback ? topic : exchange,
callbk = arguments.length === 3 ? callback : topic; exch = callback ? exchange : DEFAULT_EXCHANGE;
var channel = this.channel(exch, tpc); var channel = this.channel(exch, tpc);
return channel.subscribe(callbk); return channel.subscribe(callbk);
}, },

10
example/standard/js/postal.js
View file

@ -315,15 +315,15 @@ var postal = {
}, },
channel: function(exchange, topic) { channel: function(exchange, topic) {
var exch = arguments.length === 2 ? exchange : DEFAULT_EXCHANGE, var exch = topic ? exchange : DEFAULT_EXCHANGE,
tpc = arguments.length === 2 ? topic : exchange; tpc = topic || exchange;
return new ChannelDefinition(exch, tpc); return new ChannelDefinition(exch, tpc);
}, },
subscribe: function(exchange, topic, callback) { subscribe: function(exchange, topic, callback) {
var exch = arguments.length === 3 ? exchange : DEFAULT_EXCHANGE, var callbk = callback || topic,
tpc = arguments.length === 3 ? topic : exchange, tpc = callback ? topic : exchange,
callbk = arguments.length === 3 ? callback : topic; exch = callback ? exchange : DEFAULT_EXCHANGE;
var channel = this.channel(exch, tpc); var channel = this.channel(exch, tpc);
return channel.subscribe(callbk); return channel.subscribe(callbk);
}, },

BIN
lib/browser/amd/postal.diagnostics.min.gz.js
View file

Binary file not shown.

10
lib/browser/amd/postal.js
View file

@ -315,15 +315,15 @@ var postal = {
}, },
channel: function(exchange, topic) { channel: function(exchange, topic) {
var exch = arguments.length === 2 ? exchange : DEFAULT_EXCHANGE, var exch = topic ? exchange : DEFAULT_EXCHANGE,
tpc = arguments.length === 2 ? topic : exchange; tpc = topic || exchange;
return new ChannelDefinition(exch, tpc); return new ChannelDefinition(exch, tpc);
}, },
subscribe: function(exchange, topic, callback) { subscribe: function(exchange, topic, callback) {
var exch = arguments.length === 3 ? exchange : DEFAULT_EXCHANGE, var callbk = callback || topic,
tpc = arguments.length === 3 ? topic : exchange, tpc = callback ? topic : exchange,
callbk = arguments.length === 3 ? callback : topic; exch = callback ? exchange : DEFAULT_EXCHANGE;
var channel = this.channel(exch, tpc); var channel = this.channel(exch, tpc);
return channel.subscribe(callbk); return channel.subscribe(callbk);
}, },

BIN
lib/browser/amd/postal.min.gz.js
View file

Binary file not shown.

2
lib/browser/amd/postal.min.js vendored
View file

File diff suppressed because one or more lines are too long

BIN
lib/browser/standard/postal.diagnostics.min.gz.js
View file

Binary file not shown.

10
lib/browser/standard/postal.js
View file

@ -315,15 +315,15 @@ var postal = {
}, },
channel: function(exchange, topic) { channel: function(exchange, topic) {
var exch = arguments.length === 2 ? exchange : DEFAULT_EXCHANGE, var exch = topic ? exchange : DEFAULT_EXCHANGE,
tpc = arguments.length === 2 ? topic : exchange; tpc = topic || exchange;
return new ChannelDefinition(exch, tpc); return new ChannelDefinition(exch, tpc);
}, },
subscribe: function(exchange, topic, callback) { subscribe: function(exchange, topic, callback) {
var exch = arguments.length === 3 ? exchange : DEFAULT_EXCHANGE, var callbk = callback || topic,
tpc = arguments.length === 3 ? topic : exchange, tpc = callback ? topic : exchange,
callbk = arguments.length === 3 ? callback : topic; exch = callback ? exchange : DEFAULT_EXCHANGE;
var channel = this.channel(exch, tpc); var channel = this.channel(exch, tpc);
return channel.subscribe(callbk); return channel.subscribe(callbk);
}, },

BIN
lib/browser/standard/postal.min.gz.js
View file

Binary file not shown.

2
lib/browser/standard/postal.min.js vendored
View file

File diff suppressed because one or more lines are too long

10
lib/node/postal.js
View file

@ -315,15 +315,15 @@ var postal = {
}, },
channel: function(exchange, topic) { channel: function(exchange, topic) {
var exch = arguments.length === 2 ? exchange : DEFAULT_EXCHANGE, var exch = topic ? exchange : DEFAULT_EXCHANGE,
tpc = arguments.length === 2 ? topic : exchange; tpc = topic || exchange;
return new ChannelDefinition(exch, tpc); return new ChannelDefinition(exch, tpc);
}, },
subscribe: function(exchange, topic, callback) { subscribe: function(exchange, topic, callback) {
var exch = arguments.length === 3 ? exchange : DEFAULT_EXCHANGE, var callbk = callback || topic,
tpc = arguments.length === 3 ? topic : exchange, tpc = callback ? topic : exchange,
callbk = arguments.length === 3 ? callback : topic; exch = callback ? exchange : DEFAULT_EXCHANGE;
var channel = this.channel(exch, tpc); var channel = this.channel(exch, tpc);
return channel.subscribe(callbk); return channel.subscribe(callbk);
}, },

4
spec/BindingsResolver.spec.js
View file

@ -1,6 +1,6 @@
QUnit.specify("postal.js", function(){ QUnit.specify("postal.js", function(){
describe("bindingsResolver", function(){ describe("bindingsResolver", function(){
describe("When calling regexify", function() { /*describe("When calling regexify", function() {
describe("With a topic containing no special escape chars", function() { describe("With a topic containing no special escape chars", function() {
var result = bindingsResolver.regexify("CoolTopic"); var result = bindingsResolver.regexify("CoolTopic");
it("Should equal 'CoolTopic'", function(){ it("Should equal 'CoolTopic'", function(){
@ -43,7 +43,7 @@ QUnit.specify("postal.js", function(){
assert(result).equals("Top\\..*\\.Bottom"); assert(result).equals("Top\\..*\\.Bottom");
}); });
}); });
}); });*/
describe("When calling compare", function(){ describe("When calling compare", function(){
describe("With topic Top.Middle.Bottom and binding Top.Middle.Bottom", function(){ describe("With topic Top.Middle.Bottom and binding Top.Middle.Bottom", function(){
var result = bindingsResolver.compare("Top.Middle.Bottom", "Top.Middle.Bottom"), var result = bindingsResolver.compare("Top.Middle.Bottom", "Top.Middle.Bottom"),

122
spec/Postal.spec.js
View file

@ -10,16 +10,21 @@ QUnit.specify("postal.js", function(){
var systemSubscription = {}; var systemSubscription = {};
before(function(){ before(function(){
systemSubscription = postal.subscribe( "postal", "subscription.created", function(x){ systemSubscription = postal.subscribe({
console.log("on subscription " + JSON.stringify(x)); exchange: "postal",
if( x.event && topic: "subscription.created",
x.event == "subscription.created" && callback: function(x){
x.exchange == "MyExchange" && console.log("on subscription " + JSON.stringify(x));
x.topic == "MyTopic") { if( x.event &&
caughtSubscribeEvent = true; x.event == "subscription.created" &&
}; x.exchange == "MyExchange" &&
x.topic == "MyTopic") {
caughtSubscribeEvent = true;
};
}
}); });
subscription = postal.channel("MyExchange","MyTopic")
subscription = postal.channel({ exchange: "MyExchange", topic: "MyTopic" })
.subscribe(function() { }); .subscribe(function() { });
sub = postal.configuration.bus.subscriptions.MyExchange.MyTopic[0]; sub = postal.configuration.bus.subscriptions.MyExchange.MyTopic[0];
}); });
@ -60,16 +65,20 @@ QUnit.specify("postal.js", function(){
subExistsAfter = true; subExistsAfter = true;
var systemSubscription = {}; var systemSubscription = {};
before(function(){ before(function(){
systemSubscription = postal.subscribe( "postal", "subscription.*", function(x){ systemSubscription = postal.subscribe({
console.log("on unsubscription " + JSON.stringify(x)); exchange: "postal",
if( x.event && topic: "subscription.*",
x.event == "subscription.removed" && callback: function(x){
x.exchange == "MyExchange" && console.log("on unsubscription " + JSON.stringify(x));
x.topic == "MyTopic") { if( x.event &&
caughtUnsubscribeEvent = true; x.event == "subscription.removed" &&
}; x.exchange == "MyExchange" &&
x.topic == "MyTopic") {
caughtUnsubscribeEvent = true;
};
}
}); });
subscription = postal.channel("MyExchange","MyTopic") subscription = postal.channel({ exchange: "MyExchange", topic: "MyTopic" })
.subscribe(function() { }); .subscribe(function() { });
subExistsBefore = postal.configuration.bus.subscriptions.MyExchange.MyTopic[0] !== undefined; subExistsBefore = postal.configuration.bus.subscriptions.MyExchange.MyTopic[0] !== undefined;
subscription.unsubscribe(); subscription.unsubscribe();
@ -93,7 +102,7 @@ QUnit.specify("postal.js", function(){
var msgReceivedCnt = 0, var msgReceivedCnt = 0,
msgData; msgData;
before(function(){ before(function(){
channel = postal.channel("MyExchange","MyTopic") channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" })
subscription = channel.subscribe(function(data) { msgReceivedCnt++; msgData = data;}); subscription = channel.subscribe(function(data) { msgReceivedCnt++; msgData = data;});
channel.publish("Testing123"); channel.publish("Testing123");
subscription.unsubscribe(); subscription.unsubscribe();
@ -112,7 +121,7 @@ QUnit.specify("postal.js", function(){
describe("When subscribing with a disposeAfter of 5", function(){ describe("When subscribing with a disposeAfter of 5", function(){
var msgReceivedCnt = 0; var msgReceivedCnt = 0;
before(function(){ before(function(){
channel = postal.channel("MyExchange","MyTopic"); channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
subscription = channel.subscribe(function(data) { msgReceivedCnt++; }) subscription = channel.subscribe(function(data) { msgReceivedCnt++; })
.disposeAfter(5); .disposeAfter(5);
channel.publish("Testing123"); channel.publish("Testing123");
@ -132,7 +141,7 @@ QUnit.specify("postal.js", function(){
describe("When subscribing and ignoring duplicates", function(){ describe("When subscribing and ignoring duplicates", function(){
var subInvokedCnt = 0; var subInvokedCnt = 0;
before(function(){ before(function(){
channel = postal.channel("MyExchange", "MyTopic"); channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
subscription = channel.subscribe(function(data) { subInvokedCnt++; }) subscription = channel.subscribe(function(data) { subInvokedCnt++; })
.ignoreDuplicates(); .ignoreDuplicates();
channel.publish("Testing123"); channel.publish("Testing123");
@ -156,7 +165,7 @@ QUnit.specify("postal.js", function(){
describe("When subscribing and passing onHandled callback", function(){ describe("When subscribing and passing onHandled callback", function(){
var whte = false; var whte = false;
before(function(){ before(function(){
channel = postal.channel("MyExchange", "MyTopic"); channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
subscription = channel.subscribe(function(data) { }) subscription = channel.subscribe(function(data) { })
.whenHandledThenExecute(function() { whte = true; }); .whenHandledThenExecute(function() { whte = true; });
channel.publish("Testing123"); channel.publish("Testing123");
@ -175,7 +184,7 @@ QUnit.specify("postal.js", function(){
describe("When subscribing with one constraint returning true", function(){ describe("When subscribing with one constraint returning true", function(){
var recvd = false; var recvd = false;
before(function(){ before(function(){
channel = postal.channel("MyExchange", "MyTopic"); channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
subscription = channel.subscribe(function(data) { recvd= true; }) subscription = channel.subscribe(function(data) { recvd= true; })
.withConstraint(function() { return true; }); .withConstraint(function() { return true; });
channel.publish("Testing123"); channel.publish("Testing123");
@ -194,7 +203,7 @@ QUnit.specify("postal.js", function(){
describe("When subscribing with one constraint returning false", function(){ describe("When subscribing with one constraint returning false", function(){
var recvd = false; var recvd = false;
before(function(){ before(function(){
channel = postal.channel("MyExchange", "MyTopic"); channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
subscription = channel.subscribe(function(data) { recvd= true; }) subscription = channel.subscribe(function(data) { recvd= true; })
.withConstraint(function() { return false; }); .withConstraint(function() { return false; });
channel.publish("Testing123"); channel.publish("Testing123");
@ -213,7 +222,7 @@ QUnit.specify("postal.js", function(){
describe("When subscribing with multiple constraints returning true", function(){ describe("When subscribing with multiple constraints returning true", function(){
var recvd = false; var recvd = false;
before(function(){ before(function(){
channel = postal.channel("MyExchange", "MyTopic"); channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
subscription = channel.subscribe(function(data) { recvd= true; }) subscription = channel.subscribe(function(data) { recvd= true; })
.withConstraints([function() { return true; }, .withConstraints([function() { return true; },
function() { return true; }, function() { return true; },
@ -234,7 +243,7 @@ QUnit.specify("postal.js", function(){
describe("When subscribing with multiple constraints and one returning false", function(){ describe("When subscribing with multiple constraints and one returning false", function(){
var recvd = false; var recvd = false;
before(function(){ before(function(){
channel = postal.channel("MyExchange", "MyTopic"); channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
subscription = channel.subscribe(function(data) { recvd= true; }) subscription = channel.subscribe(function(data) { recvd= true; })
.withConstraints([function() { return true; }, .withConstraints([function() { return true; },
function() { return false; }, function() { return false; },
@ -260,7 +269,7 @@ QUnit.specify("postal.js", function(){
} }
}; };
before(function(){ before(function(){
channel = postal.channel("MyExchange", "MyTopic"); channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
subscription = channel.subscribe(function(data) { this.increment(); }) subscription = channel.subscribe(function(data) { this.increment(); })
.withContext(obj); .withContext(obj);
channel.publish("Testing123"); channel.publish("Testing123");
@ -275,9 +284,9 @@ QUnit.specify("postal.js", function(){
describe("When subscribing with a hierarchical binding, no wildcards", function(){ describe("When subscribing with a hierarchical binding, no wildcards", function(){
var count = 0, channelB, channelC; var count = 0, channelB, channelC;
before(function(){ before(function(){
channel = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic"); channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic" });
channelB = postal.channel("MyExchange", "MyTopic.MiddleTopic"); channelB = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic" });
channelC = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic.YetAnother"); channelC = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
subscription = channel.subscribe(function(data) { count++; }); subscription = channel.subscribe(function(data) { count++; });
channel.publish("Testing123"); channel.publish("Testing123");
channelB.publish("Testing123"); channelB.publish("Testing123");
@ -294,10 +303,10 @@ QUnit.specify("postal.js", function(){
describe("When subscribing with a hierarchical binding, using #", function(){ describe("When subscribing with a hierarchical binding, using #", function(){
var count = 0, channelB, channelC, channelD; var count = 0, channelB, channelC, channelD;
before(function(){ before(function(){
channel = postal.channel("MyExchange", "MyTopic.#.SubTopic"); channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic.#.SubTopic" });
channelB = postal.channel("MyExchange", "MyTopic.MiddleTopic"); channelB = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic" });
channelC = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic"); channelC = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic" });
channelD = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic.YetAnother"); channelD = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
subscription = channel.subscribe(function(data) { count++; }); subscription = channel.subscribe(function(data) { count++; });
channelC.publish({exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic", data: "Testing123"}); channelC.publish({exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic", data: "Testing123"});
channelB.publish({exchange: "MyExchange", topic: "MyTopic.MiddleTopic", data: "Testing123"}); channelB.publish({exchange: "MyExchange", topic: "MyTopic.MiddleTopic", data: "Testing123"});
@ -314,10 +323,10 @@ QUnit.specify("postal.js", function(){
describe("When subscribing with a hierarchical binding, using *", function(){ describe("When subscribing with a hierarchical binding, using *", function(){
var count = 0, channelB, channelC, channelD; var count = 0, channelB, channelC, channelD;
before(function(){ before(function(){
channel = postal.channel("MyExchange", "MyTopic.MiddleTopic.*"); channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.*" });
channelB = postal.channel("MyExchange", "MyTopic.MiddleTopic"); channelB = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic" });
channelC = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic"); channelC = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic" });
channelD = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic.YetAnother"); channelD = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
subscription = channel.subscribe(function(data) { count++; }); subscription = channel.subscribe(function(data) { count++; });
channelC.publish("Testing123"); channelC.publish("Testing123");
@ -335,11 +344,11 @@ QUnit.specify("postal.js", function(){
describe("When subscribing with a hierarchical binding, using # and *", function(){ describe("When subscribing with a hierarchical binding, using # and *", function(){
var count = 0, channelB, channelC, channelD, channelE; var count = 0, channelB, channelC, channelD, channelE;
before(function(){ before(function(){
channel = postal.channel("MyExchange", "MyTopic.#.*"); channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic.#.*" });
channelB = postal.channel("MyExchange", "MyTopic.MiddleTopic"); channelB = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic" });
channelC = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic"); channelC = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic" });
channelD = postal.channel("MyExchange", "MyTopic.MiddleTopic.SubTopic.YetAnother"); channelD = postal.channel({ exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic.YetAnother" });
channelE = postal.channel("MyExchange", "OtherTopic.MiddleTopic.SubTopic.YetAnother"); channelE = postal.channel({ exchange: "MyExchange", topic: "OtherTopic.MiddleTopic.SubTopic.YetAnother" });
subscription = channel.subscribe(function(data) { count++; }); subscription = channel.subscribe(function(data) { count++; });
channelC.publish({exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic", data: "Testing123"}); channelC.publish({exchange: "MyExchange", topic: "MyTopic.MiddleTopic.SubTopic", data: "Testing123"});
@ -359,7 +368,7 @@ QUnit.specify("postal.js", function(){
var msgReceivedCnt = 0, var msgReceivedCnt = 0,
msgData; msgData;
before(function(){ before(function(){
channel = postal.channel("MyExchange","MyTopic") channel = postal.channel({ exchange: "MyExchange", topic: "MyTopic" });
subscription = channel.subscribe(function(data) { msgReceivedCnt++; msgData = data;}); subscription = channel.subscribe(function(data) { msgReceivedCnt++; msgData = data;});
postal.publish("MyExchange", "MyTopic", "Testing123"); postal.publish("MyExchange", "MyTopic", "Testing123");
subscription.unsubscribe(); subscription.unsubscribe();
@ -377,7 +386,11 @@ QUnit.specify("postal.js", function(){
}); });
describe("When using shortcut subscribe api", function(){ describe("When using shortcut subscribe api", function(){
before(function(){ before(function(){
subscription = postal.subscribe("MyExchange", "MyTopic", function() { }); subscription = postal.subscribe({
exchange: "MyExchange",
topic: "MyTopic",
callback: function() { }
});
sub = postal.configuration.bus.subscriptions.MyExchange.MyTopic[0]; sub = postal.configuration.bus.subscriptions.MyExchange.MyTopic[0];
}); });
after(function(){ after(function(){
@ -409,18 +422,20 @@ QUnit.specify("postal.js", function(){
}); });
}); });
describe("when subscribing and unsubscribing a wire tap", function() { describe("when subscribing and unsubscribing a wire tap", function() {
var wireTapData = [], var wireTapData,
wireTapEnvelope = [], wireTapEnvelope,
wiretap; wiretap;
before(function(){ before(function(){
caughtUnsubscribeEvent = false; caughtUnsubscribeEvent = false;
wiretap = postal.addWireTap(function(msg, envelope) { wireTapData = [];
wireTapEnvelope = [];
wiretap = postal.addWireTap(function(envelope, msg) {
wireTapData.push(msg); wireTapData.push(msg);
wireTapEnvelope.push(envelope); wireTapEnvelope.push(envelope);
}); });
postal.publish("Oh.Hai.There", { data: "I'm in yer bus, tappin' yer subscriptionz..."}); postal.publish({ topic: "Oh.Hai.There" }, { data: "I'm in yer bus, tappin' yer subscriptionz..."});
wiretap(); wiretap();
postal.publish("Oh.Hai.There", { data: "I'm in yer bus, tappin' yer subscriptionz..."}); postal.publish({ topic: "Oh.Hai.There" }, { data: "I'm in yer bus, tappin' yer subscriptionz..."});
}); });
after(function(){ after(function(){
postal.configuration.bus.subscriptions = {}; postal.configuration.bus.subscriptions = {};
@ -433,6 +448,7 @@ QUnit.specify("postal.js", function(){
assert(wireTapData[0].data).equals("I'm in yer bus, tappin' yer subscriptionz..."); assert(wireTapData[0].data).equals("I'm in yer bus, tappin' yer subscriptionz...");
}); });
it("wireTap envelope should match expected results", function() { it("wireTap envelope should match expected results", function() {
console.log("ONOES! " + JSON.stringify(wireTapEnvelope));
assert(wireTapEnvelope[0].exchange).equals(DEFAULT_EXCHANGE); assert(wireTapEnvelope[0].exchange).equals(DEFAULT_EXCHANGE);
assert(wireTapEnvelope[0].topic).equals("Oh.Hai.There"); assert(wireTapEnvelope[0].topic).equals("Oh.Hai.There");
}); });
@ -444,7 +460,7 @@ QUnit.specify("postal.js", function(){
linkages; linkages;
before(function(){ before(function(){
linkages = postal.bindExchanges({ exchange: "sourceExchange" }, { exchange: "destinationExchange" }); linkages = postal.bindExchanges({ exchange: "sourceExchange" }, { exchange: "destinationExchange" });
subscription = postal.subscribe("destinationExchange", "Oh.Hai.There", function(data, env) { subscription = postal.subscribe({ exchange: "destinationExchange", topic: "Oh.Hai.There", callback: function(data, env) {
destData.push(data); destData.push(data);
destEnv.push(env); destEnv.push(env);
}); });
@ -473,7 +489,7 @@ QUnit.specify("postal.js", function(){
linkages; linkages;
before(function(){ before(function(){
linkages = postal.bindExchanges({ exchange: "sourceExchange", topic: "Oh.Hai.There" }, { exchange: "destinationExchange", topic: "kthxbye" }); linkages = postal.bindExchanges({ exchange: "sourceExchange", topic: "Oh.Hai.There" }, { exchange: "destinationExchange", topic: "kthxbye" });
subscription = postal.subscribe("destinationExchange", "kthxbye", function(data, env) { subscription = postal.subscribe({ exchange: "destinationExchange", topic: "kthxbye", callback: function(data, env) {
destData.push(data); destData.push(data);
destEnv.push(env); destEnv.push(env);
}); });
@ -502,7 +518,7 @@ QUnit.specify("postal.js", function(){
linkages; linkages;
before(function(){ before(function(){
linkages = postal.bindExchanges({ exchange: "sourceExchange" }, { exchange: "destinationExchange", topic: function(tpc) { return "NewTopic." + tpc; } }); linkages = postal.bindExchanges({ exchange: "sourceExchange" }, { exchange: "destinationExchange", topic: function(tpc) { return "NewTopic." + tpc; } });
subscription = postal.subscribe("destinationExchange", "NewTopic.Oh.Hai.There", function(data, env) { subscription = postal.subscribe({ exchange: "destinationExchange", topic: "NewTopic.Oh.Hai.There", callback: function(data, env) {
destData.push(data); destData.push(data);
destEnv.push(env); destEnv.push(env);
}); });

53
src/main/Api.js
View file

@ -1,27 +1,39 @@
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 = { var postal = {
configuration: { configuration: {
bus: localBus, bus: localBus,
resolver: bindingsResolver resolver: bindingsResolver
}, },
channel: function(exchange, topic) { channel: function(options) {
var exch = arguments.length === 2 ? exchange : DEFAULT_EXCHANGE, var exch = options.exchange || DEFAULT_EXCHANGE,
tpc = arguments.length === 2 ? topic : exchange; tpc = options.topic;
return new ChannelDefinition(exch, tpc); return new ChannelDefinition(exch, tpc);
}, },
subscribe: function(exchange, topic, callback) { subscribe: function(options) {
var exch = arguments.length === 3 ? exchange : DEFAULT_EXCHANGE, var callback = options.callback,
tpc = arguments.length === 3 ? topic : exchange, topic = options.topic,
callbk = arguments.length === 3 ? callback : topic; exchange = options.exchange || DEFAULT_EXCHANGE;
var channel = this.channel(exch, tpc); return new ChannelDefinition(exchange, topic).subscribe(callback);
return channel.subscribe(callbk);
}, },
publish: function(exchange, topic, payload, envelopeOptions) { publish: function() {
var parsedArgs = parsePublishArgs([].slice.call(arguments,0)); var len = arguments.length;
var channel = this.channel(parsedArgs.envelope.exchange, parsedArgs.envelope.topic); if(publishPicker[len]) {
channel.publish(parsedArgs.payload, parsedArgs.envelope); publishPicker[len].apply(this, arguments);
}
}, },
addWireTap: function(callback) { addWireTap: function(callback) {
@ -29,21 +41,28 @@ var postal = {
}, },
bindExchanges: function(sources, destinations) { bindExchanges: function(sources, destinations) {
var subscriptions = []; var subscriptions;
if(!_.isArray(sources)) { if(!_.isArray(sources)) {
sources = [sources]; sources = [sources];
} }
if(!_.isArray(destinations)) { if(!_.isArray(destinations)) {
destinations = [destinations]; destinations = [destinations];
} }
subscriptions = new Array(sources.length * destinations.length);
_.each(sources, function(source){ _.each(sources, function(source){
var sourceTopic = source.topic || "*"; var sourceTopic = source.topic || "*";
_.each(destinations, function(destination) { _.each(destinations, function(destination) {
var destExchange = destination.exchange || DEFAULT_EXCHANGE; var destExchange = destination.exchange || DEFAULT_EXCHANGE;
subscriptions.push( subscriptions.push(
postal.subscribe(source.exchange || DEFAULT_EXCHANGE, source.topic || "*", function(msg, env) { postal.subscribe({
var destTopic = _.isFunction(destination.topic) ? destination.topic(env.topic) : destination.topic || env.topic; exchange: source.exchange || DEFAULT_EXCHANGE,
postal.publish(destExchange, destTopic, msg); 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);
}
}) })
); );
}); });

11
src/main/BindingsResolver.js
View file

@ -5,7 +5,10 @@ var bindingsResolver = {
if(this.cache[topic] && this.cache[topic][binding]) { if(this.cache[topic] && this.cache[topic][binding]) {
return true; 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); result = rgx.test(topic);
if(result) { if(result) {
if(!this.cache[topic]) { if(!this.cache[topic]) {
@ -14,11 +17,5 @@ var bindingsResolver = {
this.cache[topic][binding] = true; this.cache[topic][binding] = true;
} }
return result; 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'
} }
}; };

11
src/main/ChannelDefinition.js
View file

@ -11,11 +11,10 @@ ChannelDefinition.prototype = {
}, },
publish: function(data, envelope) { publish: function(data, envelope) {
var env = _.extend({ var env = envelope || {};
exchange: this.exchange, env.exchange = this.exchange;
timeStamp: new Date(), env.timeStamp = new Date();
topic: this.topic env.topic = this.topic;
}, envelope); postal.configuration.bus.publish(env, data);
postal.configuration.bus.publish(data, env);
} }
}; };

34
src/main/Constants.js
View file

@ -2,36 +2,4 @@ var DEFAULT_EXCHANGE = "/",
DEFAULT_PRIORITY = 50, DEFAULT_PRIORITY = 50,
DEFAULT_DISPOSEAFTER = 0, DEFAULT_DISPOSEAFTER = 0,
SYSTEM_EXCHANGE = "postal", SYSTEM_EXCHANGE = "postal",
NO_OP = function() { }, 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;
};

25
src/main/LocalBus.js
View file

@ -2,10 +2,12 @@ var localBus = {
subscriptions: {}, subscriptions: {},
wireTaps: [], wireTaps: new Array(0),
publish: function(data, envelope) { publish: function(envelope, data) {
this.notifyTaps(data, envelope); _.each(this.wireTaps,function(tap) {
tap(envelope, data);
});
_.each(this.subscriptions[envelope.exchange], function(topic) { _.each(this.subscriptions[envelope.exchange], function(topic) {
_.each(topic, function(binding){ _.each(topic, function(binding){
@ -22,10 +24,15 @@ var localBus = {
}, },
subscribe: function(subDef) { 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] || {}; if(!exch) {
subs = this.subscriptions[subDef.exchange][subDef.topic] = this.subscriptions[subDef.exchange][subDef.topic] || []; 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; idx = subs.length - 1;
//if(!_.any(subs, function(cfg) { return cfg === subDef; })) { //if(!_.any(subs, function(cfg) { return cfg === subDef; })) {
@ -42,12 +49,6 @@ var localBus = {
//} //}
}, },
notifyTaps: function(data, envelope) {
_.each(this.wireTaps,function(tap) {
tap(data, envelope);
});
},
unsubscribe: function(config) { unsubscribe: function(config) {
if(this.subscriptions[config.exchange][config.topic]) { if(this.subscriptions[config.exchange][config.topic]) {
var len = this.subscriptions[config.exchange][config.topic].length, var len = this.subscriptions[config.exchange][config.topic].length,

24
src/main/SubscriptionDefinition.js
View file

@ -3,25 +3,29 @@ var SubscriptionDefinition = function(exchange, topic, callback) {
this.topic = topic; this.topic = topic;
this.callback = callback; this.callback = callback;
this.priority = DEFAULT_PRIORITY; this.priority = DEFAULT_PRIORITY;
this.constraints = []; this.constraints = new Array(0);
this.maxCalls = DEFAULT_DISPOSEAFTER; this.maxCalls = DEFAULT_DISPOSEAFTER;
this.onHandled = NO_OP; this.onHandled = NO_OP;
this.context = null; this.context = null;
_.defer(function() { postal.publish({
postal.publish(SYSTEM_EXCHANGE, "subscription.created", exchange: SYSTEM_EXCHANGE,
{ topic: "subscription.created"
event: "subscription.created", },
exchange: exchange, {
topic: topic event: "subscription.created",
}) exchange: exchange,
}); topic: topic
});
}; };
SubscriptionDefinition.prototype = { SubscriptionDefinition.prototype = {
unsubscribe: function() { unsubscribe: function() {
postal.configuration.bus.unsubscribe(this); postal.configuration.bus.unsubscribe(this);
postal.publish(SYSTEM_EXCHANGE, "subscription.removed", postal.publish({
exchange: SYSTEM_EXCHANGE,
topic: "subscription.removed"
},
{ {
event: "subscription.removed", event: "subscription.removed",
exchange: this.exchange, exchange: this.exchange,