Build the response body with Buffer to prevent Express from setting d…

…efault utf-8 charset. Remove default encoding on request.
Aconex · Mar 16, 2015 · 9a49bc8 · 9a49bc8
1 parent fa0e6c8
commit 9a49bc8
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 18 deletions.
diff --git a/lib/middleware/request.js b/lib/middleware/request.js
@@ -3,7 +3,6 @@ var logger = require('../logger');
 
 exports.getBody = function(req, res, next) {
     req.body = '';
-    req.setEncoding('utf8');
     req.on('data', function(chunk) {
         req.body += chunk;
     });

diff --git a/lib/route.js b/lib/route.js
@@ -5,14 +5,28 @@ exports.getRouteHandlers = function (method, parsedUrl, action) {
 
     var getResponseHandler = function (specPairs) {
         return function (req, res) {
+            var buildResponseBody = function(specBody){
+                switch (typeof specBody) {
+                    case 'boolean':
+                    case 'number':
+                    case 'string':
+                        return new Buffer(specBody);
+                    case 'object':
+                        return new Buffer(JSON.stringify(specBody));
+                    default:
+                        return specBody;
+                }
+            };
+
             var matchRequests= function (specPair){
                 if (content.matches(req, specPair.request)) {
                     logger.log('[DRAKOV]'.red, action.method.green, parsedUrl.uriTemplate.yellow, (specPair.request && specPair.request.description ? specPair.request.description : action.name).blue);
 
                     specPair.response.headers.forEach(function (header) {
                         res.set(header.name, header.value);
                     });
-                    res.status(+specPair.response.name).send(specPair.response.body);
+                    res.status(+specPair.response.name);
+                    res.send(buildResponseBody(specPair.response.body));
                     return true;
                 }
 

diff --git a/test/api/headers-test.js b/test/api/headers-test.js
@@ -48,7 +48,7 @@ describe('HEADERS', function(){
                 request.get('/things')
                     .set('Content-Type', 'application/json')
                     .expect(200)
-                    .expect('Content-type', 'application/json; charset=utf-8')
+                    .expect('Content-type', 'application/json;charset=UTF-8')
                     .expect({'header':'json'})
                     .end(helper.endCb(done));
             });

diff --git a/test/api/multiple-examples-api-test.js b/test/api/multiple-examples-api-test.js
@@ -16,7 +16,7 @@ describe('/api/multiple', function(){
             request.get('/api/multiple')
             .set('Custom-header', 'First')
             .expect(200)
-            .expect('Content-type', 'application/json; charset=utf-8')
+            .expect('Content-type', 'application/json;charset=UTF-8')
             .expect({'first': 'response'})
             .end(helper.endCb(done));
         });
@@ -25,7 +25,7 @@ describe('/api/multiple', function(){
             request.get('/api/multiple')
                 .set('Custom-header', 'Second')
                 .expect(200)
-                .expect('Content-type', 'application/json; charset=utf-8')
+                .expect('Content-type', 'application/json;charset=UTF-8')
                 .expect({'second': 'response'})
                 .end(helper.endCb(done));
         });
@@ -37,7 +37,7 @@ describe('/api/multiple', function(){
                 .set('Content-type', 'application/json')
                 .send({'first': 'example'})
                 .expect(200)
-                .expect('Content-type', 'application/json; charset=utf-8')
+                .expect('Content-type', 'application/json;charset=UTF-8')
                 .expect({'first': 'example','status': 'ok'})
                 .end(helper.endCb(done));
         });
@@ -47,7 +47,7 @@ describe('/api/multiple', function(){
                 .set('Content-type', 'application/json')
                 .send({'second': 'example'})
                 .expect(200)
-                .expect('Content-type', 'application/json; charset=utf-8')
+                .expect('Content-type', 'application/json;charset=UTF-8')
                 .expect({'second': 'example','status': 'ok'})
                 .end(helper.endCb(done));
         });
@@ -57,7 +57,7 @@ describe('/api/multiple', function(){
                 .set('Content-type', 'application/x-www-form-urlencoded')
                 .send({third: 'example'})
                 .expect(200)
-                .expect('Content-type', 'application/json; charset=utf-8')
+                .expect('Content-type', 'application/json;charset=UTF-8')
                 .expect({third: 'example',status: 'ok'})
                 .end(helper.endCb(done));
         });

diff --git a/test/api/query-parameter-test.js b/test/api/query-parameter-test.js
@@ -14,7 +14,7 @@ describe('Query Parameters', function(){
         it('should respond with response specified in a endpoint with no parameters', function(done){
             request.get('/api/query')
             .expect(200)
-            .expect('Content-type', 'application/json; charset=utf-8')
+            .expect('Content-type', 'application/json;charset=UTF-8')
             .expect({id: 'raw'})
             .end(helper.endCb(done));
         });
@@ -24,7 +24,7 @@ describe('Query Parameters', function(){
         it('should respond with response specified in a endpoint with "param1" parameter', function(done){
             request.get('/api/query?param1=1')
             .expect(200)
-            .expect('Content-type', 'application/json; charset=utf-8')
+            .expect('Content-type', 'application/json;charset=UTF-8')
             .expect({id: 'parameter1'})
             .end(helper.endCb(done));
         });
@@ -34,15 +34,15 @@ describe('Query Parameters', function(){
         it('should respond with response specified in a endpoint with "param2" parameter', function(done){
             request.get('/api/query?param2=2')
                 .expect(200)
-                .expect('Content-type', 'application/json; charset=utf-8')
+                .expect('Content-type', 'application/json;charset=UTF-8')
                 .expect({id: 'parameter2'})
                 .end(helper.endCb(done));
         });
 
         it('should respond with response specified in a endpoint with "param2" parameter - scenario 2', function(done){
             request.get('/api/query?param2=2&param7=7')
                 .expect(200)
-                .expect('Content-type', 'application/json; charset=utf-8')
+                .expect('Content-type', 'application/json;charset=UTF-8')
                 .expect({id: 'parameter2'})
                 .end(helper.endCb(done));
         });
@@ -52,14 +52,14 @@ describe('Query Parameters', function(){
         it('should respond with response specified in a endpoint with "param1" and "param2" parameters - scenario 1', function(done){
             request.get('/api/query?param1=1&param2=2')
                 .expect(200)
-                .expect('Content-type', 'application/json; charset=utf-8')
+                .expect('Content-type', 'application/json;charset=UTF-8')
                 .expect({id: 'parameter1_parameter2'})
                 .end(helper.endCb(done));
         });
         it('should respond with response specified in a endpoint with "param1" and "param2" parameters  - scenario 2 (inverted position)', function(done){
             request.get('/api/query?param2=2&param1=1')
                 .expect(200)
-                .expect('Content-type', 'application/json; charset=utf-8')
+                .expect('Content-type', 'application/json;charset=UTF-8')
                 .expect({id: 'parameter1_parameter2'})
                 .end(helper.endCb(done));
         });
@@ -69,7 +69,7 @@ describe('Query Parameters', function(){
         it('should respond with response specified in a endpoint with "param2" and "param3" parameters', function(done){
             request.get('/api/query?param2=2&param3=3')
                 .expect(200)
-                .expect('Content-type', 'application/json; charset=utf-8')
+                .expect('Content-type', 'application/json;charset=UTF-8')
                 .expect({id: 'parameter2_parameter3'})
                 .end(helper.endCb(done));
         });

diff --git a/test/api/simple-api-test.js b/test/api/simple-api-test.js
@@ -15,7 +15,7 @@ describe('Simple-API', function(){
             it('should respond with json collection from contract example', function(done){
                 request.get('/api/things')
                 .expect(200)
-                .expect('Content-type', 'application/json; charset=utf-8')
+                .expect('Content-type', 'application/json;charset=UTF-8')
                 .expect([
                     {text:'Zip2',id: '1'},
                     {text: 'X.com', id: '2'},
@@ -33,7 +33,7 @@ describe('Simple-API', function(){
             it('should respond with json object from contract example', function(done){
                 request.get('/api/things/1111')
                 .expect(200)
-                .expect('Content-type', 'application/json; charset=utf-8')
+                .expect('Content-type', 'application/json;charset=UTF-8')
                 .expect([{text: 'Zip2', id: '1'}
                     ])
                 .end(helper.endCb(done));
@@ -46,11 +46,23 @@ describe('Simple-API', function(){
                 .set('Content-type', 'application/json')
                 .send({text: 'Hyperspeed jet', id: '1'})
                 .expect(200)
-                .expect('Content-type', 'application/json; charset=utf-8')
+                .expect('Content-type', 'application/json;charset=UTF-8')
                 .expect({text: 'Hyperspeed jet', id: '1'})
                 .end(helper.endCb(done));
             });
         });
     });
 
+    describe('/api/charsetless', function(){
+        describe('GET', function(){
+            it('should not include charset on the response`s content-type', function(done){
+                request.get('/api/charsetless')
+                    .expect(200)
+                    .expect('Content-type', 'application/json')
+                    .expect({'charset':'not present', 'id': '1'})
+                    .end(helper.endCb(done));
+            });
+        });
+    });
+
 });
diff --git a/test/example/md/simple-api.md b/test/example/md/simple-api.md
@@ -85,3 +85,17 @@ Update the text of the thing
     + Body
 
             { "like": true }
+
+
+## Things undefined charset [/api/charsetless]
+
+### Retrieve all the things and not add charset on the response [GET]
+
++ Response 200 (application/json)
+
+    + Body
+
+           {
+              "charset":"not present",
+              "id": "1"
+            }