feedtools 0.2.22 → 0.2.23

data/test/unit/atom_test.rb

@@ -14,6 +14,17 @@ class AtomTest < Test::Unit::TestCase
         File.expand_path(File.dirname(__FILE__)) + '/../feeds')
   end
 
+  def test_iri_feed
+    if FeedTools::UriHelper.idn_enabled?
+      with_feed(:from_url =>
+          'http://www.詹姆斯.com/atomtests/iri/everything.atom') { |feed|
+        assert_equal(
+          "http://www.xn--8ws00zhy3a.com/atomtests/iri/everything.atom",
+          feed.url)
+      }
+    end
+  end
+  
   def test_feed_title
     with_feed(:from_file => 'wellformed/atom/atom_namespace_1.xml') { |feed|
       assert_equal("Example Atom", feed.title)
@@ -31,11 +42,13 @@ class AtomTest < Test::Unit::TestCase
       assert_equal("Example Atom", feed.title)
     }
     with_feed(:from_file => 'wellformed/atom/feed_title_base64.xml') { |feed|
-      assert_equal("Example <b>Atom</b>", feed.title)
+      assert_equal("Example &lt;b&gt;Atom&lt;/b&gt;", feed.title)
     }
     with_feed(:from_file =>
         'wellformed/atom/feed_title_base64_2.xml') { |feed|
-      assert_equal("<p>History of the &lt;blink&gt; tag</p>", feed.title)
+      assert_equal(
+        "&lt;p&gt;History of the &amp;lt;blink&amp;gt; tag&lt;/p&gt;",
+        feed.title)
     }
   end
   
@@ -94,16 +107,38 @@ class AtomTest < Test::Unit::TestCase
       assert_equal("http://www.example.com/something.jpeg",
         feed.images[0].url)
     }
+    with_feed(:from_data => <<-FEED
+      <feed>
+        <entry xml:base="http://example.com/articles/">
+          <title>Pain And Suffering</title>
+          <link href="1.html" type="text/plain" />
+          <link href="./2.html" type="application/xml" rel="alternate" />
+          <link href="../3.html" type="text/html" rel="alternate" />
+          <link href="../4.html" />
+          <link href="./5.html" type="application/xhtml+xml" />
+          <link href="6.css" type="text/css" rel="stylesheet" />
+          <content type="text">
+            What does your parser come up with for the main link?
+            What's the right value?
+          </content>
+        </entry>
+      </feed>
+    FEED
+    ) { |feed|
+      assert_equal("http://example.com/3.html", feed.entries[0].link)
+    }    
   end
 
   def test_feed_copyright
     with_feed(:from_file =>
         'wellformed/atom/feed_copyright_base64.xml') { |feed|
-      assert_equal("Example <b>Atom</b>", feed.copyright)
+      assert_equal("Example &lt;b&gt;Atom&lt;/b&gt;", feed.copyright)
     }
     with_feed(:from_file =>
         'wellformed/atom/feed_copyright_base64_2.xml') { |feed|
-      assert_equal("<p>History of the &lt;blink&gt; tag</p>", feed.copyright)
+      assert_equal(
+        "&lt;p&gt;History of the &amp;lt;blink&amp;gt; tag&lt;/p&gt;",
+        feed.copyright)
     }
   end
   
@@ -136,5 +171,203 @@ class AtomTest < Test::Unit::TestCase
       assert_equal(nil, feed.link)
     }
   end
-end
-
+  
+  def test_feed_item_summary_plus_content
+    with_feed(:from_data => <<-FEED
+      <?xml version="1.0" encoding="iso-8859-1"?>
+      <prefix:feed version="1.0" xmlns:prefix="http://www.w3.org/2005/Atom">
+        <prefix:entry>
+          <prefix:summary>Excerpt</prefix:summary>
+          <prefix:content>Full Content</prefix:content>
+        </prefix:entry>
+      </prefix:feed>
+    FEED
+    ) { |feed|
+      assert_equal(1, feed.items.size)
+      assert_equal("Excerpt", feed.items[0].summary)
+      assert_equal("Full Content", feed.items[0].content)
+    }
+  end
+  
+  # Make sure it knows a title from a hole in the ground
+  def test_all_feed_titles
+    with_feed(:from_data => <<-FEED
+      <?xml version="1.0" encoding="iso-8859-1"?>
+      <feed version="1.0" xmlns="http://www.w3.org/2005/Atom">
+        <title><![CDATA[&lt;title>]]></title>
+        <entry>
+          <title><![CDATA[&lt;title>]]></title>
+        </entry>
+      </feed>
+    FEED
+    ) { |feed|
+      assert_equal("&amp;lt;title&gt;",
+        feed.title, "Text CDATA failed")
+      assert_equal(1, feed.items.size)
+      assert_equal("&amp;lt;title&gt;",
+        feed.items[0].title, "Text CDATA failed")
+    }
+    with_feed(:from_data => <<-FEED
+      <?xml version="1.0" encoding="iso-8859-1"?>
+      <feed version="1.0" xmlns="http://www.w3.org/2005/Atom">
+        <title type="html"><![CDATA[&lt;title>]]></title>
+        <entry>
+          <title type="html"><![CDATA[&lt;title>]]></title>
+        </entry>
+      </feed>
+    FEED
+    ) { |feed|
+      assert_equal("&lt;title&gt;",
+        feed.title, "HTML CDATA failed")
+      assert_equal(1, feed.items.size)
+      assert_equal("&lt;title&gt;",
+        feed.items[0].title, "HTML CDATA failed")
+    }
+    with_feed(:from_data => <<-FEED
+      <?xml version="1.0" encoding="iso-8859-1"?>
+      <feed version="1.0" xmlns="http://www.w3.org/2005/Atom">
+        <title type="html">&amp;lt;title></title>
+        <entry>
+          <title type="html">&amp;lt;title></title>
+        </entry>
+      </feed>
+    FEED
+    ) { |feed|
+      assert_equal("&lt;title>",
+        feed.title, "HTML entity failed")
+      assert_equal(1, feed.items.size)
+      assert_equal("&lt;title>",
+        feed.items[0].title, "HTML entity failed")
+    }
+    with_feed(:from_data => <<-FEED
+      <?xml version="1.0" encoding="iso-8859-1"?>
+      <feed version="1.0" xmlns="http://www.w3.org/2005/Atom">
+        <title type="html">&#38;lt;title></title>
+        <entry>
+          <title type="html">&#38;lt;title></title>
+        </entry>
+      </feed>
+    FEED
+    ) { |feed|
+      assert_equal("&lt;title>",
+        feed.title, "HTML NCR failed")
+      assert_equal(1, feed.items.size)
+      assert_equal("&lt;title>",
+        feed.items[0].title, "HTML NCR failed")
+    }
+    with_feed(:from_data => <<-FEED
+      <?xml version="1.0" encoding="iso-8859-1"?>
+      <feed version="1.0" xmlns="http://www.w3.org/2005/Atom">
+        <title type="text"><![CDATA[<title>]]></title>
+        <entry>
+          <title type="text"><![CDATA[<title>]]></title>
+        </entry>
+      </feed>
+    FEED
+    ) { |feed|
+      assert_equal("&lt;title&gt;",
+        feed.title, "Text CDATA failed")
+      assert_equal(1, feed.items.size)
+      assert_equal("&lt;title&gt;",
+        feed.items[0].title, "Text CDATA failed")
+    }
+    with_feed(:from_data => <<-FEED
+      <?xml version="1.0" encoding="iso-8859-1"?>
+      <feed version="1.0" xmlns="http://www.w3.org/2005/Atom">
+        <title type="text">&lt;title></title>
+        <entry>
+          <title type="text">&lt;title></title>
+        </entry>
+      </feed>
+    FEED
+    ) { |feed|
+      assert_equal("&lt;title&gt;",
+        feed.title, "Text entity failed")
+      assert_equal(1, feed.items.size)
+      assert_equal("&lt;title&gt;",
+        feed.items[0].title, "Text entity failed")
+    }
+    with_feed(:from_data => <<-FEED
+      <?xml version="1.0" encoding="iso-8859-1"?>
+      <feed version="1.0" xmlns="http://www.w3.org/2005/Atom">
+        <title type="text">&#60;title></title>
+        <entry>
+          <title type="text">&#60;title></title>
+        </entry>
+      </feed>
+    FEED
+    ) { |feed|
+      assert_equal("&lt;title&gt;",
+        feed.title, "Text NCR failed")
+      assert_equal(1, feed.items.size)
+      assert_equal("&lt;title&gt;",
+        feed.items[0].title, "Text NCR failed")
+    }
+    with_feed(:from_data => <<-FEED
+      <?xml version="1.0" encoding="iso-8859-1"?>
+      <feed version="1.0" xmlns="http://www.w3.org/2005/Atom">
+        <title type="xhtml">
+          <div xmlns="http://www.w3.org/1999/xhtml">&lt;title></div>
+        </title>
+        <entry>
+          <title type="xhtml">
+            <div xmlns="http://www.w3.org/1999/xhtml">&lt;title></div>
+          </title>
+        </entry>
+      </feed>
+    FEED
+    ) { |feed|
+      assert_equal(
+        '&lt;title&gt;',
+        feed.title, "XHTML entity failed")
+      assert_equal(1, feed.items.size)
+      assert_equal(
+        '&lt;title&gt;',
+        feed.items[0].title, "XHTML entity failed")
+    }
+    with_feed(:from_data => <<-FEED
+      <?xml version="1.0" encoding="iso-8859-1"?>
+      <feed version="1.0" xmlns="http://www.w3.org/2005/Atom">
+        <title type="xhtml">
+          <div xmlns="http://www.w3.org/1999/xhtml">&#60;title></div>
+        </title>
+        <entry>
+          <title type="xhtml">
+            <div xmlns="http://www.w3.org/1999/xhtml">&#60;title></div>
+          </title>
+        </entry>
+      </feed>
+    FEED
+    ) { |feed|
+      assert_equal(
+        '&#60;title&gt;',
+        feed.title, "XHTML NCR failed")
+      assert_equal(1, feed.items.size)
+      assert_equal(
+        '&#60;title&gt;',
+        feed.items[0].title, "XHTML NCR failed")
+    }
+    with_feed(:from_data => <<-FEED
+      <?xml version="1.0" encoding="iso-8859-1"?>
+      <feed version="1.0" xmlns="http://www.w3.org/2005/Atom">
+        <title type="xhtml" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+          <xhtml:div>&lt;title></xhtml:div>
+        </title>
+        <entry>
+          <title type="xhtml" xmlns:xhtml="http://www.w3.org/1999/xhtml">
+            <xhtml:div>&lt;title></xhtml:div>
+          </title>
+        </entry>
+      </feed>
+    FEED
+    ) { |feed|
+      assert_equal(
+        '&lt;title&gt;',
+        feed.title, "XHTML NCR failed")
+      assert_equal(1, feed.items.size)
+      assert_equal(
+        '&lt;title&gt;',
+        feed.items[0].title, "XHTML NCR failed")
+    }
+  end
+end

data/test/unit/cache_test.rb

@@ -64,7 +64,7 @@ class CacheTest < Test::Unit::TestCase
       assert_equal(false, slashdot_feed.url.blank?)
       FeedTools::Feed.open(slashdot_feed.url)
     
-      entries = FeedTools::DatabaseFeedCache.find_all_by_url(slashdot_feed.url)
+      entries = FeedTools::DatabaseFeedCache.find_all_by_href(slashdot_feed.url)
       assert_equal(1, entries.size)
     rescue FeedTools::FeedAccessError
     end

data/test/unit/encoding_test.rb

@@ -38,7 +38,7 @@ class EncodingTest < Test::Unit::TestCase
       </rss>
     FEED
     ) { |feed|
-      assert_equal("utf-8", feed.encoding_from_xml_data)
+      assert_equal("utf-8", feed.encoding_from_feed_data)
       assert_equal("utf-8", feed.encoding)
     }
 
@@ -48,7 +48,7 @@ class EncodingTest < Test::Unit::TestCase
       </rss>
     FEED
     ) { |feed|
-      assert_equal("us-ascii", feed.encoding_from_xml_data)
+      assert_equal("us-ascii", feed.encoding_from_feed_data)
       assert_equal("us-ascii", feed.encoding)
     }
 
@@ -58,7 +58,7 @@ class EncodingTest < Test::Unit::TestCase
       </rss>
     FEED
     ) { |feed|
-      assert_equal("us-ascii", feed.encoding_from_xml_data)
+      assert_equal("us-ascii", feed.encoding_from_feed_data)
       assert_equal("us-ascii", feed.encoding)
     }
 
@@ -68,7 +68,7 @@ class EncodingTest < Test::Unit::TestCase
       </rss>
     FEED
     ) { |feed|
-      assert_equal("big5", feed.encoding_from_xml_data)
+      assert_equal("big5", feed.encoding_from_feed_data)
       assert_equal("big5", feed.encoding)
     }
 
@@ -78,7 +78,7 @@ class EncodingTest < Test::Unit::TestCase
       </rss>
     FEED
     ) { |feed|
-      assert_equal("mac", feed.encoding_from_xml_data)
+      assert_equal("mac", feed.encoding_from_feed_data)
       assert_equal("mac", feed.encoding)
     }
   end

data/test/unit/generation_test.rb

@@ -17,9 +17,10 @@ class GenerationTest < Test::Unit::TestCase
     3.times do |i|
       item = FeedTools::FeedItem.new
       item.content = "This is item number #{i}"
+      item.summary = "This is the excerpt for item number #{i}"
       item.link = "http://example.com/item#{i}/"
       feed.items << item
-      sleep(0.5)
+      sleep(1.0)
     end
     output_xml = feed.build_xml('rss', 2.0)
     
@@ -34,10 +35,16 @@ class GenerationTest < Test::Unit::TestCase
     
     # Note reverse chronological order
     assert_equal('This is item number 2', parsed_feed.items[0].content)
+    assert_equal('This is the excerpt for item number 2',
+      parsed_feed.items[0].summary)
     assert_equal('http://example.com/item2/', parsed_feed.items[0].link)
     assert_equal('This is item number 1', parsed_feed.items[1].content)
+    assert_equal('This is the excerpt for item number 1',
+      parsed_feed.items[1].summary)
     assert_equal('http://example.com/item1/', parsed_feed.items[1].link)
     assert_equal('This is item number 0', parsed_feed.items[2].content)
+    assert_equal('This is the excerpt for item number 0',
+      parsed_feed.items[2].summary)
     assert_equal('http://example.com/item0/', parsed_feed.items[2].link)
     
     # Check feed information
@@ -55,6 +62,7 @@ class GenerationTest < Test::Unit::TestCase
     3.times do |i|
       item = FeedTools::FeedItem.new
       item.content = "This is item number #{i}"
+      item.summary = "This is the excerpt for item number #{i}"
       item.link = "http://example.com/item#{i}/"
       feed.items << item
       sleep(0.5)
@@ -72,10 +80,16 @@ class GenerationTest < Test::Unit::TestCase
     
     # Note reverse chronological order
     assert_equal('This is item number 2', parsed_feed.items[0].content)
+    assert_equal('This is the excerpt for item number 2',
+      parsed_feed.items[0].summary)
     assert_equal('http://example.com/item2/', parsed_feed.items[0].link)
     assert_equal('This is item number 1', parsed_feed.items[1].content)
+    assert_equal('This is the excerpt for item number 1',
+      parsed_feed.items[1].summary)
     assert_equal('http://example.com/item1/', parsed_feed.items[1].link)
     assert_equal('This is item number 0', parsed_feed.items[2].content)
+    assert_equal('This is the excerpt for item number 0',
+      parsed_feed.items[2].summary)
     assert_equal('http://example.com/item0/', parsed_feed.items[2].link)
     
     # Check feed information
@@ -93,6 +107,7 @@ class GenerationTest < Test::Unit::TestCase
     3.times do |i|
       item = FeedTools::FeedItem.new
       item.content = "This is item number #{i}"
+      item.summary = "This is the excerpt for item number #{i}"
       item.link = "http://example.com/item#{i}/"
       feed.items << item
       sleep(0.5)
@@ -110,10 +125,16 @@ class GenerationTest < Test::Unit::TestCase
     
     # Note reverse chronological order
     assert_equal('This is item number 2', parsed_feed.items[0].content)
+    assert_equal('This is the excerpt for item number 2',
+      parsed_feed.items[0].summary)
     assert_equal('http://example.com/item2/', parsed_feed.items[0].link)
     assert_equal('This is item number 1', parsed_feed.items[1].content)
+    assert_equal('This is the excerpt for item number 1',
+      parsed_feed.items[1].summary)
     assert_equal('http://example.com/item1/', parsed_feed.items[1].link)
     assert_equal('This is item number 0', parsed_feed.items[2].content)
+    assert_equal('This is the excerpt for item number 0',
+      parsed_feed.items[2].summary)
     assert_equal('http://example.com/item0/', parsed_feed.items[2].link)
     
     # Check feed information
@@ -130,6 +151,7 @@ class GenerationTest < Test::Unit::TestCase
     3.times do |i|
       item = FeedTools::FeedItem.new
       item.content = nil
+      item.summary = nil
       item.link = "http://example.com/item#{i}/"
       feed.items << item
       sleep(0.5)
@@ -147,10 +169,13 @@ class GenerationTest < Test::Unit::TestCase
     
     # Note reverse chronological order
     assert_equal(nil, parsed_feed.items[0].content)
+    assert_equal(nil, parsed_feed.items[0].summary)
     assert_equal('http://example.com/item2/', parsed_feed.items[0].link)
     assert_equal(nil, parsed_feed.items[1].content)
+    assert_equal(nil, parsed_feed.items[1].summary)
     assert_equal('http://example.com/item1/', parsed_feed.items[1].link)
     assert_equal(nil, parsed_feed.items[2].content)
+    assert_equal(nil, parsed_feed.items[2].summary)
     assert_equal('http://example.com/item0/', parsed_feed.items[2].link)
     
     # Check feed information
@@ -167,6 +192,7 @@ class GenerationTest < Test::Unit::TestCase
     3.times do |i|
       item = FeedTools::FeedItem.new
       item.content = nil
+      item.summary = nil
       item.link = "http://example.com/item#{i}/"
       feed.items << item
       sleep(0.5)
@@ -184,10 +210,13 @@ class GenerationTest < Test::Unit::TestCase
     
     # Note reverse chronological order
     assert_equal(nil, parsed_feed.items[0].content)
+    assert_equal(nil, parsed_feed.items[0].summary)
     assert_equal('http://example.com/item2/', parsed_feed.items[0].link)
     assert_equal(nil, parsed_feed.items[1].content)
+    assert_equal(nil, parsed_feed.items[1].summary)
     assert_equal('http://example.com/item1/', parsed_feed.items[1].link)
     assert_equal(nil, parsed_feed.items[2].content)
+    assert_equal(nil, parsed_feed.items[2].summary)
     assert_equal('http://example.com/item0/', parsed_feed.items[2].link)
     
     # Check feed information
@@ -204,6 +233,7 @@ class GenerationTest < Test::Unit::TestCase
     3.times do |i|
       item = FeedTools::FeedItem.new
       item.content = nil
+      item.summary = nil
       item.link = "http://example.com/item#{i}/"
       feed.items << item
       sleep(0.5)
@@ -221,10 +251,13 @@ class GenerationTest < Test::Unit::TestCase
     
     # Note reverse chronological order
     assert_equal(nil, parsed_feed.items[0].content)
+    assert_equal(nil, parsed_feed.items[0].summary)
     assert_equal('http://example.com/item2/', parsed_feed.items[0].link)
     assert_equal(nil, parsed_feed.items[1].content)
+    assert_equal(nil, parsed_feed.items[1].summary)
     assert_equal('http://example.com/item1/', parsed_feed.items[1].link)
     assert_equal(nil, parsed_feed.items[2].content)
+    assert_equal(nil, parsed_feed.items[2].summary)
     assert_equal('http://example.com/item0/', parsed_feed.items[2].link)
     
     # Check feed information