Add superagent request builder

lib/http/index.js

@@ -1,4 +1,5 @@
 module.exports = {
   RangeParser: require('./range-parser').RangeParser,
-  request: require('./request')
+  request: require('./request'),
+  requestBuilder: require('./request-builder').requestBuilder
 };

lib/http/request-builder.js

@@ -0,0 +1,55 @@
+var methods = require('methods')
+  , _ = require('lodash');
+
+function RequestBuilder (agent) {
+  this._agent = agent;
+  this._plugins = [];
+}
+
+RequestBuilder.prototype.use = function (plugin) {
+  this._plugins.push(plugin);
+  return this;
+}
+
+// Create prototype method for each superagent request method.
+// Superagent uses similar implementation to generate http request
+// verb method names.
+var verbs = methods.concat('del');
+_.each(verbs, function (verb) {
+  RequestBuilder.prototype[verb] = function () {
+    var request = this._agent[verb].apply(this._agent, arguments);
+
+    _.each(this._plugins, function (plugin) {
+      request.use(plugin);
+    });
+
+    return request;
+  }
+});
+
+/**
+ * Superagent request builder.
+ *
+ * Builder allows to chain superagent plugins before calling request
+ * factory method. Superagent request is created with chained plugins
+ * when builder's http request factory method is called.
+ *
+ * Example:
+ *
+ * var requestBuilder = require('dodo/http').requestBuilder
+ *   , superagent = require('superagent')
+ *   , prefix = require('superagent-prefix');
+ *
+ * var request = requestBuilder(superagent)
+ *   .use(prefix('http://localhost:8080'));
+ *
+ * request.get('/some/resource')
+ *  .then(function (res) {
+ *     console.log(res);
+ *   });
+ */
+module.exports = {
+  requestBuilder: function (agent) {
+    return new RequestBuilder(agent);
+  }
+};

lib/utils/TestHelper.js

@@ -1,7 +1,8 @@
 'use strict';
 
 var main = require('../app/express/main')
-  , request = require('../http/request')
+  , superagent = require('superagent')
+  , requestBuilder = require('../http').requestBuilder
   , path = require('path')
   , _ = require('lodash');
 
@@ -19,10 +20,15 @@ var main = require('../app/express/main')
  */
 function TestHelper(config) {
   this.serverUrl = getAppAddress(config);
-  this.request = request(this.serverUrl);
   this.app = main.createApp(config);
 
   var self = this;
+
+  this.request = requestBuilder(superagent)
+    .use(function (req) {
+      req.url = self.serverUrl + req.url;
+    });
+
   before(function () {
     return main.startApp(self.app);
   });

lib/utils/index.js

@@ -1,7 +1,7 @@
 module.exports = {
   classUtils: require('./class-utils'),
   mergeConfig: require('./merge-config').mergeConfig,
-  MultiRequire: require('./multi-require').MultiRequire,
+  multiRequire: require('./multi-require').multiRequire,
   runCommandInPromise: require('./run-command-in-promise').runCommandInPromise,
   TestHelper: require('./TestHelper').TestHelper
 };

lib/utils/multi-require.js

@@ -181,7 +181,7 @@ MultiRequire.prototype.doRequire_ = function(callback) {
  * @returns {MultiRequire}
  */
 module.exports = {
-  MultiRequire: function(pathPattern) {
+  multiRequire: function(pathPattern) {
     return new MultiRequire(pathPattern);
   }
 };

package.json

@@ -26,7 +26,8 @@
   "files": [
     "README.md",
     "LICENSE",
-    "lib/*"
+    "lib/*",
+    "*.js"
   ],
   "dependencies": {
     "aws-sdk": "2.1.26",
@@ -40,10 +41,12 @@
     "fs-extra": "0.18.2",
     "glob": "5.0.5",
     "lodash": "^3.6.0",
+    "methods": "^1.1.2",
     "minimist": "1.1.1",
     "moment": "2.10.2",
     "mv": "2.0.3",
     "node-uuid": "1.4.3",
+    "superagent": "^2.3.0",
     "tv4": "1.1.9",
     "tv4-formats": "1.0.0",
     "underscore.string": "^3.0.0"

tests/http/request-builder.spec.js

@@ -0,0 +1,31 @@
+var _ = require('lodash')
+  , methods = require('methods')
+  , expect = require('chai').expect
+  , requestBuilder = require('../../lib/http').requestBuilder;
+
+describe('request builder', function () {
+
+  it('should call use for each plugin when creating request', function () {
+    var agent = {
+      args: {}
+    };
+
+    agent.get = function (url) {
+      agent.args.get = url;
+      return agent;
+    }
+
+    agent.use = function (plugin) {
+      agent.args.use = plugin;
+      return agent;
+    }
+
+    var request = requestBuilder(agent)
+      .use('foo')
+      .get('http://example.com');
+
+    expect(agent.args.use).to.equal('foo');
+    expect(agent.args.get).to.equal('http://example.com');
+  });
+
+});