Skip to content

Commit

Permalink
Update routes
Browse files Browse the repository at this point in the history
  • Loading branch information
zeekay committed Jun 30, 2012
1 parent 921afea commit 592bd5f
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 54 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"coffee-script": "~1.3.3",
"node-github": "0.0.3",
"express": "~2.5.9",
"mongoose": "~2.6.5",
"mongoose": "~2.6.8",
"sockjs": "~0.3.1",
"die": "~0.6.0",
"chai": "~1.1.0"
Expand Down
30 changes: 15 additions & 15 deletions routes/commits.coffee
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
Commit = require '../models/commit'

module.exports = (app) ->
module.exports = ->

# Add commit
app.post "/api/commits", (req, res) ->
@post "/api/commits", ->
commit = req.body
commit.id = Date.now().toString()
new Commit(commit).save (err) ->
if not err
res.json commit, 201
@json commit, 201

# List commits
app.get "/api/commits", (req, res) ->
@get "/api/commits", ->
Commit.find {}, (err, commits) ->
res.json commits
@json commits

# Read commit
app.get "/api/commits/:id", (req, res) ->
Commit.findOne {id: req.params.id}, (err, commit) ->
res.json commit
@get "/api/commits/:id", (id) ->
Commit.findOne {id: id}, (err, commit) ->
@json commit

# Update commit
app.put "/api/commits/:id", (req, res) ->
commit = req.body
Commit.update {id: req.params.id}, commit, {}, (err, num) ->
res.json (if err then 404 else 200)
@put "/api/commits/:id", (id) ->
commit = @body
Commit.update {id: id}, commit, {}, (err, num) ->
@json (if err then 404 else 200)

# Delete commit
app.del "/api/commits/:id", (req, res) ->
Commit.findOne {id: req.params.id}, (err, commit) ->
@del "/api/commits/:id", (id) ->
Commit.findOne {id: id}, (err, commit) ->
if not err
commit.remote()
res.json (if err then 404 else 204)
@json (if err then 404 else 204)
41 changes: 21 additions & 20 deletions routes/sessions.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ loginRequired = (req, res, next) ->
else
res.redirect('sessions/new?redir=' + req.url)

module.exports = (app) ->
app.post '/register', (req, res) ->
user = new User(req.body.user)
module.exports = ->

@post '/register', ->
user = new User(@body.user)

userSaveFailed = () ->
req.flash('error', 'Account creation failed')
@flash('error', 'Account creation failed')
console.log('user save failed')
res.render 'users/new.jade',
@render 'users/new.jade',
locals: {user: user}

user.save (err, user) ->
Expand All @@ -23,25 +24,25 @@ module.exports = (app) ->
return userSaveFailed()
else
console.log user
req.session.user = user
@session.user = user

req.flash('info', 'Your account has been created')
@flash('info', 'Your account has been created')
res.redirect('/')

app.get '/login', (req, res) ->
res.render 'users/login',
@get '/login', ->
@render 'users/login',
title: 'Login',
redir: req.query.redir
redir: @query.redir

app.post '/sessions', (req, res) ->
User.findOne {email: req.body.username}, (err, user) ->
if user and user.authenticate(req.body.password)
req.session.user_id = user.id
@post '/sessions', ->
User.findOne {email: @body.username}, (err, user) ->
if user and user.authenticate(@body.password)
@session.user_id = user.id
else
req.flash('error', 'Incorrect credentials')
res.redirect('/sessions/new')
@flash('error', 'Incorrect credentials')
@redirect('/sessions/new')

app.del '/sessions/new', loginRequired, (req, res) ->
if (req.session.user)
req.session.user.destroy -> return
res.redirect('/sessions/new')
@del '/sessions/new', loginRequired, ->
if (@session.user)
@session.user.destroy -> return
@redirect('/sessions/new')
30 changes: 15 additions & 15 deletions routes/users.coffee
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
User = require '../models/user'

module.exports = (app) ->
module.exports = ->

# Add user
app.post "/api/users", (req, res) ->
@post "/api/users", ->
user = req.body
user.id = Date.now().toString()
new User(user).save (err) ->
if not err
res.json user, 201
@json user, 201

# List users
app.get "/api/users", (req, res) ->
@get "/api/users", ->
User.find {}, (err, users) ->
res.json users
@json users

# Read user
app.get "/api/users/:username", (req, res) ->
User.findOne {username: req.params.username}, (err, user) ->
res.json user
@get "/api/users/:username", (username) ->
User.findOne {username: username}, (err, user) ->
@json user

# Update user
app.put "/api/users/:username", (req, res) ->
user = req.body
User.update {username: req.params.username}, user, {}, (err, num) ->
res.json (if err then 404 else 200)
@put "/api/users/:username", (username) ->
user = @body
User.update {username: username}, user, {}, (err, num) ->
@json (if err then 404 else 200)

# Delete user
app.del "/api/users/:username", (req, res) ->
User.findOne {username: req.params.username}, (err, user) ->
@del "/api/users/:username", (username) ->
User.findOne {username: username}, (err, user) ->
if not err
user.remote()
res.json (if err then 404 else 204)
@json (if err then 404 else 204)
6 changes: 3 additions & 3 deletions routes/webhook.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ User = require '../models/user'
Repo = require '../models/repo'
Commit = require '../models/commit'

module.exports = (app) ->
app.post '/api/commit-webhook/', (req, res) ->
module.exports = ->
@post '/api/commit-webhook/', ->
console.log 'recieving commit info'
data = ''
req.addListener 'data', (chunk) ->
@request.addListener 'data', (chunk) ->
data += chunk.toString()
.addListener 'end', ->
payload = JSON.parse qs.parse(data).payload
Expand Down

0 comments on commit 592bd5f

Please sign in to comment.