Ignore Makefile.

self vs this fix for inside a callback

.npmignore

@@ -2,10 +2,9 @@
 .gitignore
 .gitmodules
 .npmignore
-.redcar
 .travis.yml
 dump.rdb
-Rakefile
+Makefile
 node_modules
 spec
 vendor

.travis.yml

@@ -4,9 +4,10 @@ node_js:
   - "0.6"
   - "0.8"
   - "0.10"
+  - "0.11"
 
 before_script:
-  - rake prepare
+  - make
 
 env: TRAVIS=1
 

CHANGELOG.md

@@ -0,0 +1,24 @@
+### 0.2.0 / 2013-10-01
+
+* Trigger the `close` event as required by Faye 1.0
+
+
+### 0.1.3 / 2013-05-11
+
+* Fix a bug due to a misuse of `this`
+
+
+### 0.1.2 / 2013-04-28
+
+* Improve garbage collection to avoid leaking Redis memory
+
+
+### 0.1.1 / 2012-07-15
+
+* Fix an implicit global variable leak (missing semicolon)
+
+
+### 0.1.0 / 2012-02-26
+
+* Initial release: Redis backend for Faye 0.8
+

CHANGELOG.txt

@@ -1,14 +0,0 @@
-=== 0.1.2 / 2013-04-28
-
-* Improve garbage collection to avoid leaking Redis memory
-
-
-=== 0.1.1 / 2012-07-15
-
-* Fix an implicit global variable leak (missing semicolon)
-
-
-=== 0.1.0 / 2012-02-26
-
-* Initial release: Redis backend for Faye 0.8
-

Makefile

@@ -0,0 +1,6 @@
+prepare:
+	git submodule update --init --recursive
+	cd vendor/faye &&	npm install
+	cd vendor/faye && ./node_modules/.bin/wake
+	npm install
+

README.md

@@ -1,9 +1,9 @@
 # faye-redis [![Build Status](https://secure.travis-ci.org/faye/faye-redis-node.png)](http://travis-ci.org/faye/faye-redis-node)
 
-This plugin provides a Redis-based backend for the [Faye](http://faye.jcoglan.com)
-messaging server. It allows a single Faye service to be distributed across many
-front-end web servers by storing state and routing messages through a
-[Redis](http://redis.io) database server.
+This plugin provides a Redis-based backend for the
+[Faye](http://faye.jcoglan.com) messaging server. It allows a single Faye
+service to be distributed across many front-end web servers by storing state and
+routing messages through a [Redis](http://redis.io) database server.
 
 
 ## Usage
@@ -33,25 +33,25 @@ server.listen(8000);
 
 The full list of settings is as follows.
 
-* <b><tt>host</tt></b> - hostname of your Redis instance
-* <b><tt>port</tt></b> - port number, default is `6379`
-* <b><tt>password</tt></b> - password, if `requirepass` is set
-* <b><tt>database</tt></b> - number of database to use, default is `0`
-* <b><tt>namespace</tt></b> - prefix applied to all keys, default is `''`
-* <b><tt>socket</tt></b> - path to Unix socket if `unixsocket` is set
+* <b>`host`</b> - hostname of your Redis instance
+* <b>`port`</b> - port number, default is `6379`
+* <b>`password`</b> - password, if `requirepass` is set
+* <b>`database`</b> - number of database to use, default is `0`
+* <b>`namespace`</b> - prefix applied to all keys, default is `''`
+* <b>`socket`</b> - path to Unix socket if `unixsocket` is set
 
 
 ## License
 
 (The MIT License)
 
-Copyright (c) 2011-2012 James Coglan
+Copyright (c) 2011-2013 James Coglan
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the 'Software'), to deal in
-the Software without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
-Software, and to permit persons to whom the Software is furnished to do so,
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
 subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all

Rakefile

@@ -1,15 +0,0 @@
-require 'fileutils'
-
-task :prepare do
-  `git submodule update --init --recursive`
-  `gem install jake`
-  FileUtils.cd 'vendor/faye' do
-    `bundle install`
-    `npm install`
-    `jake`
-  end
-  `npm install`
-end
-
-task :default => :prepare
-

faye-redis.js

@@ -27,10 +27,15 @@ var Engine = function(server, options) {
   this._redis.select(db);
   this._subscriber.select(db);
 
+  this._messageChannel = this._ns + '/notifications/messages';
+  this._closeChannel   = this._ns + '/notifications/close';
+
   var self = this;
-  this._subscriber.subscribe(this._ns + '/notifications');
+  this._subscriber.subscribe(this._messageChannel);
+  this._subscriber.subscribe(this._closeChannel);
   this._subscriber.on('message', function(topic, message) {
-    self.emptyQueue(message);
+    if (topic === self._messageChannel) self.emptyQueue(message);
+    if (topic === self._closeChannel)   self._server.trigger('close', message);
   });
 
   this._gc = setInterval(function() { self.gc() }, gc * 1000);
@@ -97,6 +102,7 @@ Engine.prototype = {
       self._redis.zrem(self._ns + '/clients', clientId, function() {
         self._server.debug('Destroyed client ?', clientId);
         self._server.trigger('disconnect', clientId);
+        self._redis.publish(self._closeChannel, clientId);
         if (callback) callback.call(context);
       });
     });
@@ -147,10 +153,10 @@ Engine.prototype = {
 
         self._server.debug('Queueing for client ?: ?', clientId, message);
         self._redis.rpush(queue, jsonMessage);
-        self._redis.publish(self._ns + '/notifications', clientId);
+        self._redis.publish(self._messageChannel, clientId);
 
         self.clientExists(clientId, function(exists) {
-          if (!exists) this._redis.del(queue);
+          if (!exists) self._redis.del(queue);
         });
       });
     };

package.json

@@ -3,25 +3,20 @@
 , "homepage"        : "http://github.com/faye/faye-redis-node"
 , "author"          : "James Coglan <jcoglan@gmail.com> (http://jcoglan.com/)"
 , "keywords"        : ["pubsub", "bayeux"]
+, "license"         : "MIT"
 
-, "version"         : "0.1.2"
+, "version"         : "0.2.0"
 , "engines"         : {"node": ">=0.4.0"}
 , "main"            : "./faye-redis"
 , "dependencies"    : {"redis": ""}
-, "devDependencies" : {"jsclass": ""}
+, "devDependencies" : {"jstest": ""}
 
 , "scripts"         : {"test": "node spec/runner.js"}
 
 , "bugs"            : "http://github.com/faye/faye-redis-node/issues"
 
-, "licenses"        : [ { "type"  : "MIT"
-                        , "url"   : "http://www.opensource.org/licenses/mit-license.php"
-                        }
-                      ]
-
-, "repositories"    : [ { "type"  : "git"
-                        , "url"   : "git://github.com/faye/faye-redis-node.git"
-                        }
-                      ]
+, "repository"      : { "type"  : "git"
+                      , "url"   : "git://github.com/faye/faye-redis-node.git"
+                      }
 }
 

spec/faye_redis_spec.js

@@ -1,20 +1,18 @@
 var RedisEngine = require('../faye-redis')
 
-JS.ENV.FayeRedisSpec = JS.Test.describe("Redis engine", function() { with(this) {
+JS.Test.describe("Redis engine", function() { with(this) {
   before(function() {
     var pw = process.env.TRAVIS ? undefined : "foobared"
     this.engineOpts = {type: RedisEngine, password: pw, namespace: new Date().getTime().toString()}
   })
 
   after(function(resume) { with(this) {
-    sync(function() {
-      engine.disconnect()
-      var redis = require('redis').createClient(6379, 'localhost', {no_ready_check: true})
-      redis.auth(engineOpts.password)
-      redis.flushall(function() {
-        redis.end()
-        resume()
-      })
+    engine.disconnect()
+    var redis = require('redis').createClient(6379, 'localhost', {no_ready_check: true})
+    redis.auth(engineOpts.password)
+    redis.flushall(function() {
+      redis.end()
+      resume()
     })
   }})
 

spec/runner.js

@@ -1,8 +1,8 @@
-require('jsclass')
-JS.require('JS.Range', 'JS.Test')
+JS = require('jstest')
 
 Faye = require('../vendor/faye/build/node/faye-node')
 require('../vendor/faye/spec/javascript/engine_spec')
 require('./faye_redis_spec')
 
 JS.Test.autorun()
+