Provide a 3-arg form of connect instead of subscribe

squaremo · squaremo · commit 9b689657a622 · 2014-03-11T17:09:01.000Z
`subscribe` is a breaking change, and I don't see any particular
advantage to it over having another form of `connect`.
diff --git a/lib/sockets.js b/lib/sockets.js
@@ -161,8 +161,7 @@ PubSocket.prototype.connect = function(destination, callback) {
   var self = this, ch = this.ch;
   ch.assertExchange(destination,
                     this.options.routing || 'fanout',
-                    {durable: false,
-                     autoDelete: true})
+                    {durable: false, autoDelete: false})
     .then(function(ok) {
       self.pubs.push(destination);
     }).then(callback || ignore);
@@ -216,29 +215,22 @@ function SubSocket(channel, opts) {
 inherits(SubSocket, Readable);
 addSocketMethods(SubSocket);
 
-SubSocket.prototype.connect = function(source, callback) {
+SubSocket.prototype.connect = function(source, topic, callback) {
+  // Support the general form of connect
+  if (callback === undefined && typeof topic === 'function') {
+    callback = topic;
+    topic = '';
+  }
   var ch = this.ch, queue = this.queue, self = this;
   ch.assertExchange(source,
                     this.options.routing || 'fanout',
-                    {autoDelete: true})
+                    {durable: false, autoDelete: false})
     .then(function(ok) {
-      self.subs.push(source);
-      self.patterns.forEach(function(pat) {
-        ch.bindQueue(queue, source, pat);
-      });
+      return ch.bindQueue(queue, source, topic);
     })
     .then(callback || ignore);
 };
 
-SubSocket.prototype.subscribe = function(pattern) {
-  var ch = this.ch; queue = this.queue;
-  pattern = pattern || '';
-  this.subs.forEach(function(sub) {
-    ch.bindQueue(queue, sub, pattern);
-  });
-  this.patterns.push(pattern);
-};
-
 // AMQP and the stream API don't really work well together here. I'm
 // supposed to initiate reads when this method is called, then not
 // push any more once I get `false` back from `#push`; but how do I do
diff --git a/test/tests.js b/test/tests.js
@@ -167,13 +167,29 @@ suite.simplestPubSub = testWithContext(function(done, CTX) {
     });
 
     sub.connect('testPubSub', function() {
-        sub.subscribe();
         pub.connect('testPubSub', function() {
             pub.write('foo');
         });
     });
 });
 
+suite.topicPubSub = testWithContext(function(done, CTX) {
+  var pub = CTX.socket('PUB', {routing: 'topic'});
+  var sub = CTX.socket('SUB', {routing: 'topic'});
+  sub.setEncoding('utf8');
+  var content = randomString();
+  sub.on('data', function(msg) {
+    try { assert.equal(content, msg); done(); }
+    catch (e) { done(e); }
+  });
+
+  sub.connect('testTopicPubSub', 'foo.*', function() {
+    pub.connect('testTopicPubSub', function() {
+      pub.publish('foo.bar', content, 'utf8');
+    });
+  });
+});
+
 suite.simplestWorker = testWithContext(function(done, CTX) {
   var work = CTX.socket('WORKER');
   work.setEncoding('utf8');
@@ -285,7 +301,6 @@ suite.allSubs = testWithContext(function(done, CTX) {
             if (latch === 0) done();
         });
         sub.connect('testMultiSub', function() {
-          sub.subscribe();
           doSub(i+1);
         });
     }
