Skip to content

Fixed warnings about the bodyparse and errorhandler #28

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
wants to merge 10 commits into
base: master
Choose a base branch
from
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules
node_modules/
node_modules/*
78 changes: 50 additions & 28 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@

/**
* Module dependencies
*/

var express = require('express'),
bodyParser = require('body-parser'),
methodOverride = require('method-override'),
errorHandler = require('error-handler'),
morgan = require('morgan'),
routes = require('./routes'),
api = require('./routes/api'),
http = require('http'),
path = require('path');
var express = require('express')
, bodyParser = require('body-parser')
, methodOverride = require('method-override')
, errorHandler = require('errorhandler')
, morgan = require('morgan')
, routes = require('./routes')
, partials = require('./routes/partials')
, api = require('./routes/api')
, http = require('http')
, path = require('path')
, modulesAPI = {}
;

modulesAPI.beers = require('./modules/beers/routes/api');

var app = module.exports = express();


/**
* Configuration
*/
Expand All @@ -25,15 +24,16 @@ app.set('port', process.env.PORT || 3000);
app.set('views', __dirname + '/views');
app.set('view engine', 'jade');
app.use(morgan('dev'));
app.use(bodyParser());
app.use(bodyParser.urlencoded({extended: true}));
app.use(bodyParser.json());
app.use(methodOverride());
app.use(express.static(path.join(__dirname, 'public')));

var env = process.env.NODE_ENV || 'development';

// development only
if (env === 'development') {
app.use(express.errorHandler());
app.use(errorHandler());
}

// production only
Expand All @@ -46,21 +46,43 @@ if (env === 'production') {
* Routes
*/

// serve index and view partials
app.get('/', routes.index);
app.get('/partials/:name', routes.partials);
// serve index
app.use('/', routes);

// server view partials
app.use('/partials', partials);

// JSON API
app.get('/api/name', api.name);
app.use('/api', api);
app.use('/api/beers', modulesAPI.beers);

// redirect all others to the index (HTML5 history)
app.get('*', routes.index);

app.get('*', function(req, res, next) {
res.render('index');
});

/**
* Start Server
*/
// error handlers

// development error handler
// will print stacktrace
if (app.get('env') === 'development') {
app.use(function(err, req, res, next) {
res.status(err.status || 500);
res.render('error', {
message: err.message,
error: err
});
});
}

http.createServer(app).listen(app.get('port'), function () {
console.log('Express server listening on port ' + app.get('port'));
// production error handler
// no stacktraces leaked to user
app.use(function(err, req, res, next) {
res.status(err.status || 500);
res.render('error', {
message: err.message,
error: {}
});
});

module.exports = app;
9 changes: 9 additions & 0 deletions bin/www
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env node
var debug = require('debug')('express');
var app = require('../app');

app.set('port', process.env.PORT || 3000);

var server = app.listen(app.get('port'), function () {
debug('Express server listening on port ' + server.address().port);
});
126 changes: 126 additions & 0 deletions modules/beers/controller.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
var Model = require('./model')
, msg = ''
, Controller = {
create: function(req, res) {
var dados = req.body
, model = new Model(dados);
model.save(function (err, data) {
if (err){
console.log('Erro: ', err);
msg = err;
}
else{
console.log('Sucesso:', data);
msg = data;
}
res.json(msg);
});
}
, retrieve: function(req, res) {
var query = {};
Model.find(query, function (err, data) {
if (err){
console.log('Erro: ', err);
msg = err;
}
else{
console.log('Sucesso:', data);
msg = data;
}
res.json(msg);
});
}
, get: function(req, res) {
var query = {_id: req.params.id};
Model.findOne(query, function (err, data) {
if (err){
console.log('Erro: ', err);
msg = err;
}
else{
console.log('Sucesso:', data);
msg = data;
}
res.json(msg);
});
}
, update: function(req, res) {
var query = {_id: req.params.id}
, mod = req.body;

Model.update(query, mod, function (err, data) {
if (err){
console.log('Erro: ', err);
msg = err;
}
else{
console.log('Sucesso:', data);
msg = data;
}
res.json(msg);
});
}
, delete: function(req, res) {
var query = {_id: req.params.id};

Model.remove(query, function (err, data) {
if (err){
console.log('Erro: ', err);
msg = err;
}
else{
console.log('Sucesso:', data);
msg = data;
}
res.json(msg);
});
}
, renderList: function(req, res) {
var query = {};
Model.find(query, function (err, data) {
if (err){
console.log('Erro: ', err);
res.render('error', err);
}
else{
console.log('Sucesso:', data);
res.render('list', {beers: data});
}
});
}
, renderGet: function(req, res) {
var query = {_id: req.params.id};
Model.findOne(query, function (err, data) {
if (err){
console.log('Erro: ', err);
res.render('error', err);
}
else{
console.log('Sucesso:', data);
res.render('get', {beer: data});
}
});
}
, renderEdit: function(req, res) {
var query = {_id: req.params.id};
Model.findOne(query, function (err, data) {
if (err){
console.log('Erro: ', err);
res.render('error', err);
}
else{
console.log('Sucesso:', data);
res.render('edit', {beer: data});
}
});
}
, renderCreate: function(req, res) {
res.render('create');
}
}
;

module.exports = Controller;



31 changes: 31 additions & 0 deletions modules/beers/model.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
var mongoose = require('mongoose');
mongoose.connect('mongodb://localhost/workshop-online-julho-2015');

var db = mongoose.connection;
db.on('error', function(err){
console.log('Erro de conexao.', err);
});
db.on('open', function () {
console.log('Conexão aberta.');
});
db.on('connected', function(err){
console.log('Conectado');
});
db.on('disconnected', function(err){
console.log('Desconectado');
});

var Schema = mongoose.Schema
, _schema = {
name: { type: String, default: '' }
, description: { type: String, default: '' }
, alcohol: { type: Number, min: 0, default: '' }
, price: { type: Number, min: 0, default: '' }
, category: { type: String, default: ''}
, created_at: { type: Date, default: Date.now() }
}
, ModelSchema = new Schema(_schema)
, Model = mongoose.model('Beer', ModelSchema)
;

module.exports = Model;
12 changes: 12 additions & 0 deletions modules/beers/routes/api.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
var express = require('express');
var router = express.Router();
var Controller = require('./../controller');

router.get('/', Controller.retrieve);
router.get('/:id', Controller.get);

router.post('/', Controller.create);
router.put('/:id', Controller.update);
router.delete('/:id', Controller.delete);

module.exports = router;
10 changes: 10 additions & 0 deletions modules/beers/routes/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
var express = require('express');
var router = express.Router();
var Controller = require('./../controller');

router.get('/', Controller.renderList);
router.get('/create', Controller.renderCreate);
router.get('/:id', Controller.renderGet);
router.get('/:id/edit', Controller.renderEdit);

module.exports = router;
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,18 @@
"name": "application-name",
"version": "0.0.1",
"private": true,
"scripts": {
"prestart": "npm install",
"start": "nodemon bin/www"
},
"dependencies": {
"body-parser": "^1.0.2",
"error-handler": "^0.1.4",
"debug": "^2.0.0",
"errorhandler": "^1.1.1",
"express": "~4.1.1",
"jade": "~0.31.2",
"method-override": "^1.0.0",
"mongoose": "^4.1.0",
"morgan": "^1.0.0"
}
}
9 changes: 7 additions & 2 deletions routes/api.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
/*
* Serve JSON to our AngularJS client
*/
var express = require('express');
var router = express.Router();

exports.name = function (req, res) {
/* GET home page. */
router.get('/name', function(req, res) {
res.json({
name: 'Bob'
});
};
});

module.exports = router;
16 changes: 6 additions & 10 deletions routes/index.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
var express = require('express');
var router = express.Router();

/*
* GET home page.
*/

exports.index = function(req, res){
/* GET home page. */
router.get('/', function(req, res) {
res.render('index');
};
});

exports.partials = function (req, res) {
var name = req.params.name;
res.render('partials/' + name);
};
module.exports = router;
9 changes: 9 additions & 0 deletions routes/partials.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
var express = require('express');
var router = express.Router();

router.get('/:name', function(req, res) {
var name = req.params.name;
res.render('partials/' + name);
});

module.exports = router;