diff --git a/libs/server.js b/libs/server.js index 8179dde..a0562f8 100644 --- a/libs/server.js +++ b/libs/server.js @@ -25,4 +25,8 @@ server.get('/minesweeper', function(request, response){ require('./world.minesweeper/minesweeper')(request, response); }); -module.exports = server; \ No newline at end of file +server.get('/astroman', function(request, response){ + require('./world.astroport/astroman')(request, response); +}); + +module.exports = server; diff --git a/libs/world.astroport/astroman.js b/libs/world.astroport/astroman.js new file mode 100644 index 0000000..1ba18dc --- /dev/null +++ b/libs/world.astroport/astroman.js @@ -0,0 +1,6 @@ +var astroman = function(request, response) { + response.setHeader('Content-Type', 'text/html'); + response.render('astroman.html'); +}; + +module.exports = astroman; diff --git a/libs/world.prime.factors/lib/prime.factors.of.js b/libs/world.prime.factors/lib/prime.factors.of.js index a394cc2..2ee3bba 100644 --- a/libs/world.prime.factors/lib/prime.factors.of.js +++ b/libs/world.prime.factors/lib/prime.factors.of.js @@ -8,7 +8,8 @@ primeFactorsOf = function(number) { } factor ++; } - return factors; + + return (typeof number === 'string' || number instanceof String)? "not a number" : factors; }; module.exports = primeFactorsOf; \ No newline at end of file diff --git a/libs/world.prime.factors/prime.factors.js b/libs/world.prime.factors/prime.factors.js index bfb9c66..d1b89eb 100644 --- a/libs/world.prime.factors/prime.factors.js +++ b/libs/world.prime.factors/prime.factors.js @@ -8,7 +8,9 @@ var primeFactors = function(request, response) { var decomposition = primeFactorsOf(number); response.setHeader('Content-Type', 'application/json'); - response.send({ number: number, decomposition: decomposition }); + var number = response.send({ number: number, decomposition: decomposition }); + + (typeof number === 'string' || number instanceof String)? response.send({ number: request.query['number'], error: decomposition }) : number; }; module.exports = primeFactors; \ No newline at end of file diff --git a/package.json b/package.json index 490b75b..1181b70 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,6 @@ "zombie": "4.2.1" }, "scripts": { - "test": "istanbul cover _mocha -- -u exports test --recursive" + "test": "istanbul cover node_modules/mocha/bin/_mocha -- -u exports test --recursive" } } diff --git a/views/astroman.html b/views/astroman.html new file mode 100644 index 0000000..edb2005 --- /dev/null +++ b/views/astroman.html @@ -0,0 +1,5 @@ + + +

Astroman

+ + diff --git a/views/index.html b/views/index.html index 46ad474..841d00e 100644 --- a/views/index.html +++ b/views/index.html @@ -4,6 +4,7 @@

Hello Yose

\ No newline at end of file