why-hpricot 0.6.204 → 0.6.207

data/lib/hpricot/elements.rb

@@ -495,7 +495,7 @@ module Hpricot
     end
 
     filter 'text()' do |val,i|
-      !self.inner_text.strip.empty?
+      self.children.grep(Hpricot::Text).detect { |x| x.content =~ /\S/ } if self.children
     end
 
     filter '@' do |attr,val,i|

data/test/test_builder.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #!/usr/bin/env ruby
 
 require 'test/unit'
@@ -17,9 +18,9 @@ class TestBuilder < Test::Unit::TestCase
   end
 
   def test_latin1_entities
-    doc = Hpricot() { b "\200\225" }
+    doc = Hpricot() { b "ۥ" }
     assert_equal "<b>&#8364;&#8226;</b>", doc.to_html
-    assert_equal "\342\202\254\342\200\242", doc.at("text()").to_s
+    assert_equal "ۥ", doc.at("text()").to_s
   end
 
   def test_escaping_attrs
@@ -29,8 +30,7 @@ class TestBuilder < Test::Unit::TestCase
   end
 
   def test_korean_utf8_entities
-    # a = '한글'
-    a = "\xed\x95\x9c\xea\xb8\x80"
+    a = '한글'
     doc = Hpricot() { b a }
     assert_equal "<b>&#54620;&#44544;</b>", doc.to_html
   end

data/test/test_parser.rb

@@ -122,7 +122,7 @@ class TestParser < Test::Unit::TestCase
     assert_equal 60, @boingboing.search("h3").length
     assert_equal 59, @boingboing.search("h3[text()!='College kids reportedly taking more smart drugs']").length
     assert_equal 17, @boingboing.search("h3[text()$='s']").length
-    assert_equal 129, @boingboing.search("p[text()]").length
+    assert_equal 116, @boingboing.search("p[text()]").length
     assert_equal 211, @boingboing.search("p").length
   end
 
@@ -162,10 +162,10 @@ class TestParser < Test::Unit::TestCase
     assert_equal 60, @boingboing.search("/*/body//p[@class='posted']").length
     assert_equal 18, @boingboing.search("//script").length
     divs = @boingboing.search("//script/../div")
-    assert_equal 1,  divs.length
+    assert_equal 2,  divs.length
     imgs = @boingboing.search('//div/p/a/img')
-    assert_equal 15, imgs.length
-    assert_equal 17, @boingboing.search('//div').search('p/a/img').length
+    assert_equal 16, imgs.length
+    assert_equal 16, @boingboing.search('//div').search('p/a/img').length
     assert imgs.all? { |x| x.name == 'img' }
   end
 
@@ -173,10 +173,10 @@ class TestParser < Test::Unit::TestCase
     @boingboing = Hpricot.parse(TestFiles::BOINGBOING)
     assert_equal 2, @boingboing.search('//link[@rel="alternate"]').length
     p_imgs = @boingboing.search('//div/p[/a/img]')
-    assert_equal 15, p_imgs.length
+    assert_equal 16, p_imgs.length
     assert p_imgs.all? { |x| x.name == 'p' }
     p_imgs = @boingboing.search('//div/p[a/img]')
-    assert_equal 18, p_imgs.length
+    assert_equal 16, p_imgs.length
     assert p_imgs.all? { |x| x.name == 'p' }
     assert_equal 1, @boingboing.search('//input[@checked]').length
   end
@@ -219,7 +219,7 @@ class TestParser < Test::Unit::TestCase
   def test_many_paths
     @boingboing = Hpricot.parse(TestFiles::BOINGBOING)
     assert_equal 62, @boingboing.search('p.posted, link[@rel="alternate"]').length
-    assert_equal 20, @boingboing.search('//div/p[a/img]|//link[@rel="alternate"]').length
+    assert_equal 18, @boingboing.search('//div/p[a/img]|//link[@rel="alternate"]').length
   end
 
   def test_stacked_search

data/test/test_preserved.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #!/usr/bin/env ruby
 
 require 'test/unit'
@@ -9,7 +10,7 @@ class TestPreserved < Test::Unit::TestCase
     doc = Hpricot(str)
     yield doc if block_given?
     str2 = doc.to_original_html
-    [*str].zip([*str2]).each do |s1, s2|
+    str.lines.zip(str2.lines).each do |s1, s2|
       assert_equal s1, s2
     end
   end
@@ -40,12 +41,12 @@ class TestPreserved < Test::Unit::TestCase
 
   def test_escaping_of_contents
     doc = Hpricot(TestFiles::BOINGBOING)
-    assert_equal "Fukuda\342\200\231s Automatic Door opens around your body as you pass through it. The idea is to save energy and keep the room clean.", doc.at("img[@alt='200606131240']").next.to_s.strip
+    assert_equal "Fukuda’s Automatic Door opens around your body as you pass through it. The idea is to save energy and keep the room clean.", doc.at("img[@alt='200606131240']").next.to_s.strip
   end
 
   def test_files
     assert_roundtrip TestFiles::BASIC
-    # assert_roundtrip TestFiles::BOINGBOING
+    assert_roundtrip TestFiles::BOINGBOING
     assert_roundtrip TestFiles::CY0
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: why-hpricot
 version: !ruby/object:Gem::Version 
-  version: 0.6.204
+  version: 0.6.207
 platform: ruby
 authors: 
 - why the lucky stiff