Skip to content

Commit

Permalink
Updated documentation, hooks-js dependency, and tests to reflect new …
Browse files Browse the repository at this point in the history
…change to hooks api where the async flag is the 2nd, not 3rd argument to pre.
  • Loading branch information
bnoguchi committed Jun 3, 2011
1 parent 22d929f commit 3a735e9
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -209,9 +209,9 @@ There's two types of middleware:
Parallel middleware offer more fine-grained flow control, and are defined
like

.pre(method, function (next, done, methodArg1, methodArg2) {
.pre(method, true, function (next, done, methodArg1, methodArg2) {
// ...
}, true)
})

Parallel middleware can `next()` immediately, but the final argument will be
called when all the parallel middleware have called `done()`.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -5,7 +5,7 @@
, "author": "Guillermo Rauch <guillermo@learnboost.com>"
, "keywords": ["mongodb", "mongoose", "orm", "data", "datastore", "nosql"]
, "dependencies": {
"hooks": ">=0.1.5"
"hooks": ">=0.1.6"
}
, "directories": { "lib": "./lib/mongoose" }
, "scripts": { "test": "make test" }
Expand Down
36 changes: 18 additions & 18 deletions test/document.test.js
Expand Up @@ -164,7 +164,7 @@ module.exports = {
});

// parallel
doc.pre('hooksTest', function(next, done){
doc.pre('hooksTest', true, function(next, done){
steps++;
setTimeout(function(){
steps.should.eql(4);
Expand All @@ -174,9 +174,9 @@ module.exports = {
done();
}, 100);
next();
}, true);
});

doc.pre('hooksTest', function(next, done){
doc.pre('hooksTest', true, function(next, done){
steps++;
setTimeout(function(){
steps.should.eql(4);
Expand All @@ -186,7 +186,7 @@ module.exports = {
done();
}, 100);
next();
}, true);
});

doc.hooksTest(function(err){
should.strictEqual(err, null);
Expand Down Expand Up @@ -233,19 +233,19 @@ module.exports = {
, steps = 0
, called = false;

doc.pre('hooksTest', function(next, done){
doc.pre('hooksTest', true, function(next, done){
steps++;
next();
done();
done();
}, true);
});

doc.pre('hooksTest', function(next, done){
doc.pre('hooksTest', true, function(next, done){
steps++;
next();
done();
done();
}, true);
});

doc.hooksTest(function(err){
should.strictEqual(err, null);
Expand All @@ -265,17 +265,17 @@ module.exports = {
, steps = 0
, called = false;

doc.pre('hooksTest', function(next, done){
doc.pre('hooksTest', true, function(next, done){
steps++;
next();
done();
done();
}, true);
});

doc.pre('hooksTest', function(next, done){
doc.pre('hooksTest', true, function(next, done){
steps++;
next();
}, true);
});

doc.hooksTest(function(err){
should.strictEqual(err, null);
Expand Down Expand Up @@ -356,23 +356,23 @@ module.exports = {
, steps = 0
, called = false;

doc.pre('hooksTest', function(next, done){
doc.pre('hooksTest', true, function(next, done){
steps++;
next();
done();
}, true);
});

doc.pre('hooksTest', function(next, done){
doc.pre('hooksTest', true, function(next, done){
steps++;
next();
done();
}, true);
});

doc.pre('hooksTest', function(next, done){
doc.pre('hooksTest', true, function(next, done){
steps++;
next();
done(new Error);
}, true);
});

doc.hooksTest(function(err){
err.should.be.an.instanceof(Error);
Expand Down

0 comments on commit 3a735e9

Please sign in to comment.