[WIP] Explicit proxies

CHANGELOG.md

@@ -1,5 +1,7 @@
 # ember-cli Changelog
 
+* [ENHANCEMENT] adds http-proxy for explicit, multi proxy use[#1474](https://github.com/stefanpenner/ember-cli/pull/1530)
+* [BREAKING ENHANCEMENT] renames apiStub to http-mock to match other http-related generators [#1474] (https://github.com/stefanpenner/ember-cli/pull/1530)
 * [ENHANCEMENT] Log proxy server traffic when using `ember serve --proxy` [#1583](https://github.com/stefanpenner/ember-cli/pull/1583)
 * [ENHANCEMENT] Remove chain from express server [#1474](https://github.com/stefanpenner/ember-cli/pull/1474)
 * [ENHANCEMENT] Remove Blueprint lookup failure stacktrace [#1476](https://github.com/stefanpenner/ember-cli/pull/1476)

blueprints/http-mock/files/server/index.js

@@ -0,0 +1,29 @@
+// To use it create some files under `routes/`
+// e.g. `server/routes/ember-hamsters.js`
+//
+// module.exports = function(app) {
+//   app.get('/ember-hamsters', function(req, res) {
+//     res.send('hello');
+//   });
+// };
+
+var bodyParser = require('body-parser');
+var globSync   = require('glob').sync;
+var mocks      = globSync('./mocks/**/*.js', { cwd: __dirname }).map(require);
+var proxies    = globSync('./proxies/**/*.js', { cwd: __dirname }).map(require);
+
+module.exports = function(app) {
+  app.use(bodyParser.json());
+  app.use(bodyParser.urlencoded({
+    extended: true
+  }));
+
+  mocks.forEach(function(route) { route(app)});
+
+  // proxy expects a stream, but express will have turned
+  // the request stream into an object because bodyParser
+  // has run. We have to convert it back to stream:
+  // https://github.com/nodejitsu/node-http-proxy/issues/180
+  app.use(require('connect-restreamer')());
+  proxies.forEach(function(route) { route(app)});
+};

blueprints/http-proxy/files/server/.jshintrc

@@ -0,0 +1,3 @@
+{
+  "node": true
+}

blueprints/http-proxy/files/server/index.js

@@ -0,0 +1,29 @@
+// To use it create some files under `routes/`
+// e.g. `server/routes/ember-hamsters.js`
+//
+// module.exports = function(app) {
+//   app.get('/ember-hamsters', function(req, res) {
+//     res.send('hello');
+//   });
+// };
+
+var bodyParser = require('body-parser');
+var globSync   = require('glob').sync;
+var mocks      = globSync('./mocks/**/*.js', { cwd: __dirname }).map(require);
+var proxies    = globSync('./proxies/**/*.js', { cwd: __dirname }).map(require);
+
+module.exports = function(app) {
+  app.use(bodyParser.json());
+  app.use(bodyParser.urlencoded({
+    extended: true
+  }));
+
+  mocks.forEach(function(route) { route(app)});
+
+  // proxy expects a stream, but express will have turned
+  // the request stream into an object because bodyParser
+  // has run. We have to convert it back to stream:
+  // https://github.com/nodejitsu/node-http-proxy/issues/180
+  app.use(require('connect-restreamer')());
+  proxies.forEach(function(route) { route(app)});
+};

blueprints/http-proxy/files/server/proxies/__name__.js

@@ -0,0 +1,14 @@
+var Proxy = require('http-proxy');
+
+// For options, see:
+// https://github.com/nodejitsu/node-http-proxy
+var proxy = Proxy.createProxyServer({});
+
+module.exports = function(app) {
+
+  app.use('/<%=camelizedModuleName %>', function(req, res, next){
+    proxy.web(req, res, { target: '<%=proxyUrl %>' });
+  })
+
+};
+

blueprints/http-proxy/index.js

@@ -0,0 +1,11 @@
+var Blueprint = require('../../lib/models/blueprint');
+
+module.exports = Blueprint.extend({
+  locals: function(options) {
+    var proxyUrl = options.args[2];
+    return {
+      path: '/' + options.entity.name.replace(/^\//, ''),
+      proxyUrl: proxyUrl
+    };
+  }
+});

package.json

@@ -132,7 +132,9 @@
     "tiny-lr": "0.0.9",
     "tmp-sync": "^1.0.1",
     "walk-sync": "^0.1.2",
-    "yam": "0.0.12"
+    "yam": "0.0.12",
+    "http-proxy": "^1.1.6",
+    "connect-restreamer": "^1.0.0"
   },
   "devDependencies": {
     "chai": "^1.9.1",

tests/acceptance/destroy-test.js

@@ -429,17 +429,29 @@ describe('Acceptance: ember destroy', function() {
     return assertDestroyAfterGenerate(commandArgs, files);
   });
 
-  it('api-stub foo', function() {
-    var commandArgs = ['api-stub', 'foo'];
+  it('http-mock foo', function() {
+    var commandArgs = ['http-mock', 'foo'];
     var files       = [
       'server/index.js',
-      'server/routes/foo.js',
+      'server/mocks/foo.js',
       'server/.jshintrc'
     ];
 
     return assertDestroyAfterGenerate(commandArgs, files);
   });
 
+  it('http-proxy foo', function() {
+    var commandArgs = ['http-proxy', 'foo'];
+    var files       = [
+      'server/index.js',
+      'server/proxies/foo.js',
+      'server/.jshintrc'
+    ];
+
+    return assertDestroyAfterGenerate(commandArgs, files);
+  });
+
+
   it('acceptance-test foo', function() {
     var commandArgs = ['acceptance-test', 'foo'];
     var files       = ['tests/acceptance/foo-test.js'];

tests/acceptance/generate-test.js

@@ -694,30 +694,38 @@ describe('Acceptance: ember generate', function() {
     });
   });
 
-  it('api-stub foo', function() {
-    return generate(['api-stub', 'foo']).then(function() {
+  it('http-mock foo', function() {
+    return generate(['http-mock', 'foo']).then(function() {
       assertFile('server/index.js', {
         contains: "var bodyParser = require('body-parser');" + EOL +
                   "var globSync   = require('glob').sync;" + EOL +
-                  "var routes     = globSync('./routes/**/*.js', { cwd: __dirname }).map(require);" + EOL +
-                  EOL +
+                  "var mocks      = globSync('./mocks/**/*.js', { cwd: __dirname }).map(require);" + EOL +
+                  "var proxies    = globSync('./proxies/**/*.js', { cwd: __dirname }).map(require);" + EOL +
+                  "" + EOL +
                   "module.exports = function(app) {" + EOL +
                   "  app.use(bodyParser.json());" + EOL +
                   "  app.use(bodyParser.urlencoded({" + EOL +
                   "    extended: true" + EOL +
                   "  }));" + EOL +
-                  EOL +
-                  "  routes.forEach(function(route) { route(app); });" + EOL +
+                  "" + EOL +
+                  "  mocks.forEach(function(route) { route(app)});" + EOL +
+                  "" + EOL +
+                  "  // proxy expects a stream, but express will have turned" + EOL +
+                  "  // the request stream into an object because bodyParser" + EOL +
+                  "  // has run. We have to convert it back to stream:" + EOL +
+                  "  // https://github.com/nodejitsu/node-http-proxy/issues/180" + EOL +
+                  "  app.use(require('connect-restreamer')());" + EOL +
+                  "  proxies.forEach(function(route) { route(app)});" + EOL +
                   "};"
       });
-      assertFile('server/routes/foo.js', {
+      assertFile('server/mocks/foo.js', {
         contains: "module.exports = function(app) {" + EOL +
                   "  var express = require('express');" + EOL +
                   "  var fooRouter = express.Router();" + EOL +
                   "  fooRouter.get('/', function(req, res) {" + EOL +
                   "    res.send({foo:[]});" + EOL +
                   "  });" + EOL +
-                  "  app.use('/api/foo', fooRouter);" + EOL + "" +
+                  "  app.use('/api/foo', fooRouter);" + EOL +
                   "};"
       });
       assertFile('server/.jshintrc', {
@@ -726,6 +734,51 @@ describe('Acceptance: ember generate', function() {
     });
   });
 
+  it('http-proxy foo', function() {
+    return generate(['http-proxy', 'foo', 'http://localhost:5000']).then(function() {
+      assertFile('server/index.js', {
+        contains: "var bodyParser = require('body-parser');\n" +
+                  "var globSync   = require('glob').sync;\n" +
+                  "var mocks      = globSync('./mocks/**/*.js', { cwd: __dirname }).map(require);\n" +
+                  "var proxies    = globSync('./proxies/**/*.js', { cwd: __dirname }).map(require);\n" +
+                  "\n" +
+                  "module.exports = function(app) {\n" +
+                  "  app.use(bodyParser.json());\n" +
+                  "  app.use(bodyParser.urlencoded({\n" +
+                  "    extended: true\n" +
+                  "  }));\n" +
+                  "\n" +
+                  "  mocks.forEach(function(route) { route(app)});\n" +
+                  "\n" +
+                  "  // proxy expects a stream, but express will have turned\n" +
+                  "  // the request stream into an object because bodyParser\n" +
+                  "  // has run. We have to convert it back to stream:\n" +
+                  "  // https://github.com/nodejitsu/node-http-proxy/issues/180\n" +
+                  "  app.use(require('connect-restreamer')());\n" +
+                  "  proxies.forEach(function(route) { route(app)});\n" +
+                  "};"
+      });
+      assertFile('server/proxies/foo.js', {
+        contains: "var Proxy = require('http-proxy');\n" +
+                  "\n" +
+                  "// For options, see:\n" +
+                  "// https://github.com/nodejitsu/node-http-proxy\n" +
+                  "var proxy = Proxy.createProxyServer({});\n" +
+                  "\n" +
+                  "module.exports = function(app) {\n" +
+                  "\n" +
+                  "  app.use('/foo', function(req, res, next){\n" +
+                  "    proxy.web(req, res, { target: 'http://localhost:5000' });\n" +
+                  "  })\n" +
+                  "\n" +
+                  "};"
+      });
+      assertFile('server/.jshintrc', {
+        contains: '{\n  "node": true\n}'
+      });
+    });
+  });
+
   it('uses blueprints from the project directory', function() {
     return initApp()
       .then(function() {

tests/acceptance/help-test.js

@@ -33,7 +33,8 @@ describe('Acceptance: ember help', function() {
       assert.include(output, 'ember-cli commands:');
       assert.include(output, '  app');
       assert.include(output, '  adapter');
-      assert.include(output, '  api');
+      assert.include(output, '  http-mock');
+      assert.include(output, '  http-proxy');
       assert.include(output, '  app');
       assert.include(output, '  blueprint');
       assert.include(output, '  component');