Migrate to underscore-plus and array-series

lib/bijous.js

@@ -1,14 +1,14 @@
-var Bijous, EventEmitter, Klect, async, exports, getModuleName, loadModule, path, setService, util, _,
+var Bijous, EventEmitter, Klect, exports, getModuleName, loadModule, path, series, setService, util, _,
   __hasProp = {}.hasOwnProperty,
   __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
 path = require('path');
 
 util = require('util');
 
-async = require('async');
+series = require('array-series');
 
-_ = require('lodash');
+_ = require('underscore-plus');
 
 EventEmitter = require('events').EventEmitter;
 
@@ -39,7 +39,7 @@ setService = function(def, services, service) {
   if (def.bundle === this.defaultBundleName) {
     services[def.name] = service;
   } else {
-    _.merge(services[_name = def.bundle] != null ? services[_name] : services[_name] = {}, _.object([def.name], [service]));
+    _.extend(services[_name = def.bundle] != null ? services[_name] : services[_name] = {}, _.object([def.name], [service]));
   }
 };
 
@@ -100,7 +100,7 @@ Bijous = (function(_super) {
         };
       };
     })(this));
-    async.series(fns, (function(_this) {
+    series(fns, (function(_this) {
       return function(error) {
         if (callback) {
           callback(error, services);

package.json

@@ -7,9 +7,9 @@
     "node": ">=0.10"
   },
   "dependencies": {
-    "async": "^0.9.0",
+    "array-series": "^0.1.5",
     "klect": "^0.1.3",
-    "lodash": "^2.4.1"
+    "underscore-plus": "^1.5.0"
   },
   "devDependencies": {
     "chai": "^1.9.1",

spec/bijous-spec.coffee

@@ -1,7 +1,7 @@
 path = require 'path'
 fs = require 'fs'
 expect = require('chai').expect
-async = require 'async'
+series = require 'array-series'
 sinon = require 'sinon'
 Bijous = require '../lib/bijous'
 
@@ -205,7 +205,7 @@ describe 'Bijous', ->
             public: 'fixtures/public/*'
             empty: 'fixtures/empty/*'
 
-        series = [
+        fns = [
           (callback) ->
             bijous.load 'private', (error, services) ->
               expect(error).to.be.undefined
@@ -234,7 +234,7 @@ describe 'Bijous', ->
               callback error
         ]
 
-        async.series series, done
+        series fns, done
 
     context 'when an error occurs while loading a module', ->
       bijous = null

src/bijous.coffee

@@ -1,7 +1,7 @@
 path = require 'path'
 util = require 'util'
-async = require 'async'
-_ = require 'lodash'
+series = require 'array-series'
+_ = require 'underscore-plus'
 {EventEmitter} = require 'events'
 Klect = require 'klect'
 
@@ -112,7 +112,7 @@ loadModule = (def, services, done) ->
 # Returns: `undefined`
 setService = (def, services, service) ->
   if def.bundle is @defaultBundleName then services[def.name] = service
-  else _.merge services[def.bundle] ?= {}, _.object([def.name], [service])
+  else _.extend services[def.bundle] ?= {}, _.object([def.name], [service])
 
   return
 
@@ -328,7 +328,7 @@ class Bijous extends EventEmitter
     fns = @require(bundle).map (def) =>
       (done) => loadModule.call @, def, services, done
 
-    async.series fns, (error) =>
+    series fns, (error) =>
       if callback then callback error, services
 
       if error and not callback then @emit 'error', error