Skip to content

Commit 061ccc4

Browse files
committed
Upgrade: Update now-and-later dependency & add iterator wrapper to handle new signature (closes #31)
1 parent c456f50 commit 061ccc4

File tree

5 files changed

+21
-5
lines changed

5 files changed

+21
-5
lines changed

lib/parallel.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ var nowAndLater = require('now-and-later');
77

88
var helpers = require('./helpers');
99

10+
function iterator(fn, key, cb) {
11+
return asyncDone(fn, cb);
12+
}
13+
1014
function buildParallel() {
1115
var args = helpers.verifyArguments(arguments);
1216

@@ -17,7 +21,7 @@ function buildParallel() {
1721
}
1822

1923
function parallel(done) {
20-
nowAndLater.map(args, asyncDone, extensions, done);
24+
nowAndLater.map(args, iterator, extensions, done);
2125
}
2226

2327
return parallel;

lib/series.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ var nowAndLater = require('now-and-later');
77

88
var helpers = require('./helpers');
99

10+
function iterator(fn, key, cb) {
11+
return asyncDone(fn, cb);
12+
}
13+
1014
function buildSeries() {
1115
var args = helpers.verifyArguments(arguments);
1216

@@ -17,7 +21,7 @@ function buildSeries() {
1721
}
1822

1923
function series(done) {
20-
nowAndLater.mapSeries(args, asyncDone, extensions, done);
24+
nowAndLater.mapSeries(args, iterator, extensions, done);
2125
}
2226

2327
return series;

lib/settleParallel.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ var nowAndLater = require('now-and-later');
77

88
var helpers = require('./helpers');
99

10+
function iterator(fn, key, cb) {
11+
return asyncSettle(fn, cb);
12+
}
13+
1014
function buildSettleParallel() {
1115
var args = helpers.verifyArguments(arguments);
1216

@@ -18,7 +22,7 @@ function buildSettleParallel() {
1822

1923
function settleParallel(done) {
2024
var onSettled = helpers.onSettled(done);
21-
nowAndLater.map(args, asyncSettle, extensions, onSettled);
25+
nowAndLater.map(args, iterator, extensions, onSettled);
2226
}
2327

2428
return settleParallel;

lib/settleSeries.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ var nowAndLater = require('now-and-later');
77

88
var helpers = require('./helpers');
99

10+
function iterator(fn, key, cb) {
11+
return asyncSettle(fn, cb);
12+
}
13+
1014
function buildSettleSeries() {
1115
var args = helpers.verifyArguments(arguments);
1216

@@ -18,7 +22,7 @@ function buildSettleSeries() {
1822

1923
function settleSeries(done) {
2024
var onSettled = helpers.onSettled(done);
21-
nowAndLater.mapSeries(args, asyncSettle, extensions, onSettled);
25+
nowAndLater.mapSeries(args, iterator, extensions, onSettled);
2226
}
2327

2428
return settleSeries;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"array-last": "^1.1.1",
3636
"async-done": "^1.2.2",
3737
"async-settle": "^1.0.0",
38-
"now-and-later": "^1.0.0"
38+
"now-and-later": "^2.0.0"
3939
},
4040
"devDependencies": {
4141
"eslint": "^1.7.3",

0 commit comments

Comments
 (0)