RubyGems - feedtools - Versions diffs - 0.2.27 → 0.2.28 - Mend

feedtools 0.2.27 → 0.2.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

data/CHANGELOG +2 -0
data/lib/feed_tools/feed.rb +8 -2
data/lib/feed_tools/helpers/html_helper.rb +54 -35
data/lib/feed_tools/version.rb +1 -1
metadata +2 -2

data/CHANGELOG CHANGED

@@ -1,3 +1,5 @@
+=== FeedTools 0.2.28
+  * fixed major bug with autodiscovery
 === FeedTools 0.2.27
   * now uses a new URI class
   * full support for IRIs

data/lib/feed_tools/feed.rb CHANGED

@@ -224,6 +224,7 @@ module FeedTools
                 "Autodiscovery loop detected: #{autodiscovered_url}"
             end
             self.feed_data = nil
             self.href = autodiscovered_url
             if FeedTools.feed_cache.nil?
               self.cache_object = nil
@@ -714,8 +715,13 @@ module FeedTools
           begin
             @xml_document = REXML::Document.new(self.feed_data_utf_8)
           rescue Exception
-            # Something failed, attempt to repair the xml with htree.
-            @xml_document = HTree.parse(self.feed_data_utf_8).to_rexml
+            # Something failed, attempt to repair the xml with html5lib.
+            begin
+              @xml_document = HTML5::XMLParser.parse(self.feed_data_utf_8)
+            rescue Exception
+              # Failed again, give up.
+              return nil
+            end
           end
         end
       end

data/lib/feed_tools/helpers/html_helper.rb CHANGED

@@ -561,47 +561,66 @@ module FeedTools
     # Given a block of html, locates feed links with a given mime type.
     def self.extract_link_by_mime_type(html, mime_type)
-      require 'feed_tools/vendor/htree'
       require 'feed_tools/helpers/xml_helper'
+      # HACK: Prevent the parser from freaking out if it sees this:
+      html = html.gsub(/<!'/, "&lt;!'")
       # This is technically very, very wrong.  But it saves oodles of
       # clock cycles, and probably works 99.999% of the time.
-      html_document = HTree.parse_xml(
-        FeedTools::HtmlHelper.tidy_html(
-          html.gsub(/<body.*?>(.|\n)*<\/body>/, "<body>-</body>"))).to_rexml
-      html_node = nil
-      head_node = nil
+      html.gsub!(/<body.*?>(.|\n)*?<\/body>/, "<body></body>")
+      html.gsub!(/<script.*?>(.|\n)*?<\/script>/, "")
+      html.gsub!(/<noscript.*?>(.|\n)*?<\/noscript>/, "")
+      html.gsub!(/<!--(.|\n)*?-->/, "")
+      html = FeedTools::HtmlHelper.tidy_html(html)
+      document = HTML5::HTMLParser.parse(html)
       link_nodes = []
-      for node in html_document.children
-        next unless node.kind_of?(REXML::Element)
-        if node.name.downcase == "html" &&
-            node.children.size > 0
-          html_node = node
-          break
-        end
-      end
-      return nil if html_node.nil?
-      for node in html_node.children
-        next unless node.kind_of?(REXML::Element)
-        if node.name.downcase == "head"
-          head_node = node
-          break
-        end
-        if node.name.downcase == "link"
-          link_nodes << node
+      get_link_nodes = lambda do |root_node|
+        html_node = nil
+        head_node = nil
+        return nil if !root_node.respond_to?(:children)
+        if root_node.name.downcase == "html" &&
+            root_node.children.size > 0
+          html_node = root_node
+        else
+          for node in fragment_node.children
+            next unless node.kind_of?(REXML::Element)
+            if node.name.downcase == "html" &&
+                node.children.size > 0
+              html_node = node
+              break
+            end
+          end
         end
-      end
-      return nil if html_node.nil? && link_nodes.empty?
-      if !head_node.nil?
-        link_nodes = []
-        for node in head_node.children
-          next unless node.kind_of?(REXML::Element)
-          if node.name.downcase == "link"
-            link_nodes << node
+        if html_node != nil
+          for node in html_node.children
+            next unless node.kind_of?(REXML::Element)
+            if node.name.downcase == "head"
+              head_node = node
+              break
+            end
+            if node.name.downcase == "link"
+              link_nodes << node
+            end
+          end
+          if html_node != nil || !link_nodes.empty?
+            if head_node != nil
+              link_nodes = []
+              for node in head_node.children
+                next unless node.kind_of?(REXML::Element)
+                if node.name.downcase == "link"
+                  link_nodes << node
+                end
+              end
+            end
           end
         end
       end
-      find_link_nodes = lambda do |links|
+      get_link_nodes.call(document.root)
+      process_link_nodes = lambda do |links|
         for link in links
           next unless link.kind_of?(REXML::Element)
           if link.attributes['type'].to_s.strip.downcase ==
@@ -613,11 +632,11 @@ module FeedTools
         end
         for link in links
           next unless link.kind_of?(REXML::Element)
-          find_link_nodes.call(link.children)
+          process_link_nodes.call(link.children)
         end
       end
-      find_link_nodes.call(link_nodes)
+      process_link_nodes.call(link_nodes)
       return nil
     end
   end
-end
+end

data/lib/feed_tools/version.rb CHANGED

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

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feedtools
 version: !ruby/object:Gem::Version
-  version: 0.2.27
+  version: 0.2.28
 platform: ruby
 authors:
 - Bob Aman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2008-01-31 00:00:00 -05:00
+date: 2008-02-01 00:00:00 -05:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency