Merge pull request #5 from dadi/feature/better-send

Feature: better send

Author: adamkdean

index.js

@@ -35,16 +35,22 @@ QueueWrapper.prototype.initialiseQueue = function () {
 }
 
 // public send function
-QueueWrapper.prototype.send = function (message, done) {
-  const send = () => {
-    let options = {
-      qname: this.options.name,
-      message: message,
-      delay: this.getDelay(message)
-    }
+QueueWrapper.prototype.send = function (address, data, done) {
+  const options = {
+    qname: this.options.name
+  }
 
-    console.log(options)
+  if (typeof data === 'function') {
+    done = data
+    options.message = address
+  } else {
+    const serializedData = typeof data === 'object' ? JSON.stringify(data) : data
+    const encodedData = new Buffer(serializedData).toString('base64')
+    options.message = `${address}:[[${encodedData}]]`
+  }
 
+  const send = () => {
+    options.delay = this.getDelay(options.message)
     this.rsmq.sendMessage(options, done)
   }
 

test/queue.js

@@ -100,6 +100,62 @@ describe('QueueWrapper', function (done) {
       })
     })
 
+    it ('should send a message when a string is passed', function (done) {
+      queueWrapper = new QueueWrapper({
+        name: 'myqueue'
+      })
+
+      fakeRsmq.emit('connect', () => {
+
+      })
+
+      // send is faked above, so the response should contain the options
+      // created by the queueWrapper to be sent as the message to the real queue
+      queueWrapper.send('worker:message', (response) => {
+        should.exist(response.qname)
+        should.exist(response.message)
+        response.message.should.equal('worker:message')
+        done()
+      })
+    })
+
+    it ('should start a message with address when an address and object are passed', function (done) {
+      queueWrapper = new QueueWrapper({
+        name: 'myqueue'
+      })
+
+      fakeRsmq.emit('connect', () => {
+
+      })
+
+      queueWrapper.send('worker', { 'test': true }, (response) => {
+        should.exist(response.qname)
+        should.exist(response.message)
+        response.message.substr(0, 7).should.equal('worker:')
+        done()
+      })
+    })
+
+    it ('should encapsulate the data with [[ ]] when an address and object are passed', function (done) {
+      queueWrapper = new QueueWrapper({
+        name: 'myqueue'
+      })
+
+      fakeRsmq.emit('connect', () => {
+
+      })
+
+      queueWrapper.send('worker', { 'test': true }, (response) => {
+        should.exist(response.qname)
+        should.exist(response.message)
+
+        const messageData = response.message.substr(7)
+        messageData.startsWith('[[').should.equal(true)
+        messageData.endsWith(']]').should.equal(true)
+        done()
+      })
+    })
+
     it ('should return error when not connected', function (done) {
       queueWrapper = new QueueWrapper({
         name: 'myqueue'