kareem 1.2.0 → 1.4.1

package/index.js

@@ -5,13 +5,18 @@ function Kareem() {
   this._posts = {};
 }
 
-Kareem.prototype.execPre = function(name, context, callback) {
+Kareem.prototype.execPre = function(name, context, args, callback) {
+  if (arguments.length === 3) {
+    callback = args;
+    args = [];
+  }
   var pres = this._pres[name] || [];
   var numPres = pres.length;
   var numAsyncPres = pres.numAsync || 0;
   var currentPre = 0;
   var asyncPresLeft = numAsyncPres;
   var done = false;
+  var $args = args;
 
   if (!numPres) {
     return process.nextTick(function() {
@@ -74,10 +79,9 @@ Kareem.prototype.execPre = function(name, context, callback) {
 
         next.apply(context, arguments);
       }];
-      if (arguments.length >= 2) {
-        for (var i = 1; i < arguments.length; ++i) {
-          args.push(arguments[i]);
-        }
+      var _args = arguments.length >= 2 ? arguments : [null].concat($args);
+      for (var i = 1; i < _args.length; ++i) {
+        args.push(_args[i]);
       }
       pre.fn.apply(context, args);
     } else {
@@ -96,7 +100,7 @@ Kareem.prototype.execPre = function(name, context, callback) {
     }
   };
 
-  next();
+  next.apply(null, [null].concat(args));
 };
 
 Kareem.prototype.execPreSync = function(name, context) {
@@ -132,13 +136,17 @@ Kareem.prototype.execPost = function(name, context, args, options, callback) {
     var post = posts[currentPost];
     var numArgs = 0;
     var argLength = args.length;
+    var newArgs = [];
     for (var i = 0; i < argLength; ++i) {
       numArgs += args[i] && args[i]._kareemIgnore ? 0 : 1;
+      if (!args[i] || !args[i]._kareemIgnore) {
+        newArgs.push(args[i]);
+      }
     }
 
     if (firstError) {
       if (post.length === numArgs + 2) {
-        post.apply(context, [firstError].concat(args).concat(function(error) {
+        post.apply(context, [firstError].concat(newArgs).concat(function(error) {
           if (error) {
             firstError = error;
           }
@@ -162,7 +170,7 @@ Kareem.prototype.execPost = function(name, context, args, options, callback) {
         return next();
       }
       if (post.length === numArgs + 1) {
-        post.apply(context, args.concat(function(error) {
+        post.apply(context, newArgs.concat(function(error) {
           if (error) {
             firstError = error;
             return next();
@@ -175,7 +183,7 @@ Kareem.prototype.execPost = function(name, context, args, options, callback) {
           next();
         }));
       } else {
-        post.apply(context, args);
+        post.apply(context, newArgs);
 
         if (++currentPost >= numPosts) {
           return callback.apply(null, [null].concat(args));
@@ -233,10 +241,15 @@ Kareem.prototype.wrap = function(name, fn, context, args, options) {
   }
   options = options || {};
 
-  this.execPre(name, context, function(error) {
+  this.execPre(name, context, args, function(error) {
     if (error) {
-      return _handleWrapError(_this, error, name, context, argsWithoutCb,
-        options, lastArg)
+      var numCallbackParams = options.numCallbackParams || 0;
+      var nulls = [];
+      for (var i = 0; i < numCallbackParams; ++i) {
+        nulls.push(null);
+      }
+      return _handleWrapError(_this, error, name, context, nulls,
+        options, lastArg);
     }
 
     var end = (typeof lastArg === 'function' ? args.length - 1 : args.length);
@@ -309,6 +322,7 @@ Kareem.prototype.clone = function() {
       continue;
     }
     n._pres[key] = this._pres[key].slice();
+    n._pres[key].numAsync = this._pres[key].numAsync;
   }
   for (var key in this._posts) {
     if (!this._posts.hasOwnProperty(key)) {
@@ -320,4 +334,23 @@ Kareem.prototype.clone = function() {
   return n;
 };
 
+Kareem.prototype.merge = function(other) {
+  var ret = this.clone();
+  for (var key in other._pres) {
+    if (!other._pres.hasOwnProperty(key)) {
+      continue;
+    }
+    ret._pres[key] = (ret._pres[key] || []).concat(other._pres[key].slice());
+    ret._pres[key].numAsync += other._pres[key].numAsync;
+  }
+  for (var key in other._posts) {
+    if (!other._posts.hasOwnProperty(key)) {
+      continue;
+    }
+    ret._posts[key] = (ret._posts[key] || []).concat(other._posts[key].slice());
+  }
+
+  return ret;
+};
+
 module.exports = Kareem;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kareem",
-  "version": "1.2.0",
+  "version": "1.4.1",
   "description": "Next-generation take on pre/post function hooks",
   "main": "index.js",
   "scripts": {

package/test/examples.test.js

@@ -337,3 +337,21 @@ describe('clone()', function() {
     assert.deepEqual(['cook'], Object.keys(k2._posts));
   });
 });
+
+describe('merge()', function() {
+  it('pulls hooks from another Kareem object', function() {
+    var k1 = new Kareem();
+    var test1 = function() {};
+    k1.pre('cook', test1);
+    k1.post('cook', function() {});
+
+    var k2 = new Kareem();
+    var test2 = function() {};
+    k2.pre('cook', test2);
+    var k3 = k2.merge(k1);
+    assert.equal(k3._pres['cook'].length, 2);
+    assert.equal(k3._pres['cook'][0].fn, test2);
+    assert.equal(k3._pres['cook'][1].fn, test1);
+    assert.equal(k3._posts['cook'].length, 1);
+  });
+});

package/test/pre.test.js

@@ -135,6 +135,27 @@ describe('execPre', function() {
     });
   });
 
+  it('async pres with clone()', function(done) {
+    var execed = false;
+
+    hooks.pre('cook', true, function(next, done) {
+      execed = true;
+      setTimeout(
+        function() {
+          done();
+        },
+        5);
+
+      next();
+    });
+
+    hooks.clone().execPre('cook', null, function(err) {
+      assert.ifError(err);
+      assert.ok(execed);
+      done();
+    });
+  });
+
   it('returns correct error when async pre errors', function(done) {
     var execed = {};
 

package/test/wrap.test.js

@@ -130,7 +130,7 @@ describe('wrap()', function() {
       done(new Error('fail'));
     });
 
-    hooks.post('cook', function(error, callback) {
+    hooks.post('cook', function(error, res, callback) {
       callback(new Error('another error occurred'));
     });
 
@@ -148,7 +148,7 @@ describe('wrap()', function() {
       },
       null,
       args,
-      { useErrorHandlers: true });
+      { useErrorHandlers: true, numCallbackParams: 1 });
   });
 
   it('error handlers with no callback', function(done) {