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/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/model/band.js b/lab-eddie/model/band.js new file mode 100644 index 0000000..aba582f --- /dev/null +++ b/lab-eddie/model/band.js @@ -0,0 +1,14 @@ +'use strict'; + +const mongoose = require('mongoose'); +const debug = require('debug')('app:band'); +const Schema = mongoose.Schema; + +const bandSchema = Schema({ + name: {type: String, required: true}, + genre: {type: String, required: true}, + members: {type: Object, required: false}, + hometown: {type: String, required: true} +}); + +module.exports = mongoose.model('band', bandSchema); diff --git a/lab-eddie/package.json b/lab-eddie/package.json new file mode 100644 index 0000000..6f41fba --- /dev/null +++ b/lab-eddie/package.json @@ -0,0 +1,28 @@ +{ + "name": "lab-eddie", + "version": "1.0.0", + "description": "", + "main": "server.js", + "scripts": { + "test": "DEBUG='app*' mocha", + "start": "DEBUG='app*' node server.js" + }, + "keywords": [], + "author": "", + "license": "ISC", + "devDependencies": { + "chai": "^4.1.0", + "mocha": "^3.5.0", + "superagent": "^3.5.2" + }, + "dependencies": { + "bluebird": "^3.5.0", + "body-parser": "^1.17.2", + "cors": "^2.8.4", + "debug": "^2.6.8", + "express": "^4.15.3", + "http-errors": "^1.6.1", + "mongoose": "^4.11.5", + "morgan": "^1.8.2" + } +} diff --git a/lab-eddie/routes/band-router.js b/lab-eddie/routes/band-router.js new file mode 100644 index 0000000..e2ec056 --- /dev/null +++ b/lab-eddie/routes/band-router.js @@ -0,0 +1,64 @@ +'use strict'; + +const Router = require('express').Router; +const createError = require('http-errors'); +const jsonParser = require('body-parser').json(); +const debug = require('debug')('song:band-route'); +const Band = require('../model/band.js'); +const bandRouter = module.exports = new Router(); + + +bandRouter.post('/api/band/', jsonParser, function(req, res, next) { + debug('POST: /api/band'); + + new Band(req.body).save() + .then(band => res.json(band)) + .catch(err => next(createError(400, err.message))); + +}); + +bandRouter.get('/api/band/:id', function(req, res, next) { + debug('GET: /api/band/:id'); + Band.findById(req.params.id) + .then( band => res.json(band)) + .catch(err => next(createError(404, err.message))); +}); + +bandRouter.get('/', function(req, res, next) { + debug('GET: /'); + res.send('This is a test') + res.end(); +}); + +bandRouter.get('/api/band/', function(req, res, next) { + debug('GET: /api/band'); + console.log('recieved'); + Band.find({}) + .then( band => res.json(band)) + .catch(err => next(createError(404, err.message))); +}); + +bandRouter.delete('/api/band/:id', function(req, res, next) { + debug('DELETE: /api/band'); + + Band.findByIdAndRemove(req.params.id) + .then(() => { + res.sendStatus(204); + res.send('Item deleted'); + res.end(); + }) + .catch(err => next(createError(400, err.message))); +}); + +bandRouter.put('/api/band/:id',jsonParser, function(req, res, next) { + debug('PUT: /api/band/:id'); + if(Object.keys(req.body).length === 0) return next(createError(400, 'No body provided')); + + Band.findByIdAndUpdate(req.params.id, req.body, {new: true}) + .then(band => { + res.json(band); + }) + .catch(err => next(createError(404, err.message))); +}); + + diff --git a/lab-eddie/server.js b/lab-eddie/server.js new file mode 100644 index 0000000..42a83dc --- /dev/null +++ b/lab-eddie/server.js @@ -0,0 +1,27 @@ +'use strict'; + +const morgan = require('morgan'); +const debug = require('debug')('app:server'); +const express = require('express'); +const mongoose = require('mongoose'); +const cors = require('cors'); +const Promise = require('bluebird'); + +const app = express(); +const PORT = process.env.PORT || 3000; +const bandRouter = require('./routes/band-router.js'); +const error = require('./lib/errors.js'); +const MONGODB_URI = 'mongodb://localhost/bands'; + + +mongoose.Promise = Promise; +mongoose.connect(MONGODB_URI, { useMongoClient: true }); + +app.use(morgan('dev')); +app.use(cors()); +app.use(bandRouter); +app.use(error) + +app.listen(PORT, () => { + debug('Server active on port: ', PORT); +}); diff --git a/lab-eddie/test/band-test.js b/lab-eddie/test/band-test.js new file mode 100644 index 0000000..549f18f --- /dev/null +++ b/lab-eddie/test/band-test.js @@ -0,0 +1,135 @@ + +'use strict'; + +const expect = require('chai').expect; +const request = require('superagent'); + +const Band = require('../model/band.js'); +const url = 'http://localhost:3000'; +require('../server.js'); + +let testingBand = { + name: 'Led Zeppelin', + genre: 'Rock', + hometown: 'London?' +} + +describe('Band Test stuff', function() { + + describe('GET api/band/invalid ID', function() { + it('should throw a 404 error', function(done){ + request.get('localhost:3000/api/band/999999') + .end(err => { + expect(err.status).to.equal(404); + done(); + }); + }); + }); + + describe('POST: /api/band/', function() { + it('Should return a 400 error with no body passed', done => { + request.post('localhost:3000/api/band', err => { + expect(err.status).to.equal(400); + done(); + }) + }); + }); + + describe('POST: /api/band/', function() { + after(done => { + Band.remove({}) + .then(() => done()) + .catch(err => done(err)); + return; + }); + + it('res should be a band.', done => { + request.post('localhost:3000/api/band') + .send(testingBand) + .end((err, res) => { + if(err) throw new Error(err); + expect(res.status).to.equal(200); + expect(res.body.name).to.equal(testingBand.name); + expect(res.body.genre).to.equal(testingBand.genre); + expect(res.body.hometown).to.equal(testingBand.hometown); + done(); + }); + }); + }); + + describe('GET: /api/band', function() { + before(done => { + Band.create(testingBand) + .then(band => { + this.tempBand = band; + done(); + }) + .catch(err => done(err)); + }); + + after(done => { + Band.remove({}) + .then(() => done()) + .catch(err => done(err)); + }); + + it('should get a band back.', done => { + request.get(`localhost:3000/api/band/${this.tempBand._id}`, (err, res) => { + if(err) throw new Error(err); + expect(res.status).to.equal(200); + expect(res.body._id).to.be.equal(this.tempBand._id.toString()); + expect(res.body.name).to.equal(this.tempBand.name); + expect(res.body.genre).to.equal(this.tempBand.genre); + expect(res.body.hometown).to.equal(this.tempBand.hometown); + done(); + }); + }); + }); + describe('PUT: /api/band', function() { + before(done => { + Band.create(testingBand) + .then(band => { + this.tempBand = band; + done(); + }) + .catch(err => done(err)); + }); + + after(done => { + Band.remove({}) + .then(() => done()) + .catch(err => done(err)); + }); + + it('Should throw a 400 error with no body passed', done => { + request.put(`localhost:3000/api/band/${this.tempBand._id}`, err => { + expect(err.status).to.equal(400); + done(); + }) + }); + + it('Should throw a 404 error with an invalid id', done => { + request.put(`localhost:3000/api/band/666`) + .send({name: 'Black Sabbath', genre: "Heavy Metal"}) + .end(err => { + expect(err.status).to.equal(404); + done(); + }) + }); + + + it('Should change the stored band', (done) => { + request.put(`localhost:3000/api/band/${this.tempBand._id}`) + .send({name: 'Black Sabbath', genre: "Heavy Metal"}) + .end((err, res) => { + if(err) throw new Error(err); + expect(res.body._id).to.equal(this.tempBand._id.toString()); + expect(res.body.name).to.not.equal(this.tempBand.name); + expect(res.body.name).to.equal('Black Sabbath'); + expect(res.body.genre).to.not.equal(this.tempBand.genre); + expect(res.body.hometown).to.equal(this.tempBand.hometown); + done(); + }) + }); + }); +}); \ No newline at end of file