jonleighton-bcms_feeds 1.0.4 → 1.0.5

data/app/models/feed.rb

@@ -17,9 +17,11 @@ class Feed < ActiveRecord::Base
     if expires_at.nil? || expires_at < Time.now.utc
       begin
         self.expires_at = Time.now.utc + TTL
-        write_attribute(:contents, remote_contents)
+        new_contents = remote_contents
+        SimpleRSS.parse(new_contents) # Check that we can actually parse it
+        write_attribute(:contents, new_contents)
         save
-      rescue StandardError, Timeout::Error => exception
+      rescue StandardError, Timeout::Error, SimpleRSSError => exception
         logger.error("Loading feed #{url} failed with #{exception.inspect}")
         self.expires_at = Time.now.utc + TTL_ON_ERROR
         save

data/test/unit/feed_test.rb

@@ -29,16 +29,18 @@ class FeedTest < ActiveSupport::TestCase
   
   test "contents with no expiry should return the remote contents and save it" do
     @feed.expires_at = nil
-    should_get_remote_contents
+    should_get_remote_contents_and_parse
   end
   
   test "contents with an expiry in the past return the remote contents and save it" do
     @feed.expires_at = Time.now - 1.hour
-    should_get_remote_contents
+    should_get_remote_contents_and_parse
   end
   
-  def should_get_remote_contents
+  def should_get_remote_contents_and_parse
     @feed.stubs(:remote_contents).returns(@contents)
+    SimpleRSS.expects(:parse).with(@contents)
+    
     assert_equal @contents, @feed.contents
     @feed.reload
     assert_equal @contents, @feed.read_attribute(:contents)
@@ -55,8 +57,8 @@ class FeedTest < ActiveSupport::TestCase
     assert_equal @contents, @feed.contents
   end
   
-  test "TTL of cached contents should be extended if there is an error fetching the remote contents" do
-    [StandardError, Timeout::Error].each do |exception|
+  test "TTL of cached contents should be extended if there is an error fetching the remote contents, or parsing the feed" do
+    [StandardError, Timeout::Error, SimpleRSSError].each do |exception|
       @feed.expires_at = Time.now - 1.hour
       @feed.stubs(:remote_contents).raises(exception)
       @feed.write_attribute(:contents, @contents)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jonleighton-bcms_feeds
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Jon Leighton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-15 00:00:00 -07:00
+date: 2009-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency