concerto_simple_rss 0.0.3 → 0.0.4

data/app/models/simple_rss.rb

@@ -2,46 +2,104 @@ class SimpleRss < DynamicContent
 
   DISPLAY_NAME = 'RSS Feed'
 
-  validate :validate_config
+  validate :validate_config, :validate_feed
 
   def build_content
-    require 'rss'
-    require 'net/http'
-    url = self.config['url']
-    feed = Net::HTTP.get_response(URI.parse(url)).body
-
-    rss = RSS::Parser.parse(feed, false, true)
     contents = []
+
+    url = self.config['url']
+    type, feed_title, rss = fetch_feed(url)
     
-    feed_title = rss.channel.title
-
-    case self.config['output_format']
-    when 'headlines'
-      rss.items.each_slice(5).with_index do |items, index|
-        htmltext = HtmlText.new()
-        htmltext.name = "#{feed_title} (#{index+1})"
-        htmltext.data = "<h1>#{feed_title}</h1> #{items_to_html(items)}"
-        contents << htmltext
-      end
-    when 'detailed'
-      rss.items.each_with_index do |item, index|
-        htmltext = HtmlText.new()
-        htmltext.name = "#{feed_title} (#{index+1})"
-        htmltext.data = item_to_html(item)
-        contents << htmltext
+    if (["RSS", "ATOM"].include? type) && !feed_title.blank?
+      # it is a valid feed
+      case self.config['output_format']
+      when 'headlines'
+        rss.items.each_slice(5).with_index do |items, index|
+          htmltext = HtmlText.new()
+          htmltext.name = "#{feed_title} (#{index+1})"
+          htmltext.data = "<h1>#{feed_title}</h1> #{items_to_html(items, type)}"
+          contents << htmltext
+        end
+      when 'detailed'
+        rss.items.each_with_index do |item, index|
+          htmltext = HtmlText.new()
+          htmltext.name = "#{feed_title} (#{index+1})"
+          htmltext.data = item_to_html(item, type)
+          contents << htmltext
+        end
+      else
+        raise ArgumentError, 'Unexpected output format for RSS feed.'
       end
     else
-      raise ArgumentError, 'Unexpected output format for RSS feed.'
+      Rails.logger.error("could not fetch #{type} feed for #{feed_title} at #{url}")
+      raise "Unexpected feed format for #{url}."
     end
+
     return contents
   end
 
-  def item_to_html(item)
-    return "<h1>#{item.title}</h1><p>#{item.description}</p>"
+  # fetch the feed, return the type, title, and contents
+  def fetch_feed(url)
+    require 'rss'
+    require 'net/http'
+
+    type = 'UNKNOWN'
+    title = ''
+    rss = nil
+
+    begin
+      feed = Net::HTTP.get_response(URI.parse(url)).body
+      rss = RSS::Parser.parse(feed, false, true)
+    rescue => e
+      # cant parse rss or url is bad
+      Rails.logger.debug("unable to fetch or parse feed - #{url}, #{e.message}")
+      rss = e.message
+    else
+      type = rss.feed_type.upcase
+
+      case type
+      when "RSS"
+        title = rss.channel.title
+      when "ATOM"
+        title = rss.title.content
+      else
+        #title = "unknown feed type"
+      end
+    end
+
+    return type, title, rss
   end
 
-  def items_to_html(items)
-    return items.collect{|item| "<h2>#{item.title}</h2>"}.join(" ")
+  def item_to_html(item, type)
+    case type
+    when "RSS"
+      title = item.title
+      description = item.description
+    when "ATOM"
+      title = item.title.content
+
+      # seems like the hard way, but the only way I could figure out to get the 
+      # contents without it being html encoded.  most likely a prime candidate for optimizing
+      require 'rexml/document'
+      entry_xml = REXML::Document.new(item.to_s)
+      content_html = REXML::XPath.first(entry_xml, "entry/content").text
+
+      description = (item.summary.nil? ? content_html : item.summary.content)
+    end
+
+    return "<h1>#{title}</h1><p>#{description.html_safe}</p>"
+  end
+
+  def items_to_html(items, type)
+    return items.collect {|item| 
+      case type
+      when "RSS"
+        title = item.title
+      when "ATOM"
+        title = item.title.content
+      end
+
+      "<h2>#{title}</h2>" }.join(" ")
   end
 
   # Simple RSS processing needs a feed URL and the format of the output content.
@@ -50,6 +108,21 @@ class SimpleRss < DynamicContent
     attributes.concat([:config => [:url, :output_format]])
   end
 
+  # if the feed is valid we store the title in config
+  def validate_feed
+    url = self.config['url']
+    unless url.blank? 
+      Rails.logger.debug("looking up feed title for #{url}")    
+
+      type, title = fetch_feed(url)
+      if (["RSS", "ATOM"].include? type) && !title.blank?
+        self.config['title'] = title
+      else
+        errors.add(:config_url, "does not appear to be an RSS feed")
+      end
+    end
+  end
+
   def validate_config
     if self.config['url'].blank?
       errors.add(:config_url, "can't be blank")

data/app/views/contents/simple_rss/{_form_top.html → _form_top.html.erb}

@@ -5,6 +5,7 @@
       <%= config.label :url %>
       <div class="input">
         <%= config.url_field :url, :placeholder => 'http://feeds.bbci.co.uk/news/rss.xml', :class => "input-xxlarge", :value => @content.config['url'] %>
+        <div><small>You can verify an RSS feed at <a href="http://validator.w3.org/feed/" target="_blank">http://validator.w3.org/feed/</a></small></div>
       </div>
     </div>
     <div class="clearfix">

data/app/views/contents/simple_rss/_render_grid.html.erb

@@ -0,0 +1,3 @@
+<div class="grid-item with-shadow">
+  <i class="ficon-rss-sign icon-4x orange"></i>
+</div>

data/app/views/contents/simple_rss/_render_tile.html.erb

@@ -0,0 +1,18 @@
+<div class="default-padding">
+  <% if content.config.include?('title') %>
+    <h1><%= content.config['title'] %></h1>
+    <p></p>
+  <% end %>
+  <h2 class="center">
+    <%= content.name %>
+  </h2>
+  <p>
+    <%= content.config['url'] %>
+  </p>
+</div>
+<% if content.config.include?('last_ok_refresh') %>
+<div class="brand muted default-padding">
+  <br/>
+  <%= distance_of_time_in_words_to_now(Time.at(content.config['last_ok_refresh'])).titleize %> Ago
+</div>
+<% end %>

data/app/views/contents/simple_rss/_tab_icon.html.erb

@@ -0,0 +1 @@
+<i class="ficon-rss-sign"></i>

data/lib/concerto_simple_rss/version.rb

@@ -1,3 +1,3 @@
 module ConcertoSimpleRss
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concerto_simple_rss
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 -07:00
+date: 2013-06-13 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70276077747540 !ruby/object:Gem::Requirement
+  requirement: &70295685543440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.2.11
   type: :runtime
   prerelease: false
-  version_requirements: *70276077747540
+  version_requirements: *70295685543440
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70276077745540 !ruby/object:Gem::Requirement
+  requirement: &70295685542820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276077745540
+  version_requirements: *70295685542820
 description: Simple support to render RSS content in Concerto 2.
 email:
 - bmichalski@gmail.com
@@ -41,11 +41,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/stylesheets/concert_simple_rss/application.css
+- app/assets/stylesheets/concerto_simple_rss/application.css
 - app/models/simple_rss.rb
-- app/views/contents/simple_rss/_form_top.html
-- app/views/contents/simple_rss/_render_default.html
-- app/views/contents/simple_rss/_render_tile.html
+- app/views/contents/simple_rss/_form_top.html.erb
+- app/views/contents/simple_rss/_render_default.html.erb
+- app/views/contents/simple_rss/_render_grid.html.erb
+- app/views/contents/simple_rss/_render_tile.html.erb
+- app/views/contents/simple_rss/_tab_icon.html.erb
 - config/routes.rb
 - lib/concerto_simple_rss/engine.rb
 - lib/concerto_simple_rss/version.rb

data/app/views/contents/simple_rss/_render_tile.html

@@ -1,3 +0,0 @@
-<h1><%= content.name %></h1>
-<br />
-<%= content.config['url'] %>