feedtools 0.2.26 → 0.2.27

data/lib/feed_tools/version.rb

@@ -2,7 +2,7 @@ module FeedTools
   module FEED_TOOLS_VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 26
+    TINY  = 27
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rakefile

@@ -14,8 +14,9 @@ PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
 
-RUBY_FORGE_PROJECT = "feedtools"
+RUBY_FORGE_PROJECT = PKG_NAME
 RUBY_FORGE_USER    = "sporkmonger"
+RUBY_FORGE_PATH    = "/var/www/gforge-projects/#{RUBY_FORGE_PROJECT}"
 
 PKG_FILES = FileList[
     "lib/**/*", "test/**/*", "examples/**/*", "doc/**/*", "db/**/*",
@@ -123,7 +124,17 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('builder', '>= 1.2.4')
 
   s.require_path = 'lib'
-  s.autorequire = 'feed_tools'
+  
+  begin
+  s.post_install_message = <<-TEXT
+
+    FeedTool's caching schema has changed to allow Feed objects to be
+    serialized to the cache.  This should offer some limited speed up
+    in some cases.
+
+  TEXT
+  rescue Exception
+  end
 
   s.has_rdoc = true
   s.extra_rdoc_files = %w( README )
@@ -180,7 +191,17 @@ end
 
 # Publishing ------------------------------------------------------
 
-desc "Publish the API documentation"
-task :pdoc => [:rdoc] do 
-  Rake::SshDirPublisher.new("vacindak@sporkmonger.com", "public_html/projects/feedtools/api", "doc").upload
-end
+namespace :publish do
+  desc "Publish the API documentation"
+  task :api => [ "rdoc" ] do 
+    Rake::SshDirPublisher.new(
+      "#{RUBY_FORGE_USER}@rubyforge.org",
+      "#{RUBY_FORGE_PATH}/",
+      "doc"
+    ).upload
+  end
+
+  desc "Runs all of the publishing tasks"
+  task :all => ["publish:api"] do
+  end
+end

data/test/unit/atom_test.rb

@@ -126,6 +126,7 @@ class AtomTest < Test::Unit::TestCase
       </feed>
     FEED
     ) { |feed|
+      assert_equal(2, feed.links.size)
       assert_equal("http://www.intertwingly.net/blog/index.atom", feed.href)
       assert_equal("http://www.intertwingly.net/blog/", feed.link)
       assert_equal("http://www.intertwingly.net/blog/", feed.author.href)
@@ -149,6 +150,7 @@ class AtomTest < Test::Unit::TestCase
       </feed>
     FEED
     ) { |feed|
+      assert_equal(2, feed.links.size)
       assert_equal("http://www.intertwingly.net/blog/", feed.link)
       assert_equal("http://www.intertwingly.net/blog/index.atom", feed.href)
       assert_equal("http://www.intertwingly.net/blog/", feed.author.href)
@@ -177,218 +179,218 @@ class AtomTest < Test::Unit::TestCase
       <?xml version="1.0" encoding="utf-8"?>
       <feed xmlns="http://www.w3.org/2005/Atom"
             xml:base="http://example.org/tests/">
-      	<title>xml:base support tests</title>
-      	<subtitle type="html">
-      	  All alternate links should point to
-      	  &lt;code>http://example.org/tests/base/result.html&lt;/code>;
-      	  all links in content should point where their label says.
-      	</subtitle>
-      	<link href="http://example.org/tests/base/result.html"/>
-      	<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base</id>
-      	<updated>2006-01-17T12:35:16+01:00</updated>
+        <title>xml:base support tests</title>
+        <subtitle type="html">
+          All alternate links should point to
+          &lt;code>http://example.org/tests/base/result.html&lt;/code>;
+          all links in content should point where their label says.
+        </subtitle>
+        <link href="http://example.org/tests/base/result.html"/>
+        <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base</id>
+        <updated>2006-01-17T12:35:16+01:00</updated>
 
-      	<entry>
-      		<title>1: Alternate link: Absolute URL</title>
-      		<link href="http://example.org/tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test1</id>
-      		<updated>2006-01-17T12:35:16+01:00</updated>
-      	</entry>
+        <entry>
+          <title>1: Alternate link: Absolute URL</title>
+          <link href="http://example.org/tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test1</id>
+          <updated>2006-01-17T12:35:16+01:00</updated>
+        </entry>
 
-      	<entry>
-      		<title>2: Alternate link: Host-relative absolute URL</title>
-      		<link href="/tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test2</id>
-      		<updated>2006-01-17T12:35:15+01:00</updated>
-      	</entry>
+        <entry>
+          <title>2: Alternate link: Host-relative absolute URL</title>
+          <link href="/tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test2</id>
+          <updated>2006-01-17T12:35:15+01:00</updated>
+        </entry>
 
-      	<entry>
-      		<title>3: Alternate link: Relative URL</title>
-      		<link href="base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test3</id>
-      		<updated>2006-01-17T12:35:14+01:00</updated>
-      	</entry>
+        <entry>
+          <title>3: Alternate link: Relative URL</title>
+          <link href="base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test3</id>
+          <updated>2006-01-17T12:35:14+01:00</updated>
+        </entry>
 
-      	<entry>
-      		<title>
-      		  4: Alternate link: Relative URL with parent directory component
-      		</title>
-      		<link href="../tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test4</id>
-      		<updated>2006-01-17T12:35:13+01:00</updated>
-      	</entry>
+        <entry>
+          <title>
+            4: Alternate link: Relative URL with parent directory component
+          </title>
+          <link href="../tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test4</id>
+          <updated>2006-01-17T12:35:13+01:00</updated>
+        </entry>
 
-      	<entry>
-      		<title>5: Content: Absolute URL</title>
-      		<link href="http://example.org/tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test5</id>
-      		<content type="html">
-      		  &lt;a href="http://example.org/tests/base/result.html"&gt;
-      		    http://example.org/tests/base/result.html
-      		  &lt;/a&gt;
-      		</content>
-      		<updated>2006-01-17T12:35:12+01:00</updated>
-      	</entry>
+        <entry>
+          <title>5: Content: Absolute URL</title>
+          <link href="http://example.org/tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test5</id>
+          <content type="html">
+            &lt;a href="http://example.org/tests/base/result.html"&gt;
+              http://example.org/tests/base/result.html
+            &lt;/a&gt;
+          </content>
+          <updated>2006-01-17T12:35:12+01:00</updated>
+        </entry>
 
-      	<entry>
-      		<title>6: Content: Host-relative URL</title>
-      		<link href="http://example.org/tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test6</id>
-      		<content type="html">
-      		  &lt;a href="/tests/base/result.html"&gt;
-      		    http://example.org/tests/base/result.html
-      		  &lt;/a&gt;
-      		</content>
-      		<updated>2006-01-17T12:35:11+01:00</updated>
-      	</entry>
+        <entry>
+          <title>6: Content: Host-relative URL</title>
+          <link href="http://example.org/tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test6</id>
+          <content type="html">
+            &lt;a href="/tests/base/result.html"&gt;
+              http://example.org/tests/base/result.html
+            &lt;/a&gt;
+          </content>
+          <updated>2006-01-17T12:35:11+01:00</updated>
+        </entry>
 
-      	<entry>
-      		<title>7: Content: Relative URL</title>
-      		<link href="http://example.org/tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test7</id>
-      		<content type="html">
-      		  &lt;a href="base/result.html"&gt;
-      		    http://example.org/tests/base/result.html
-      		  &lt;/a&gt;
-      		</content>
-      		<updated>2006-01-17T12:35:10+01:00</updated>
-      	</entry>
+        <entry>
+          <title>7: Content: Relative URL</title>
+          <link href="http://example.org/tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test7</id>
+          <content type="html">
+            &lt;a href="base/result.html"&gt;
+              http://example.org/tests/base/result.html
+            &lt;/a&gt;
+          </content>
+          <updated>2006-01-17T12:35:10+01:00</updated>
+        </entry>
 
-      	<entry>
-      		<title>
-      		  8: Content: Relative URL with parent directory component
-      		</title>
-      		<link href="http://example.org/tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test8</id>
-      		<content type="html">
-      		  &lt;a href="../tests/base/result.html"&gt;
-      		    http://example.org/tests/base/result.html
-      		  &lt;/a&gt;
-      		</content>
-      		<updated>2006-01-17T12:35:9+01:00</updated>
-      	</entry>
+        <entry>
+          <title>
+            8: Content: Relative URL with parent directory component
+          </title>
+          <link href="http://example.org/tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test8</id>
+          <content type="html">
+            &lt;a href="../tests/base/result.html"&gt;
+              http://example.org/tests/base/result.html
+            &lt;/a&gt;
+          </content>
+          <updated>2006-01-17T12:35:9+01:00</updated>
+        </entry>
 
-      	<entry xml:base="http://example.org/tests/entrybase/">
-      		<title type="html">
-      		  9: Content, &lt;code>&amp;lt;entry>&lt;/code> has base:
-      		  Absolute URL
-      		</title>
-      		<link href="http://example.org/tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test9</id>
-      		<content type="html">
-      		  &lt;a href="http://example.org/tests/entrybase/result.html"&gt;
-      		    http://example.org/tests/entrybase/result.html
-      		  &lt;/a&gt;
-      		</content>
-      		<updated>2006-01-17T12:35:8+01:00</updated>
-      	</entry>
+        <entry xml:base="http://example.org/tests/entrybase/">
+          <title type="html">
+            9: Content, &lt;code>&amp;lt;entry>&lt;/code> has base:
+            Absolute URL
+          </title>
+          <link href="http://example.org/tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test9</id>
+          <content type="html">
+            &lt;a href="http://example.org/tests/entrybase/result.html"&gt;
+              http://example.org/tests/entrybase/result.html
+            &lt;/a&gt;
+          </content>
+          <updated>2006-01-17T12:35:8+01:00</updated>
+        </entry>
 
-      	<entry xml:base="http://example.org/tests/entrybase/">
-      		<title type="html">
-      		  10: Content, &lt;code>&amp;lt;entry>&lt;/code> has base:
-      		  Host-relative URL
-      		</title>
-      		<link href="http://example.org/tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test10</id>
-      		<content type="html">
-      		  &lt;a href="/tests/entrybase/result.html"&gt;
-      		    http://example.org/tests/entrybase/result.html
-      		  &lt;/a&gt;
-      		</content>
-      		<updated>2006-01-17T12:35:7+01:00</updated>
-      	</entry>
+        <entry xml:base="http://example.org/tests/entrybase/">
+          <title type="html">
+            10: Content, &lt;code>&amp;lt;entry>&lt;/code> has base:
+            Host-relative URL
+          </title>
+          <link href="http://example.org/tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test10</id>
+          <content type="html">
+            &lt;a href="/tests/entrybase/result.html"&gt;
+              http://example.org/tests/entrybase/result.html
+            &lt;/a&gt;
+          </content>
+          <updated>2006-01-17T12:35:7+01:00</updated>
+        </entry>
 
-      	<entry xml:base="http://example.org/tests/entrybase/">
-      		<title type="html">
-      		  11: Content, &lt;code>&amp;lt;entry>&lt;/code> has base:
-      		  Relative URL
-      		</title>
-      		<link href="http://example.org/tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test11</id>
-      		<content type="html">
-      		  &lt;a href="result.html"&gt;
-      		    http://example.org/tests/entrybase/result.html
-      		  &lt;/a&gt;
-      		</content>
-      		<updated>2006-01-17T12:35:6+01:00</updated>
-      	</entry>
+        <entry xml:base="http://example.org/tests/entrybase/">
+          <title type="html">
+            11: Content, &lt;code>&amp;lt;entry>&lt;/code> has base:
+            Relative URL
+          </title>
+          <link href="http://example.org/tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test11</id>
+          <content type="html">
+            &lt;a href="result.html"&gt;
+              http://example.org/tests/entrybase/result.html
+            &lt;/a&gt;
+          </content>
+          <updated>2006-01-17T12:35:6+01:00</updated>
+        </entry>
 
-      	<entry xml:base="http://example.org/tests/entrybase/">
-      		<title type="html">
-      		  12: Content, &lt;code>&amp;lt;entry>&lt;/code> has base:
-      		  Relative URL with parent directory component</title>
-      		<link href="http://example.org/tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test12</id>
-      		<content type="html">
-      		  &lt;a href="../entrybase/result.html"&gt;
-      		    http://example.org/tests/entrybase/result.html
-      		  &lt;/a&gt;
-      		</content>
-      		<updated>2006-01-17T12:35:5+01:00</updated>
-      	</entry>
+        <entry xml:base="http://example.org/tests/entrybase/">
+          <title type="html">
+            12: Content, &lt;code>&amp;lt;entry>&lt;/code> has base:
+            Relative URL with parent directory component</title>
+          <link href="http://example.org/tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test12</id>
+          <content type="html">
+            &lt;a href="../entrybase/result.html"&gt;
+              http://example.org/tests/entrybase/result.html
+            &lt;/a&gt;
+          </content>
+          <updated>2006-01-17T12:35:5+01:00</updated>
+        </entry>
 
-      	<entry>
-      		<title type="html">
-      		  13: Content, &lt;code>&amp;lt;content>&lt;/code> has base:
-      		  Absolute URL
-      		</title>
-      		<link href="http://example.org/tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test13</id>
-      		<content type="html"
-      		         xml:base="http://example.org/tests/contentbase/">
-      		  &lt;a href="http://example.org/tests/contentbase/result.html"&gt;
-      		    http://example.org/tests/contentbase/result.html
-      		  &lt;/a&gt;
-      		</content>
-      		<updated>2006-01-17T12:35:4+01:00</updated>
-      	</entry>
+        <entry>
+          <title type="html">
+            13: Content, &lt;code>&amp;lt;content>&lt;/code> has base:
+            Absolute URL
+          </title>
+          <link href="http://example.org/tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test13</id>
+          <content type="html"
+                   xml:base="http://example.org/tests/contentbase/">
+            &lt;a href="http://example.org/tests/contentbase/result.html"&gt;
+              http://example.org/tests/contentbase/result.html
+            &lt;/a&gt;
+          </content>
+          <updated>2006-01-17T12:35:4+01:00</updated>
+        </entry>
 
-      	<entry>
-      		<title type="html">
-      		  14: Content, &lt;code>&amp;lt;content>&lt;/code> has base:
-      		  Host-relative URL
-      		</title>
-      		<link href="http://example.org/tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test14</id>
-      		<content type="html"
-      		         xml:base="http://example.org/tests/contentbase/">
-      		  &lt;a href="/tests/contentbase/result.html"&gt;
-      		    http://example.org/tests/contentbase/result.html
-      		  &lt;/a&gt;
-      		</content>
-      		<updated>2006-01-17T12:35:3+01:00</updated>
-      	</entry>
+        <entry>
+          <title type="html">
+            14: Content, &lt;code>&amp;lt;content>&lt;/code> has base:
+            Host-relative URL
+          </title>
+          <link href="http://example.org/tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test14</id>
+          <content type="html"
+                   xml:base="http://example.org/tests/contentbase/">
+            &lt;a href="/tests/contentbase/result.html"&gt;
+              http://example.org/tests/contentbase/result.html
+            &lt;/a&gt;
+          </content>
+          <updated>2006-01-17T12:35:3+01:00</updated>
+        </entry>
 
-      	<entry>
-      		<title type="html">
-      		  15: Content, &lt;code>&amp;lt;content>&lt;/code> has base:
-      		  Relative URL
-      		</title>
-      		<link href="http://example.org/tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test15</id>
-      		<content type="html"
-      		         xml:base="http://example.org/tests/contentbase/">
-      		  &lt;a href="result.html"&gt;
-      		    http://example.org/tests/contentbase/result.html
-      		  &lt;/a&gt;
-      		</content>
-      		<updated>2006-01-17T12:35:2+01:00</updated>
-      	</entry>
+        <entry>
+          <title type="html">
+            15: Content, &lt;code>&amp;lt;content>&lt;/code> has base:
+            Relative URL
+          </title>
+          <link href="http://example.org/tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test15</id>
+          <content type="html"
+                   xml:base="http://example.org/tests/contentbase/">
+            &lt;a href="result.html"&gt;
+              http://example.org/tests/contentbase/result.html
+            &lt;/a&gt;
+          </content>
+          <updated>2006-01-17T12:35:2+01:00</updated>
+        </entry>
 
-      	<entry>
-      		<title type="html">
-      		  16: Content, &lt;code>&amp;lt;content>&lt;/code> has base:
-      		  Relative URL with parent directory component
-      		</title>
-      		<link href="http://example.org/tests/base/result.html"/>
-      		<id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test16</id>
-      		<content type="html"
-      		         xml:base="http://example.org/tests/contentbase/">
-      		  &lt;a href="../contentbase/result.html"&gt;
-      		    http://example.org/tests/contentbase/result.html
-      		  &lt;/a&gt;
-      		</content>
-      		<updated>2006-01-17T12:35:1+01:00</updated>
-      	</entry>
+        <entry>
+          <title type="html">
+            16: Content, &lt;code>&amp;lt;content>&lt;/code> has base:
+            Relative URL with parent directory component
+          </title>
+          <link href="http://example.org/tests/base/result.html"/>
+          <id>tag:plasmasturm.org,2005:Atom-Tests:xml-base:Test16</id>
+          <content type="html"
+                   xml:base="http://example.org/tests/contentbase/">
+            &lt;a href="../contentbase/result.html"&gt;
+              http://example.org/tests/contentbase/result.html
+            &lt;/a&gt;
+          </content>
+          <updated>2006-01-17T12:35:1+01:00</updated>
+        </entry>
 
       </feed>
     FEED
@@ -398,29 +400,41 @@ class AtomTest < Test::Unit::TestCase
           "Broken link for: " + entry.title)
       end
       assert_equal(2, feed.entries[4].content.scan(
-        'http://example.org/tests/base/result.html').size)
+        'http://example.org/tests/base/result.html').size,
+        "Invalid URI resolution:\n#{feed.entries[4].content}")
       assert_equal(2, feed.entries[5].content.scan(
-        'http://example.org/tests/base/result.html').size)
+        'http://example.org/tests/base/result.html').size,
+        "Invalid URI resolution:\n#{feed.entries[5].content}")
       assert_equal(2, feed.entries[6].content.scan(
-        'http://example.org/tests/base/result.html').size)
+        'http://example.org/tests/base/result.html').size,
+        "Invalid URI resolution:\n#{feed.entries[6].content}")
       assert_equal(2, feed.entries[7].content.scan(
-        'http://example.org/tests/base/result.html').size)
+        'http://example.org/tests/base/result.html').size,
+        "Invalid URI resolution:\n#{feed.entries[7].content}")
       assert_equal(2, feed.entries[8].content.scan(
-        'http://example.org/tests/entrybase/result.html').size)
+        'http://example.org/tests/entrybase/result.html').size,
+        "Invalid URI resolution:\n#{feed.entries[8].content}")
       assert_equal(2, feed.entries[9].content.scan(
-        'http://example.org/tests/entrybase/result.html').size)
+        'http://example.org/tests/entrybase/result.html').size,
+        "Invalid URI resolution:\n#{feed.entries[9].content}")
       assert_equal(2, feed.entries[10].content.scan(
-        'http://example.org/tests/entrybase/result.html').size)
+        'http://example.org/tests/entrybase/result.html').size,
+        "Invalid URI resolution:\n#{feed.entries[10].content}")
       assert_equal(2, feed.entries[11].content.scan(
-        'http://example.org/tests/entrybase/result.html').size)
+        'http://example.org/tests/entrybase/result.html').size,
+        "Invalid URI resolution:\n#{feed.entries[11].content}")
       assert_equal(2, feed.entries[12].content.scan(
-        'http://example.org/tests/contentbase/result.html').size)
+        'http://example.org/tests/contentbase/result.html').size,
+        "Invalid URI resolution:\n#{feed.entries[12].content}")
       assert_equal(2, feed.entries[13].content.scan(
-        'http://example.org/tests/contentbase/result.html').size)
+        'http://example.org/tests/contentbase/result.html').size,
+        "Invalid URI resolution:\n#{feed.entries[13].content}")
       assert_equal(2, feed.entries[14].content.scan(
-        'http://example.org/tests/contentbase/result.html').size)
+        'http://example.org/tests/contentbase/result.html').size,
+        "Invalid URI resolution:\n#{feed.entries[14].content}")
       assert_equal(2, feed.entries[15].content.scan(
-        'http://example.org/tests/contentbase/result.html').size)
+        'http://example.org/tests/contentbase/result.html').size,
+        "Invalid URI resolution:\n#{feed.entries[15].content}")
     }    
   end
 
@@ -436,6 +450,56 @@ class AtomTest < Test::Unit::TestCase
         feed.copyright)
     }
   end
+
+  def test_feed_license
+    with_feed(:from_data => <<-FEED
+      <feed xmlns="http://www.w3.org/2005/Atom">
+        <id>http://www.example.com/myfeed</id>
+        <title>My Example Feed</title>
+        <updated>2005-07-28T12:00:00Z</updated>
+        <link href="http://www.example.com/myfeed" />
+        <link rel="license" type="application/rdf+xml"
+          href="http://creativecommons.org/licenses/by-nc/2.5/rdf" />
+        <rights>
+          Copyright (c) 2005. Some rights reserved. This feed
+          is licensed under a Creative Commons Attribute-NonCommercial
+          Use License. It contains material originally published by
+          Jane Smith at http://www.example.com/entries/1 under the
+          Creative Commons Attribute License.
+        </rights>
+        <author><name>James</name></author>
+        <entry>
+          <id>tag:entries.org,2005:1</id>
+          <title>Atom Powered Robots Run Amok</title>
+          <updated>2005-06-28T12:00:00Z</updated>
+          <link href="http://www.example.org/entries/1" />
+          <summary>Atom Powered Robots Run Amok</summary>
+          <author><name>Jane Smith</name></author>
+          <link rel="license" type="text/html"
+            href="http://creativecommons.org/licenses/by/2.5/" />
+        </entry>
+      </feed>
+    FEED
+    ) { |feed|
+      assert_equal(1, feed.entries.size)
+      assert_equal(
+        "http://creativecommons.org/licenses/by-nc/2.5/rdf",
+        feed.license.href
+      )
+      assert_equal(
+        "application/rdf+xml",
+        feed.license.type
+      )
+      assert_equal(
+        "http://creativecommons.org/licenses/by/2.5/",
+        feed.entries[0].license.href
+      )
+      assert_equal(
+        "text/html",
+        feed.entries[0].license.type
+      )
+    }
+  end
   
   def test_feed_item_author
     with_feed(:from_data => <<-FEED
@@ -635,11 +699,11 @@ class AtomTest < Test::Unit::TestCase
     FEED
     ) { |feed|
       assert_equal(
-        '&#60;title&gt;',
+        '&lt;title&gt;',
         feed.title, "XHTML NCR failed")
       assert_equal(1, feed.items.size)
       assert_equal(
-        '&#60;title&gt;',
+        '&lt;title&gt;',
         feed.items[0].title, "XHTML NCR failed")
     }
     with_feed(:from_data => <<-FEED
@@ -665,4 +729,28 @@ class AtomTest < Test::Unit::TestCase
         feed.items[0].title, "XHTML NCR failed")
     }
   end
+  
+  def test_feed_item_content_sanitization
+    with_feed(:from_data => <<-FEED
+      <?xml version="1.0" encoding="iso-8859-1"?>
+      <feed version="1.0" xmlns="http://www.w3.org/2005/Atom">
+        <entry>
+          <content type="xhtml" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+            <xhtml:div>
+              <xhtml:script>alert('Content Attack Succeeded');</xhtml:script>
+            </xhtml:div>
+          </content>
+        </entry>
+      </feed>
+    FEED
+    ) { |feed|
+      assert_equal(1, feed.items.size)
+      assert_equal(0,
+        feed.items[0].content.scan("<xhtml:script>").size,
+        "Sanitization of content element failed")
+      assert_equal(0,
+        feed.items[0].content.scan("<script>").size,
+        "Sanitization of content element failed")
+    }
+  end
 end