feed-normalizer 1.2.0 → 1.3.0

data/History.txt

@@ -1,3 +1,6 @@
+1.3.0
+
+ * Small changes to work with hpricot 0.5. 
 
 1.2.0
 

data/Rakefile

@@ -1,6 +1,6 @@
 require 'hoe'
 
-Hoe.new("feed-normalizer", "1.2.0") do |s|
+Hoe.new("feed-normalizer", "1.3.0") do |s|
   s.author = "Andrew A. Smith"
   s.email = "andy@tinnedfruit.org"
   s.url = "http://feed-normalizer.rubyforge.org/"

data/lib/html-cleaner.rb

@@ -59,11 +59,13 @@ module FeedNormalizer
       def clean(str)
         str = unescapeHTML(str)
 
-        doc = Hpricot(str, :xhtml_strict => true)
+        doc = Hpricot(str, :fixup_tags => true)
         doc = subtree(doc, :body)
 
         # get all the tags in the document
-        tags = (doc/"*").collect {|e| e.name}
+        # Somewhere near hpricot 0.4.92 "*" starting to return all elements,
+        # including text nodes instead of just tagged elements.
+        tags = (doc/"*").inject([]) { |m,e| m << e.name if(e.respond_to?(:name) && e.name =~ /^\w+$/) ; m }.uniq
 
         # Remove tags that aren't whitelisted.
         remove_tags!(doc, tags - HTML_ELEMENTS)
@@ -109,6 +111,7 @@ module FeedNormalizer
       # This method rejects javascript, vbscript, livescript, mocha and data URLs.
       # It *could* be refined to only deny dangerous data URLs, however.
       def dodgy_uri?(uri)
+        uri = uri.to_s
 
         # special case for poorly-formed entities (missing ';')
         # if these occur *anywhere* within the string, then throw it out.
@@ -143,7 +146,7 @@ module FeedNormalizer
       #
       # This method could be improved by adding a whitelist of html entities.
       def add_entities(str)
-        str.gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;').gsub(/&(?!(\#\d+|\#x([0-9a-f]+)|\w{2,8});)/nmi, '&amp;')
+        str.to_s.gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;').gsub(/&(?!(\#\d+|\#x([0-9a-f]+)|\w{2,8});)/nmi, '&amp;')
       end
 
       private

data/lib/structures.rb

@@ -29,7 +29,7 @@ module FeedNormalizer
     def ==(other)
       other.equal?(self) ||
         (other.instance_of?(self.class) &&
-          self.class::ELEMENTS.collect{|el| self.instance_variable_get("@#{el}")==other.instance_variable_get("@#{el}")}.all?)
+          self.class::ELEMENTS.all?{ |el| self.send(el) == other.send(el)} )
     end
 
     # Returns the difference between two Feed instances as a hash.

data/test/test_htmlcleaner.rb

@@ -13,6 +13,7 @@ class HtmlCleanerTest < Test::Unit::TestCase
   end
 
   def test_add_entities
+    assert_equal "", HtmlCleaner.add_entities(nil)
     assert_equal "x &gt; y", HtmlCleaner.add_entities("x > y")
     assert_equal "1 &amp; 2", HtmlCleaner.add_entities("1 & 2")
     assert_equal "&amp; &#123; &acute; &#x123;", HtmlCleaner.add_entities("& &#123; &acute; &#x123;")
@@ -140,6 +141,7 @@ class HtmlCleanerTest < Test::Unit::TestCase
     assert HtmlCleaner.dodgy_uri?("jav\tascript:foo()")
 
     # The Good
+    assert_nil HtmlCleaner.dodgy_uri?(nil)
     assert_nil HtmlCleaner.dodgy_uri?("http://example.org")
     assert_nil HtmlCleaner.dodgy_uri?("http://example.org/foo.html")
     assert_nil HtmlCleaner.dodgy_uri?("http://example.org/foo.cgi?x=y&a=b")

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.2
 specification_version: 1
 name: feed-normalizer
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2006-11-29 00:00:00 -08:00
+  version: 1.3.0
+date: 2007-05-22 00:00:00 -07:00
 summary: Extensible Ruby wrapper for Atom and RSS parsers
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Andrew A. Smith
 files: 
@@ -61,29 +62,29 @@ requirements: []
 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: simple-rss
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.6
+        version: "1.1"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: simple-rss
+  name: hpricot
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.1"
+        version: "0.4"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: hoe
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.4"
+        version: 1.2.0
     version: