removed dependency on building a c++ module for xml parsing

dynajoe · dynajoe · commit 8675b26842d9 · 2012-02-03T19:20:55.000-06:00
diff --git a/app.coffee b/app.coffee
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 express = require 'express'
 app = express.createServer()
 port = process.env.PORT || 3000
@@ -23,6 +21,7 @@ app.set 'view engine', 'jade'
 app.get '/', data.load('tweets', 'messages', 'events', 'gitEvents'), (req, res) ->
   res.render 'layout', res.data
 
+
 app.listen port
 
 console.log 'server listening on port ' + port
diff --git a/cache.coffee b/cache.coffee
@@ -1,13 +1,13 @@
 module.exports = {
   for: (expiration, work) ->
-    lastResult = null
-    lastModified = null
+    last_result = null
+    last_modified = null
     return (complete) -> 
-       if lastModified? and (new Date).getTime() - expiration < lastModified
-         complete lastResult
+       if last_modified? and (new Date).getTime() - expiration < last_modified
+         complete last_result
        else
          work (data) ->         
-           lastResult = data
-           lastModified = (new Date).getTime()
-           complete lastResult
+           last_result = data
+           last_modified = (new Date).getTime()
+           complete last_result
 }
diff --git a/data.coffee b/data.coffee
@@ -4,18 +4,18 @@ Tweet = require './models/tweet'
 Message = require './models/message'
 GitEvent = require './models/gitevent'
 
-tenMinutes = 10 * 60 * 1000
+ten_minutes = 10 * 60 * 1000
 
-fetchMessages = cache.for tenMinutes, (cb) ->
+fetchMessages = cache.for ten_minutes, (cb) ->
   Message.load cb
 
-fetchTweets = cache.for tenMinutes, (cb) ->
+fetchTweets = cache.for ten_minutes, (cb) ->
   Tweet.load cb
 
-fetchEvents = cache.for tenMinutes, (cb) ->
+fetchEvents = cache.for ten_minutes, (cb) ->
   Event.load cb
 
-fetchGitEvents = cache.for tenMinutes, (cb) ->
+fetchGitEvents = cache.for ten_minutes, (cb) ->
   GitEvent.loadPushEvents 10, cb
     
 module.exports = {
@@ -40,7 +40,6 @@ module.exports = {
       cb()
   gitEvents: (data, cb) ->
     fetchGitEvents (events) ->
-      console.log events
       data.gitEvents = events
       cb()
 }
diff --git a/models/event.coffee b/models/event.coffee
@@ -1,25 +1,20 @@
 moment = require 'moment'
-parser = require 'xml2json'
 rest = require 'restler'
 ical = require 'ical'
 require 'datejs'
 
-parseFeed = (feed) ->
-  JSON.parse(parser.toJson(feed)).feed.entry
+event_feed = 'http://www.google.com/calendar/ical/nodekc.org_e8lg6hesldeld1utui23ebpg7k%40group.calendar.google.com/public/basic.ics'
 
 formatDate = (start, end) ->
-  start = moment(start.setTimezone("CST"))
-  end = moment(end.setTimezone("CST"))
-
+  start = moment(start.setTimezone('CST'))
+  end = moment(end.setTimezone('CST'))
   date = start.format('ddd, MMM D')
 
   if end.diff(start, 'days') == 1 and start.hours() == 0
     return date
 
   date + start.format(' h:mma CST')
 
-eventFeed = 'http://www.google.com/calendar/ical/nodekc.org_e8lg6hesldeld1utui23ebpg7k%40group.calendar.google.com/public/basic.ics'
-
 Event = (data) ->
   this.title = data.summary
   this.location = data.location 
@@ -29,7 +24,7 @@ Event = (data) ->
   return
 
 Event.load = (cb) ->
-  ical.fromURL eventFeed, {}, (err, calendar) ->
+  ical.fromURL event_feed, {}, (err, calendar) ->
       calendar or= {}
       events = for k,v of calendar
         new Event v
diff --git a/models/gitevent.coffee b/models/gitevent.coffee
@@ -1,10 +1,9 @@
 rest = require 'restler'
 moment = require 'moment'
 
-eventFeed = 'https://api.github.com/orgs/nodekc/events'
+event_feed_url = 'https://api.github.com/orgs/nodekc/events'
 
 GitEvent = (data) ->
-  console.log data
   this.actor = data.actor.login
   this.actor_gravatar_id = data.actor.gravatar_id
   this.timeago = moment(new Date(data.created_at)).fromNow()
@@ -13,15 +12,14 @@ GitEvent = (data) ->
   return
 
 GitEvent.loadPushEvents = (limit, cb) ->
-  rest.get(eventFeed).on('complete', (data) ->
-    
-    filtered = data.filter (x) ->
-      x.type == "PushEvent"
+  rest.get(event_feed_url)
+    .on 'complete', (data) ->  
+      filtered = data.filter (x) ->
+        x.type == "PushEvent"
 
-    gitEvents = for x in filtered[0...limit]
-      new GitEvent x
+      gitEvents = for x in filtered[0...limit]
+        new GitEvent x
 
-    cb gitEvents
-  )
+      cb gitEvents
   
 module.exports = GitEvent
diff --git a/models/message.coffee b/models/message.coffee
@@ -1,11 +1,8 @@
 moment = require 'moment'
-parser = require 'xml2json'
 rest = require 'restler'
+FeedParser = require 'feedparser'
 
-messageFeed = 'http://groups.google.com/group/nodekc/feed/atom_v1_0_topics.xml'
-
-parseFeed = (feed) ->
-  JSON.parse(parser.toJson(feed)).feed.entry
+message_feed_url = 'http://groups.google.com/group/nodekc/feed/atom_v1_0_topics.xml'
 
 striphtml = (value) ->
   value.replace(/<(?:.|\n)*?>/gm, ' ')
@@ -16,22 +13,28 @@ formatContent = (content) ->
   content
 
 Message = (data) ->
-  this.subject = data.title.$t
-  this.body = formatContent data.summary.$t
-  this.author = data.author.name
-  this.timeago = moment(new Date(data.updated)).fromNow()
-  this.url = data.link.href
-  this.author = data.author.name
+  this.subject = data.title
+  this.body = formatContent data.description
+  this.timeago = moment(new Date(data.date)).fromNow()
+  this.url = data.link
+  this.author = data.author
   return
 
 Message.load = (cb) ->
-  rest.get(messageFeed).on('complete', (data) -> 
-    data or= ''
-
-    messages = for x in parseFeed data 
-      new Message x
-      
-    cb messages
-  )
+  rest.get(message_feed_url)
+    .on 'complete', (data) -> 
+      parser = new FeedParser()
+
+      articles = []
+
+      parser.on 'article', (article) ->
+        articles.push(article)
+
+      parser.parseString data 
+
+      messages = for x in articles
+        new Message x
+        
+      cb messages
 
 module.exports = Message
diff --git a/models/tweet.coffee b/models/tweet.coffee
@@ -1,6 +1,7 @@
 moment = require 'moment'
 rest = require 'restler'
-twitterFeed = 'http://search.twitter.com/search.json?q=%40nodekc&rpp=5'
+
+twitter_feed_url = 'http://search.twitter.com/search.json?q=%40nodekc&rpp=5'
 
 Tweet = (data) ->
   this.created_by = data.from_user
@@ -10,14 +11,14 @@ Tweet = (data) ->
   return
 
 Tweet.load = (cb) ->
-  rest.get(twitterFeed).on('complete', (data) -> 
-    data or= {}
-    data.results or= []
-    
-    tweets = for x in data.results
-      new Tweet x
-        
-    cb tweets
-  )
+  rest.get(twitter_feed_url)
+    .on 'complete', (data) -> 
+      data or= {}
+      data.results or= []
+      
+      tweets = for x in data.results
+        new Tweet x
+          
+      cb tweets
 
 module.exports = Tweet
diff --git a/package.json b/package.json
@@ -1,18 +1,17 @@
 {
-   "name": "node-kc",
+   "name": "nodekc",
    "version": "0.0.1",
    "dependencies": {
       "express": "~2.5.6",
       "coffee-script": "latest",
       "jade": "~v0.20.0",
       "stylus": "~v0.22.5",
-      "easysax": "latest",
       "restler": "latest",
       "underscore.date": "latest",
-      "xml2json": "latest",
       "ical": "latest",
       "moment": "latest",
-      "datejs": "latest"
+      "datejs": "latest",
+      "feedparser": "0.9.1"   
    }
 }
              
