-
Notifications
You must be signed in to change notification settings - Fork 12
Sharmarke #10
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
sharmarkei
wants to merge
6
commits into
codefellows-javascript-401d17:master
Choose a base branch
from
sharmarkei:sharmarke
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Sharmarke #10
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
9f1c49e
added server and storage
sharmarkei 989f469
add middleware and create routes
sharmarkei 7c1a5e2
test set up
sharmarkei 8a085ed
Remove the now ignored directory node_modules
sharmarkei 1a1034d
fixed test
sharmarkei c5f705b
fixed test
sharmarkei File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| **/node_modules/* | ||
| **/vendor/* | ||
| **/*.min.js | ||
| **/coverage/* | ||
| **/build/* |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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(); | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| 'use strict'; | ||
|
|
||
| const createError = require('http-errors'); | ||
| const debug = require('debug')('car: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(); | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| 'use strict'; | ||
|
|
||
| const Promise = require('bluebird'); | ||
| const fs = Promise.promisifyAll(require('fs'), {suffix: 'Prom'}); | ||
| const createError = require('http-errors'); | ||
| const debug = require('debug')('car:storage'); | ||
|
|
||
| module.exports = exports = {}; | ||
|
|
||
| exports.createItem = function(schemaName, item) { | ||
| debug('createItem'); | ||
|
|
||
| if (!schemaName) return Promise.reject(createError(400, 'expected schema name')); | ||
| if (!item) return Promise.reject(createError(400, 'expected item')); | ||
|
|
||
| let json = JSON.stringify(item); | ||
| return fs.writeFilePath(`${__dirname}/data/${schemaName}/${item.id}.json`, json) | ||
| .then( () => item) | ||
| .catch( err => Promise.reject(createError(500, err.message))); | ||
| }; | ||
|
|
||
| exports.fetchItem = function(schemaName, id) { | ||
| debug('fetchItem'); | ||
|
|
||
| if (!schemaName) return Promise.reject(createError(400, 'expected schema name')); | ||
| if (!id) return Promise.reject(createError(400, 'expected id')); | ||
|
|
||
| return fs.readFileProm(`${__dirname}/../data/${schemaName}/${id}.json`) | ||
| .then( data => { | ||
| try { | ||
| let item = JSON.parse(data.toString()) | ||
| return item; | ||
| } catch (err) { | ||
| return Promise.reject(CreateError(500, err.message)); | ||
| } | ||
| }) | ||
| .catch(err => Promise.reject(CreateError(404, err.message))); | ||
| }; | ||
|
|
||
| exports.deleteItem = function(schemaName, id) { | ||
| debug('deleteItem'); | ||
|
|
||
| if (!schemaName) return Promise.reject(createError(400, 'expected schema name')); | ||
| if (!id) return Promise.reject(createError(404, err.message)); | ||
|
|
||
| return fs.unlinkProm(`${__dirname}/../data/${schemaName}/${id}.json`) | ||
| .catch( err => Promise.reject(createError(404, err.message))); | ||
| } | ||
|
|
||
| exports.availIDs = function(schemaName) { | ||
| return fs.readdirProm(`${__dirname}/../data/${schemaName}`) | ||
| .then( files => files.map(name => name.split('.json')[0])) | ||
| .catch( err => Promise.reject(createError(404, err.message))); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| 'use strict'; | ||
|
|
||
| const uuidv4 = require('uuid/v4'); | ||
| const createError = require('http-errors'); | ||
| const debug = require('debug')('car:car'); | ||
| const storage = require('../lib/storage.js'); | ||
|
|
||
| const Car = module.exports = function(make, model, year) { | ||
| debug('note constructor'); | ||
|
|
||
| if (!make) throw new Error('expected make'); | ||
| if (!model) throw new Error('expected model'); | ||
| if (!year) throw new Error ('expected year'); | ||
|
|
||
| this.id = uuidv4(); | ||
| this.make = make; | ||
| this.model = model; | ||
| this.year = year; | ||
| }; | ||
|
|
||
| Car.createCar = function(_car) { | ||
| debug('createCar'); | ||
|
|
||
| try { | ||
| let car = new Car(_car.make, _car.model, _car.year); | ||
| return storage.createItem('car', car); | ||
| } catch (err) { | ||
| return Promise.reject(err); | ||
| } | ||
| } | ||
|
|
||
| Car.fetchCar = function(id) { | ||
| debug('fetchCar'); | ||
| return storage.fetchCar('car', id); | ||
| } | ||
|
|
||
| Car.updateCar = function(id, _car) { | ||
| debug('updateCar'); | ||
|
|
||
| return storage.fetchItem('car', id) | ||
| .catch( err => Promise.reject(createError(404, err.message))) | ||
| .then( note => { | ||
| for (var prop in car) { | ||
| if (prop === 'id') continue; | ||
| if (_car[prop]) car[prop] = _car[prop]; | ||
| } | ||
| return storage.createItem('car', car); | ||
| }); | ||
| }; | ||
|
|
||
| Car.deleteCar = function(id) { | ||
| debug('deleteCar'); | ||
| return storage.deleteItem('car', id); | ||
| }; | ||
|
|
||
| Car.fetchIDs = function() { | ||
| debug('fetchIDs'); | ||
| return storage.availIDs('car'); | ||
| }; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| { | ||
| "name": "lab-sharmarke", | ||
| "version": "1.0.0", | ||
| "description": "", | ||
| "main": "server.js", | ||
| "directories": { | ||
| "test": "test" | ||
| }, | ||
| "scripts": { | ||
| "test": "DEBUG='note*' ./node_modules/mocha/bin/mocha", | ||
| "start": "DEBUG='note*' 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" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| 'use strict'; | ||
|
|
||
| const Router = require('express').Router; | ||
| const jsonParser = require('body-parser').json(); | ||
| const debug = require('debug')('car:car-router'); | ||
| const Car = require('../model/car.js'); | ||
| const carRouter = new Router(); | ||
|
|
||
| carRouter.post('/api/note', jsonParser, function(req, res, next) { | ||
| debug('POST: /api/car'); | ||
|
|
||
| Car.createCar(req.body) | ||
| .then( car => res.json(car)) | ||
| .catch( err => next(err)); | ||
| }); | ||
|
|
||
| carRouter.get('/api/car/:id', function(req, res, next) { | ||
| debug('GET: /api/car/:id'); | ||
|
|
||
| Car.fetchCar(req.params.id) | ||
| .then( car => res.json(car)) | ||
| .catch( err => next(err)); | ||
| }); | ||
|
|
||
| carRouter.get('/api/car', function(req, res, next) { | ||
| debug('GET: /api/car'); | ||
|
|
||
| Car.fetchIDs() | ||
| .then( ids => res.json(ids)) | ||
| .catch( err => next(err)); | ||
| }); | ||
|
|
||
| carRouter.put('/api/car', jsonParser, function(req, res, next) { | ||
| debug('POST: /api/car'); | ||
|
|
||
| Car.updateCar(req.quer.id, req.body) | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this route you probably want to define the id as a url param as opposed to a query. |
||
| .then( car => res.json(car)) | ||
| .catch( err => next(err)); | ||
| }); | ||
|
|
||
| module.exports = carRouter; | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
err isn't defined here.