Breaking: Move settle functions to own module & add timing methods

index.js

@@ -1,11 +1,11 @@
-var series = require('./series');
-var parallel = require('./parallel');
-var settleSeries = require('./settleSeries');
-var settleParallel = require('./settleParallel');
+'use strict';
+
+var asyncDone = require('async-done');
+
+var createSeries = require('./lib/createSeries');
+var createParallel = require('./lib/createParallel');
 
 module.exports = {
-  series: series,
-  parallel: parallel,
-  settleSeries: settleSeries,
-  settleParallel: settleParallel,
+  series: createSeries(asyncDone),
+  parallel: createParallel(asyncDone)
 };

lib/createParallel.js

@@ -0,0 +1,21 @@
+'use strict';
+
+var _ = require('lodash');
+var async = require('async');
+
+function createSeries(mapFn){
+
+  function buildParallel(){
+    var args = _.flatten(arguments);
+
+    function parallel(done){
+      async.map(args, mapFn, done);
+    }
+
+    return parallel;
+  }
+
+  return buildParallel;
+}
+
+module.exports = createSeries;

lib/createSeries.js

@@ -0,0 +1,21 @@
+'use strict';
+
+var _ = require('lodash');
+var async = require('async');
+
+function createSeries(mapFn, onDone){
+
+  function buildSeries(){
+    var args = _.flatten(arguments);
+
+    function series(done){
+      async.mapSeries(args, mapFn, done);
+    }
+
+    return series;
+  }
+
+  return buildSeries;
+}
+
+module.exports = createSeries;

package.json

@@ -29,9 +29,10 @@
     "tap": "~0.4.8"
   },
   "dependencies": {
-    "async-settle": "~0.1.0",
-    "async-done": "~0.2.0",
     "async": "~0.2.10",
+    "async-done": "~0.2.0",
+    "async-settle": "~0.1.0",
+    "async-time": "~0.0.1",
     "lodash": "~2.4.1"
   }
 }

settle.js

@@ -0,0 +1,9 @@
+'use strict';
+
+var series = require('./settle/series');
+var parallel = require('./settle/parallel');
+
+module.exports = {
+  series: series,
+  parallel: parallel
+};

settleParallel.js → settle/parallel.js

@@ -4,7 +4,7 @@ var _ = require('lodash');
 var async = require('async');
 var asyncSettle = require('async-settle');
 
-var onSettled = require('./lib/onSettled');
+var onSettled = require('../lib/onSettled');
 
 function buildParallel(){
   var args = _.flatten(arguments);

settleSeries.js → settle/series.js

@@ -4,7 +4,7 @@ var _ = require('lodash');
 var async = require('async');
 var asyncSettle = require('async-settle');
 
-var onSettled = require('./lib/onSettled');
+var onSettled = require('../lib/onSettled');
 
 function buildParallel(){
   var args = _.flatten(arguments);

test/settleParallel.js

@@ -2,7 +2,7 @@
 
 var test = require('tap').test;
 
-var bach = require('../');
+var bach = require('../settle');
 
 function fn1(done){
   done(null, 1);
@@ -23,7 +23,7 @@ function fnError(done){
 }
 
 test('should execute functions in parallel and call callback with results on settled', function(t){
-  bach.settleParallel(fn1, fn2, fn3)(function(errors, results){
+  bach.parallel(fn1, fn2, fn3)(function(errors, results){
     t.notOk(errors, 'errors should be undefined');
     t.ok(results, 'results should be defined');
     t.deepEqual(results, [1, 2, 3], 'results should be [1, 2, 3]');
@@ -38,7 +38,7 @@ test('should execute functions in parallel and call callback with errors on sett
       done(null, 2);
     }, 500);
   }
-  bach.settleParallel(fn1, slowFn, fn3, fnError)(function(errors, results){
+  bach.parallel(fn1, slowFn, fn3, fnError)(function(errors, results){
     t.ok(errors, 'errors should be defined');
     t.ok(results, 'results should be defined');
     t.ok(Array.isArray(errors), 'errors should be an array');

test/settleSeries.js

@@ -2,7 +2,7 @@
 
 var test = require('tap').test;
 
-var bach = require('../');
+var bach = require('../settle');
 
 function fn1(done){
   done(null, 1);
@@ -23,7 +23,7 @@ function fnError(done){
 }
 
 test('should execute functions in series and call callback with results on settled', function(t){
-  bach.settleSeries(fn1, fn2, fn3)(function(errors, results){
+  bach.series(fn1, fn2, fn3)(function(errors, results){
     t.notOk(errors, 'errors should be undefined');
     t.ok(results, 'results should be defined');
     t.deepEqual(results, [1, 2, 3], 'results should be [1, 2, 3]');
@@ -38,7 +38,7 @@ test('should execute functions in series and call callback with errors on settle
       done(null, 2);
     }, 500);
   }
-  bach.settleSeries(fn1, slowFn, fn3, fnError)(function(errors, results){
+  bach.series(fn1, slowFn, fn3, fnError)(function(errors, results){
     t.ok(errors, 'errors should be defined');
     t.ok(results, 'results should be defined');
     t.ok(Array.isArray(errors), 'errors should be an array');

test/timeParallel.js

@@ -0,0 +1,41 @@
+'use strict';
+
+var test = require('tap').test;
+
+var bach = require('../time');
+
+function fn1(done){
+  done(null, 1);
+}
+
+function fn2(done){
+  setTimeout(function(){
+    done(null, 2);
+  }, 500);
+}
+
+function fn3(done){
+  done(null, 3);
+}
+
+function done(){}
+
+test('should emit start event for each function', function(t){
+  t.plan(3);
+
+  bach.on('start', function(evt){
+    t.ok(evt, 'start event should be defined');
+  });
+
+  bach.parallel(fn1, fn2, fn3)(console.log);
+});
+
+test('should emit stop event for each function', function(t){
+  t.plan(3);
+
+  bach.on('stop', function(evt){
+    t.ok(evt, 'stop event should be defined');
+  });
+
+  bach.parallel(fn1, fn2, fn3)(done);
+});

test/timeSeries.js

@@ -0,0 +1,41 @@
+'use strict';
+
+var test = require('tap').test;
+
+var bach = require('../time');
+
+function fn1(done){
+  done(null, 1);
+}
+
+function fn2(done){
+  setTimeout(function(){
+    done(null, 2);
+  }, 500);
+}
+
+function fn3(done){
+  done(null, 3);
+}
+
+function done(){}
+
+test('should emit start event for each function', function(t){
+  t.plan(3);
+
+  bach.on('start', function(evt){
+    t.ok(evt, 'start event should be defined');
+  });
+
+  bach.series(fn1, fn2, fn3)(console.log);
+});
+
+test('should emit stop event for each function', function(t){
+  t.plan(3);
+
+  bach.on('stop', function(evt){
+    t.ok(evt, 'stop event should be defined');
+  });
+
+  bach.series(fn1, fn2, fn3)(done);
+});

time.js

@@ -0,0 +1,15 @@
+'use strict';
+
+var EE = require('events').EventEmitter;
+
+var bus = new EE();
+
+var asyncTime = require('async-time')(bus);
+
+var createSeries = require('./lib/createSeries');
+var createParallel = require('./lib/createParallel');
+
+bus.series = createSeries(asyncTime);
+bus.parallel = createParallel(asyncTime);
+
+module.exports = bus;