diff --git a/lab-eddie/.eslintignore b/lab-eddie/.eslintignore new file mode 100644 index 0000000..ae8da71 --- /dev/null +++ b/lab-eddie/.eslintignore @@ -0,0 +1,6 @@ + +**/node_modules/* +**/vendor/* +**/*.min.js +**/coverage/* +**/build/* diff --git a/lab-eddie/.eslintrc b/lab-eddie/.eslintrc new file mode 100644 index 0000000..8dc6807 --- /dev/null +++ b/lab-eddie/.eslintrc @@ -0,0 +1,21 @@ +{ + "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 + }, + "ecmaFeatures": { + "modules": true, + "experimentalObjectRestSpread": true, + "impliedStrict": true + }, + "extends": "eslint:recommended" +} diff --git a/lab-eddie/.gitignore b/lab-eddie/.gitignore new file mode 100644 index 0000000..e19c8ab --- /dev/null +++ b/lab-eddie/.gitignore @@ -0,0 +1,128 @@ + +# Created by https://www.gitignore.io/api/osx,vim,node,windows + +### 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 ### +*.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 + +### 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,windows +data \ No newline at end of file diff --git a/lab-eddie/lib/cors.js b/lab-eddie/lib/cors.js new file mode 100644 index 0000000..4ee4326 --- /dev/null +++ b/lab-eddie/lib/cors.js @@ -0,0 +1,7 @@ +'use strict'; + +module.exports = function(req, res, next) { + res.append('Access-Control-Allow-Origin', '*'); + res.append('Access-Control-Allow-Headers', '*'); + next(); +} \ No newline at end of file diff --git a/lab-eddie/lib/errors.js b/lab-eddie/lib/errors.js new file mode 100644 index 0000000..c8d54b5 --- /dev/null +++ b/lab-eddie/lib/errors.js @@ -0,0 +1,21 @@ +'use strict'; + +const createError = require('http-errors'); +const debug = require('debug')('note:error-middleware'); + +module.exports = function(err, req, res, next) { + console.error(err.message); + + if (err.status) { + debug('user error'); + + res.status(err.status).send(err.name); + next(); + return; + } + + debug('server error'); + err = createError(500, err.message); + res.status(err.status).send(err.name); + next(); +}; \ No newline at end of file diff --git a/lab-eddie/lib/member-router.js b/lab-eddie/lib/member-router.js new file mode 100644 index 0000000..06e778e --- /dev/null +++ b/lab-eddie/lib/member-router.js @@ -0,0 +1,52 @@ +'use strict'; + +const Router = require('express').Router; +const jsonParser = require('body-parser').json(); +const BandMember = require('../model/band-member.js'); +const debug = require('debug'); +const memberRouter = new Router(); + + +memberRouter.post('/api/band-member/*', jsonParser, function(req, res, next) { + debug('POST: api/band-member'); + + BandMember.createMember(...req.params[0].split('/')) + .then(member => res.json(member)) + .catch(err => next(err)); +}); + +memberRouter.get('/api/band-member/:id', function(req, res, next) { + debug('GET: api/band-member/:id'); + + + BandMember.fetchMember(req.params.id) + .then(member => res.json(member)) + .catch(err => next(err)); +}); + +memberRouter.get('/api/band-member', function(req, res, next) { + debug('GET: api/band-member/'); + + BandMember.fetchAll() + .then(band => res.json(band)) + .catch(err => next(err)); +}); + +memberRouter.put('/api/band-member/*', jsonParser, function(req, res, next){ + debug('PUT: api/band-member'); + + BandMember.updateMember(...req.params[0].split('/')) + .then(member => res.json(member)) + .catch(err => next(err)); + +}); + +memberRouter.delete('/api/band-member/:id', function(req, res, next) { + debug('DELETE: api/band-member/:id'); + BandMember.deleteMember(req.params.id) + .then(member => res.json(member)) + .catch(err => next(err)); +}) + + +module.exports = memberRouter; diff --git a/lab-eddie/lib/storage.js b/lab-eddie/lib/storage.js new file mode 100644 index 0000000..3c616fc --- /dev/null +++ b/lab-eddie/lib/storage.js @@ -0,0 +1,55 @@ +'use strict' + +const debug = require('debug')('app:storage'); +const Promise = require('bluebird'); +const fs = Promise.promisifyAll(require('fs'), {suffix: 'Prom'}); +const createError = require('http-errors'); + +const storage = module.exports = {}; + +storage.fetchItem = function(category, id) { + debug('fetchItem') + if(!category) return Promise.reject(createError(404, 'Expeced Category')); + if(!id) return storage.fetchAll(category); + + return fs.readFileProm(`${__dirname}/../data/${category}/${id}.json`) + .then(data => { + try { + return JSON.parse(data.toString()); + } catch (err) { + return Promise.reject(createError(400, 'Bad Request')); + } + }) + .catch(err => Promise.reject(createError(404, 'resource not found'))); +}; + +storage.createItem = function(category, item) { + debug('createItem'); + if(!category) return Promise.reject(createError(404, 'Expected Category')); + if(!item) return Promise.reject(createError(404, 'Expected item')); + + let json = JSON.stringify(item); + return fs.writeFileProm(`${__dirname}/../data/${category}/${item.id}.json`, json) + .then(() => item) + .catch(err => Promise.reject(createError(500, err.message))); + +}; + +storage.deleteItem = function(category, id) { + debug('deleteItem') + if(!category) return Promise.reject(createError(404, 'Expected Category')); + if(!id) return Promise.reject(createError(404, 'Expected id')); + + return fs.unlinkProm(`${__dirname}/../data/${category}/${id}.json`) + .catch(err => Promise.reject(createError(404, 'Item not found'))); + +}; + +storage.fetchAll = function(category) { + if(!category) Promise.reject(createError(404, 'Expected Category')); + console.log(category) + + return fs.readdirProm(`${__dirname}/../data/${category}`) + .then(dir => dir.map(file => file.split('.json')[0])) + .catch(err => Promise.reject(createError(404, err.message))); +}; \ No newline at end of file diff --git a/lab-eddie/model/band-member.js b/lab-eddie/model/band-member.js new file mode 100644 index 0000000..fe7f07d --- /dev/null +++ b/lab-eddie/model/band-member.js @@ -0,0 +1,62 @@ +'use strict'; + +const uuid = require('uuid/v4'); +const storage = require('../lib/storage'); +const createError = require('http-errors'); +const debug = require('debug')('app:band-members'); + +const BandMember = module.exports = function(first, last, ...instruments) { + debug('member constructor'); + if(arguments.length < 3) return new Error('Expected at least3 arguments'); + + this.first = first; + this.last = last; + this.instruments = instruments; + this.id = uuid(); + +}; + +BandMember.fetchMember = function(id) { + debug('fetchMember'); + return storage.fetchItem('bandMember', id); +}; + +BandMember.createMember = function(...params) { + debug('createMember'); + try { + let member = new BandMember(...params); + return storage.createItem('bandMember', member); + } catch(err) { + return Promise.reject(createError(400, err.message)); + } +}; + +BandMember.deleteMember = function(id) { + debug('deleteMember'); + + return storage.deleteItem('bandMember', id); +} + +BandMember.updateMember = function(..._member) { + debug('updateMember'); + + let id = _member.shift(); + _member = new BandMember(..._member); + _member.id = id; + + + return storage.fetchItem('bandMember', id) + .catch( err => Promise.reject(createError(404, err.message))) + .then( member => { + for (var key in member) { + if (key === 'id') continue; + if (_member[key]) member[key] = _member[key]; + } + return storage.createItem('bandMember', member); + }); +}; + +BandMember.fetchAll = function() { + debug('fetchAll'); + return storage.fetchItem('bandMember'); +}; diff --git a/lab-eddie/package.json b/lab-eddie/package.json new file mode 100644 index 0000000..32df5e5 --- /dev/null +++ b/lab-eddie/package.json @@ -0,0 +1,27 @@ +{ + "name": "lab-eddie", + "version": "1.0.0", + "description": "", + "main": "server.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "start": "node server.js" + }, + "keywords": [], + "author": "", + "license": "ISC", + "dependencies": { + "bluebird": "^3.5.0", + "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-eddie/server.js b/lab-eddie/server.js new file mode 100644 index 0000000..6f2b275 --- /dev/null +++ b/lab-eddie/server.js @@ -0,0 +1,22 @@ +'use strict'; + +const express = require('express'); +const debug = require('debug')('app:server'); +const morgan = require('morgan'); +const creatError = require('http-errors'); + +const PORT = process.env.PORT || 3000; +const app = express(); + +const myRouter = require('./lib/member-router.js'); +const cors = require('./lib/cors.js'); +const errors = require('./lib/errors.js'); + +app.use(morgan('dev')); +app.use(cors); +app.use(myRouter); +app.use(errors); + +app.listen(PORT, () => { + debug(console.log('Server active: ', PORT)); +}) \ No newline at end of file diff --git a/lab-eddie/test/band-members-test.js b/lab-eddie/test/band-members-test.js new file mode 100644 index 0000000..8d46a65 --- /dev/null +++ b/lab-eddie/test/band-members-test.js @@ -0,0 +1,111 @@ +'use strict'; + +const expect = require('chai').expect; +const request = require('superagent'); +const BandMember = require('../model/band-member.js'); +const url = 'http://localhost:3000'; +require('../server.js'); + +const testMember = ["Eddie", "DelRio", ...['guitar']]; + +describe('Band-Member routes', function(){ + + describe('GET /api/band-member', function() { + before( done => { + BandMember.createMember(...testMember) + .then(member => { + this.tempObj = member; + done(); + }) + .catch(err => done(err)); + }); + + after(done => { + BandMember.deleteMember(this.tempObj.id) + .then(() => done()) + .catch(err => done(err)); + }); + + it('Should return a band-member', (done) => { + request.get(`${url}/api/band-member/${this.tempObj.id}`) + .end((err, res) => { + if (err) return done(err); + expect(res.status).to.equal(200); + expect(res.body.id).to.equal(this.tempObj.id); + expect(res.body.first).to.equal(this.tempObj.first); + expect(res.body.last).to.equal(this.tempObj.last); + expect(res.body.istruments).to.deep.equal(this.tempObj.istruments) + done(); + }); + }); + }); + describe('With an invalid id', function() { + it('Should respond with 404 coed', (done) => { + request.get(`${url}/api/band-member/1234`) + .end((err) => { + if (err) { + expect(err.status).to.equal(404); + done(); + } + }); + }); + }); + + describe('POST: /api/band-member', function() { + describe('with a valid body', function() { + after( done => { + if (this.tempMember) { + BandMember.deleteMember(this.tempMember.id) + .then( ()=> done()) + .catch( err => done(err)); + } + }); + + it('Should create a new member', done => { + request.post(`${url}/api/band-member/Eddie/DelRio/Guitar/Bass/Drums`) + .end((err, res) => { + if(err) return done(err); + expect(res.status).to.equal(200); + expect(res.body.first).to.equal('Eddie'); + expect(res.body.last).to.equal('DelRio'); + expect(res.body.instruments).to.deep.equal(['Guitar', 'Bass', 'Drums']); + this.tempMember = res.body; + done(); + }) + }) + }) + + describe('PUT api/band-member', function(){ + describe('With valid id and body', function() { + before(done => { + BandMember.createMember(...testMember) + .then(member => { + this.tempMember = member; + done(); + }) + .catch(err => done(err)); + }); + + after(done => { + BandMember.deleteMember(this.tempMember.id) + .then(() => done()) + .catch(err => done(err)); + }) + + it('Should return a band-member', done => { + request.put(`${url}/api/band-member/${this.tempMember.id}/Edwin/DelRio/Piano`) + .end((err, res) => { + if(err) return done(err); + expect(res.status).to.equal(200); + expect(res.body.id).to.equal(this.tempMember.id); + expect(res.body.first).to.not.equal(this.tempMember.first); + expect(res.body.last).to.equal(this.tempMember.last); + expect(res.body.instruments).to.not.deep.equal(this.tempMember.instruments); + done() + }); + }); + }); + }); + }); +}); +