kareem 1.0.0 → 1.0.1

package/.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
-  - "0.11"
+  - "0.12"
   - "0.10"
+  - "iojs"
 script: "npm run-script test-travis"
 after_script: "npm install coveralls@2.10.0 && cat ./coverage/lcov.info | coveralls"

package/index.js

@@ -38,7 +38,7 @@ Kareem.prototype.execPre = function(name, context, callback) {
           }
 
           ++currentPre;
-          next();
+          next.apply(context, arguments);
         },
         function(error) {
           if (error) {
@@ -54,7 +54,7 @@ Kareem.prototype.execPre = function(name, context, callback) {
           }
         });
     } else if (pre.fn.length > 0) {
-      pre.fn.call(context, function(error) {
+      var args = [function(error) {
         if (error) {
           if (done) {
             return;
@@ -72,8 +72,14 @@ Kareem.prototype.execPre = function(name, context, callback) {
           }
         }
 
-        next();
-      });
+        next.apply(context, arguments);
+      }];
+      if (arguments.length >= 2) {
+        for (var i = 1; i < arguments.length; ++i) {
+          args.push(arguments[i]);
+        }
+      }
+      pre.fn.apply(context, args);
     } else {
       pre.fn.call(context);
       if (++currentPre >= numPres) {
@@ -133,7 +139,7 @@ Kareem.prototype.execPost = function(name, context, args, callback) {
   next();
 };
 
-Kareem.prototype.wrap = function(name, fn, context, args) {
+Kareem.prototype.wrap = function(name, fn, context, args, useLegacyPost) {
   var lastArg = (args.length > 0 ? args[args.length - 1] : null);
   var _this = this;
 
@@ -155,6 +161,10 @@ Kareem.prototype.wrap = function(name, fn, context, args) {
           undefined;
       }
 
+      if (useLegacyPost && typeof lastArg === 'function') {
+        lastArg.apply(context, arguments);
+      }
+
       var argsWithoutError = Array.prototype.slice.call(arguments, 1);
       _this.execPost(name, context, argsWithoutError, function() {
         if (arguments[0]) {
@@ -163,7 +173,7 @@ Kareem.prototype.wrap = function(name, fn, context, args) {
             undefined;
         }
 
-        return typeof lastArg === 'function' ?
+        return typeof lastArg === 'function' && !useLegacyPost ?
           lastArg.apply(context, arguments) :
           undefined;
       });

package/package.json

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

package/test/pre.test.js

@@ -193,4 +193,34 @@ describe('execPre', function() {
       done();
     });
   });
+
+  it('allows passing arguments to the next pre', function(done) {
+    var execed = {};
+
+    hooks.pre('cook', function(next) {
+      execed.first = true;
+      next(null, 'test');
+    });
+
+    hooks.pre('cook', function(next, p) {
+      execed.second = true;
+      assert.equal(p, 'test');
+      next();
+    });
+
+    hooks.pre('cook', function(next, p) {
+      execed.third = true;
+      assert.ok(!p);
+      next();
+    });
+
+    hooks.execPre('cook', null, function(err) {
+      assert.ifError(err);
+      assert.equal(3, Object.keys(execed).length);
+      assert.ok(execed.first);
+      assert.ok(execed.second);
+      assert.ok(execed.third);
+      done();
+    });
+  });
 });

package/test/wrap.test.js

@@ -248,4 +248,30 @@ describe('wrap()', function() {
       },
       25);
   });
+
+  it('can use legacy post behavior', function(done) {
+    var called = 0;
+    hooks.post('cook', function(callback) {
+      ++called;
+      callback();
+    });
+
+    var args = [function(error) {
+      assert.equal(called, 0);
+
+      setTimeout(function() {
+        assert.equal(called, 1);
+        done();
+      }, 0);
+    }];
+
+    hooks.wrap(
+      'cook',
+      function(callback) {
+        callback();
+      },
+      null,
+      args,
+      true);
+  });
 });