hpricot 0.8.5-i386-mswin32 → 0.8.6-i386-mswin32

data/ext/hpricot_scan/hpricot_scan.java.rl

@@ -375,18 +375,30 @@ public class HpricotScanService implements BasicLibraryService {
                     if(!S.xml) {
                         IRubyObject match = runtime.getNil(), e = S.focus;
                         while(e != S.doc) {
-                            IRubyObject hEC = H_ELE_GET(e, H_ELE_EC);
-                            if(hEC instanceof RubyHash) {
-                                IRubyObject has = ((RubyHash)hEC).op_aref(scanner.ctx, name);
-                                if(!has.isNil()) {
-                                    if(has == runtime.getTrue()) {
-                                        if(match.isNil()) {
-                                            match = e;
+                            if (ec.isNil()) {
+                                // Anything can contain an unknown element
+                                if(match.isNil()) {
+                                    match = e;
+                                }
+                            } else {
+                                IRubyObject hEC = H_ELE_GET(e, H_ELE_EC);
+                                if(hEC instanceof RubyHash) {
+                                    IRubyObject has = ((RubyHash)hEC).op_aref(scanner.ctx, name);
+                                    if(!has.isNil()) {
+                                        if(has == runtime.getTrue()) {
+                                            if(match.isNil()) {
+                                                match = e;
+                                            }
+                                        } else if(has == x.symAllow) {
+                                            match = S.focus;
+                                        } else if(has == x.symDeny) {
+                                            match = runtime.getNil();
                                         }
-                                    } else if(has == x.symAllow) {
-                                        match = S.focus;
-                                    } else if(has == x.symDeny) {
-                                        match = runtime.getNil();
+                                    }
+                                } else {
+                                    // Unknown elements can contain anything
+                                    if(match.isNil()) {
+                                        match = e;
                                     }
                                 }
                             }

data/ext/hpricot_scan/hpricot_scan.rl

@@ -356,23 +356,32 @@ rb_hpricot_token(hpricot_state *S, VALUE sym, VALUE tag, VALUE attr,
       VALUE match = Qnil, e = S->focus;
       while (e != S->doc)
       {
-        VALUE hEC = H_ELE_GET(e, H_ELE_EC);
-
-        if (TYPE(hEC) == T_HASH)
-        {
-          VALUE has = rb_hash_lookup(hEC, name);
-          if (has != Qnil) {
-            if (has == Qtrue) {
-              if (match == Qnil)
-                match = e;
-            } else if (has == symAllow) {
-              match = S->focus;
-            } else if (has == symDeny) {
-              match = Qnil;
+        if (ec == Qnil) {
+          // anything can contain unknown elements
+          if (match == Qnil)
+            match = e;
+        } else {
+          VALUE hEC = H_ELE_GET(e, H_ELE_EC);
+
+          if (TYPE(hEC) == T_HASH)
+          {
+            VALUE has = rb_hash_lookup(hEC, name);
+            if (has != Qnil) {
+              if (has == Qtrue) {
+                if (match == Qnil)
+                  match = e;
+              } else if (has == symAllow) {
+                match = S->focus;
+              } else if (has == symDeny) {
+                match = Qnil;
+              }
             }
+          } else {
+            // Unknown elements can contain anything
+            if (match == Qnil)
+              match = e;
           }
         }
-
         e = H_ELE_GET(e, H_ELE_PARENT);
       }
 

data/test/test_parser.rb

@@ -475,4 +475,22 @@ class TestParser < Test::Unit::TestCase
    assert_nothing_raised {Hpricot.parse(TestFiles::BNQT)}
  end
 
+ def test_unknown_tag
+   header = <<-edoc
+<header id="htest">
+  <div id="dtest">blah</div>
+</header>
+   edoc
+   doc = Hpricot(<<-edoc)
+      <div>#{header}</div>
+    edoc
+   assert_equal header.chomp, (doc/"#htest").to_html
+ end
+
+ def test_nested_unknown_tags
+   header =
+     %(<header id="htest"><div id="dtest"><nav>blah</nav></div></header>)
+   doc = Hpricot(%(<div>#{header}</div>))
+   assert_equal header.chomp, (doc/"#htest").to_html
+ end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hpricot
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 8
-  - 5
-  version: 0.8.5
+  - 6
+  version: 0.8.6
 platform: i386-mswin32
 authors: 
 - why the lucky stiff
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-29 00:00:00 Z
+date: 2012-01-17 00:00:00 Z
 dependencies: []
 
 description: a swift, liberal HTML parser with a fantastic library