Merge pull request #44 from msgflo/coffeescript_2

CoffeeScript 2

Author: jonnor

.npmignore

@@ -2,3 +2,5 @@
 node_modules/
 .DS_Store
 mosquitto*
+fbp-config.json
+.travis.yml

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 services:
 - rabbitmq
 node_js:
-- '4.2'
+- '6'
 before_install:
 - sudo apt-get update -qq
 - sudo apt-get install pkg-config cmake openssl libc-ares-dev

Gruntfile.coffee

@@ -6,6 +6,8 @@ module.exports = ->
     # CoffeeScript compilation
     coffee:
       library:
+        options:
+          bare: true
         expand: true
         cwd: 'src'
         src: ['**.coffee']
@@ -18,6 +20,9 @@ module.exports = ->
         src: ['spec/*.coffee']
         options:
           reporter: 'spec'
+          require: [
+            'coffeescript/register'
+          ]
           grep: process.env.TESTS
 
     # Protocol tests

bin/msgflo-nodejs

@@ -1,4 +1,4 @@
 #!/usr/bin/env node
 
-require('coffee-script/register')
+require('coffeescript/register')
 require('../src/main').main()

index.js

@@ -2,6 +2,6 @@ try {
   // Compiled JavaScript first
   module.exports = require('./lib/');
 } catch (e) {
-  require('coffee-script/register');
+  require('coffeescript/register');
   module.exports = require('./src/');
 }

package.json

@@ -14,6 +14,7 @@
   "dependencies": {
     "async": "^2.1.4",
     "chance": "^1.0.4",
+    "coffeescript": "^2.0.2",
     "commander": "^2.6.0",
     "debug": "^3.0.0",
     "fbp": "^1.1.2",
@@ -24,8 +25,7 @@
     "amqplib": "^0.5.1",
     "chai": "^4.1.0",
     "grunt": "^1.0.1",
-    "coffee-script": "^1.8.0",
-    "grunt-contrib-coffee": "^1.0.0",
+    "grunt-contrib-coffee": "^2.0.0",
     "grunt-mocha-test": "^0.13.2",
     "grunt-shell-spawn": "^0.3.1",
     "mocha": "^4.0.0",

src/amqp.coffee

@@ -11,7 +11,10 @@ catch e
   amqp = e
 
 class Client extends interfaces.MessagingClient
-  constructor: (@address, @options={}) ->
+  constructor: (address, options={}) ->
+    super address, options
+    @address = address
+    @options = options
     @connection = null
     @channel = null
     @options.prefetch = 2 if not @options.prefetch?

src/direct.coffee

@@ -9,7 +9,10 @@ brokers = {}
 
 
 class Client extends interfaces.MessagingClient
-  constructor: (@address, @options) ->
+  constructor: (address, options) ->
+    super address, options
+    @address = address
+    @options = options
 #    console.log 'client', @address
     @broker = null
 
@@ -68,6 +71,7 @@ class Client extends interfaces.MessagingClient
 
 class Queue extends EventEmitter
   constructor: () ->
+    super()
 
   send: (msg) ->
     @_emitSend msg
@@ -76,7 +80,9 @@ class Queue extends EventEmitter
     @emit 'message', msg
 
 class MessageBroker extends interfaces.MessageBroker
-  constructor: (@address) ->
+  constructor: (address) ->
+    super address
+    @address = address
     routing.binderMixin this
     @queues = {}
 #    console.log 'broker', @address

src/mqtt.coffee

@@ -9,7 +9,10 @@ catch e
   mqtt = e
 
 class Client extends interfaces.MessagingClient
-  constructor: (@address, @options) ->
+  constructor: (address, options) ->
+    super address, options
+    @address = address
+    @options = options
     @client = null
     @subscribers = {} # queueName -> [handler1, ...]
 

src/participant.coffee

@@ -49,7 +49,9 @@ defaultDiscoveryPeriod = parseInt process.env.MSGFLO_DISCOVERY_PERIOD if process
 
 class Participant extends EventEmitter
   # @func gets called with inport, , and should return outport, outdata
-  constructor: (client, def, @func, role, options={}) ->
+  constructor: (client, def, func, role, options={}) ->
+    super()
+    @func = func
     client = transport.getClient(client) if typeof client == 'string'
     @messaging = client
     role = 'unknown' if not role