@@ -32,11 +32,11 @@ class NewsItem < ActiveRecord::Base if raw_items = get_feed_items active = [] raw_items.each do |raw_item| - item = NewsItem.find_by_link(raw_item.elements['link'].text) || NewsItem.new - item.link = raw_item.elements['link'].text - item.title = raw_item.elements['title'].text - item.body = raw_item.elements['description'].text - item.published = (raw_item.elements['dc:date'] || raw_item.elements['pubDate']).text.gsub(/[TZ]/, ' ') rescue nil + item = NewsItem.find_by_link(raw_item.url) || NewsItem.new + item.link = raw_item.url + item.title = raw_item.title + item.body = raw_item.content || raw_item.summary + item.published = raw_item.published item.active = true item.source = 'feed' item.save @@ -47,12 +47,10 @@ class NewsItem < ActiveRecord::Base end def get_feed_items - if Setting.get(:url, :news_rss) + if url = Setting.get(:url, :news_rss) begin - xml = Net::HTTP.get(URI.parse(Setting.get(:url, :news_rss))) - root = REXML::Document.new(xml).root - items = root.elements.to_a('item') - items.any? ? items : root.elements['channel'].elements.to_a('item') + feed = Feedzirra::Feed.fetch_and_parse(url) + feed.entries rescue nil end app/models/news_item.rb @@ -34,6 +34,7 @@ Rails::Initializer.run do |config| config.gem 'seven1m-campaign_monitor', :source => 'http://gems.github.com', :lib => 'campaign_monitor' config.gem 'chronic' config.gem 'javan-whenever', :source => 'http://gems.github.com', :lib => 'whenever' + config.gem 'pauldix-feedzirra', :source => 'http://gems.github.com', :lib => 'feedzirra' end PHONE_HOME_FOR_VERSION_INFO = true unless defined? PHONE_HOME_FOR_VERSION_INFO config/environment.rb ef2c01df6ac73aff0401b68b4e3c79d8184c1a25 Tim Morgan tim@timmorgan.org http://github.com/seven1m/onebody/commit/f2c44a54428d08494dedf1ed0e1014bee6e290ee f2c44a54428d08494dedf1ed0e1014bee6e290ee 2009-07-06T14:14:03-07:00 2009-07-06T14:14:03-07:00 Use Paul Dix's Feedzirra for news feed parsing. f5396af6b64b5e76d705c4a8474714b933fb6e5e Tim Morgan tim@timmorgan.org