From 0d2feba29bc7c6a2120bad423fc041901f5ead3d Mon Sep 17 00:00:00 2001 From: winsonyangjoe Date: Mon, 26 Sep 2016 14:41:24 +0700 Subject: [PATCH 1/6] string guard --- libs/world.prime.factors/lib/prime.factors.of.js | 3 ++- libs/world.prime.factors/prime.factors.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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..b66681d 100644 --- a/libs/world.prime.factors/prime.factors.js +++ b/libs/world.prime.factors/prime.factors.js @@ -2,7 +2,7 @@ var primeFactorsOf = require('./lib/prime.factors.of'); var primeFactors = function(request, response) { - var number = parseInt(request.query['number']); + var number = request.query['number']; console.log('Prime Factors Challenge Number: ' + number); var decomposition = primeFactorsOf(number); From 75cef0dadbb591b82ae9eb1c5e637d61c4210651 Mon Sep 17 00:00:00 2001 From: winsonyangjoe Date: Mon, 26 Sep 2016 14:47:03 +0700 Subject: [PATCH 2/6] contact me link --- views/index.html | 1 + 1 file changed, 1 insertion(+) 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 From ebdb21d6d6068625c181a3649ff0087746e483f8 Mon Sep 17 00:00:00 2001 From: gmaggio Date: Mon, 26 Sep 2016 14:49:59 +0700 Subject: [PATCH 3/6] Astroport name & URL --- libs/server.js | 6 +++++- libs/world.astroport/astroman.js | 6 ++++++ package.json | 2 +- views/astroman.html | 5 +++++ 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 libs/world.astroport/astroman.js create mode 100644 views/astroman.html 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/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

+ + From bbf381fa5ad7afc8e2a197052664c7d1e7891175 Mon Sep 17 00:00:00 2001 From: winsonyangjoe Date: Mon, 26 Sep 2016 14:51:01 +0700 Subject: [PATCH 4/6] push --- libs/world.prime.factors/prime.factors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/world.prime.factors/prime.factors.js b/libs/world.prime.factors/prime.factors.js index b66681d..bfb9c66 100644 --- a/libs/world.prime.factors/prime.factors.js +++ b/libs/world.prime.factors/prime.factors.js @@ -2,7 +2,7 @@ var primeFactorsOf = require('./lib/prime.factors.of'); var primeFactors = function(request, response) { - var number = request.query['number']; + var number = parseInt(request.query['number']); console.log('Prime Factors Challenge Number: ' + number); var decomposition = primeFactorsOf(number); From ce93d90cd0c0133cdfc62db87a55d42c559e5f7f Mon Sep 17 00:00:00 2001 From: winsonyangjoe Date: Mon, 26 Sep 2016 15:02:43 +0700 Subject: [PATCH 5/6] test --- libs/world.prime.factors/prime.factors.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/world.prime.factors/prime.factors.js b/libs/world.prime.factors/prime.factors.js index bfb9c66..25a6e9e 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: number, error: decomposition }) : number; }; module.exports = primeFactors; \ No newline at end of file From e13fe38ac05ec8bf890b8fd8824d10c455f6a47e Mon Sep 17 00:00:00 2001 From: winsonyangjoe Date: Mon, 26 Sep 2016 15:08:26 +0700 Subject: [PATCH 6/6] test --- libs/world.prime.factors/prime.factors.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/world.prime.factors/prime.factors.js b/libs/world.prime.factors/prime.factors.js index 25a6e9e..d1b89eb 100644 --- a/libs/world.prime.factors/prime.factors.js +++ b/libs/world.prime.factors/prime.factors.js @@ -10,7 +10,7 @@ var primeFactors = function(request, response) { response.setHeader('Content-Type', 'application/json'); var number = response.send({ number: number, decomposition: decomposition }); - (typeof number === 'string' || number instanceof String)? response.send({ number: number, error: decomposition }) : number; + (typeof number === 'string' || number instanceof String)? response.send({ number: request.query['number'], error: decomposition }) : number; }; module.exports = primeFactors; \ No newline at end of file