File feedjira.patch of Package discourse

Overview Repositories Revisions Requests Users Attributes Meta

File feedjira.patch of Package discourse (Revision cbaab5bd6a4c68324c9b8fedeceb5bfc)

Currently displaying revision cbaab5bd6a4c68324c9b8fedeceb5bfc , Show latest

commit bc086e291a9c152e91b948848a3d56df693af3db
Author: Marcus Rückert <darix@nordisch.org>
Date:   Wed Apr 15 02:24:01 2015 +0200

Initial implementation with feedjira

Index: discourse-1.3.0+git1432889907.555b5cb/Gemfile
===================================================================
--- discourse-1.3.0+git1432889907.555b5cb.orig/Gemfile
+++ discourse-1.3.0+git1432889907.555b5cb/Gemfile
@@ -168,7 +168,7 @@ gem 'rbtrace', require: false, platform:
 #
 gem 'ruby-readability', require: false
 
-gem 'simple-rss', require: false
+gem 'feedjira', require: false
 
 gem 'gctools', require: false, platform: :mri_21
 
Index: discourse-1.3.0+git1432889907.555b5cb/app/jobs/scheduled/poll_feed.rb
===================================================================
--- discourse-1.3.0+git1432889907.555b5cb.orig/app/jobs/scheduled/poll_feed.rb
+++ discourse-1.3.0+git1432889907.555b5cb/app/jobs/scheduled/poll_feed.rb
@@ -4,7 +4,6 @@
 require 'digest/sha1'
 require_dependency 'post_creator'
 require_dependency 'post_revisor'
-require 'open-uri'
 
 module Jobs
   class PollFeed < Jobs::Scheduled
@@ -41,10 +40,12 @@ module Jobs
     end
 
     class Feed
-      require 'simple-rss'
+      require 'feedjira'
+      # we could use ox or oga, but at least oga 0.3.0 triggers a bug and nokogiri is pulled already
+      SAXMachine.handler = :nokogiri
 
       if SiteSetting.embed_username_key_from_feed.present?
-        SimpleRSS.item_tags << SiteSetting.embed_username_key_from_feed.to_sym
+        Feedjira::Parser::RSSEntry.element(SiteSetting.embed_username_key_from_feed.to_sym, :as => :author)
       end
 
       def initialize
@@ -55,7 +56,7 @@ module Jobs
       def topics
         feed_topics = []
 
-        rss.items.each do |i|
+        rss.entries.each do |i|
           current_feed_topic = FeedTopic.new(i)
           feed_topics << current_feed_topic if current_feed_topic.content
         end
@@ -66,7 +67,7 @@ module Jobs
       private
 
       def rss
-        SimpleRSS.parse open(@feed_url)
+        Feedjira::Feed.fetch_and_parse(@feed_url)
       end
 
     end
@@ -77,7 +78,7 @@ module Jobs
       end
 
       def url
-        link = @article_rss_item.link
+        link = @article_rss_item.url
         if url?(link)
           return link
         else
@@ -86,7 +87,7 @@ module Jobs
       end
 
       def content
-        @article_rss_item.content || @article_rss_item.description
+        @article_rss_item.content || @article_rss_item.summary
       end
 
       def title
@@ -109,7 +110,7 @@ module Jobs
 
       def author_username
         begin
-          @article_rss_item.send(SiteSetting.embed_username_key_from_feed.to_sym)
+          @article_rss_item.author
         rescue
           nil
         end

Places

File feedjira.patch of Package discourse (Revision cbaab5bd6a4c68324c9b8fedeceb5bfc)

Places