client.sjs macros + bisubscriber::off

Author: Havvy

doc/changelog.txt

@@ -173,12 +173,14 @@ Changelog
 
 0.8.4:
     * Update irc-socket to 2.2.0.
-    * Any other change is a bug.
-    * Configuration changes:
+    * Configuration changes (from irc-socket):
     ** nickname is an alias for nick. (Prefer nickname)
     ** username is an alias for user. (Prefer username)
     ** Added ipv6 (See irc-socket)
     ** Added localAddress (See irc-socket, net.Socket)
+    * Nick highlight command trigger case is now case-insensitive. (Thanks metalbot)
+    * Subscriber and Client gain .off() method which works as long as the event emitters has .removeListener or .off
+    * Maybe .quit() will finally accept a reason properly.
 
 0.9.0:
     [Not yet done]

fez.js

@@ -4,7 +4,8 @@ var fez = require('fez');
 var sweetjs = require('fez-sweet.js');
 
 exports.build = function(rule) {
-    rule.each("test-src/*.sjs", fez.mapFile("test/%f.js"), sweetjs({'modules': ['sweet-bdd'], 'readableNames': true}));
+    rule.each('test-src/*.sjs', fez.mapFile('test/%f.js'), sweetjs({'modules': ['sweet-bdd'], 'readableNames': true}));
+    rule.each('src/*.sjs', fez.mapFile('lib/%f.js'), sweetjs({'modules': ['coco-js'], 'readableNames': true}))
 };
 
 exports.default = exports.build;

lib/bisubscriber.js

@@ -7,12 +7,12 @@
  * 1. An object dictionary where the keys are the events to listen to and the
  *    and the values are the functions to register for the events.
  *
- *    Ex:  subscriber.on({"join" : onjoin, "!help !h" : onhelp});
+ *    Ex:  subscriber.on({'join' : onjoin, '!help !h' : onhelp});
  *
  * 2. If there's only one string/function pair, you can pass them as two
  *    arguments.
  *
- *    Ex:  subscriber.on("join", onjoin);
+ *    Ex:  subscriber.on('join', onjoin);
  *
  * The string value is a space delimited list of events to listen to. If the
  * event begins with an exclamation mark, then it will be subscribed to the
@@ -28,19 +28,27 @@
  *   - on(events: string, listener: function): undefined
  *   - once(listenerMap: Object): undefined
  *   - once(events: string, listener: function): undefined
+ *   - off(listenerMap: Object): undefined
+ *   - off(events: string, listener: function): undefined
  */
 
-/*
-*/
+const inspect = require('util').inspect;
+
+const BiEventSubscriber = function (primary, secondary) {
+    if (!(this instanceof BiEventSubscriber)) {
+        return new BiEventSubscriber;
+    }
 
-var BiEventSubscriber = function (primary, secondary) {
     this._primary = primary;
     this._secondary = secondary;
+
+    this._primaryOff = (primary.removeListener ? 'removeListener' : 'off');
+    this._secondaryOff = (secondary.removeListener ? 'removeListener' : 'off');
 };
 
 BiEventSubscriber.prototype = {
     _onString : function (type, listener) {
-        type.split(" ").forEach(function (event) {
+        type.split(' ').forEach(function (event) {
             if (event[0] === '!') {
                 this._secondary.on(event.substr(1), listener);
             } else {
@@ -55,8 +63,24 @@ BiEventSubscriber.prototype = {
         }
     },
 
+    _offString : function (type, listener) {
+        type.split(' ').forEach(function (event) {
+            if (event[0] === '!') {
+                this._secondary[this._secondaryOff](event, listener);
+            } else {
+                this._primary['removeListener'](event, listener);
+            }
+        }.bind(this));
+    },
+
+    _offMap : function (typemap) {
+        for (var key in typemap) {
+            this._offString(key, typemap[key]);
+        }
+    },
+
     _onceString : function (type, listener) {
-        type.split(" ").forEach(function (event) {
+        type.split(' ').forEach(function (event) {
             if (event[0] === '!') {
                 this._secondary.once(event.substr(1), listener);
             } else {
@@ -65,8 +89,8 @@ BiEventSubscriber.prototype = {
         }.bind(this));
     },
 
-    _onceMap : function (ee, map) {
-        for (var event in map) {
+    _onceMap : function (typemap) {
+        for (var event in typemap) {
             this._onceString(event, map[event]);
         }
     },
@@ -75,15 +99,23 @@ BiEventSubscriber.prototype = {
         switch (arguments.length) {
             case 1: this._onMap(arguments[0]); break;
             case 2: this._onString(arguments[0], arguments[1]); break;
-            default: throw new Exception("on takes one (object) or two (string, fn) arguments.");
+            default: throw new Exception('on takes one (object) or two (string, fn) arguments.');
+        }
+    },
+
+    off: function () {
+        switch (arguments.length) {
+            case 1: this._offMap(arguments[0]); break;
+            case 2: this._offString(arguments[0], arguments[1]); break;
+            default: throw new Exception('off takes one (object) or two (string, fn) arguments.')
         }
     },
 
     once : function () {
         switch (arguments.length) {
             case 1: return this._onceMap(arguments[0]);
             case 2: return this._onceString(arguments[0], arguments[1]);
-            default: throw new Exception("on takes one (object) or two (string, fn) arguments.");
+            default: throw new Exception('on takes one (object) or two (string, fn) arguments.');
         }
     }
 };