Breaking: Remove timing methods & switch to now-and-later for series/…

…parallel

index.js

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

lib/parallel.js

@@ -0,0 +1,24 @@
+'use strict';
+
+var _ = require('lodash');
+var asyncDone = require('async-done');
+var nowAndLater = require('now-and-later');
+
+var verifyArguments = require('./verifyArguments');
+
+function buildParallel(){
+  var args = verifyArguments(arguments);
+
+  var extensions = {};
+  if(typeof _.last(args) !== 'function'){
+    extensions = _.last(args);
+  }
+
+  function parallel(done){
+    nowAndLater.parallel(args, asyncDone, extensions, done);
+  }
+
+  return parallel;
+}
+
+module.exports = buildParallel;

lib/series.js

@@ -0,0 +1,24 @@
+'use strict';
+
+var _ = require('lodash');
+var asyncDone = require('async-done');
+var nowAndLater = require('now-and-later');
+
+var verifyArguments = require('./verifyArguments');
+
+function buildSeries(){
+  var args = verifyArguments(arguments);
+
+  var extensions = {};
+  if(typeof _.last(args) !== 'function'){
+    extensions = _.last(args);
+  }
+
+  function series(done){
+    nowAndLater.series(args, asyncDone, extensions, done);
+  }
+
+  return series;
+}
+
+module.exports = buildSeries;

lib/verifyArguments.js

@@ -1,13 +1,25 @@
+'use strict';
+
 var assert = require('assert');
 
-module.exports = function(args){
+var _ = require('lodash');
+
+function verifyArguments(args){
+  args = _.flatten(args);
 
-  assert(args.length > 0, 'A set of functions to combine is mandatory');
+  assert.ok(args.length, 'A set of functions to combine is required');
 
-  args.forEach(function(arg, argIdx){
-    assert.equal(typeof arg, 'function',
-        'Only functions can be combined, got ' + typeof arg + ' for argument ' + argIdx);
+  _.forEach(args, function(arg, argIdx){
+    var isFunction = _.isFunction(arg);
+    if(isFunction){
+      return;
+    }
+
+    var msg = 'Only functions can be combined, got ' + typeof arg + ' for argument ' + argIdx;
+    assert.ok(isFunction, msg);
   });
 
   return args;
-};
+}
+
+module.exports = verifyArguments;

package.json

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

test/parallel.js

@@ -41,7 +41,7 @@ test('should execute functions in parallel and call callback with error on an er
   bach.parallel(fn1, slowFn, fn3, fnError)(function(error, results){
     t.ok(error, 'error should be defined');
     t.ok(results, 'results should be defined');
-    t.deepEqual(results, [1, , 3, undefined], 'results should be [1, , 3, undefined]');
+    t.deepEqual(results, [1, undefined, 3, undefined], 'results should be [1, undefined, 3, undefined]');
     t.ok(error instanceof Error, 'error should be instance of an Error');
     t.end();
   });

test/verifyArguments.js

@@ -26,7 +26,7 @@ test('should throw descriptive error message on when no arguments provided', fun
   t.throws(function(){
     verifyArguments([]);
   }, {
-    name: 'AssertionError', message: 'A set of functions to combine is mandatory'
+    name: 'AssertionError', message: 'A set of functions to combine is required'
   }, 'should throw AssertionError');
   t.end();
-});
+});