Merged heroku into working branch.

Andrew Dunkman · Andrew Dunkman · commit a00f9342e9c0 · 2012-01-24T13:16:31.000-08:00
diff --git a/app.coffee b/app.coffee
@@ -20,7 +20,7 @@ app.configure 'production', () ->
 app.set 'views', path.join(__dirname, 'views')
 app.set 'view engine', 'jade'
 
-app.get '/', data.load('tweets', 'messages'), (req, res) ->
+app.get '/', data.load('tweets', 'messages', 'events'), (req, res) ->
   res.render 'plug', res.data
 
 app.listen port
diff --git a/data.coffee b/data.coffee
@@ -7,14 +7,16 @@ fetchMessages = (cb) ->
 fetchTweets = (cb) ->
   rest.get('http://search.twitter.com/search.json?q=%40nodekc').on('complete', (data) -> cb(data))
 
+fetchEvents = (cb) ->
+  rest.get('http://www.google.com/calendar/feeds/nodekc.org_e8lg6hesldeld1utui23ebpg7k%40group.calendar.google.com/public/basic').on('complete', (data) -> cb(parser(data).items))
+
 module.exports = {
   load: (keys...) ->
-    that = this
-    return (req, res, next) -> 
+    return (req, res, next) => 
       finished = []
       res.data or= {}
-      keys.forEach (key) ->
-        that[key] res.data, (k) ->
+      keys.forEach (key) =>
+        this[key] res.data, (k) ->
           finished.push k
           next() if finished.length == keys.length
           
@@ -26,4 +28,8 @@ module.exports = {
     fetchTweets (result) ->
       data.tweets = result
       cb 'tweets'
+  events: (data, cb) ->
+    fetchEvents (result) ->
+      data.events = result
+      cb 'events'
 }
diff --git a/test.js b/test.js
@@ -0,0 +1,5 @@
+var rest = require('restler')
+var parser = require('./utility/atomParser.js')
+
+rest.get('http://www.google.com/calendar/feeds/nodekc.org_e8lg6hesldeld1utui23ebpg7k%40group.calendar.google.com/public/basic').on('complete', function(d) {console.log(parser(d))});
+
diff --git a/views/layout.jade b/views/layout.jade
@@ -40,5 +40,9 @@ html(lang="en")
                   p.tweet #{item.text}
                   span #{item.created_at}
         li.panel
-          h2 Members
-            p Unknown
+          h2 Events
+            ul
+              each item in events
+                li 
+                  a(href=item.guid)#{item.title}
+                  p.teaser #{item.desc}
