add morgan, travis, tests, eslint

Author: germanattanasio

.cfignore

@@ -1,3 +1,5 @@
 node_modules
+.env
+coverage
 uploads/*
 !uploads/README.md

.eslintignore

@@ -0,0 +1,3 @@
+coverage
+public/js/vendors
+public/js/components

.eslintrc

@@ -0,0 +1,21 @@
+{
+  "rules": {
+    "no-console": 0,
+    "func-names": 0,
+    "vars-on-top": 0,
+    "no-else-return": 0,
+    "consistent-return": 0,
+    "no-process-exit": 0
+  },
+  "globals": {
+    "casper": false,
+    "describe": true,
+    "it": true
+  },
+  "env": {
+    "node": true,
+    "jquery": true,
+    "browser": true
+  },
+  "extends": "eslint-config-airbnb-es5",
+}

.gitignore

@@ -1,5 +1,5 @@
 node_modules
 uploads/*
 !uploads/README.md
-VCAP_SERVICES.json
-run.sh
+coverage
+.env

.travis.yml

@@ -0,0 +1,25 @@
+language: node_js
+sudo: true
+node_js: stable
+script:
+- npm run lint
+- npm test
+env:
+  global:
+  - CF_APP=document-conversion-demo
+  - CF_API=https://api.ng.bluemix.net
+  - CF_ORGANIZATION=WatsonPlatformServices
+  - CF_SPACE=demos
+  - secure: "1ArUhDyjOH/g7MdGNRCDrDintTMPk1bihDB7ZjTv9p+nxQS090r8VtnkeQgo+yzaK8HHLiG14LFiaWK6eIVf6HnlgyeX3Hh7KsF/rnb0w7TPbPvYpolmDHyLB7FdWtLVVTZPVUpxkiJID6PEh/ENSnC1GWDGpIn9LlyElmVt5sMZAXqs77XJNT0ogxHz1OjZB7UqWwsEPrNmdPEPGkRloxcDdM3m19VCmwL/WoI1a1T9r48L7p8IeM5bQ+olIWnNzoboOw2O+gEUzzHeE8ufXp9eWSju6fO8JCPkNLsGMpVwR8aIoFvOcZPE5W7UfzAeQkYwuayDndqg+lFZd32+tFMr8e6OT590B1fI8Ut9F4cRkGG5ivV16/SJJKrWRp0vRiGZ/N7yCbW+YE2OcsxquXDt5VqRPqW+nAjMCw7ADxq5C3zBMxQK9ST1p0pTVJLLrIq0QUjfYhTEjYufeWaxLXgVdyXE6QLm1Z2REjXLBzUs8Wc1AkJbbhfJ03RJvj39A3dlNgy8F5UbC3AVAQ817xaRPcho4LakfDulTvUooIL0j5ROh81Q/d/DDlnrs4ymlsGqNmJ7ZfMxvtXDesFyy+ZlqmxxRTA8NOpzBMSHP4GZ9oq+HMudPyVVaZexSewouBXj6bOG0uNG8iWa8YCKDnlxiNAmCEEodcLlb+XEhVQ="
+  - secure: "bFhB3yakclo4ebxm63JN2BBAptN/UI/OrIBMqeK0a6AufHekbwJWxPjtt3yqruKnop1aLfkTi8MF8C8eQOp8NZ8oVRBzjGmv3h+cTFD9cgcig7Ut0660/TwABIJv8rRMTaOy3CxsRKAVFjMnFFx6YWbKu1+T+5EUfjIiXALzEVOfAr67Y1aR6ACApS9GlUJ2PDErdQVcm6JJ81h/TLLOmmnUoTGv/5O+OUUxzwwLeW+f5jMVgoIUfN9+z1SWzPkBdZhHT91KeihPl1GgBeonBWpCQMGbCuEbB97K0BrbExvZXjqcs4avJr/u2SIOP9NFcw69O59ey5LTBNhW3PcMDDtGFiQ5fjCjP9ldWSnBXYcVd3V9FatX/KnHOE8GtXzCVZt3W3cMnL0s/9wfhfkBuuZscKE8hbKbcMXe9Xtc1Qik8hefCmCWek3utFtW2mLklVo9Y3Ec+p7h7cq7k1LI6zCxHolAGXBu2fXoF6ErJKW1Y8WB4b6EJnpb+XUUgBmw8yZDVDdTKONYDg+EgEqUYB4kzSbvfgH6i8A9nb6rSY3qJUJoj+q5h/EBAxtFz4YEb6QVrT3gkE8acnYRgAKTukX5t5uwO1B7svBaWjZvxfaTBx0GSQmTMNXThgM62ExKEEfkZr5i9Dgu83pGXBEyGS9T+p6gHziE8bZfvU9SWK8="
+before_deploy: npm install -g cf-blue-green
+deploy:
+  provider: script
+  script:
+    - cf-blue-green-travis
+  on:
+    branch: master
+    repo: watson-developer-cloud/document-conversion-nodejs
+  skip_cleanup: true
+notifications:
+  email: false

app.js

@@ -16,10 +16,12 @@
 
 'use strict';
 
-var express    = require('express'),
-  app          = express(),
-  watson       = require('watson-developer-cloud'),
-  fs           = require('fs');
+var express = require('express');
+var app = express();
+var watson = require('watson-developer-cloud');
+var fs = require('fs');
+var path = require('path');
+
 // Bootstrap application settings
 require('./config/express')(app);
 
@@ -31,19 +33,17 @@ var credentials = {
   version: 'v1'
 };
 
-var document_conversion = watson.document_conversion(credentials);
+var documentConversion = watson.document_conversion(credentials);
 
 var types = {
   'ANSWER_UNITS': '.json',
   'NORMALIZED_HTML': '.html',
   'NORMALIZED_TEXT': '.txt'
 };
 
-var samples = ['sampleHTML.html','samplePDF.pdf','sampleWORD.docx'];
-
-
-var uploadFolder = __dirname + '/uploads/';
-var sampleFolder = __dirname + '/public/data/';
+var samples = ['sampleHTML.html', 'samplePDF.pdf', 'sampleWORD.docx'];
+var uploadFolder = path.join(__dirname, 'uploads/');
+var sampleFolder = path.join(__dirname, 'public/data/');
 
 /**
  * Returns the file path to a previously uploaded file or a sample file
@@ -54,28 +54,31 @@ function getFilePath(filename) {
   if (samples.indexOf(filename) !== -1) {
     return sampleFolder + filename;
   } else {
-    if (fs.readdirSync(uploadFolder).indexOf(filename) !== -1)
+    console.log(uploadFolder);
+    if (fs.readdirSync(uploadFolder).indexOf(filename) !== -1) {
       return uploadFolder + filename;
-    else
-      return null;
+    }
+    return null;
   }
 }
 
 app.get('/', function(req, res) {
-  res.render('index', { ct: req._csrfToken });
+  res.render('index');
 });
 
 /*
  * Uploads a file
  */
 app.post('/files', app.upload.single('document'), function(req, res, next) {
-  if (!req.file  && !req.file.path) {
+  if (!req.file && !req.file.path) {
     return next({
       error: 'Missing required parameter: file',
       code: 400
     });
   }
-  res.json({ id: req.file.filename });
+  res.json({
+    id: req.file.filename
+  });
 });
 
 /*
@@ -84,33 +87,31 @@ app.post('/files', app.upload.single('document'), function(req, res, next) {
 app.get('/api/convert', function(req, res, next) {
   var file = getFilePath(req.query.document_id);
   var params = {
-    conversion_target : req.query.conversion_target,
+    conversion_target: req.query.conversion_target,
     file: file ? fs.createReadStream(file) : null
   };
 
-  document_conversion.convert(params, function(err, data) {
+  documentConversion.convert(params, function(err, data) {
     if (err) {
       return next(err);
     }
     var type = types[req.query.conversion_target];
     res.type(type);
     if (req.query.download) {
-      res.setHeader('content-disposition','attachment; filename=output-' + Date.now() + '.' + type);
+      res.setHeader('content-disposition', 'attachment; filename=output-' + Date.now() + '.' + type);
     }
     res.send(data);
   });
 });
 
-
 /*
  * Returns an uploaded file from the service
  */
 app.get('/files/:id', function(req, res) {
   var file = getFilePath(req.params.id);
-  fs.createReadStream(file)
-  .on('response', function(response) {
+  fs.createReadStream(file).on('response', function(response) {
     if (req.query.download) {
-     response.headers['content-disposition'] = 'attachment; filename=' + req.params.id;
+      response.headers['content-disposition'] = 'attachment; filename=' + req.params.id;
     }
   })
   .pipe(res);
@@ -119,6 +120,4 @@ app.get('/files/:id', function(req, res) {
 // error-handler settings
 require('./config/error-handler')(app);
 
-var port = process.env.VCAP_APP_PORT || 3000;
-app.listen(port);
-console.log('listening at:', port);
+module.exports = app;

config/error-handler.js

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+ /* eslint no-unused-vars: "off" */
 
 'use strict';
 
-module.exports = function (app) {
-
+module.exports = function(app) {
   // catch 404 and forward to error handler
   app.use(function(req, res, next) {
     var err = new Error('Not Found');
@@ -32,10 +32,6 @@ module.exports = function (app) {
       code: err.code || 500,
       error: err.error || err.message
     };
-
-    console.log('error:', error);
-
     res.status(error.code).json(error);
   });
-
 };

config/express.js

@@ -17,41 +17,48 @@
 'use strict';
 
 // Module dependencies
-var express      = require('express'),
-  bodyParser     = require('body-parser'),
-  multer         = require('multer'),
-  findRemoveSync = require('find-remove');
+var express = require('express');
+var bodyParser = require('body-parser');
+var multer = require('multer');
+var findRemoveSync = require('find-remove');
+var path = require('path');
+var morgan = require('morgan');
 
-module.exports = function (app) {
+module.exports = function(app) {
   app.enable('trust proxy');
   app.set('view engine', 'ejs');
 
-  // Only loaded when SECURE_EXPRESS is `true`
-  if (process.env.SECURE_EXPRESS)
+  // Only loaded when running in Bluemix
+  if (process.env.VCAP_APPLICATION) {
     require('./security')(app);
+  }
 
   // Configure Express
   app.use(bodyParser.urlencoded({ extended: true, limit: '1mb' }));
   app.use(bodyParser.json({ limit: '1mb' }));
-  app.use(express.static(__dirname + '/../public'));
+  app.use(express.static(path.join(__dirname, '..', 'public')));
+  app.use(morgan('dev'));
 
   // Setup the upload mechanism
   var storage = multer.diskStorage({
-    destination: function (req, file, cb) {
+    destination: function(req, file, cb) {
       cb(null, './uploads/');
     },
-    filename: function (req, file, cb) {
+    filename: function(req, file, cb) {
       cb(null, Date.now() + '-' + file.originalname);
     }
   });
 
-  var upload = multer({ storage: storage });
+  var upload = multer({
+    storage: storage
+  });
   app.upload = upload;
 
   // Remove files older than 1 hour every hour.
   setInterval(function() {
-    var removed = findRemoveSync(__dirname + '/../uploads', {age: {seconds: 3600}});
-    if (removed.length > 0)
+    var removed = findRemoveSync(path.join(__dirname, '..', 'uploads'), { age: { seconds: 3600 } });
+    if (removed.length > 0) {
       console.log('removed:', removed);
+    }
   }, 3600000);
 };

config/security.js

@@ -17,14 +17,13 @@
 'use strict';
 
 // security.js
-var secure     = require('express-secure-only'),
-  csrf         = require('csurf'),
-  cookieParser = require('cookie-parser'),
-  rateLimit    = require('express-rate-limit'),
-  helmet       = require('helmet');
-
-module.exports = function (app) {
+var secure = require('express-secure-only');
+var csrf = require('csurf');
+var cookieParser = require('cookie-parser');
+var rateLimit = require('express-rate-limit');
+var helmet = require('helmet');
 
+module.exports = function(app) {
   // 1. redirects http to https
   app.use(secure());
 
@@ -37,7 +36,9 @@ module.exports = function (app) {
   app.use(cookieParser(secret));
 
   // 4. csrf
-  var csrfProtection = csrf({ cookie: true });
+  var csrfProtection = csrf({
+    cookie: true
+  });
   app.get('/', csrfProtection, function(req, res, next) {
     req._csrfToken = req.csrfToken();
     next();
@@ -49,12 +50,19 @@ module.exports = function (app) {
     delayMs: 0,
     max: 5,
     message: JSON.stringify({
-      error:'Too many requests, please try again in 30 seconds.',
+      error: 'Too many requests, please try again in 30 seconds.',
       code: 429
-    }),
+    })
   });
 
-
   // 3. rate limiting.
   app.use('/api/', csrfProtection, limiter);
+
+  app.get('/*', csrfProtection, function(req, res, next) {
+    res.locals = {
+      ga: process.env.GOOGLE_ANALYTICS,
+      ct: req.csrfToken()
+    };
+    next();
+  });
 };

manifest.yml

@@ -6,9 +6,6 @@ applications:
 - services:
   - document-conversion-service
   name: document-conversion-demo
-  command: node app.js
+  command: npm start
   path: .
-  memory: 512M
-  env:
-    NODE_ENV: production
-    SECURE_EXPRESS: 1
+  memory: 512M