(fix) type in resolve

(added) custom-response test
(fix) needed to add this customer to work around the issue of lodash converting buffers to arrays (lodash/lodash#1453)

.eslintrc

@@ -28,6 +28,7 @@
     },
     "env": {
         "node": true,
+        "es6": true,
         "mocha": true
     }
 }

.travis.yml

@@ -1,8 +1,8 @@
 language: node_js
 node_js:
-  - "6.3"
+  - "6.5"
   - "5.12"
-  - "4.4"
+  - "4.5"
   - "0.12"
 
 after_script:

examples/custom-response/helloworld-singlefile/app.js

@@ -20,8 +20,9 @@ var app = hyper.start({
       method: {
         get: function world ($custom) {
           var data = 'iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAMAAADXqc3KAAAB+FBMVEUAAAA/mUPidDHiLi5Cn0XkNTPmeUrkdUg/m0Q0pEfcpSbwaVdKskg+lUP4zA/iLi3msSHkOjVAmETdJSjtYFE/lkPnRj3sWUs8kkLeqCVIq0fxvhXqUkbVmSjwa1n1yBLepyX1xxP0xRXqUkboST9KukpHpUbuvRrzrhF/ljbwaljuZFM4jELaoSdLtElJrUj1xxP6zwzfqSU4i0HYnydMtUlIqUfywxb60AxZqEXaoifgMCXptR9MtklHpEY2iUHWnSjvvRr70QujkC+pUC/90glMuEnlOjVMt0j70QriLS1LtEnnRj3qUUXfIidOjsxAhcZFo0bjNDH0xxNLr0dIrUdmntVTkMoyfL8jcLBRuErhJyrgKyb4zA/5zg3tYFBBmUTmQTnhMinruBzvvhnxwxZ/st+Ktt5zp9hqota2vtK6y9FemNBblc9HiMiTtMbFtsM6gcPV2r6dwroseLrMrbQrdLGdyKoobKbo3Zh+ynrgVllZulTsXE3rV0pIqUf42UVUo0JyjEHoS0HmsiHRGR/lmRz/1hjqnxjvpRWfwtOhusaz0LRGf7FEfbDVmqHXlJeW0pbXq5bec3fX0nTnzmuJuWvhoFFhm0FtrziBsjaAaDCYWC+uSi6jQS3FsSfLJiTirCOkuCG1KiG+wSC+GBvgyhTszQ64Z77KAAAARXRSTlMAIQRDLyUgCwsE6ebm5ubg2dLR0byXl4FDQzU1NDEuLSUgC+vr6urq6ubb29vb2tra2tG8vLu7u7uXl5eXgYGBgYGBLiUALabIAAABsElEQVQoz12S9VPjQBxHt8VaOA6HE+AOzv1wd7pJk5I2adpCC7RUcHd3d3fXf5PvLkxheD++z+yb7GSRlwD/+Hj/APQCZWxM5M+goF+RMbHK594v+tPoiN1uHxkt+xzt9+R9wnRTZZQpXQ0T5uP1IQxToyOAZiQu5HEpjeA4SWIoksRxNiGC1tRZJ4LNxgHgnU5nJZBDvuDdl8lzQRBsQ+s9PZt7s7Pz8wsL39/DkIfZ4xlB2Gqsq62ta9oxVlVrNZpihFRpGO9fzQw1ms0NDWZz07iGkJmIFH8xxkc3a/WWlubmFkv9AB2SEpDvKxbjidN2faseaNV3zoHXvv7wMODJdkOHAegweAfFPx4G67KluxzottCU9n8CUqXzcIQdXOytAHqXxomvykhEKN9EFutG22p//0rbNvHVxiJywa8yS2KDfV1dfbu31H8jF1RHiTKtWYeHxUvq3bn0pyjCRaiRU6aDO+gb3aEfEeVNsDgm8zzLy9egPa7Qt8TSJdwhjplk06HH43ZNJ3s91KKCHQ5x4sw1fRGYDZ0n1L4FKb9/BP5JLYxToheoFCVxz57PPS8UhhEpLBVeAAAAAElFTkSuQmCC';
+          var bData = new Buffer(data, 'base64');
           $custom({
-            data:     new Buffer(data, 'base64'),
+            data:     bData,
             filename: 'test.png'
           });
         }

legacy/manager.resource.js

@@ -239,7 +239,7 @@ var ResourceManager = function () {
       }
 
       if (!promise) {
-        promise = when.resolce();
+        promise = when.resolve();
       }
 
       return promise;

legacy/service.middleware/apiviewRoutes.js

@@ -314,7 +314,13 @@ var ApiViewRoutes = function (_ServiceMiddleware) {
 
       var deferer = when.defer();
       var resolveOutput = function resolveOutput(newOutput) {
-        var out = _.merge(orgOutput, newOutput);
+        // needed to add this customer to work around the issue of lodash converting buffers to arrays
+        // https://github.com/lodash/lodash/issues/1453
+        var out = _.merge(orgOutput, newOutput, function (a, b) {
+          if (b instanceof Buffer) {
+            return b;
+          }
+        });
         deferer.resolve(out);
       };
 

lib/manager.resource.js

@@ -223,7 +223,7 @@ class ResourceManager {
     }
 
     if (!promise) {
-      promise = when.resolce();
+      promise = when.resolve();
     }
 
     return promise;

lib/service.middleware/apiviewRoutes.js

@@ -286,7 +286,13 @@ class ApiViewRoutes extends ServiceMiddleware {
 
     var deferer = when.defer();
     var resolveOutput = function (newOutput) {
-      var out = _.merge(orgOutput, newOutput);
+      // needed to add this customer to work around the issue of lodash converting buffers to arrays
+      // https://github.com/lodash/lodash/issues/1453
+      var out = _.merge(orgOutput, newOutput, function (a, b) {
+        if (b instanceof Buffer) {
+          return b;
+        }
+      });
       deferer.resolve(out);
     };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyper.io",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "MicroServices so fast they've gone plaid!",
   "homepage": "https://github.com/jstty/hyper.io#readme",
   "keywords": [
@@ -81,8 +81,8 @@
     "supertest": "~2.0.0"
   },
   "scripts": {
-    "lint": "npm run clearn && ./node_modules/.bin/eslint lib examples test",
-    "lint-fix": "npm run clearn && ./node_modules/.bin/eslint lib examples test --fix",
+    "lint": "npm run clean && ./node_modules/.bin/eslint lib examples test",
+    "lint:fix": "npm run clean && ./node_modules/.bin/eslint lib examples test --fix",
     "compile": "./node_modules/.bin/babel lib --out-dir legacy",
     "clean": "find examples -name 'node_modules' -print0 | xargs -0 rm -rf",
     "prepublish": "npm run-script compile",

test/examples/custom-response/helloworld-singlefile.js

@@ -0,0 +1,43 @@
+var common  = require('../../util/common.js');
+var request = common.request;
+var expect  = common.expect;
+
+module.exports = [
+  function (server, done) {
+    expect(server).to.not.be.null;
+
+    if (server) {
+      request(server)
+        .get('/hello')
+        .expect(200)
+        .end(function (err, res) {
+          expect(err).to.be.null;
+
+          expect(res.header).to.have.keys([
+            'connection',
+            'content-disposition',
+            'content-type',
+            'date',
+            'filename',
+            'transfer-encoding',
+            'x-powered-by'
+          ]);
+          expect(res.header['content-disposition']).to.equal('attachment; filename=test.png');
+          expect(res.header['content-type']).to.equal('image/png');
+          expect(res.header['filename']).to.equal('test.png');
+          expect(res.header['transfer-encoding']).to.equal('chunked');
+
+          expect(res.body.length).to.equal(1086);
+
+          var data = 'iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAMAAADXqc3KAAAB+FBMVEUAAAA/mUPidDHiLi5Cn0XkNTPmeUrkdUg/m0Q0pEfcpSbwaVdKskg+lUP4zA/iLi3msSHkOjVAmETdJSjtYFE/lkPnRj3sWUs8kkLeqCVIq0fxvhXqUkbVmSjwa1n1yBLepyX1xxP0xRXqUkboST9KukpHpUbuvRrzrhF/ljbwaljuZFM4jELaoSdLtElJrUj1xxP6zwzfqSU4i0HYnydMtUlIqUfywxb60AxZqEXaoifgMCXptR9MtklHpEY2iUHWnSjvvRr70QujkC+pUC/90glMuEnlOjVMt0j70QriLS1LtEnnRj3qUUXfIidOjsxAhcZFo0bjNDH0xxNLr0dIrUdmntVTkMoyfL8jcLBRuErhJyrgKyb4zA/5zg3tYFBBmUTmQTnhMinruBzvvhnxwxZ/st+Ktt5zp9hqota2vtK6y9FemNBblc9HiMiTtMbFtsM6gcPV2r6dwroseLrMrbQrdLGdyKoobKbo3Zh+ynrgVllZulTsXE3rV0pIqUf42UVUo0JyjEHoS0HmsiHRGR/lmRz/1hjqnxjvpRWfwtOhusaz0LRGf7FEfbDVmqHXlJeW0pbXq5bec3fX0nTnzmuJuWvhoFFhm0FtrziBsjaAaDCYWC+uSi6jQS3FsSfLJiTirCOkuCG1KiG+wSC+GBvgyhTszQ64Z77KAAAARXRSTlMAIQRDLyUgCwsE6ebm5ubg2dLR0byXl4FDQzU1NDEuLSUgC+vr6urq6ubb29vb2tra2tG8vLu7u7uXl5eXgYGBgYGBLiUALabIAAABsElEQVQoz12S9VPjQBxHt8VaOA6HE+AOzv1wd7pJk5I2adpCC7RUcHd3d3fXf5PvLkxheD++z+yb7GSRlwD/+Hj/APQCZWxM5M+goF+RMbHK594v+tPoiN1uHxkt+xzt9+R9wnRTZZQpXQ0T5uP1IQxToyOAZiQu5HEpjeA4SWIoksRxNiGC1tRZJ4LNxgHgnU5nJZBDvuDdl8lzQRBsQ+s9PZt7s7Pz8wsL39/DkIfZ4xlB2Gqsq62ta9oxVlVrNZpihFRpGO9fzQw1ms0NDWZz07iGkJmIFH8xxkc3a/WWlubmFkv9AB2SEpDvKxbjidN2faseaNV3zoHXvv7wMODJdkOHAegweAfFPx4G67KluxzottCU9n8CUqXzcIQdXOytAHqXxomvykhEKN9EFutG22p//0rbNvHVxiJywa8yS2KDfV1dfbu31H8jF1RHiTKtWYeHxUvq3bn0pyjCRaiRU6aDO+gb3aEfEeVNsDgm8zzLy9egPa7Qt8TSJdwhjplk06HH43ZNJ3s91KKCHQ5x4sw1fRGYDZ0n1L4FKb9/BP5JLYxToheoFCVxz57PPS8UhhEpLBVeAAAAAElFTkSuQmCC';
+          var bData = new Buffer(data, 'base64');
+          expect(res.body).to.deep.equal(bData);
+
+          if (done) done();
+        });
+    }
+    else {
+      if (done) done();
+    }
+  }
+];

test/examples/tests-list.js

@@ -33,6 +33,9 @@ module.exports = {
     'multiservice-singlefile': 'server',
     'shared':                  'app'
   },
+  'custom-response': {
+    'helloworld-singlefile': 'app'
+  },
   'template': {
     'helloworld-singlefile': 'app',
     'helloworld-multifile':  'app'