kareem 1.3.0 → 1.5.0

package/index.js

@@ -209,14 +209,7 @@ Kareem.prototype.execPostSync = function(name, context) {
 function _handleWrapError(instance, error, name, context, args, options, callback) {
   if (options.useErrorHandlers) {
     var _options = { error: error };
-    var newArgs = [];
-    // Filter out trailing undefineds
-    for (var i = args.length; i >= 0; --i) {
-      if (newArgs.length > 0 || args[i] !== void 0) {
-        newArgs.unshift(args[i]);
-      }
-    }
-    return instance.execPost(name, context, newArgs, _options, function(error) {
+    return instance.execPost(name, context, args, _options, function(error) {
       return typeof callback === 'function' && callback(error);
     });
   } else {
@@ -257,10 +250,13 @@ Kareem.prototype.wrap = function(name, fn, context, args, options) {
     fn.apply(context, args.slice(0, end).concat(function() {
       var args = arguments;
       var argsWithoutError = Array.prototype.slice.call(arguments, 1);
+      if (options.nullResultByDefault && argsWithoutError.length === 0) {
+        argsWithoutError.push(null);
+      }
       if (arguments[0]) {
         // Assume error
         return _handleWrapError(_this, arguments[0], name, context,
-          args, options, lastArg);
+          argsWithoutError, options, lastArg);
       } else {
         if (useLegacyPost && typeof lastArg === 'function') {
           lastArg.apply(context, arguments);
@@ -322,6 +318,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)) {
@@ -333,4 +330,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.3.0",
+  "version": "1.5.0",
   "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 = {};