Improved test, fixed callback name

x25 · Aug 10, 2014 · b0bdcb7 · b0bdcb7
1 parent ebf79db
commit b0bdcb7
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -20,9 +20,11 @@ var publisher = new Pub();
 publisher.listen(8002);
 
 setInterval(function () {
+
   publisher.publish('channel_one', 'message_one');
   publisher.publish('channel_two', {message: 'two'});
   publisher.publish('channel_three', ['message', 'three']);
+
 }, 1000);
 ```
 
@@ -38,6 +40,7 @@ subscriber.connect(8002, '127.0.0.1');
 subscriber.subscribe('channel_two');
 
 subscriber.on('message', function (channel, data) {
+
   console.log(channel, data);
 });
 ```

diff --git a/lib/publisher.js b/lib/publisher.js
@@ -68,7 +68,7 @@ Publisher.prototype.connect = function (port, host) {
 
 	socket.on('error', function (e) {
 
-		console.error(e);
+		self.emit('log', 'debug', 'publisher.error', e);
 	});
 
 	socket.on('connect', function () {
@@ -107,7 +107,7 @@ Publisher.prototype.connect = function (port, host) {
 
 			};
 
-			setTimeout(f, 1000);
+			setTimeout(r, 1000);
 
 		} else {
 

diff --git a/lib/subscriber.js b/lib/subscriber.js
@@ -84,7 +84,7 @@ Subscriber.prototype.connect = function (port, host) {
 
 	socket.on('error', function (e) {
 
-		console.error(e);
+		self.emit('log', 'debug', 'subscriber.error', e);
 	});
 
 	socket.on('connect', function () {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "pub-sub-js",
-	"version": "1.0.1",
+	"version": "1.1.0",
 	"description": "Distributed publish/subscribe messaging system",
 	"main": "index.js",
 	"scripts": {

diff --git a/test/test.js b/test/test.js
@@ -55,7 +55,7 @@ module.exports = {
 
 	testSubToPub: function (test) {
 
-		test.expect(4);
+		test.expect(5);
 
 		var publisher = new PubSub.Publisher();
 
@@ -75,9 +75,24 @@ module.exports = {
 
 		subscriber.subscribe('channel_one');
 
+		subscriber.subscribe('channel_two');
+
 		subscriber.connect(8002, '127.0.0.1');
 
-		subscriber.subscribe('channel_two');
+		subscriber.connect(8002, '127.0.0.1');
+
+		subscriber.connect(8003, '127.0.0.1');
+
+		subscriber.subscribe('channel_one');
+
+		try {
+
+			subscriber.subscribe('a\nb');
+
+		} catch (e) {
+
+			test.ok(true);
+		}
 
 		var n = 1;
 
@@ -115,8 +130,14 @@ module.exports = {
 
 			subscriber.unsubscribe('channel_two');
 
+			subscriber.unsubscribe('channel_two');
+
+			subscriber.unsubscribe('channel_x');
+
 			subscriber.disconnect(8002, '127.0.0.1');
 
+			subscriber.disconnect(8003, '127.0.0.1');
+
 			publisher.close();
 
 			setTimeout(function () {
@@ -138,6 +159,10 @@ module.exports = {
 
 		publisher.connect(8002, '127.0.0.1');
 
+		publisher.connect(8002, '127.0.0.1');
+
+		publisher.connect(8003, '127.0.0.1');
+
 		setTimeout(function () {
 
 			publisher.publish('channel_one', 'message_one');
@@ -190,8 +215,12 @@ module.exports = {
 
 			subscriber.unsubscribe('channel_two');
 
+			subscriber.unsubscribe('channel_undefined');
+
 			publisher.disconnect(8002, '127.0.0.1');
 
+			publisher.disconnect(8003, '127.0.0.1');
+
 			subscriber.close();
 
 			setTimeout(function () {