Skip to content

Commit 7cb8e2d

Browse files
authored
Merge pull request #4 from BoolJS/develop
Improved final handler and fixed mocha execution
2 parents 4b0e1a9 + 9505969 commit 7cb8e2d

File tree

7 files changed

+18
-2189
lines changed

7 files changed

+18
-2189
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
node_modules
22
*.log
33
.DS_Store
4+
package-lock.json

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: node_js
22
before_install:
3-
- npm install -g npm@latest
43
- npm install booljs@latest
54
node_js:
6-
- 7.0
5+
- lts/*

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Build Status](https://travis-ci.org/BoolJS/booljs-express.svg?branch=master)](https://travis-ci.org/BoolJS/booljs-express) [![Dependencies status for bool.js](https://david-dm.org/booljs/booljs-express.svg)](https://david-dm.org/booljs/booljs-express) [![devDependency Status](https://david-dm.org/booljs/booljs-express/dev-status.svg)](https://david-dm.org/booljs/booljs-express#info=devDependencies) [![Code Climate](https://codeclimate.com/github/BoolJS/booljs-express/badges/gpa.svg)](https://codeclimate.com/github/BoolJS/booljs-express) [![Inline docs](http://inch-ci.org/github/booljs/booljs-express.svg?branch=master)](http://inch-ci.org/github/booljs/booljs-express)
44

5-
[![Bool.js NPM icon](https://nodei.co/npm/booljs-express.png)](https://npmjs.com/packages/booljs-express)
5+
[![Bool.js NPM icon](https://nodei.co/npm/booljs.express.png)](https://npmjs.com/packages/booljs.express)
66

77
[![Join the chat at https://gitter.im/BoolJS/booljs-express](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/BoolJS/booljs-express?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
88

lib/server/router/handlers.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@
33
module.exports = function ({ Error, views: { Json } }, router) {
44
let json = new Json();
55

6-
// 404 Handler. Acts when a resource call isn't found
7-
router.use((request, response) => json.error(
8-
new Error(404, 'method_not_found', 'Method wasn\'t found'), response
9-
));
6+
// Final handler. Acts when a resource call isn't found
7+
router.use((request, response) => {
8+
const notImplementedError = new Error(501,
9+
'not_implemented', 'Method haven\'t been implemented yet');
10+
if (response.headersSent === false) {
11+
if (request.path === '/' && request.method === 'GET') {
12+
json.standard('Welcome to API!', response);
13+
} else {
14+
json.error(notImplementedError, response);
15+
}
16+
}
17+
});
1018

1119
// Error Handler. Processes an error output view.
1220
router.use((error, req, response, next) => json.error(error, response));

0 commit comments

Comments
 (0)