Merge pull request #1 from watson-developer-cloud/master

get new changes

Author: Mikemosca

.cfignore

@@ -2,4 +2,4 @@ node_modules
 .env
 coverage
 uploads/*
-!uploads/README.md
+!uploads/.gitkeep

.travis.yml

@@ -3,16 +3,18 @@ sudo: true
 node_js: stable
 script:
 - npm test
+env:
+  global:
+  - CF_APP=document-conversion-demo
+  - CF_API=https://api.ng.bluemix.net
+  - CF_ORGANIZATION=WatsonPlatformServices
+  - CF_SPACE=demos
+before_deploy: npm install -g cf-blue-green
 deploy:
-  provider: cloudfoundry
-  api: https://api.ng.bluemix.net
-  username: $CF_USERNAME
-  password: $CF_PASSWORD
-  organization: WatsonPlatformServices
-  space: demos
+  provider: script
+  script:
+    - cf-blue-green-travis
   on:
     repo: watson-developer-cloud/document-conversion-nodejs
     branch: master
   skip_cleanup: true
-notifications:
-  email: false

config/error-handler.js

@@ -28,7 +28,8 @@ module.exports = function (app) {
   // error handler
   app.use((err, req, res, next) => {
     const error = {
-      code: err.code || 500,
+      // node.js will throw if the http status code is invalid
+      code: typeof err.code === 'number' && err.code >= 100 && err.code <= 999 ? err.code : 500,
       error: err.error || err.message,
     };
     res.status(error.code).json(error);

config/express.js

@@ -17,7 +17,6 @@
 
 // Module dependencies
 const express = require('express');
-const bodyParser = require('body-parser');
 const findRemoveSync = require('find-remove');
 const path = require('path');
 const morgan = require('morgan');
@@ -49,8 +48,6 @@ module.exports = function (app) {
   app.get('/js/bundle.js', browserifyier);
 
   // Configure Express
-  app.use(bodyParser.urlencoded({ extended: true, limit: '1mb' }));
-  app.use(bodyParser.json({ limit: '1mb' }));
   app.use(express.static(path.join(__dirname, '..', 'public')));
   app.use(express.static(path.join(__dirname, '..', 'node_modules/watson-react-components/dist/')));
   app.use(morgan('dev'));

package.json

@@ -20,7 +20,6 @@
     "babel-preset-react": "^6.11.1",
     "babel-register": "^6.16.3",
     "babelify": "^7.3.0",
-    "body-parser": "^1.15.2",
     "cf-deployment-tracker-client": "^0.1.1",
     "dotenv": "^2.0.0",
     "express": "^4.14.0",