Added in full test coverage of current spec

server/brew.api.js

@@ -14,35 +14,36 @@ router.get('/api/brew', (req, res, next) => {
 
 //Get
 router.get('/api/brew/:shareId', mw.viewBrew, (req, res, next) => {
-	return res.json(req.brew);
+	return res.json(req.brew.toJSON());
 });
 
 //Create
 router.post('/api/brew', (req, res, next)=>{
-	const newBrew = req.body;
-	if(req.account) newBrew.authors = [req.account.username];
-	BrewData.create(newBrew)
+	const brew = req.body;
+	if(req.account) brew.authors = [req.account.username];
+	BrewData.create(brew)
 		.then((brew) => {
-			return res.json(brew);
+			return res.json(brew.toJSON());
 		})
 		.catch(next)
 });
 
 //Update
 router.put('/api/brew/:editId', mw.loadBrew, (req, res, next)=>{
+	const brew = req.body || {};
 	if(req.account){
-		req.brew.authors = _.uniq(_.concat(req.brew.authors, req.account.username));
+		brew.authors = _.uniq(_.concat(brew.authors, req.account.username));
 	}
-	BrewData.update(req.brew)
+	BrewData.update(req.params.editId, brew)
 		.then((brew) => {
-			return res.json(brew);
+			return res.json(brew.toJSON());
 		})
 		.catch(next);
 });
 
 //Delete
 router.delete('/api/brew/:editId', mw.loadBrew, (req, res, next) => {
-	BrewData.remove(req.brew.editId)
+	BrewData.remove(req.params.editId)
 		.then(()=>{
 			return res.sendStatus(200);
 		})

server/brew.data.js

@@ -2,6 +2,7 @@ const _ = require('lodash');
 const shortid = require('shortid');
 const mongoose = require('./db.js').instance;
 
+const Error = require('./error.js');
 const utils = require('./utils.js');
 
 const BrewSchema = mongoose.Schema({
@@ -21,41 +22,15 @@ const BrewSchema = mongoose.Schema({
 	updatedAt  : { type: Date, default: Date.now},
 	lastViewed : { type: Date, default: Date.now},
 	views      : {type:Number, default:0}
-}, { versionKey: false });
-
-/*
-BrewSchema.methods.sanatize = function(userName, isAdmin, getText = true){
-	const brew = this.toJSON();
-	delete brew._id;
-	delete brew.__v;
-	const isPriviledged = isAdmin || _.contains(this.authors, userName);
-	if(!isPriviledged) delete brew.editId;
-	if(!getText) delete brew.text;
-	return brew;
-};
-*/
-/*
-BrewSchema.methods.sanatize = function(req, getText = true){
-	const brew = this.toJSON();
-	delete brew._id;
-	delete brew.__v;
-	const isPriviledged = isAdmin || _.contains(this.authors, userName);
-	if(!isPriviledged) delete brew.editId;
-	if(!getText) delete brew.text;
-	return brew;
-};
-
-BrewSchema.methods.increaseView = function(){
-	return new Promise((resolve, reject) => {
-		this.lastViewed = new Date();
-		this.views = this.views + 1;
-		this.save((err) => {
-			if(err) return reject(err);
-			return resolve(this);
-		});
-	});
-};
-*/
+}, {
+	versionKey: false,
+	toJSON : {
+		transform: (doc, ret, options) => {
+			delete ret._id;
+			return ret;
+		}
+	}
+});
 
 BrewSchema.methods.increaseView = function(){
 	this.views = this.views + 1;
@@ -72,32 +47,36 @@ const BrewData = {
 	model  : Brew,
 
 	get : (query) => {
-		//returns a single brew with the given query
-		//Start using egads for errors
-		return Brew.findOne(query).exec();
+		return Brew.findOne(query).exec()
+			.then((brew) => {
+				if(!brew) throw Error.noBrew();
+				return brew;
+			});
 	},
 	create : (brew) => {
 		delete brew.shareId;
 		delete brew.editId;
-
 		if(!brew.title) brew.title = utils.getGoodBrewTitle(brew.text);
-		const newBrew = new Brew(brew);
-
-		return newBrew.save();
+		return (new Brew(brew)).save();
 	},
-	update : (newBrew) => {
-		return Brew.findOneAndUpdate({ editId : newBrew.editId },
-			_.merge(newBrew, { updatedAt : Date.now() }),
-			{new : true, upsert : true}
-		).exec(); //TODO: TEST THIS that this returns a record
+	update : (editId, newBrew) => {
+		return BrewData.get({ editId })
+			.then((brew) => {
+				delete newBrew.shareId;
+				delete newBrew.editId;
+				brew = _.merge(brew, newBrew, { updatedAt : Date.now() });
+				return brew.save();
+			});
 	},
 	remove : (editId) => {
 		return Brew.find({ editId }).remove().exec();
 	},
+	removeAll : ()=>{
+		return Brew.find({}).remove().exec();
+	},
 
 	//////// Special
 
-
 	getByShare : (shareId) => {
 		return BrewData.get({ shareId : shareId})
 			.then((brew) => {
@@ -108,7 +87,7 @@ const BrewData = {
 			});
 	},
 	getByEdit : (editId) => {
-		return Brew.get({ editId });
+		return BrewData.get({ editId });
 	},
 
 	search : (query, req={}) => {

server/db.js

@@ -24,6 +24,5 @@ module.exports = {
 			);
 		});
 	},
-	instance : mongoose,
-	clearDatabase : ()=>{}
+	instance : mongoose
 }

server/error.js

@@ -1,14 +1,12 @@
 
-const ApiError = require('egads').extend('Server Error', 500, 'Generic Server Error');
+const Error = require('egads').extend('Server Error', 500, 'Generic Server Error');
 
-ApiError.noBrew = ApiError.extend('Can not find a brew with that id', 404);
+Error.noBrew = Error.extend('Can not find a brew with that id', 404, 'No Brew Found');
+Error.noAuth = Error.extend('You can not access this route', 401, 'Unauthorized');
 
 
-
-
-
-ApiError.expressHandler = (err, req, res, next) => {
-	if(err instanceof ApiError){
+Error.expressHandler = (err, req, res, next) => {
+	if(err instanceof Error){
 		return res.status(err.status).send({
 			type : err.name,
 			message : err.message
@@ -23,4 +21,4 @@ ApiError.expressHandler = (err, req, res, next) => {
 
 
 
-module.exports = ApiError;
+module.exports = Error;

server/middleware.js

@@ -2,6 +2,7 @@ const _ = require('lodash');
 const jwt = require('jwt-simple');
 const config = require('nconf');
 
+const Error = require('./error.js');
 const BrewData = require('./brew.data.js');
 
 const Middleware = {
@@ -15,13 +16,11 @@ const Middleware = {
 	},
 	admin : (req, res, next) => {
 		if(req.query.admin_key === config.get('admin_key')){
-			delete req.admin_key;
-			req.isAdmin = true;
+			req.admin = true;
 		}
 		return next();
 	},
 
-
 	//Filters
 	devOnly : (req, res, next) => {
 		const env = process.env.NODE_ENV;
@@ -29,20 +28,27 @@ const Middleware = {
 		return res.sendStatus(404);
 	},
 	adminOnly : (req, res, next) => {
-		if(req.isAdmin) return next();
-		return res.sendStatus(401);
+		if(req.admin) return next();
+		return next(Error.noAuth());
 	},
 
 
 	//Loaders
 	loadBrew : (req, res, next) => {
-		//Loads a brew by edit id
-
-		//TODO: move validate into hurrr
+		BrewData.getByEdit(req.params.editId)
+			.then((brew) => {
+				req.brew = brew;
+				return next()
+			})
+			.catch(next);
 	},
 	viewBrew : (req, res, next) => {
-		//load by share
-		//increase view count
+		BrewData.getByShare(req.params.shareId)
+			.then((brew) => {
+				req.brew = brew;
+				return next()
+			})
+			.catch(next);
 	},
 
 };

server/utils.js

@@ -1,17 +1,17 @@
 const _ = require('lodash');
 
 
-
 module.exports = {
-	getGoodBrewTitle : (text) => {
+	getGoodBrewTitle : (text = '') => {
 		const titlePos = text.indexOf('# ');
 		if(titlePos !== -1){
-			const ending = text.indexOf('\n', titlePos);
-			return text.substring(titlePos + 2, ending);
+			let ending = text.indexOf('\n', titlePos);
+			ending = (ending == -1 ? undefined : ending);
+			return text.substring(titlePos + 2, ending).trim();
 		}else{
-			return _.find(text.split('\n'), (line)=>{
+			return (_.find(text.split('\n'), (line)=>{
 				return line;
-			});
+			}) || '').trim();
 		}
 	},
 	replaceByMap : (text, mapping) => {