feedtools 0.2.22 → 0.2.23

data/test/unit/helper_test.rb

@@ -1,10 +1,11 @@
 require 'test/unit'
 require 'feed_tools'
+require 'feed_tools/helpers/html_helper'
+require 'feed_tools/helpers/xml_helper'
 require 'feed_tools/helpers/feed_tools_helper'
 
 class HelperTest < Test::Unit::TestCase
   include FeedTools::FeedToolsHelper
-  include FeedTools::GenericHelper
 
   def setup
     FeedTools.reset_configurations
@@ -24,7 +25,7 @@ class HelperTest < Test::Unit::TestCase
       </RoOt>
     XML
     xml_doc = REXML::Document.new(xml)
-    test_string = try_xpaths(xml_doc, [
+    test_string = FeedTools::XmlHelper.try_xpaths(xml_doc, [
       "ROOT/child/text()"
     ], :select_result_value => true)
     assert_equal("Test String #1", test_string)
@@ -35,7 +36,7 @@ class HelperTest < Test::Unit::TestCase
       </root>
     XML
     xml_doc = REXML::Document.new(xml)
-    test_string = try_xpaths(xml_doc, [
+    test_string = FeedTools::XmlHelper.try_xpaths(xml_doc, [
       "ROOT/testnamespace:child/text()"
     ], :select_result_value => true)
     assert_equal("Test String #2", test_string)
@@ -46,7 +47,7 @@ class HelperTest < Test::Unit::TestCase
       </RoOt>
     XML
     xml_doc = REXML::Document.new(xml)
-    test_string = try_xpaths(xml_doc, [
+    test_string = FeedTools::XmlHelper.try_xpaths(xml_doc, [
       "ROOT/child/@ATTRIB"
     ], :select_result_value => true)
     assert_equal("Test String #3", test_string)
@@ -57,7 +58,7 @@ class HelperTest < Test::Unit::TestCase
       </RoOt>
     XML
     xml_doc = REXML::Document.new(xml)
-    test_string = try_xpaths(xml_doc, [
+    test_string = FeedTools::XmlHelper.try_xpaths(xml_doc, [
       "ROOT/child/@testnamespace:ATTRIB"
     ], :select_result_value => true)
     assert_equal("Test String #4", test_string)
@@ -71,36 +72,47 @@ class HelperTest < Test::Unit::TestCase
   
   def test_normalize_url
     assert_equal("http://slashdot.org/",
-      FeedTools.normalize_url("slashdot.org"))
+      FeedTools::UriHelper.normalize_url("slashdot.org"))
     assert_equal("http://example.com/index.php",
-      FeedTools.normalize_url("example.com/index.php"))
+      FeedTools::UriHelper.normalize_url("example.com/index.php"))
 
     # Test windows-style file: protocol normalization
     assert_equal("file:///c:/windows/My%20Documents%20100%20/foo.txt",
-      FeedTools.normalize_url("c:\\windows\\My Documents 100%20\\foo.txt"))
+      FeedTools::UriHelper.normalize_url("c:\\windows\\My Documents 100%20\\foo.txt"))
     assert_equal("file:///c:/windows/My%20Documents%20100%20/foo.txt",
-      FeedTools.normalize_url(
+      FeedTools::UriHelper.normalize_url(
         "file://c:\\windows\\My Documents 100%20\\foo.txt"))
     assert_equal("file:///c:/windows/My%20Documents%20100%20/foo.txt",
-      FeedTools.normalize_url(
+      FeedTools::UriHelper.normalize_url(
         "file:///c|/windows/My%20Documents%20100%20/foo.txt"))
     assert_equal("file:///c:/windows/My%20Documents%20100%20/foo.txt",
-      FeedTools.normalize_url(
+      FeedTools::UriHelper.normalize_url(
         "file:///c:/windows/My%20Documents%20100%20/foo.txt"))
+    if FeedTools::UriHelper.idn_enabled?
+      # Test internationalized domain names
+      assert_equal(
+        "http://www.xn--8ws00zhy3a.com/atomtests/iri/everything.atom",
+        FeedTools::UriHelper.normalize_url(
+          "http://www.詹姆斯.com/atomtests/iri/everything.atom"))
+      assert_equal(
+        "http://www.xn--8ws00zhy3a.com/atomtests/iri/%E8%A9%B9.html",
+        FeedTools::UriHelper.normalize_url(
+          "http://www.詹姆斯.com/atomtests/iri/詹.html"))
+    end
   end
   
   def test_sanitize_html
-    assert_equal("<!--foo-->", FeedTools.sanitize_html("<!--foo-->"))
+    assert_equal("<!--foo-->", FeedTools::HtmlHelper.sanitize_html("<!--foo-->"))
     assert_equal("<P>Upper-case tags</P>",
-      FeedTools.sanitize_html("<P>Upper-case tags</P>"))
+      FeedTools::HtmlHelper.sanitize_html("<P>Upper-case tags</P>"))
     assert_equal("<A HREF='/dev/null'>Upper-case attributes</A>",
-      FeedTools.sanitize_html(
+      FeedTools::HtmlHelper.sanitize_html(
         "<A HREF='/dev/null'>Upper-case attributes</A>"))
   end
   
   def test_tidy_html
     FeedTools.configurations[:tidy_enabled] = true
-    unless FeedTools.tidy_enabled?
+    unless FeedTools::HtmlHelper.tidy_enabled?
       puts "\nCould not test tidy support.  Libtidy couldn't be found."
     else
       illegal_pre = <<-EOF
@@ -134,15 +146,97 @@ class HelperTest < Test::Unit::TestCase
          end
         </pre>
       EOF
-      illegal_pre_after_tidy = FeedTools.tidy_html(illegal_pre)
+      illegal_pre_after_tidy = FeedTools::HtmlHelper.tidy_html(illegal_pre)
       assert_not_equal(nil, illegal_pre_after_tidy =~ /class HTTPIO &lt; HTTP/,
         "Tidy failed to clean up illegal chars in <pre> block.")
+      
+      unescaped_utf8_characters = <<-EOF
+        \302\240
+      EOF
+      unescaped_utf8_characters_after_tidy =
+        FeedTools::HtmlHelper.tidy_html(unescaped_utf8_characters)
+      assert_not_equal("&#194;&#160;", unescaped_utf8_characters_after_tidy,
+        "Tidy failed to escape the unicode characters correctly.")
+      assert_not_equal("&Acirc;&nbsp;", unescaped_utf8_characters_after_tidy,
+        "Tidy failed to escape the unicode characters correctly.")
     end
     FeedTools.configurations[:tidy_enabled] = false
   end
   
   def test_build_urn_uri
     assert_equal("urn:uuid:fa6d0b87-3f36-517d-b9b7-1349f8c3fc6b",
-      FeedTools.build_urn_uri('http://sporkmonger.com/'))
+      FeedTools::UriHelper.build_urn_uri('http://sporkmonger.com/'))
+  end
+  
+  def test_build_merged_feed
+    merged_feed = FeedTools.build_merged_feed([
+      "http://rss.slashdot.org/Slashdot/slashdot"
+    ])
+  end
+  
+  def test_extract_xhtml
+    FeedTools.configurations[:tidy_enabled] = false
+    
+    xml = <<-XML
+      <content>
+        <div xmlns='http://www.w3.org/1999/xhtml'><em>Testing.</em></div>
+      </content>
+    XML
+    doc = REXML::Document.new(xml)
+    assert_equal(
+      "<div><em>Testing.</em></div>",
+      FeedTools::HtmlHelper.extract_xhtml(doc.root))
+    xml = <<-XML
+      <content xmlns:xhtml='http://www.w3.org/1999/xhtml'>
+        <xhtml:div><xhtml:em>Testing.</xhtml:em></xhtml:div>
+      </content>
+    XML
+    doc = REXML::Document.new(xml)
+    assert_equal(
+      "<div><em>Testing.</em></div>",
+      FeedTools::HtmlHelper.extract_xhtml(doc.root))
+    xml = <<-XML
+      <content type="xhtml" xmlns:xhtml='http://www.w3.org/1999/xhtml'>
+        <xhtml:div xmlns='http://hsivonen.iki.fi/FooML'>
+			    <xhtml:ul>
+            <xhtml:li>XHTML List Item</xhtml:li>
+          </xhtml:ul>
+          <ul>
+            <li>FooML List Item</li>
+          </ul>
+        </xhtml:div>
+		  </content>
+    XML
+    doc = REXML::Document.new(xml)
+    xhtml = FeedTools::HtmlHelper.extract_xhtml(doc.root)
+    assert((xhtml =~ /<div>/) && (xhtml =~ /<\/div>/),
+      "XHTML divs were not normalized properly.")
+    assert((xhtml =~ /hsivonen\.iki\.fi/),
+      "FooML namespace was not preserved.")
+    assert((xhtml =~ /<ul xmlns=/),
+      "Namespace was not placed correctly.")
+
+    FeedTools.configurations[:tidy_enabled] = true
+
+    xml = <<-XML
+      <content type="xhtml" xmlns:xhtml='http://www.w3.org/1999/xhtml'>
+        <xhtml:div xmlns='http://hsivonen.iki.fi/FooML'>
+			    <xhtml:ul>
+            <xhtml:li>XHTML List Item</xhtml:li>
+          </xhtml:ul>
+          <ul>
+            <li>FooML List Item</li>
+          </ul>
+        </xhtml:div>
+		  </content>
+    XML
+    doc = REXML::Document.new(xml)
+    xhtml = FeedTools::HtmlHelper.extract_xhtml(doc.root)
+    assert((xhtml =~ /<div>/) && (xhtml =~ /<\/div>/),
+      "XHTML divs were not normalized properly.")
+    assert((xhtml =~ /hsivonen\.iki\.fi/),
+      "FooML namespace was not preserved.")
+    assert((xhtml =~ /<ul xmlns=/),
+      "Namespace was not placed correctly.")
   end
 end

data/test/unit/rss_test.rb

@@ -476,8 +476,8 @@ class RssTest < Test::Unit::TestCase
   
   def test_item_source
     with_feed(:from_file => 'wellformed/rss/item_source.xml') { |feed|
-      assert_equal("http://example.com/", feed.items.first.source.url)
-      assert_equal("Example source", feed.items.first.source.value)
+      assert_equal("http://example.com/", feed.items.first.source.href)
+      assert_equal("Example source", feed.items.first.source.title)
     }
   end
   
@@ -736,4 +736,23 @@ class RssTest < Test::Unit::TestCase
       assert_equal(1, feed.items.size)
     }
   end
+    
+  def test_feed_item_description_plus_content_encoded
+    with_feed(:from_data => <<-FEED
+      <?xml version="1.0" encoding="iso-8859-1"?>
+      <rss version="2.0">
+        <channel>
+          <item>
+            <description>Excerpt</description>
+            <content:encoded><![CDATA[Full Content]]></content:encoded>
+          </item>
+        </channel>
+      </rss>
+    FEED
+    ) { |feed|
+      assert_equal(1, feed.items.size)
+      assert_equal("Excerpt", feed.items[0].summary)
+      assert_equal("Full Content", feed.items[0].content)
+    }
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: feedtools
 version: !ruby/object:Gem::Version 
-  version: 0.2.22
-date: 2006-01-22 00:00:00 -05:00
+  version: 0.2.23
+date: 2006-03-03 00:00:00 -05:00
 summary: "Parsing, generation, and caching system for xml news feeds."
 require_paths: 
   - lib
@@ -38,6 +38,7 @@ files:
   - lib/feed_tools/database_feed_cache.rb
   - lib/feed_tools/feed.rb
   - lib/feed_tools/feed_item.rb
+  - lib/feed_tools/feed_structures.rb
   - lib/feed_tools/helpers
   - lib/feed_tools/vendor
   - lib/feed_tools/helpers/debug_helper.rb
@@ -45,8 +46,10 @@ files:
   - lib/feed_tools/helpers/feed_item_helper.rb
   - lib/feed_tools/helpers/feed_tools_helper.rb
   - lib/feed_tools/helpers/generic_helper.rb
-  - lib/feed_tools/helpers/module_helper.rb
+  - lib/feed_tools/helpers/html_helper.rb
   - lib/feed_tools/helpers/retrieval_helper.rb
+  - lib/feed_tools/helpers/uri_helper.rb
+  - lib/feed_tools/helpers/xml_helper.rb
   - lib/feed_tools/vendor/htree
   - lib/feed_tools/vendor/htree.rb
   - lib/feed_tools/vendor/htree/container.rb
@@ -2856,6 +2859,7 @@ files:
   - test/unit/nonstandard_test.rb
   - test/unit/rdf_test.rb
   - test/unit/rss_test.rb
+  - db/migration.rb
   - db/schema.mysql.sql
   - db/schema.postgresql.sql
   - db/schema.sqlite.sql

data/lib/feed_tools/helpers/module_helper.rb

@@ -1,27 +0,0 @@
-#--
-# Copyright (c) 2005 Robert Aman
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-
-module FeedTools
-  module FeedToolsModuleHelper
-  end
-end