Something is up

api.test.js

@@ -1,6 +1,4 @@
 const request = require('superagent');
-const brewData = require('./server/brew.data.js');
-
 const path = 'localhost:8000';
 
 request.post(`${path}/api/brew`)
@@ -9,29 +7,21 @@ request.post(`${path}/api/brew`)
 	})
 	.end((err, res) => {
 		console.log(err, res && res.body);
+	});
 
-		console.log('creaitng brew');
 
-		//creating brew
+/////////
+
+const db = require('./server/db.js');
+const brewData = require('./server/brew.data.js');
+
+
+db.connect()
+	.then(()=>{
 		brewData.create({
-			text : 'yeah yeah'
+			text : 'test'
 		})
 		.then((brew)=>{
 			console.log(brew);
 		})
-			.catch((e) => {
-				console.log(e);
 	})
-
-		/*
-		res.body.text = 'check it';
-		brewData.update(res.body)
-			.then((newBrew) => {
-				console.log(newBrew);
-			})
-			.catch((e) => {
-				console.log(e);
-			})
-		*/
-	})
-

client/homebrew/homebrew.jsx

@@ -13,6 +13,13 @@ const NewPage   = require('./pages/newPage/newPage.jsx');
 //const ErrorPage = require('./pages/errorPage/errorPage.jsx');
 const PrintPage = require('./pages/printPage/printPage.jsx');
 
+const mapObject = (names, obj) => {
+	return _.reduce(names, (r, name) => {
+		if(obj[name]) r[name] = obj[name];
+		return r;
+	}, {});
+};
+
 let Router;
 const Homebrew = React.createClass({
 	getDefaultProps: function() {
@@ -21,7 +28,7 @@ const Homebrew = React.createClass({
 			version : '0.0.0',
 			user : undefined,
 
-			brew : {},
+			brew : undefined,
 			brews : []
 		};
 	},
@@ -30,11 +37,9 @@ const Homebrew = React.createClass({
 		global.account = this.props.account;
 		global.version = this.props.version;
 
-		Actions.init({
+		console.log(mapObject(['version', 'brew', 'account'], this.props));
-			version : this.props.version,
+
-			brew : this.props.brew,
+		Actions.init(mapObject(['version', 'brew', 'account'], this.props));
-			account : this.props.account
-		});
 
 
 		Router = CreateRouter({

package.json

@@ -10,7 +10,7 @@
     "prod": "set NODE_ENV=production&& npm run build",
     "postinstall": "npm run build",
     "start": "node server.js",
-    "test": "mocha --recursive test"
+    "test": "mocha test"
   },
   "author": "stolksdorf",
   "license": "MIT",

server.js

@@ -1,4 +1,3 @@
-const _ = require('lodash');
 
 const express = require("express");
 const app = express();
@@ -36,3 +35,5 @@ app.use(require('./server/error.js').expressHandler);
 const PORT = process.env.PORT || 8000;
 app.listen(PORT);
 console.log(`server on port:${PORT}`);
+
+module.exports = app;

server/brew.data.js

@@ -1,7 +1,6 @@
 const _ = require('lodash');
 const shortid = require('shortid');
-const mongoose = require('mongoose');
+const mongoose = require('./db.js').instance;
-mongoose.Promise = Promise;
 
 const utils = require('./utils.js');
 
@@ -78,15 +77,22 @@ const BrewData = {
 		return Brew.findOne(query).exec();
 	},
 	create : (brew) => {
-		console.log('here');
 		delete brew.shareId;
 		delete brew.editId;
 
 		if(!brew.title) brew.title = utils.getGoodBrewTitle(brew.text);
 		const newBrew = new Brew(brew);
 
-		//TODO: add error decorators to the catches
 		return newBrew.save();
+
+		//TODO: add error decorators to the catches
+		const temp = newBrew.save().then(()=>{
+			console.log('SAVED');
+		});
+
+		console.log(typeof temp, _.keys(temp), temp);
+
+		return temp;
 	},
 	update : (newBrew) => {
 		return Brew.findOneAndUpdate({ editId : newBrew.editId },

server/db.js

@@ -1,18 +1,23 @@
+const mongoose = require('mongoose');
+mongoose.Promise = Promise;
+
+const dbPath = process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb://localhost/homebrewery';
 
 module.exports = {
 	connect : ()=>{
 		return new Promise((resolve, reject)=>{
-			require('mongoose')
+			mongoose.createConnection(dbPath,
-				.connect(process.env.MONGODB_URI || process.env.MONGOLAB_URI || 'mongodb://localhost/homebrewery',
 				(err) => {
 					if(err){
 						console.log('Error : Could not connect to a Mongo Database.');
 						console.log('        If you are running locally, make sure mongodb.exe is running.');
-							return reject();
+						return reject(err);
 					}
 					return resolve();
 				}
 			);
 		});
-	}
+	},
+	instance : mongoose,
+	clearDatabase : ()=>{}
 }

test/brew.apitest.js

@@ -1,17 +1,12 @@
-const testing = require('./test.init.js');
+
 const request = require('supertest-as-promised');
-
+const app = require('../server.js');
-
-const app = require('../server.js')
 
 
 const apiPath = '/api/brew';
 
 describe('/api/brew', () => {
 
-	before('Await DB', ()=>{
-		return require('db.js').connect();
-	});
 
 	describe('POST', () => {
 

test/brew.datatest.js

@@ -1,26 +1,38 @@
 
-const testing = require('./test.init.js');
+const should = require('chai').use(require('chai-as-promised')).should();
-const should = testing.should;
+
+const BrewDB = require('../server/db.js');
+const BrewData = require('../server/brew.data.js');
 
 
-const BrewDB = require('../server/brew.data.js');
+describe.skip('BrewDB', () => {
-
-
-describe('BrewDB', () => {
 
 	before('Await DB', ()=>{
-		return require('db.js').connect();
+		return BrewDB.connect()
+			.then(()=>{
+				console.log('connected');
+			})
+			.catch(()=>{
+				console.log('sdfdsfdsfdsf');
+			})
 	});
 
-	it('generates ID on save', () => {
+	it('generates ID on save', (done) => {
-		return BrewDB.create({
+		console.log('getting here');
+		return BrewData.create({
 			text : "Brew Text"
 		}).then((brew) => {
+			console.log('here2');
 			should.exist(brew);
 			brew.should.have.property('editId').that.is.a('string');
 			brew.should.have.property('shareId').that.is.a('string');
 			brew.should.have.property('text').that.is.a('string');
-		});
+			console.log('and I am done');
+			done();
+		})
+		.catch((e) => {
+			console.log('an error', e);
+		})
 	});
 
 });