kindle-feeds 1.0.2 → 1.0.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.3 / 2008-08-24
+
+* Atom feeds scanned first before RSS
+
 === 1.0.2 / 2008-08-24
 
 * minor bugfixes and tweaks

data/lib/kindle-feeds.erb.html

@@ -51,8 +51,8 @@
 
       <% f.entries.each_with_index do |e, n| %>
         <a name="section-<%= i %>-feed-<%= j %>-entry-<%= n %>"></a>
-        <h3>(<%= n + 1 %>/<%= f.entries.size %>) <a href="<%= e.url %>"><%= e.title %></a></h3>
-        <div style="text-align:right"><i><%= e.date_published ? e.date_published.strftime('%B %d, %Y') : nil %></i></div>
+        <div style="text-align:right"><i><%= e.date_published ? e.date_published.strftime('%B %d, %Y') : nil %></i> (<%= n + 1 %>/<%= f.entries.size %>)</div>
+        <h3><a href="<%= e.url %>"><%= e.title %></a></h3>
         <div>
           <%= e.content %>
         </div>

data/lib/kindle-feeds.rb

@@ -77,7 +77,7 @@ class Autodiscovery
     # <link rel="alternate" type="application/rss+xml" title="RSS"
     #       href="http://feeds.feedburner.com/TheRssBlog">
     # Tricky: Hpricot CSS attribute selectors are written like XPath selectors
-    [:rss, :atom].each do |flavor|
+    [:atom, :rss].each do |flavor|
       if x=@doc.at("head link[@type=application/#{flavor}+xml]")
         return x[:href]
       end
@@ -91,8 +91,15 @@ end
 
 class Feed
   def self.create_feed(xml, feed_url)
-    feed = FeedNormalizer::FeedNormalizer.parse(xml)
-    return nil unless feed.is_a?(FeedNormalizer::Feed)
+    begin
+      feed = FeedNormalizer::FeedNormalizer.parse(xml)
+      return nil unless feed.is_a?(FeedNormalizer::Feed)
+    rescue
+      puts "Error trying to parse feed: #{feed_url}"
+      puts $!
+      puts
+      return nil
+    end
     # clean up entries:
     ic = Iconv.new('ISO-8859-1//TRANSLIT', 'utf-8') 
     ic2 = Iconv.new('ISO-8859-1//IGNORE', 'utf-8') 
@@ -197,7 +204,7 @@ class Section
 end
 
 class KindleFeeds
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
   attr_accessor :sections
   # config is a text file with a certain format
   def initialize(config)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kindle-feeds
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Daniel Choi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-24 00:00:00 -04:00
+date: 2008-08-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency