removing unnecessary xpath() lookups, fixing version-specific test

brynary · Dec 5, 2008 · b97b572 · b97b572
1 parent 0c3105b
commit b97b572
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/lib/dryopteris/sanitize.rb b/lib/dryopteris/sanitize.rb
@@ -13,23 +13,25 @@ def strip_tags(string_or_io, encoding=nil)
       return "" if string_or_io.strip.size == 0
 
       doc = Nokogiri::HTML.parse(string_or_io, nil, encoding)
-      doc.xpath("html/body/*").each do |node| 
+      body = doc.xpath("/html/body").first
+      return "" if body.nil?
+      body.children.each do |node| 
         traverse_conditionally_top_down(node, :remove_tags_from_node)
       end
-      snippet = doc.xpath("html/body").first
+      body.inner_html
-      snippet.nil? ? "" : snippet.inner_html
     end
 
     def sanitize(string_or_io, encoding=nil)
       return nil if string_or_io.nil?
       return "" if string_or_io.strip.size == 0
 
       doc = Nokogiri::HTML.parse(string_or_io, nil, encoding)
-      doc.xpath("html/body/*").each do |node| 
+      body = doc.xpath("/html/body").first
+      return "" if body.nil?
+      body.children.each do |node| 
         traverse_conditionally_top_down(node, :sanitize_node)
       end
-      snippet = doc.xpath("html/body").first
+      body.inner_html
-      snippet.nil? ? "" : snippet.inner_html
     end
 
     private

diff --git a/test/test_sanitizer.rb b/test/test_sanitizer.rb
@@ -38,7 +38,7 @@ def check_sanitization(input, htmloutput, xhtmloutput, rexmloutput)
 #         xhtmloutput = htmloutput
 #         rexmloutput = "<image title='1'>foo &lt;bad&gt;bar&lt;/bad&gt; baz</image>"
       if WhiteList::VOID_ELEMENTS.include?(tag_name)
-        if Nokogiri::LIBXML_VERSION >= "2.6.16"
+        if Nokogiri::LIBXML_VERSION <= "2.6.16"
           htmloutput = "<#{tag_name} title='1'/><p>foo &lt;bad&gt;bar&lt;/bad&gt; baz</p>"
         else
           htmloutput = "<#{tag_name} title='1'/>foo &lt;bad&gt;bar&lt;/bad&gt; baz"