Merge pull request #13 from msgflo/remove-sendtoqueue

Remove deprecated sendToQueue()

Author: jonnor

CHANGES.md

@@ -1,4 +1,14 @@
 
+# msgflo-nodejs 0.7.0, 09.10.2016
+
+* Client/AMQP/MQTT: Remove deprecated `sendToQueue()`.
+
+# msgflo-nodejs 0.6.0, 10.09.2016
+
+* participant: Remove deprecated `connectGraphEdges()` and `connectGraphFile()`.
+Should use `msgflo.setup` instead.
+* MQTT: Implement `removeBinding()`, for removing a connection
+
 # msgflo-nodejs 0.5.0, 06.06.2016
 
 * Allows to register custom transports using `msgflo_nodejs.transport.register()`

spec/01transport.coffee

@@ -64,7 +64,7 @@ createBindQueues = (broker, queueMapping, callback) ->
 sendPackets = (packets, callback) ->
   send = (p, cb) ->
     [client, queue, data] = p
-    client.sendToQueue queue, data, cb
+    client.sendTo 'outqueue', queue, data, cb
 
   async.map packets, send, callback
 
@@ -128,7 +128,7 @@ transportTests = (type) ->
         ], (err) ->
           chai.expect(err).to.not.exist
 
-          clients.sender.sendToQueue outQueue, payload, (err) ->
+          clients.sender.sendTo 'outqueue', outQueue, payload, (err) ->
             chai.expect(err).to.not.exist
             done()
 
@@ -149,7 +149,7 @@ transportTests = (type) ->
 
           clients.receiver.subscribeToQueue sharedQueue, onReceive, (err) ->
             chai.expect(err).to.be.a 'null'
-          clients.sender.sendToQueue sharedQueue, payload, (err) ->
+          clients.sender.sendTo 'outqueue', sharedQueue, payload, (err) ->
             chai.expect(err).to.be.a 'null'
 
 
@@ -173,7 +173,7 @@ transportTests = (type) ->
 
             clients.receiver.subscribeToQueue sharedQueue, onReceive, (err) ->
               chai.expect(err).to.be.a 'null'
-            clients.sender.sendToQueue sharedQueue, payload, (err) ->
+            clients.sender.sendTo 'outqueue', sharedQueue, payload, (err) ->
               chai.expect(err).to.be.a 'null'
 
 
@@ -293,7 +293,7 @@ transportTests = (type) ->
               handlers.push [ clients[name], name, onReceives[name] ]
             subscribeData handlers, (err) ->
               chai.expect(err).to.not.exist
-              clients.sender.sendToQueue outQueue2, {data: 'ident'}, (err) ->
+              clients.sender.sendTo 'outqueue', outQueue2, {data: 'ident'}, (err) ->
                 chai.expect(err).to.not.exist
 
   describeIfRoundRobinSupport 'Roundrobin binding', ->

src/amqp.coffee

@@ -146,7 +146,7 @@ class Client extends interfaces.MessagingClient
       payload: part
     @channel.assertQueue 'fbp'
     data = new Buffer JSON.stringify msg
-    @channel.sendToQueue 'fbp', data
+    @channel.sendTo 'inqueue', 'fbp', data
     return callback null
 
 class MessageBroker extends Client

src/direct.coffee

@@ -102,7 +102,7 @@ class MessageBroker extends interfaces.MessageBroker
 
   ## Sending/Receiving messages
   sendTo: (type, queueName, message, callback) ->
-#    console.log 'broker sendToQueue', queueName, Object.keys(@queues), @queues[queueName]
+    debug 'broker sendTo', queueName
     @queues[queueName].send message
     return callback null
 

src/interfaces.coffee

@@ -20,14 +20,10 @@ class MessagingSystem
     throw new Error 'Not Implemented'
 
   ## Sending/Receiving messages
+  # queueName must be created beforehand, and be of correct type
   sendTo: (type, name, message, callback) ->
     throw new Error 'Not Implemented'
 
-  # queueName must be created beforehand, and be of correct type
-  sendToQueue: (queueName, message, callback) ->
-    console.log 'WARN: sendToQueue is deprecated. Use sendTo() instead'
-    @sendTo 'outqueue', queueName, message, callback
-
   # handler must call ackMessage() on succesful processing of a message
   subscribeToQueue: (queueName, handler, callback) ->
     throw new Error 'Not Implemented'

src/mqtt.coffee

@@ -106,7 +106,7 @@ class Client extends interfaces.MessagingClient
       protocol: 'discovery'
       command: 'participant'
       payload: part
-    @sendToQueue 'fbp', msg, callback
+    @sendTo 'inqueue', 'fbp', msg, callback
 
 class MessageBroker extends Client
   constructor: (address, options) ->