feedtools 0.2.13 → 0.2.14

data/CHANGELOG

@@ -1,3 +1,5 @@
+== FeedTools 0.2.14
+ * fixed bug with feeds not expiring properly
 == FeedTools 0.2.13
  * fixed issued with missing namespace parameter for uuid creation
 == FeedTools 0.2.12

data/lib/feed_tools.rb

@@ -32,7 +32,7 @@ FEED_TOOLS_ENV = ENV['FEED_TOOLS_ENV'] ||
                  ENV['RAILS_ENV'] ||
                  'production' # :nodoc:
 
-FEED_TOOLS_VERSION = "0.2.13"
+FEED_TOOLS_VERSION = "0.2.14"
 
 $:.unshift(File.dirname(__FILE__))
 $:.unshift(File.dirname(__FILE__) + "/feed_tools/vendor")

data/lib/feed_tools/feed.rb

@@ -1789,9 +1789,11 @@ module FeedTools
       return @live
     end
   
-    # True if the feed has expired and must be reacquired from the remote server.
+    # True if the feed has expired and must be reacquired from the remote
+    # server.
     def expired?
-      return self.last_retrieved == nil || (self.last_retrieved + self.time_to_live.hour) < Time.now
+      return self.last_retrieved == nil ||
+        (self.last_retrieved + self.time_to_live) < Time.now
     end
   
     # Forces this feed to expire.
@@ -1800,8 +1802,9 @@ module FeedTools
       self.save
     end
 
-    # A hook method that is called during the feed generation process.  Overriding this method
-    # will enable additional content to be inserted into the feed.
+    # A hook method that is called during the feed generation process.
+    # Overriding this method will enable additional content to be
+    # inserted into the feed.
     def build_xml_hook(feed_type, version, xml_builder)
       return nil
     end

data/rakefile

@@ -7,7 +7,7 @@ require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
 PKG_NAME      = 'feedtools'
-PKG_VERSION   = '0.2.13'
+PKG_VERSION   = '0.2.14'
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"

data/test/cache_test.rb

@@ -53,4 +53,22 @@ class CacheTest < Test::Unit::TestCase
     entries = FeedTools::DatabaseFeedCache.find_all_by_url(slashdot_feed.url)
     assert_equal(1, entries.size)
   end
+  
+  def test_cached_item_expiration
+    # Ensure the cache is on for this test
+    FeedTools.feed_cache = FeedTools::DatabaseFeedCache
+    
+    slashdot_feed = FeedTools::Feed.open('http://www.slashdot.org/index.rss')
+    assert(slashdot_feed.feed_data != nil, "No content retrieved.")
+    slashdot_feed.expire!
+    assert_equal(true, slashdot_feed.expired?)
+    slashdot_feed = FeedTools::Feed.open('http://www.slashdot.org/index.rss')
+    assert(slashdot_feed.feed_data != nil, "No content retrieved.")
+    assert_equal(true, slashdot_feed.live?)
+    slashdot_feed.time_to_live = 1.hour
+    slashdot_feed.last_retrieved = (Time.now - 55.minute)
+    assert_equal(false, slashdot_feed.expired?)
+    slashdot_feed.last_retrieved = (Time.now - 61.minute)
+    assert_equal(true, slashdot_feed.expired?)
+  end
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: feedtools
 version: !ruby/object:Gem::Version 
-  version: 0.2.13
+  version: 0.2.14
 date: 2005-09-28 00:00:00 -04:00
 summary: "Parsing, generation, and caching system for xml news feeds."
 require_paths: