Update to most recent codebase

2013-02-18 19:15:35 -05:00
parent 425b8aa870
commit 0945434dda
2 changed files with 30 additions and 106 deletions
@@ -3,6 +3,7 @@ router = new express.Router()

 scoring = require '../app/scoring'
 _ = require 'underscore'
+icalendar = require('icalendar')

 # ---------- /v1 API ------------
 # Every url added beneath router is prefaced by /v1
@@ -38,7 +39,7 @@ router.post '/users/:uid/tasks/:taskId/:direction', (req, res) ->
    # TODO add service & icon to task
    unless model.get("_user.tasks.#{taskId}")
      model.refList "_habitList", "_user.tasks", "_user.habitIds"
-      model.at('_habitList').push {
+      model.at('_habitList').push
        id: taskId
        type: 'habit'
        text: (title || taskId)
@@ -46,9 +47,6 @@ router.post '/users/:uid/tasks/:taskId/:direction', (req, res) ->
        up: true
        down: true
        notes: "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task."
-      }, (a,b,c) ->
-        console.log {a:a,b:b,c:c}
-

    scoring.setModel(model)
    delta = scoring.score(taskId, direction)
@@ -56,4 +54,32 @@ router.post '/users/:uid/tasks/:taskId/:direction', (req, res) ->
    result.delta = delta
    res.send(result)

+router.get '/users/:uid/calendar.ics', (req, res) ->
+  #    return next() #disable for now
+    {uid} = req.params
+    {apiToken} = req.query
+
+    model = req.getModel()
+    query = model.query('users').withIdAndToken(uid, apiToken)
+    query.fetch (err, result) ->
+  #    require('mongoskin').db(process.env.NODE_DB_URI, {safe:true}).collection('users').find({_id:uid, apiToken:apiToken}).toArray (err, result) ->
+      return res.send(500, err) if err
+      tasks = result.at(0).get('tasks')
+      #      tasks = result[0].tasks
+      tasksWithDates = _.filter tasks, (task) -> !!task.date
+      return res.send(500, "No events found") if _.isEmpty(tasksWithDates)
+
+      ical = new icalendar.iCalendar()
+      ical.addProperty('NAME', 'HabitRPG')
+      _.each tasksWithDates, (task) ->
+        event = new icalendar.VEvent(task.id);
+        event.setSummary(task.text);
+        d = new Date(task.date)
+        d.date_only = true
+        event.setDate d
+        ical.addComponent event
+      res.type('text/calendar')
+      formattedIcal = ical.toString().replace(/DTSTART\:/g, 'DTSTART;VALUE=DATE:')
+      res.send(200, formattedIcal)
+
 module.exports = router
@@ -1,102 +0,0 @@
-scoring = require('../app/scoring')
-_ = require('underscore')
-icalendar = require('icalendar')
-mount = require('express')()
-
-module.exports.API = ->
-  mount.get '/v1/users/:uid/calendar.ics', (req, res) ->
-  #    return next() #disable for now
-    {uid} = req.params
-    {apiToken} = req.query
-
-    model = req.getModel()
-    query = model.query('users').withIdAndToken(uid, apiToken)
-    query.fetch (err, result) ->
-  #    require('mongoskin').db(process.env.NODE_DB_URI, {safe:true}).collection('users').find({_id:uid, apiToken:apiToken}).toArray (err, result) ->
-      return res.send(500, err) if err
-      tasks = result.at(0).get('tasks')
-      #      tasks = result[0].tasks
-      tasksWithDates = _.filter tasks, (task) -> !!task.date
-      return res.send(500, "No events found") if _.isEmpty(tasksWithDates)
-
-      ical = new icalendar.iCalendar()
-      ical.addProperty('NAME', 'HabitRPG')
-      _.each tasksWithDates, (task) ->
-        event = new icalendar.VEvent(task.id);
-        event.setSummary(task.text);
-        d = new Date(task.date)
-        d.date_only = true
-        event.setDate d
-        ical.addComponent event
-      res.type('text/calendar')
-      formattedIcal = ical.toString().replace(/DTSTART\:/g, 'DTSTART;VALUE=DATE:')
-      res.send(200, formattedIcal)
-
-
-  # ---------- Deprecated Paths ------------
-
-  deprecatedMessage = 'This API is no longer supported, see https://github.com/lefnire/habitrpg/wiki/API for new protocol'
-  mount.get '/:uid/up/:score?', (req, res) -> res.send(500, deprecatedMessage)
-  mount.get '/:uid/down/:score?', (req, res) -> res.send(500, deprecatedMessage)
-  mount.post '/users/:uid/tasks/:taskId/:direction', (req, res) -> res.send(500, deprecatedMessage)
-
-  # ---------- v1 API ------------
-
-  ###
-    v1 API. Requires user-id and apiToken, task-id, direction. Test with:
-    curl -X POST -H "Content-Type:application/json" -d '{"apiToken":"{TOKEN}"}' localhost:3000/v1/users/{UID}/tasks/productivity/up
-  ###
-  mount.post '/v1/users/:uid/tasks/:taskId/:direction', (req, res) ->
-    {uid, taskId, direction} = req.params
-    {apiToken, title, service, icon} = req.body
-    console.log {params:req.params, body:req.body} if process.env.NODE_ENV == 'development'
-
-    # Send error responses for improper API call
-    return res.send(500, 'request body "apiToken" required') unless apiToken
-    return res.send(500, ':uid required') unless uid
-    return res.send(500, ':taskId required') unless taskId
-    return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
-
-    model = req.getModel()
-    req._isServer = true
-    model.fetch model.query('users').withIdAndToken(uid, apiToken), (err, result) ->
-      return res.send(500, err) if err
-      user = result.at(0)
-      userObj = user.get()
-      if _.isEmpty(userObj)
-        return res.send(500, "User with uid=#{uid}, token=#{apiToken} not found. Make sure you're not using your username, but your User Id")
-
-      model.ref('_user', user)
-
-      # Create task if doesn't exist
-      # TODO add service & icon to task
-      unless model.get("_user.tasks.#{taskId}")
-        model.refList "_habitList", "_user.tasks", "_user.habitIds"
-        model.at('_habitList').push
-          id: taskId
-          type: 'habit'
-          text: (title || taskId)
-          value: 0
-          up: true
-          down: true
-          notes: "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task."
-
-      scoring.setModel(model)
-      delta = scoring.score(taskId, direction)
-      result = model.get ('_user.stats')
-      result.delta = delta
-      res.send(result)
-
-
-  return mount
-
-module.exports.serverPages = (expressApp, root, derby) ->
-
-  # ---------- Static Pages ------------
-  staticPages = derby.createStatic root
-
-  expressApp.get '/privacy', (req, res) ->
-    staticPages.render 'privacy', res
-
-  expressApp.get '/terms', (req, res) ->
-    staticPages.render 'terms', res