feedtools 0.2.0 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+== FeedTools 0.2.1
+ * fixed incorrect dependancy on ActiveRecord 1.10.1
+ * more unit tests
+ * preliminary support for "bozo-detection"
 == FeedTools 0.2.0
  * more complete support for rss, atom, cdf
  * modular caching mechanism

data/lib/feed_tools.rb

@@ -25,7 +25,7 @@ FEED_TOOLS_ENV = ENV['FEED_TOOLS_ENV'] ||
                  ENV['RAILS_ENV'] ||
                  'production' # :nodoc:
 
-FEED_TOOLS_VERSION = "0.2.0"
+FEED_TOOLS_VERSION = "0.2.1"
 
 $:.unshift(File.dirname(__FILE__))
 $:.unshift(File.dirname(__FILE__) + "/../../activerecord/lib")
@@ -1275,6 +1275,36 @@ module FeedTools
       @time_to_live = 1 if @time_to_live < 1
     end
 
+    # Returns the feed generator
+    def generator
+      if @generator.nil?
+        @generator = XPath.first(channel_node, "generator/text()").to_s
+        @generator = FeedTools.strip_html(@generator)
+        @generator = nil if @generator == ""
+      end
+      return @generator
+    end
+
+    # Sets the feed generator
+    def generator=(new_generator)
+      @generator = new_generator
+    end
+
+    # Returns the feed docs
+    def docs
+      if @docs.nil?
+        @docs = XPath.first(channel_node, "docs/text()").to_s
+        @docs = FeedTools.strip_html(@docs)
+        @docs = nil if @docs == ""
+      end
+      return @docs
+    end
+
+    # Sets the feed docs
+    def docs=(new_docs)
+      @docs = new_docs
+    end
+
     # Returns the feed language
     def language
       if @language.nil?
@@ -1292,6 +1322,7 @@ module FeedTools
           @language = "en-us"
         end
         @language = @language.downcase
+        @language = nil if @language == ""
       end
       return @language
     end
@@ -1392,6 +1423,14 @@ module FeedTools
       return vidlog
     end
     
+    # True if this feed is malformed somehow
+    def bozo?
+      if @bozo.nil?
+        @bozo = false
+      end
+      return @bozo
+    end
+    
     # True if the feed was not last retrieved from the cache.
     def live?
       return @live

data/rakefile

@@ -7,7 +7,7 @@ require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
 PKG_NAME      = 'feedtools'
-PKG_VERSION   = '0.2.0'
+PKG_VERSION   = '0.2.1'
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
@@ -58,7 +58,7 @@ spec = Gem::Specification.new do |s|
     end
   end
   
-  s.add_dependency('activerecord', '= 1.10.1')
+  s.add_dependency('activerecord', '>= 1.10.1')
 
   s.require_path = 'lib'
   s.autorequire = 'feed_tools'

data/test/rss_test.rb

@@ -8,90 +8,129 @@ class RssTest < Test::Unit::TestCase
   def setup
   end
 
-  def test_title
+  def test_feed_well_formed
+    feed = FeedTools::Feed.open(
+      'http://feedparser.org/tests/wellformed/rss/aaa_wellformed.xml')
+    assert_equal(false, feed.bozo?)
+  end
+  
+  def test_feed_title
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/channel_title.xml')
     assert_equal("Example feed", feed.title)
+    assert_equal(false, feed.bozo?)
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/channel_title_apos.xml')
     assert_equal("Mark's title", feed.title)
+    assert_equal(false, feed.bozo?)
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/channel_title_gt.xml')
     assert_equal("2 > 1", feed.title)
+    assert_equal(false, feed.bozo?)
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/channel_title_lt.xml')
     assert_equal("1 < 2", feed.title)
+    assert_equal(false, feed.bozo?)
   end
   
-  def test_description
+  def test_feed_description
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/channel_description.xml')
     assert_equal("Example description", feed.description)
+    assert_equal(false, feed.bozo?)
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/' +
       'channel_description_escaped_markup.xml')
     assert_equal("<p>Example description</p>", feed.description)
+    assert_equal(false, feed.bozo?)
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/' +
       'channel_description_map_tagline.xml')
     assert_equal("Example description", feed.tagline)
+    assert_equal(false, feed.bozo?)
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/' +
       'channel_description_naked_markup.xml')
     assert_equal("<p>Example description</p>", feed.description)
+    assert_equal(false, feed.bozo?)
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/' +
       'channel_description_shorttag.xml')
     assert_equal(nil, feed.description)
     assert_equal('http://example.com/', feed.link)
+    assert_equal(false, feed.bozo?)
+  end
+  
+  def test_feed_generator
+    feed = FeedTools::Feed.open(
+      'http://feedparser.org/tests/wellformed/rss/channel_generator.xml')
+    assert_equal("Example generator", feed.generator)
+    assert_equal(false, feed.bozo?)
+  end
+
+  def test_feed_docs
+    feed = FeedTools::Feed.open(
+      'http://feedparser.org/tests/wellformed/rss/channel_docs.xml')
+    assert_equal("http://www.example.com/", feed.docs)
+    assert_equal(false, feed.bozo?)
   end
   
-  def test_ttl
+  def test_feed_ttl
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/channel_ttl.xml')
-    assert_equal(1.hour, feed.ttl)    
+    assert_equal(1.hour, feed.ttl)
+    assert_equal(false, feed.bozo?)
   end
   
   def test_item_content
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/item_content_encoded.xml')
     assert_equal('<p>Example content</p>', feed.entries.first.content)
+    assert_equal(false, feed.bozo?)
   end
   
   def test_item_description
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/item_description.xml')
     assert_equal('Example description', feed.entries.first.description)
+    assert_equal(false, feed.bozo?)
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/' +
       'item_description_escaped_markup.xml')
     assert_equal('<p>Example description</p>', feed.entries.first.description)
+    assert_equal(false, feed.bozo?)
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/' +
       'item_description_map_summary.xml')
     assert_equal('Example description', feed.entries.first.description)
+    assert_equal(false, feed.bozo?)
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/' +
       'item_description_naked_markup.xml')
     assert_equal('<p>Example description</p>', feed.entries.first.description)
+    assert_equal(false, feed.bozo?)
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/' +
       'item_description_not_a_doctype.xml')
     assert_equal('&lt;!\'  <a href=\'foo\'/>', feed.entries.first.description)
+    assert_equal(false, feed.bozo?)
   end
   
   def test_item_guid
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/item_guid.xml')
     assert_equal('http://guid.example.com/', feed.entries.first.guid)
+    assert_equal(false, feed.bozo?)
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/' +
       'item_guid_conflict_link.xml')
     assert_equal('http://guid.example.com/', feed.entries.first.guid)
     assert_equal('http://link.example.com/', feed.entries.first.link)
+    assert_equal(false, feed.bozo?)
     feed = FeedTools::Feed.open(
       'http://feedparser.org/tests/wellformed/rss/item_guid_guidislink.xml')
     assert_equal('http://guid.example.com/', feed.entries.first.guid)
     assert_equal('http://guid.example.com/', feed.entries.first.link)
+    assert_equal(false, feed.bozo?)
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.10
 specification_version: 1
 name: feedtools
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2005-07-30
+  version: 0.2.1
+date: 2005-08-08
 summary: "Parsing, generation, and caching system for xml news feeds."
 require_paths: 
   - lib
@@ -85,7 +85,7 @@ dependencies:
     version_requirements: !ruby/object:Gem::Version::Requirement 
       requirements: 
         - 
-          - "="
+          - ">="
           - !ruby/object:Gem::Version 
             version: 1.10.1
       version: