Load markdown file into memory and check if client requested html

controller/index.js

@@ -5,32 +5,47 @@ var fs = require('fs');
 
 function setup(){
 
-  function controller( req, res, next ){
+  var text = null;
-
+  function getText( callback ) {
-    fs.readFile('./DOCS.md', 'utf8', function (err, content) {
+    if( text ) {
-      if (!err) {
+      process.nextTick( callback.bind( null, null, text ) );
-        var header = '# Pelias API\n';
+      return;
-        var version = '### Version: ['+ pkg.version+ '](https://github.com/pelias/api/releases)\n';
+    }
-        var style = '<style>html{font-family:monospace}</style>';
+
-        
+    fs.readFile( './DOCS.md', 'utf8', function ( err, content ) {
-        res.send(style + markdown.toHTML(header + version + content));
+      if( err ) {
-
+        callback( err );
-      } else {
+        return;
-        // stats
-        res.json({
-          name: pkg.name,
-          version: {
-            number: pkg.version
-          }
-        });
       }
-      
+      text = '# Pelias API\n';
+      text += '### Version: ['+ pkg.version+ '](https://github.com/pelias/api/releases)\n';
+      text += content;
+
+      callback( null, text );
     });
+  }
 
+  function controller( req, res, next ) {
+    getText( function ( err, content ) {
+      if( !err ) {
+        if( req.accepts( 'html' ) ) {
+          var style = '<style>html{font-family:monospace}</style>';
+          res.send( style + markdown.toHTML( content ) );
+        }
+        else {
+          // stats
+          res.json({
+            name: pkg.name,
+            version: {
+              number: pkg.version
+            }
+          });
+        }
+      }
+    });
   }
 
   return controller;
-
 }
 
 module.exports = setup;

test/unit/controller/index.js

@@ -11,21 +11,40 @@ module.exports.tests.interface = function(test, common) {
   });
 };
 
-module.exports.tests.info = function(test, common) {
+module.exports.tests.info_json = function(test, common) {
-  test('returns server info', function(t) {
+  test('returns server info in json', function(t) {
     var controller = setup();
+    var req = {
+      accepts: function (format) {
+        t.equal(format, 'html', 'check for Accepts:html');
+        return false;
+      }
+    };
     var res = { json: function( json ){
       t.equal(typeof json, 'object', 'returns json');
       t.equal(typeof json.name, 'string', 'name');
       t.equal(typeof json.version, 'object', 'version');
       t.equal(typeof json.version.number, 'string', 'version number');
       t.end();
-    },
+    }};
-      send: function( html ){
+    controller( req, res );
-      t.equal(typeof html, 'string', 'returns string');
+  });
+};
+
+module.exports.tests.info_html = function(test, common) {
+  test('returns server info in json', function(t) {
+    var controller = setup();
+    var req = {
+      accepts: function () {
+        return true;
+      }
+    };
+    var res = { send: function( content ){
+      t.equal(typeof content, 'string', 'returns string');
+      t.assert(content.indexOf('<style>html{font-family:monospace}</style>') === 0, 'style set to monospace');
       t.end();
     }};
-    controller( null, res );
+    controller( req, res );
   });
 };