Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@

# Created by https://www.gitignore.io/api/node

### 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


# End of https://www.gitignore.io/api/node
1 change: 1 addition & 0 deletions data/food/018d5ec0-fe11-11e6-ba61-f102da4292cc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"018d5ec0-fe11-11e6-ba61-f102da4292cc","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/146b0640-fe17-11e6-8fed-7dcafec693d2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"146b0640-fe17-11e6-8fed-7dcafec693d2","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/23addf50-fe13-11e6-96ee-43549667ee63.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"23addf50-fe13-11e6-96ee-43549667ee63","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/4dcace00-fe0f-11e6-baad-4b3a8a44b23c.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"4dcace00-fe0f-11e6-baad-4b3a8a44b23c","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/64d98a20-fe17-11e6-b8b8-4f062c199b30.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"64d98a20-fe17-11e6-b8b8-4f062c199b30","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/66c591c0-fe0e-11e6-8ca7-cd0ef82a3c83.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"66c591c0-fe0e-11e6-8ca7-cd0ef82a3c83","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/68414630-fe17-11e6-8e49-6f2924e672a2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"68414630-fe17-11e6-8e49-6f2924e672a2","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/69408dc0-fe17-11e6-9bfa-850f072f6f29.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"69408dc0-fe17-11e6-9bfa-850f072f6f29","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/6a1fca30-fe17-11e6-9904-993162493958.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"6a1fca30-fe17-11e6-9904-993162493958","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/6b0680b0-fe17-11e6-9da7-2b59171fbc40.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"6b0680b0-fe17-11e6-9da7-2b59171fbc40","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/6bdc2030-fe17-11e6-80c6-51afe6863e9b.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"6bdc2030-fe17-11e6-80c6-51afe6863e9b","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/6caa6cb0-fe17-11e6-9515-f7620fc270fd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"6caa6cb0-fe17-11e6-9515-f7620fc270fd","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/6d822f10-fe17-11e6-94df-1f70e4b8c46f.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"6d822f10-fe17-11e6-94df-1f70e4b8c46f","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/6e5361c0-fe17-11e6-8374-e14ec6f222bf.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"6e5361c0-fe17-11e6-8374-e14ec6f222bf","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/8740e340-fe0f-11e6-9f79-85c72bb30ce9.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"8740e340-fe0f-11e6-9f79-85c72bb30ce9","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/cd74c270-fe0d-11e6-a085-a9fe723f1fbe.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"cd74c270-fe0d-11e6-a085-a9fe723f1fbe","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/d2238e60-fe16-11e6-ab37-13edf83391ef.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"d2238e60-fe16-11e6-ab37-13edf83391ef","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/d5b089e0-fe0f-11e6-8fc3-f967ea5b1870.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"d5b089e0-fe0f-11e6-8fc3-f967ea5b1870","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/dda95f70-fe12-11e6-b02b-311c1ae35311.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"dda95f70-fe12-11e6-b02b-311c1ae35311","name":"example name","meal":"example meal"}
1 change: 1 addition & 0 deletions data/food/faf8fb30-fe0d-11e6-9972-a19d68dbd41b.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"faf8fb30-fe0d-11e6-9972-a19d68dbd41b","name":"example name","meal":"example meal"}
7 changes: 7 additions & 0 deletions lib/cors-middleware.js
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();
};
21 changes: 21 additions & 0 deletions lib/error-middleware.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
'use strict';

const createError = require('http-errors');
const debug = require('debug')('node: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();
};
52 changes: 52 additions & 0 deletions lib/storage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
'use strict';

const Promise = require('bluebird');
const createError = require('http-errors');
const debug = require('debug')('note:storage');
const fs = Promise.promisifyAll(require('fs'), {suffix: 'Prom'});

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.writeFileProm(`${__dirname}/../data/${schemaName}/${item.id}.json`, json)
.then( () => item)
.catch( err => Promise.reject(createError(500, err.meessage)));
};

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)));
};
// here is the good delete function
exports.deleteItem = function(schemaName, id) {
debug('deleteItem');

if (!schemaName) return Promise.reject(createError(400, 'expected schema name'));
if (!id) return Promise.reject(createError(400, 'expected schema id'));

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)));
};
66 changes: 66 additions & 0 deletions model/food.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
'use strict';

const uuid = require('node-uuid');
const createError = require('http-errors');
const debug = require('debug')('food:food');
const storage = require('../lib/storage.js');

const Food = module.exports = function(name, meal) {
debug('food constructor');

if(!name) throw createError(400, 'expected name');
if(!meal) throw createError(400, 'expected meal');

this.id = uuid.v1();
this.name = name;
this.meal = meal;
};

Food.createFood = function(_food) {
debug('createFood');

try {
let food = new Food(_food.name, _food.meal);
return storage.createItem('food', food);
} catch(err){
return Promise.reject(err);
}
};

Food.fetchFood = function(id) {
debug('fetchfood');
return storage.fetchItem('food', id);
};

// will stop usign this logic tomorrow when using mongodb
Food.updateFood = function(id, _food) {
debug('updateFood');

return storage.fetchItem('food', id)
.catch( err => Promise.reject(createError(404, err.message)))
.then( food => {
for(var prop in food) {
if(prop === 'id') continue;
if(_food[prop]) food[prop] = _food[prop];
}
return storage.createItem('food', food);
});
};

Food.deleteFood = function(id) {
debug('deleteFood');
return storage.deleteItem('food', id);
};

Food.fetchIDs = function() {
debug('fetchIDs');
return storage.availIDs('food');
};

// started by making pagkacge.json and NM
// install dependencies
// work in food.js
// create schema constructor
// Create Storage file
// Setup server
// makme data/schema folder
39 changes: 39 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"name": "12-express_middleware",
"version": "1.0.0",
"description": "![CF](https://camo.githubusercontent.com/70edab54bba80edb7493cad3135e9606781cbb6b/687474703a2f2f692e696d6775722e636f6d2f377635415363382e706e67) Lab 12: Single Resource Express API\r ===",
"main": "server.js",
"directories": {
"test": "test"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"start": "node server.js"
},
"repository": {
"type": "git",
"url": "git+https://github.com/noahgribbin/12-express_middleware.git"
},
"keywords": [],
"author": "",
"license": "ISC",
"bugs": {
"url": "https://github.com/noahgribbin/12-express_middleware/issues"
},
"homepage": "https://github.com/noahgribbin/12-express_middleware#readme",
"dependencies": {
"bluebird": "^3.4.7",
"body-parser": "^1.16.1",
"debug": "^2.6.1",
"express": "^4.14.1",
"http-errors": "^1.6.1",
"mkdirp": "^0.5.1",
"morgan": "^1.8.1",
"node-uuid": "^1.4.7"
},
"devDependencies": {
"chai": "^3.5.0",
"mocha": "^3.2.0",
"superagent": "^3.5.0"
}
}
41 changes: 41 additions & 0 deletions route/food-router.js
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')('food:food-router');
const Food = require('../model/food.js');
const foodRouter = new Router();

foodRouter.post('/api/food', jsonParser, function(req, res, next) {
debug('POST: /api/food');

Food.createFood(req.body)
.then( food => res.json(food))
.catch(err => next(err));
});

foodRouter.get('/api/food/:id', jsonParser, function(req, res, next) {
debug('GET: /api/food/:id');

Food.fetchFood(req.params.id)
.then( food => res.json(food))
.catch( err => next(err));
});

foodRouter.get('/api/food/', function(req, res, next) {
debug('GET: /api/food');

Food.fetchIDs()
.then( ids => res.json(ids))
.catch(next);
});

foodRouter.put('/api/food', jsonParser, function(req, res, next) {
debug('PUT: /api/food');

Food.updateFood(req.query.id, req.body)
.then( food => res.json(food))
.catch(next);
});

module.exports = foodRouter;
25 changes: 25 additions & 0 deletions server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
'use strict';

const morgan = require('morgan');
const express = require('express');
const createError = require('http-errors');
const debug = require('debug')('note:server');

const foodRouter = require('./route/food-router.js');
const cors = require('./lib/cors-middleware.js');
const errors = require('./lib/error-middleware.js');

const PORT = process.env.PORT || 3000;
const app = express();

// middleware
app.use(morgan('dev'));
app.use(cors);

app.use(foodRouter);

app.use(errors);

app.listen(PORT, () => {
debug(`server up: ${PORT}`);
});
Loading