diff --git a/lab-nathan/.eslintignore b/lab-nathan/.eslintignore new file mode 100644 index 0000000..c6abca4 --- /dev/null +++ b/lab-nathan/.eslintignore @@ -0,0 +1,6 @@ +**/node_modules/* +**/vendor/* +**/*.min.js +**/coverage/* +**/build/* +**/assets/* diff --git a/lab-nathan/.eslintrc b/lab-nathan/.eslintrc new file mode 100644 index 0000000..c8dfef7 --- /dev/null +++ b/lab-nathan/.eslintrc @@ -0,0 +1,23 @@ +{ + "rules": { + "no-console": "off", + "indent": [ "error", 2 ], + "quotes": [ "error", "single" ], + "semi": ["error", "always"], + "linebreak-style": [ "error", "unix" ] + }, + "env": { + "es6": true, + "node": true, + "mocha": true, + "jasmine": true + }, + "parserOptions": { + "ecmaFeatures": { + "modules": true, + "experimentalObjectRestSpread": true, + "impliedStrict": true + } + }, + "extends": "eslint:recommended" +} diff --git a/lab-nathan/.gitignore b/lab-nathan/.gitignore new file mode 100644 index 0000000..115b88e --- /dev/null +++ b/lab-nathan/.gitignore @@ -0,0 +1,138 @@ +# Created by https://www.gitignore.io/api/osx,vim,node,macos,windows + +### macOS ### +*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### Node ### +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Typescript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + + +### OSX ### + +# Icon must end with two \r + +# Thumbnails + +# Files that might appear in the root of a volume + +# Directories potentially created on remote AFP share + +### Vim ### +# swap +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-v][a-z] +[._]sw[a-p] +# session +Session.vim +# temporary +.netrwhist +*~ +# auto-generated tag files +tags + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.gitignore.io/api/osx,vim,node,macos,windows + +data diff --git a/lab-nathan/README.md b/lab-nathan/README.md new file mode 100644 index 0000000..9930d13 --- /dev/null +++ b/lab-nathan/README.md @@ -0,0 +1,35 @@ +# Express REST API with Middleware + +This project contains a basic REST API built on express.js featuring file-system persistance, cors, and testing. You can access the API by making an HTTP request to one of the endpoints listed below. + +## Resources +The following resources are available for storage and retrieval: + +Note: ids are automatically generated. + +```js +Book { + id: '6c5036a6-913d-4475-91b0-084e4115e61b' + title: 'Hamlet' + author: 'William Shakespeare' + date: 1599 + genre: 'Drama' +} +``` + +## Book Endpoints + +### GET `/api/book` +Gets an array of Book ids. + +### GET `/api/book/:id` +Gets a JSON representation of a Book with the specified id. + +### PUT `/api/book/:id` +Updates a Book with the specified id. The body of the request should be a serialized JSON object containing the updated property values. + +### POST `/api/book` +Creates a Book object. The body of the request should be a serialized JSON object containing the Book's property values. + +### DELETE `/api/book/:id` +Deletes a Book object with the specified id. \ No newline at end of file diff --git a/lab-nathan/lib/fs-promises.js b/lab-nathan/lib/fs-promises.js new file mode 100644 index 0000000..a0583dc --- /dev/null +++ b/lab-nathan/lib/fs-promises.js @@ -0,0 +1,84 @@ +'use strict'; + +const fs = require('fs'); +const debug = require('debug')('book:fs-promises'); + +let fsPromises = {}; + +module.exports = fsPromises; + +fsPromises.createDirectory = function(path) { + debug('createDirectory'); + return new Promise(function(resolve, reject) { + fs.mkdir(path, function(error) { + if (error && error.code !== 'EEXIST') { + reject(error); + } else { + resolve(); + } + }); + }); +}; + +fsPromises.writeFile = function(path, item) { + debug('writeFile'); + return new Promise(function(resolve, reject) { + fs.writeFile(path, item, function(error) { + if (error) { + reject(error); + } else { + resolve(); + } + }); + }); +}; + +fsPromises.readFile = function(path) { + debug('readFile'); + return new Promise((resolve, reject) => { + fs.readFile(path, function(error, buffer) { + if (error) { + reject(error); + } else { + resolve(JSON.parse(buffer.toString())); + } + }); + }); +}; + +fsPromises.deleteFile = function(path) { + debug('deleteFile'); + return new Promise((resolve, reject) => { + fs.unlink(path, function(error) { + if (error) { + reject(error); + } else { + resolve(); + } + }); + }); +}; + +fsPromises.exists = function(path) { + debug('exists'); + return new Promise(function(resolve) { + fs.exists(path, function(exists) { + resolve(exists); + }); + }); +}; + +fsPromises.readDirectory = function(path) { + debug('readDirectory'); + return new Promise(function(resolve, reject) { + fs.readdir(path, function(error, files) { + if (error) { + reject(error); + } else { + resolve(files); + } + }); + }); +}; + + diff --git a/lab-nathan/lib/storage.js b/lab-nathan/lib/storage.js new file mode 100644 index 0000000..f755e9d --- /dev/null +++ b/lab-nathan/lib/storage.js @@ -0,0 +1,38 @@ +'use strict'; + +const debug = require('debug')('book:storage'); +const fsPromises = require('./fs-promises.js'); + +let storage = {}; + +module.exports = storage; + +storage.createItem = function(categoryName, item) { + debug('createItem'); + return fsPromises.createDirectory(`${__dirname}/../data/`) + .then(fsPromises.createDirectory(`${__dirname}/../data/${categoryName}`)) + .then(fsPromises.writeFile(`${__dirname}/../data/${categoryName}/${item.id}.json`, JSON.stringify(item))) + .then(() => item) + .catch(error => Promise.reject(error)); +}; + +storage.getItem = function(categoryName, id) { + debug('getItem'); + return fsPromises.readFile(`${__dirname}/../data/${categoryName}/${id}.json`); +}; + +storage.removeItem = function(categoryName, id) { + debug('removeItem'); + return fsPromises.deleteFile(`${__dirname}/../data/${categoryName}/${id}.json`); +}; + +storage.itemExists = function(categoryName, id) { + debug('itemExists'); + return fsPromises.exists(`${__dirname}/../data/${categoryName}/${id}.json`); +}; + +storage.getIds = function(categoryName) { + debug('getIds'); + return fsPromises.readDirectory(`${__dirname}/../data/${categoryName}`) + .then(files => files.map(file => file.split('.json')[0])); +}; \ No newline at end of file diff --git a/lab-nathan/middleware/cors.js b/lab-nathan/middleware/cors.js new file mode 100644 index 0000000..bfda9e1 --- /dev/null +++ b/lab-nathan/middleware/cors.js @@ -0,0 +1,9 @@ +'use strict'; + +module.exports = corsMiddleware; + +function corsMiddleware(request, response, next) { + response.append('Access-Control-Allow-Origin', '*'); + response.append('Access-Control-Allow-Headers', '*'); + next(); +} \ No newline at end of file diff --git a/lab-nathan/middleware/error.js b/lab-nathan/middleware/error.js new file mode 100644 index 0000000..d6d7210 --- /dev/null +++ b/lab-nathan/middleware/error.js @@ -0,0 +1,23 @@ +'use strict'; + +const createError = require('http-errors'); +const debug = require('debug')('book:error-middleware'); + +module.exports = errorMiddleware; + +function errorMiddleware(error, request, response, next) { + debug('errorMiddleware'); + console.error(error.message); + + if (!next) { + error = createError(404); + } + + if (error.status) { + return response.status(error.status).send(error.message); + } + + error = createError(500, error.message); + response.status(error.status).send(error.name); + next(); +} \ No newline at end of file diff --git a/lab-nathan/model/book.js b/lab-nathan/model/book.js new file mode 100644 index 0000000..a8d63f5 --- /dev/null +++ b/lab-nathan/model/book.js @@ -0,0 +1,96 @@ +'use strict'; + +const uuidv4 = require('uuid/v4'); +const debug = require('debug')('book:book'); +const createError = require('http-errors'); + +const storage = require('../lib/storage.js'); + +module.exports = Book; + +function Book(title, author, date, genre) { + debug('Book'); + + if (!title) { + throw new Error('Title not provided.'); + } + + if (!author) { + throw new Error('Author not provided.'); + } + + if (!date) { + throw new Error('Date not provided.'); + } + + if (!genre) { + throw new Error('Genre not provided.'); + } + + this.id = uuidv4(); + this.title = title; + this.author = author; + this.date = date; + this.genre = genre; +} + +Book.get = function(id) { + debug('get'); + + if (!id) { + return Promise.reject(createError(400, 'Id not provided.')); + } + + return storage.itemExists('book', id) + .then(function(exists) { + if (exists) { + return Promise.resolve(); + } + else { + return Promise.reject(createError(404, 'Book not found.')); + } + }) + .then(() => Promise.resolve(storage.getItem('book', id))); +}; + +Book.create = function(bookData) { + debug('create'); + + try { + let book = new Book(bookData.title, bookData.author, bookData.date, bookData.genre); + return storage.createItem('book', book); + } catch (error) { + return Promise.reject(error); + } +}; + +Book.update = function(id, bookData) { + debug('update'); + + return storage.getItem('book', id) + .then(book => { + for (var prop in book) { + if (prop === id) { + continue; + } + + if (bookData[prop]) { + book[prop] = bookData[prop]; + } + } + + return storage.createItem('book', book); + }); +}; + +Book.delete = function(id) { + debug('delete'); + + return storage.removeItem('book', id); +}; + +Book.getIds = function() { + debug('getIds'); + + return storage.getIds('book'); +}; \ No newline at end of file diff --git a/lab-nathan/package.json b/lab-nathan/package.json new file mode 100644 index 0000000..4b62d82 --- /dev/null +++ b/lab-nathan/package.json @@ -0,0 +1,36 @@ +{ + "name": "11-express-api", + "version": "1.0.0", + "description": "![cf](https://i.imgur.com/7v5ASc8.png) 11: Single Resource Express API\r ======", + "main": "server.js", + "scripts": { + "test-win": "SET DEBUG='note*' && mocha", + "test": "DEBUG='note*' mocha", + "start-win": "SET DEBUG='note*' && node server.js", + "start": "DEBUG='note*' node server.js" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/nharren/11-express-api.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/nharren/11-express-api/issues" + }, + "homepage": "https://github.com/nharren/11-express-api#readme", + "dependencies": { + "body-parser": "^1.17.2", + "debug": "^2.6.8", + "express": "^4.15.3", + "http-errors": "^1.6.1", + "morgan": "^1.8.2", + "uuid": "^3.1.0" + }, + "devDependencies": { + "chai": "^4.1.0", + "mocha": "^3.5.0", + "superagent": "^3.5.2" + } +} diff --git a/lab-nathan/route/book-routes.js b/lab-nathan/route/book-routes.js new file mode 100644 index 0000000..cdee4ee --- /dev/null +++ b/lab-nathan/route/book-routes.js @@ -0,0 +1,66 @@ +'use strict'; + +const Router = require('express').Router; +const jsonParser = require('body-parser').json(); +const debug = require('debug')('book:book'); +const createError = require('http-errors'); + +const Book = require('../model/book.js'); + +let bookRouter = new Router(); + +module.exports = bookRouter; + +bookRouter.get('/', function(request, response) { + debug('GET: /'); + + response.send('Welcome to Nathan\'s Book API using Express.'); +}); + +bookRouter.get('/api/book/:id', function(request, response, next) { + debug('GET: /api/book/:id'); + + Book.get(request.params.id) + .then(book => response.json(book)) + .catch(error => next(error)); +}); + +bookRouter.get('/api/book', function(request, response, next) { + debug('GET: /api/book'); + + Book.getIds() + .then(ids => response.json(ids)) + .catch(error => next(error)); +}); + +bookRouter.post('/api/book', jsonParser, function(request, response, next) { + debug('POST: /api/book'); + + if (Object.keys(request.body).length === 0) { + return next(createError(400, 'Book not provided.')); + } + + Book.create(request.body) + .then(book => response.json(book)) + .catch(error => next(createError(400, error.message))); +}); + +bookRouter.put('/api/book/:id', jsonParser, function(request, response, next) { + debug('PUT: /api/book'); + + if (Object.keys(request.body).length === 0) { + return next(createError(400, 'Book not provided.')); + } + + Book.update(request.params.id, request.body) + .then(book => response.json(book)) + .catch(error => next(createError(400, error.message))); +}); + +bookRouter.delete('/api/book/:id', function(request, response, next) { + debug('DELETE: /api/book'); + + Book.delete(request.params.id) + .then(() => response.sendStatus(204)) + .catch(error => next(error)); +}); \ No newline at end of file diff --git a/lab-nathan/server.js b/lab-nathan/server.js new file mode 100644 index 0000000..ff5316f --- /dev/null +++ b/lab-nathan/server.js @@ -0,0 +1,21 @@ +'use strict'; + +const morgan = require('morgan'); +const debug = require('debug')('book:server'); +const express = require('express'); + +const bookRoutes = require('./route/book-routes.js'); +const errors = require('./middleware/error.js'); +const cors = require('./middleware/cors.js'); + +const PORT = process.env.PORT || 3000; +const app = express(); + +app.use(morgan('dev')); +app.use(cors); +app.use(bookRoutes); +app.use(errors); + +app.listen(PORT, function() { + debug(`Server started on port ${PORT}.`); +}); \ No newline at end of file diff --git a/lab-nathan/test/book-route-tests.js b/lab-nathan/test/book-route-tests.js new file mode 100644 index 0000000..f58c896 --- /dev/null +++ b/lab-nathan/test/book-route-tests.js @@ -0,0 +1,222 @@ +'use strict'; + +const expect = require('chai').expect; +const request = require('superagent'); +const Book = require('../model/book.js'); + +require('../server.js'); + +const testBookData = { + title: 'Hamlet', + author: 'Shakespeare', + date: 1599, + genre: 'Drama' +}; + +const updateBookData = { + title: 'Macbeth', + date: 1606 +}; + +describe('Book API', function() { + it('should return \'bad request\' if route not found.', function(done) { + request.get('localhost:8000/ponies', function(error, response) { + expect(response.status).to.equal(404); + done(); + }); + }); + + describe('GET: /', function() { + it('should return a welcome message.', function(done) { + request.get('localhost:8000/', function(error, response) { + expect(response.text).to.equal('Welcome to Nathan\'s Book API using Express.'); + done(); + }); + }); + }); + + describe('POST: /api/book/', function() { + after(done => { + Book.delete(this.testBook.id) + .then(() => done()) + .catch(error => done(error)); + }); + + it('should return a book.', done => { + request.post('localhost:8000/api/book') + .send(testBookData) + .end((error, response) => { + this.testBook = response.body; + expect(response.status).to.equal(200); + expect(this.testBook.id).to.be.a('string'); + expect(this.testBook.title).to.equal(testBookData.title); + expect(this.testBook.author).to.equal(testBookData.author); + expect(this.testBook.date).to.equal(testBookData.date); + expect(this.testBook.genre).to.equal(testBookData.genre); + done(); + }); + }); + + it('should return an error if posting with no body.', function(done) { + request.post('localhost:8000/api/book') + .send() + .end(function(error, response) { + expect(response.status).to.equal(400); + expect(response.text).to.equal('Book not provided.'); + done(); + }); + }); + + it('should return an error if posting with no title.', function(done) { + request.post('localhost:8000/api/book') + .send({ + author: testBookData.author, + date: testBookData.date, + genre: testBookData.genre + }) + .end(function(error, response) { + expect(response.status).to.equal(400); + expect(response.text).to.equal('Title not provided.'); + done(); + }); + }); + + it('should return an error if posting with no author.', function(done) { + request.post('localhost:8000/api/book') + .send({ + title: testBookData.title, + date: testBookData.date, + genre: testBookData.genre + }) + .end(function(error, response) { + expect(response.status).to.equal(400); + expect(response.text).to.equal('Author not provided.'); + done(); + }); + }); + + it('should return an error if posting with no date.', function(done) { + request.post('localhost:8000/api/book') + .send({ + title: testBookData.title, + author: testBookData.author, + genre: testBookData.genre + }) + .end(function(error, response) { + expect(response.status).to.equal(400); + expect(response.text).to.equal('Date not provided.'); + done(); + }); + }); + + it('should return an error if posting with no genre.', function(done) { + request.post('localhost:8000/api/book') + .send({ + title: testBookData.title, + author: testBookData.author, + date: testBookData.date, + }) + .end(function(error, response) { + expect(response.status).to.equal(400); + expect(response.text).to.equal('Genre not provided.'); + done(); + }); + }); + }); + + describe('GET: /api/book', function() { + before(done => { + Book.create(testBookData) + .then(book => { + this.testBook = book; + done(); + }) + .catch(error => done(error)); + }); + + after(done => { + Book.delete(this.testBook.id) + .then(() => done()) + .catch(error => done(error)); + }); + + it('should return a list of ids if id not provided.', function(done) { + request.get('localhost:8000/api/book', function(error, response) { + expect(response.body).to.be.an('array'); + done(); + }); + }); + + it('should return an error if id not found.', function(done) { + request.get('localhost:8000/api/book/1', function(error, response) { + expect(response.status).to.equal(404); + expect(response.text).to.equal('Book not found.'); + done(); + }); + }); + + it('should return a book.', done => { + request.get(`localhost:8000/api/book/${this.testBook.id}`, (error, response) => { + expect(response.status).to.equal(200); + expect(response.body.id).to.be.equal(this.testBook.id); + expect(response.body.title).to.equal(this.testBook.title); + expect(response.body.author).to.equal(this.testBook.author); + expect(response.body.date).to.equal(this.testBook.date); + expect(response.body.genre).to.equal(this.testBook.genre); + done(); + }); + }); + }); + + describe('PUT: /api/book/', function() { + before(done => { + Book.create(testBookData) + .then(book => { + this.testBook = book; + done(); + }) + .catch(error => done(error)); + }); + + after(done => { + Book.delete(this.testBook.id) + .then(() => done()) + .catch(error => done(error)); + }); + + it('should return a book.', done => { + request.put(`localhost:8000/api/book/${this.testBook.id}`) + .send({ + title: 'Macbeth', + date: 1606, + }) + .end((error, response) => { + expect(response.status).to.equal(200); + expect(response.body.id).to.equal(this.testBook.id); + expect(response.body.title).to.equal(updateBookData.title); + expect(response.body.author).to.equal(this.testBook.author); + expect(response.body.date).to.equal(updateBookData.date); + expect(response.body.genre).to.equal(this.testBook.genre); + done(); + }); + }); + }); + + describe('DELETE: /api/book', function() { + before(done => { + Book.create(testBookData) + .then(book => { + this.testBook = book; + done(); + }) + .catch(error => done(error)); + }); + + it('should delete a book.', done => { + request.delete(`localhost:8000/api/book/${this.testBook.id}`, function(error, response) { + expect(response.status).to.equal(204); + done(); + }); + }); + }); +});