jonleighton-bcms_feeds 1.0.3 → 1.0.4

data/app/models/feed.rb

@@ -18,15 +18,17 @@ class Feed < ActiveRecord::Base
       begin
         self.expires_at = Time.now.utc + TTL
         write_attribute(:contents, remote_contents)
+        save
       rescue StandardError, Timeout::Error => exception
         logger.error("Loading feed #{url} failed with #{exception.inspect}")
         self.expires_at = Time.now.utc + TTL_ON_ERROR
-        read_attribute(:contents)
+        save
       end
     else
       logger.info("Loading feed from cache: #{url}")
-      read_attribute(:contents)
     end
+    
+    read_attribute(:contents)
   end
   
   def remote_contents

data/test/unit/feed_test.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + "/../test_helper"
 
 class FeedTest < ActiveSupport::TestCase
   def setup
-    @feed = Feed.new(:url => "http://example.com/blog.rss")
+    @feed = Feed.create!(:url => "http://example.com/blog.rss")
     @contents = "<feed>Some feed</feed>"
     
     now = Time.now
@@ -12,13 +12,13 @@ class FeedTest < ActiveSupport::TestCase
     Feed.send(:remove_const, :TIMEOUT)
     Feed.const_set(:TIMEOUT, 1)
   end
-
-  def test_remote_contents
+  
+  test "remote_contents should fetch the feed" do
     @feed.expects(:open).with("http://example.com/blog.rss").returns(stub(:read => @contents))
     assert_equal @contents, @feed.remote_contents
   end
   
-  def test_remote_contents_timeout
+  test "remote_contents should raise a Timeout::Error if fetching the feed takes longer then Feed::TIMEOUT" do
     def @feed.open(url)
       sleep(2)
       stubs(:read => "bla")
@@ -27,32 +27,35 @@ class FeedTest < ActiveSupport::TestCase
     assert_raise(Timeout::Error) { @feed.remote_contents }
   end
   
-  def test_contents_no_expiry
+  test "contents with no expiry should return the remote contents and save it" do
     @feed.expires_at = nil
-    @feed.stubs(:remote_contents).returns(@contents)
-    
-    assert_equal @contents, @feed.contents
-    assert_equal @contents, @feed.read_attribute(:contents)
-    assert_equal Time.now.utc + Feed::TTL, @feed.expires_at
+    should_get_remote_contents
   end
   
-  def test_contents_expiry_in_past
+  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
+  end
+  
+  def should_get_remote_contents
     @feed.stubs(:remote_contents).returns(@contents)
-    
     assert_equal @contents, @feed.contents
+    @feed.reload
     assert_equal @contents, @feed.read_attribute(:contents)
-    assert_equal Time.now.utc + Feed::TTL, @feed.expires_at
+    
+    # I think the to_i is necessary because of a lack of precision provided by sqlite3. I think.
+    # Anyway, without it the comparison fails.
+    assert_equal (Time.now.utc + Feed::TTL).to_i, @feed.expires_at.to_i
   end
   
-  def test_contents_expiry_in_future
+  test "contents with the expiry in the future should return the cached contents" do
     @feed.expires_at = Time.now + 1.hour
     @feed.write_attribute(:contents, @contents)
     
     assert_equal @contents, @feed.contents
   end
   
-  def test_contents_expiry_in_past_with_error_getting_remote_contents
+  test "TTL of cached contents should be extended if there is an error fetching the remote contents" do
     [StandardError, Timeout::Error].each do |exception|
       @feed.expires_at = Time.now - 1.hour
       @feed.stubs(:remote_contents).raises(exception)
@@ -63,7 +66,7 @@ class FeedTest < ActiveSupport::TestCase
     end
   end
   
-  def test_parsed_contents
+  test "parsed_contents should return the contents parsed by SimpleRSS" do
     @feed.stubs(:contents).returns(@contents)
     SimpleRSS.stubs(:parse).with(@contents).returns(parsed_contents = stub)
     

metadata

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