From 8289de10320599d457424c78a3c18b049a1ef4dd Mon Sep 17 00:00:00 2001 From: sharmarke Date: Wed, 2 Aug 2017 12:25:25 -0700 Subject: [PATCH 1/7] sets up scaffold --- lab-sharmarke/.gitignore | 136 ++++++++++++++++++++++++++++++ lab-sharmarke/model/list.js | 0 lab-sharmarke/package.json | 27 ++++++ lab-sharmarke/route/list-route.js | 0 lab-sharmarke/server.js | 0 lab-sharmarke/test/list-test.js | 0 6 files changed, 163 insertions(+) create mode 100644 lab-sharmarke/.gitignore create mode 100644 lab-sharmarke/model/list.js create mode 100644 lab-sharmarke/package.json create mode 100644 lab-sharmarke/route/list-route.js create mode 100644 lab-sharmarke/server.js create mode 100644 lab-sharmarke/test/list-test.js diff --git a/lab-sharmarke/.gitignore b/lab-sharmarke/.gitignore new file mode 100644 index 0000000..345130c --- /dev/null +++ b/lab-sharmarke/.gitignore @@ -0,0 +1,136 @@ +# 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 diff --git a/lab-sharmarke/model/list.js b/lab-sharmarke/model/list.js new file mode 100644 index 0000000..e69de29 diff --git a/lab-sharmarke/package.json b/lab-sharmarke/package.json new file mode 100644 index 0000000..60a857a --- /dev/null +++ b/lab-sharmarke/package.json @@ -0,0 +1,27 @@ +{ + "name": "lab-sharmarke", + "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", + "cors": "^2.8.4", + "debug": "^2.6.8", + "express": "^4.15.3", + "mongoose": "^4.11.5", + "morgan": "^1.8.2" + }, + "devDependencies": { + "chai": "^4.1.0", + "mocha": "^3.5.0", + "superagent": "^3.5.2" + } +} diff --git a/lab-sharmarke/route/list-route.js b/lab-sharmarke/route/list-route.js new file mode 100644 index 0000000..e69de29 diff --git a/lab-sharmarke/server.js b/lab-sharmarke/server.js new file mode 100644 index 0000000..e69de29 diff --git a/lab-sharmarke/test/list-test.js b/lab-sharmarke/test/list-test.js new file mode 100644 index 0000000..e69de29 From 04eba44089369aad8aa5631eea1bb27deea034db Mon Sep 17 00:00:00 2001 From: sharmarke Date: Wed, 2 Aug 2017 12:41:38 -0700 Subject: [PATCH 2/7] server running --- lab-sharmarke/package.json | 4 ++-- lab-sharmarke/server.js | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/lab-sharmarke/package.json b/lab-sharmarke/package.json index 60a857a..81a0e43 100644 --- a/lab-sharmarke/package.json +++ b/lab-sharmarke/package.json @@ -4,8 +4,8 @@ "description": "", "main": "server.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "start": "node server.js" + "test": "DEBUG='note*' mocha", + "start": "DEBUG='note*' node server.js" }, "keywords": [], "author": "", diff --git a/lab-sharmarke/server.js b/lab-sharmarke/server.js index e69de29..5c1cdfa 100644 --- a/lab-sharmarke/server.js +++ b/lab-sharmarke/server.js @@ -0,0 +1,17 @@ +'use strict'; + +const express = require('express'); +const morgan = require('morgan'); +const cors = require('cors'); +const Promise = require('bluebird'); +const mongoose = require('mongoose'); +const debug = require('debug')('note:server'); +const listRouter = require('./route/list-route.js'); + +const app = express(); +const PORT = process.env.PORT || 3000; +const MONGODB_URI = 'mongodb://localhost/listofnotes'; + +app.listen(PORT, () => { + debug(`listening on ${PORT}`); +}); From 7cbe806146520277e120731ecc5d241d3c2514ed Mon Sep 17 00:00:00 2001 From: sharmarke Date: Wed, 2 Aug 2017 13:23:13 -0700 Subject: [PATCH 3/7] renamed files and set up car routes --- lab-sharmarke/model/car.js | 11 +++++++++++ lab-sharmarke/model/list.js | 0 lab-sharmarke/route/car-route.js | 29 +++++++++++++++++++++++++++++ lab-sharmarke/route/list-route.js | 0 lab-sharmarke/server.js | 6 +++--- 5 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 lab-sharmarke/model/car.js delete mode 100644 lab-sharmarke/model/list.js create mode 100644 lab-sharmarke/route/car-route.js delete mode 100644 lab-sharmarke/route/list-route.js diff --git a/lab-sharmarke/model/car.js b/lab-sharmarke/model/car.js new file mode 100644 index 0000000..5129f06 --- /dev/null +++ b/lab-sharmarke/model/car.js @@ -0,0 +1,11 @@ +'use strict'; + +const mongoose = require('mongoose'); +const Schema = mongoose.Schema; + +const carSchema = Schema({ + name: {type: String, required: true}, + timestamp: {type: Date, required: true} +}); + +module.exports = mongoose.model('car', carSchema); diff --git a/lab-sharmarke/model/list.js b/lab-sharmarke/model/list.js deleted file mode 100644 index e69de29..0000000 diff --git a/lab-sharmarke/route/car-route.js b/lab-sharmarke/route/car-route.js new file mode 100644 index 0000000..96c627e --- /dev/null +++ b/lab-sharmarke/route/car-route.js @@ -0,0 +1,29 @@ +'use strict'; + +const Router = require('express').Router; +const jsonParser = require('body-parser').json(); +const Car = require('../model/car.js'); +const carRouter = module.exports = new Router(); +const debug = require('debug')('car:car-router'); + +carRouter.post('/api/car', jsonParser, function(req, res, next) { + debug('POST: /api/car'); + res.body.timestamp = new Date(); + new Car(req.body).save() + .then( car => res.json( )) + .catch(next); +}); + +carRouter.get('/api/car/:id', function(req, res, next) { + debug('GET: /api/car'); + Car.findById(req.params.id) + .then( car => res.json(car)) + .catch(next); +}); + +carRouter.delete('/api/car/:id', function(req, res, next) { + debug('DELETE: /api/car'); + Car.findByIdAndRemove(req.params.id, req.body) + .then(car => res.json(car)) + .catch(next); +}); diff --git a/lab-sharmarke/route/list-route.js b/lab-sharmarke/route/list-route.js deleted file mode 100644 index e69de29..0000000 diff --git a/lab-sharmarke/server.js b/lab-sharmarke/server.js index 5c1cdfa..2e15b1d 100644 --- a/lab-sharmarke/server.js +++ b/lab-sharmarke/server.js @@ -5,12 +5,12 @@ const morgan = require('morgan'); const cors = require('cors'); const Promise = require('bluebird'); const mongoose = require('mongoose'); -const debug = require('debug')('note:server'); -const listRouter = require('./route/list-route.js'); +const debug = require('debug')('car:server'); +const carRouter = require('./route/car-route.js'); const app = express(); const PORT = process.env.PORT || 3000; -const MONGODB_URI = 'mongodb://localhost/listofnotes'; +const MONGODB_URI = 'mongodb://localhost/listofcarss'; app.listen(PORT, () => { debug(`listening on ${PORT}`); From 8eaa4ccba52e922ac8a7d652bf602a5f702075ab Mon Sep 17 00:00:00 2001 From: sharmarke Date: Wed, 2 Aug 2017 14:08:46 -0700 Subject: [PATCH 4/7] test file set up --- lab-sharmarke/test/car-test.js | 80 +++++++++++++++++++++++++++++++++ lab-sharmarke/test/list-test.js | 0 2 files changed, 80 insertions(+) create mode 100644 lab-sharmarke/test/car-test.js delete mode 100644 lab-sharmarke/test/list-test.js diff --git a/lab-sharmarke/test/car-test.js b/lab-sharmarke/test/car-test.js new file mode 100644 index 0000000..344f1fc --- /dev/null +++ b/lab-sharmarke/test/car-test.js @@ -0,0 +1,80 @@ +'use strict'; + +const expect = require('chai').expect; +const request = require('superagent'); +const Car = require('../model/car.js'); +const PORT = process.env.PORT || 3000; +const mongoose = require('mongoose'); + + + +mongoose.Promise = Promise; +require('../server.js'); + +const url = `http://localhost:${PORT}`; +const exampleCar = { + name : 'test car name' +} + +describe('Car Routes', function() { + describe('POST: /api/car', function() { + describe('with a valid req body', function() { + after( done => { + if (this.tempCar) { + Car.remove({}) + .then( () => done()) + .catch(done); + return; + } + done(); + }); + + it('should return a car', done => { + request.post(`${url}/api/car`) + .send(exampleCar) + .end((err, res) => { + if (err) return done(err); + expect(res.status).to.equal(200); + expect(res.body.name).to.equal('test car name'); + this.tempCar = res.body; + done(); + }); + }); + }); + }); + + describe('GET: /api/car/:id', function() { + describe('with a valid body', function() { + before( done => { + exampleCar.timestamp = new Date(); + new Car(exampleCar).save() + .then( car => { + this.tempCar = car; + done(); + }) + .catch(done); + }); + + after( done => { + delete exampleCar.timestamp; + if (this.tempCar) { + Car.remove({}) + .then( () => done()) + .catch(done); + return; + } + done(); + }); + + it('should return a car', done => { + request.get(`${url}/api/car/${this.tempCar._id}`) + .end((err, res) => { + if (err) return done(err); + expect(res.status).to.equal(200); + expect(res.body.name).to.equal('test car name'); + done(); + }); + }); + }); + }); +}); diff --git a/lab-sharmarke/test/list-test.js b/lab-sharmarke/test/list-test.js deleted file mode 100644 index e69de29..0000000 From d95c641f3f03494f189cc97fbc0b16af33ed2873 Mon Sep 17 00:00:00 2001 From: sharmarke Date: Wed, 2 Aug 2017 19:31:26 -0700 Subject: [PATCH 5/7] did stuff --- lab-sharmarke/package.json | 4 ++-- lab-sharmarke/route/car-route.js | 4 ++-- lab-sharmarke/server.js | 7 ++++++ lab-sharmarke/test/car-test.js | 41 +++++++++++++++++++++++++++++++- 4 files changed, 51 insertions(+), 5 deletions(-) diff --git a/lab-sharmarke/package.json b/lab-sharmarke/package.json index 81a0e43..cb54616 100644 --- a/lab-sharmarke/package.json +++ b/lab-sharmarke/package.json @@ -4,8 +4,8 @@ "description": "", "main": "server.js", "scripts": { - "test": "DEBUG='note*' mocha", - "start": "DEBUG='note*' node server.js" + "test": "DEBUG='car*' mocha", + "start": "DEBUG='car*' node server.js" }, "keywords": [], "author": "", diff --git a/lab-sharmarke/route/car-route.js b/lab-sharmarke/route/car-route.js index 96c627e..fc5e0e3 100644 --- a/lab-sharmarke/route/car-route.js +++ b/lab-sharmarke/route/car-route.js @@ -8,9 +8,9 @@ const debug = require('debug')('car:car-router'); carRouter.post('/api/car', jsonParser, function(req, res, next) { debug('POST: /api/car'); - res.body.timestamp = new Date(); + req.body.timestamp = new Date(); new Car(req.body).save() - .then( car => res.json( )) + .then( car => res.json(car)) .catch(next); }); diff --git a/lab-sharmarke/server.js b/lab-sharmarke/server.js index 2e15b1d..563f8e5 100644 --- a/lab-sharmarke/server.js +++ b/lab-sharmarke/server.js @@ -12,6 +12,13 @@ const app = express(); const PORT = process.env.PORT || 3000; const MONGODB_URI = 'mongodb://localhost/listofcarss'; +mongoose.Promise = Promise; +mongoose.connect(MONGODB_URI); + +app.use(cors()); +app.use(morgan('dev')); +app.use(carRouter); + app.listen(PORT, () => { debug(`listening on ${PORT}`); }); diff --git a/lab-sharmarke/test/car-test.js b/lab-sharmarke/test/car-test.js index 344f1fc..82e5c7b 100644 --- a/lab-sharmarke/test/car-test.js +++ b/lab-sharmarke/test/car-test.js @@ -6,7 +6,7 @@ const Car = require('../model/car.js'); const PORT = process.env.PORT || 3000; const mongoose = require('mongoose'); - +// process.env.MONGODB_URI = 'mongodb://localhost/listofcars'; mongoose.Promise = Promise; require('../server.js'); @@ -15,6 +15,11 @@ const url = `http://localhost:${PORT}`; const exampleCar = { name : 'test car name' } +const carTwo = { +// this is from vim + name: 'second test name', + timestamp: new Date() +}; describe('Car Routes', function() { describe('POST: /api/car', function() { @@ -77,4 +82,38 @@ describe('Car Routes', function() { }); }); }); + describe('PUT: /api/car', function() { + describe('with a valid id', function() { + before(done => { + exampleCar.timestamp = new Date(); + new Car(exampleCar).save() + .then( car => { + this.tempCar = car; + done(); + }) + .catch(done); + }); + after( done => { + delete exampleCar.timestamp; + if(this.tempCar) { + Car.remove({}) + .then( () => done()) + .catch(done); + return; + } + done(); + }); + it('should return a car', done => { + request.put(`${url}/api/car/${this.tempCar._id}`) + .send(carTwo) + .end((err, res) => { + if (err) return done(err); + expect(res.status).to.equal(200); + expect(res.body.name).to.equal('second test name'); + done(); + }); + }); + }); + + }) }); From 7578c5f59a7beffcc326eddacbd3638743683ddf Mon Sep 17 00:00:00 2001 From: sharmarke Date: Fri, 4 Aug 2017 14:19:10 -0700 Subject: [PATCH 6/7] added more test --- lab-sharmarke/test/car-test.js | 59 ++++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/lab-sharmarke/test/car-test.js b/lab-sharmarke/test/car-test.js index 82e5c7b..123cb4f 100644 --- a/lab-sharmarke/test/car-test.js +++ b/lab-sharmarke/test/car-test.js @@ -6,19 +6,12 @@ const Car = require('../model/car.js'); const PORT = process.env.PORT || 3000; const mongoose = require('mongoose'); -// process.env.MONGODB_URI = 'mongodb://localhost/listofcars'; - mongoose.Promise = Promise; require('../server.js'); const url = `http://localhost:${PORT}`; const exampleCar = { name : 'test car name' -} -const carTwo = { -// this is from vim - name: 'second test name', - timestamp: new Date() }; describe('Car Routes', function() { @@ -81,6 +74,34 @@ describe('Car Routes', function() { }); }); }); + // describe('with an invalid id', function() { + // before( done => { + // exampleCar.timestamp = new Date(); + // new Car(exampleCar).save() + // .then(car => { + // this.tempCar = car; + // done(); + // }) + // .catch(done); + // }); + // after( done => { + // delete exampleCar.timestamp; + // if(this.tempCar) { + // Car.remove({}) + // .then( () => done()) + // .catch(done); + // return; + // } + // done(); + // }); + // it('should return a 404', done => { + // request.get(`${url}/api/car/asapferg`) + // .end((err, res) => { + // expect(res.status).to.equal(404); + // done(); + // }); + // }); + // }); }); describe('PUT: /api/car', function() { describe('with a valid id', function() { @@ -93,6 +114,7 @@ describe('Car Routes', function() { }) .catch(done); }); + after( done => { delete exampleCar.timestamp; if(this.tempCar) { @@ -103,17 +125,34 @@ describe('Car Routes', function() { } done(); }); + it('should return a car', done => { request.put(`${url}/api/car/${this.tempCar._id}`) - .send(carTwo) + .send({name:'second test name'}) .end((err, res) => { - if (err) return done(err); expect(res.status).to.equal(200); expect(res.body.name).to.equal('second test name'); done(); }); }); }); + }); + describe('DELETE: /api/car', function() { + before( done => { + exampleCar.timestamp = new Date(); + new Car(exampleCar).save() + .then( car => { + this.tempCar = car; + done(); + }) + .catch(done); + }); - }) + it('should return 204', done => { + request.delete(`${url}/api/car/${this.tempCar._id}`, function(err, res) { + expect(res.status).to.equal(204); + done(); + }); + }); + }); }); From 529632faab7b00e4e51940c00852e56f78570ba8 Mon Sep 17 00:00:00 2001 From: sharmarke Date: Sun, 17 Sep 2017 18:17:10 -0700 Subject: [PATCH 7/7] redo --- lab-sharmarke/lib/error-middleware.js | 21 +++++++++++++++++++++ lab-sharmarke/route/car-route.js | 21 ++++++++++++++++----- 2 files changed, 37 insertions(+), 5 deletions(-) create mode 100644 lab-sharmarke/lib/error-middleware.js diff --git a/lab-sharmarke/lib/error-middleware.js b/lab-sharmarke/lib/error-middleware.js new file mode 100644 index 0000000..0777e1f --- /dev/null +++ b/lab-sharmarke/lib/error-middleware.js @@ -0,0 +1,21 @@ +'use strict'; + +const createError = require('http-errors'); +const debug = require('debug')('song: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(); +}; diff --git a/lab-sharmarke/route/car-route.js b/lab-sharmarke/route/car-route.js index fc5e0e3..ab0008c 100644 --- a/lab-sharmarke/route/car-route.js +++ b/lab-sharmarke/route/car-route.js @@ -5,25 +5,36 @@ const jsonParser = require('body-parser').json(); const Car = require('../model/car.js'); const carRouter = module.exports = new Router(); const debug = require('debug')('car:car-router'); +const createError = require('http-errors'); carRouter.post('/api/car', jsonParser, function(req, res, next) { debug('POST: /api/car'); req.body.timestamp = new Date(); new Car(req.body).save() .then( car => res.json(car)) - .catch(next); + .catch( err => next(createError(400, err.message))); }); carRouter.get('/api/car/:id', function(req, res, next) { debug('GET: /api/car'); Car.findById(req.params.id) .then( car => res.json(car)) - .catch(next); + .catch( err => next(createError(404, err.message))); +}); + +carRouter.put('/api/car/:id', jsonParser, function(req, res, next) { + debug('PUT: /api/car/:id'); + + if(!req.body.name) return next(createError(400, 'bad request')); + + Car.findByIdAndUpdate(req.params.id, req.body, { 'new': true }) + .then( car => res.json(car)) + .catch(err => next(createError(404, err.message))); }); carRouter.delete('/api/car/:id', function(req, res, next) { debug('DELETE: /api/car'); - Car.findByIdAndRemove(req.params.id, req.body) - .then(car => res.json(car)) - .catch(next); + Car.findByIdAndRemove(req.params.id) + .then(() => res.status(204)) + .catch(err => next(err)); });