nokogiri 1.11.4-java → 1.12.0-java

data/ext/java/nokogiri/{HtmlElementDescription.java → Html4ElementDescription.java}

@@ -16,12 +16,12 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
- * Class for Nokogiri::HTML::ElementDescription.
+ * Class for Nokogiri::HTML4::ElementDescription.
  *
  * @author Patrick Mahoney <pat@polycrystal.org>
  */
-@JRubyClass(name = "Nokogiri::HTML::ElementDescription")
-public class HtmlElementDescription extends RubyObject
+@JRubyClass(name = "Nokogiri::HTML4::ElementDescription")
+public class Html4ElementDescription extends RubyObject
 {
 
   /**
@@ -38,7 +38,7 @@ public class HtmlElementDescription extends RubyObject
   protected HTMLElements.Element element;
 
   public
-  HtmlElementDescription(Ruby runtime, RubyClass rubyClass)
+  Html4ElementDescription(Ruby runtime, RubyClass rubyClass)
   {
     super(runtime, rubyClass);
   }
@@ -89,8 +89,8 @@ public class HtmlElementDescription extends RubyObject
       return context.nil;
     }
 
-    HtmlElementDescription desc =
-      new HtmlElementDescription(context.getRuntime(), (RubyClass)klazz);
+    Html4ElementDescription desc =
+      new Html4ElementDescription(context.getRuntime(), (RubyClass)klazz);
     desc.element = elem;
     return desc;
   }

data/ext/java/nokogiri/{HtmlEntityLookup.java → Html4EntityLookup.java}

@@ -12,16 +12,16 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
- * Class for Nokogiri::HTML::EntityLookup.
+ * Class for Nokogiri::HTML4::EntityLookup.
  *
  * @author Patrick Mahoney <pat@polycrystal.org>
  */
-@JRubyClass(name = "Nokogiri::HTML::EntityLookup")
-public class HtmlEntityLookup extends RubyObject
+@JRubyClass(name = "Nokogiri::HTML4::EntityLookup")
+public class Html4EntityLookup extends RubyObject
 {
 
   public
-  HtmlEntityLookup(Ruby runtime, RubyClass rubyClass)
+  Html4EntityLookup(Ruby runtime, RubyClass rubyClass)
   {
     super(runtime, rubyClass);
   }
@@ -41,7 +41,7 @@ public class HtmlEntityLookup extends RubyObject
     if (val == -1) { return ruby.getNil(); }
 
     IRubyObject edClass =
-      ruby.getClassFromPath("Nokogiri::HTML::EntityDescription");
+      ruby.getClassFromPath("Nokogiri::HTML4::EntityDescription");
     IRubyObject edObj = invoke(context, edClass, "new",
                                ruby.newFixnum(val), ruby.newString(name),
                                ruby.newString(name + " entity"));

data/ext/java/nokogiri/{HtmlSaxParserContext.java → Html4SaxParserContext.java}

@@ -24,27 +24,27 @@ import nokogiri.internals.NokogiriHandler;
 import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
 
 /**
- * Class for Nokogiri::HTML::SAX::ParserContext.
+ * Class for Nokogiri::HTML4::SAX::ParserContext.
  *
  * @author serabe
  * @author Patrick Mahoney <pat@polycrystal.org>
  * @author Yoko Harada <yokolet@gmail.com>
  */
 
-@JRubyClass(name = "Nokogiri::HTML::SAX::ParserContext", parent = "Nokogiri::XML::SAX::ParserContext")
-public class HtmlSaxParserContext extends XmlSaxParserContext
+@JRubyClass(name = "Nokogiri::HTML4::SAX::ParserContext", parent = "Nokogiri::XML::SAX::ParserContext")
+public class Html4SaxParserContext extends XmlSaxParserContext
 {
 
-  static HtmlSaxParserContext
+  static Html4SaxParserContext
   newInstance(final Ruby runtime, final RubyClass klazz)
   {
-    HtmlSaxParserContext instance = new HtmlSaxParserContext(runtime, klazz);
+    Html4SaxParserContext instance = new Html4SaxParserContext(runtime, klazz);
     instance.initialize(runtime);
     return instance;
   }
 
   public
-  HtmlSaxParserContext(Ruby ruby, RubyClass rubyClass)
+  Html4SaxParserContext(Ruby ruby, RubyClass rubyClass)
   {
     super(ruby, rubyClass);
   }
@@ -68,7 +68,7 @@ public class HtmlSaxParserContext extends XmlSaxParserContext
       return parser;
     } catch (SAXException ex) {
       throw new SAXException(
-        "Problem while creating HTML SAX Parser: " + ex.toString());
+        "Problem while creating HTML4 SAX Parser: " + ex.toString());
     }
   }
 
@@ -79,7 +79,7 @@ public class HtmlSaxParserContext extends XmlSaxParserContext
                IRubyObject data,
                IRubyObject encoding)
   {
-    HtmlSaxParserContext ctx = HtmlSaxParserContext.newInstance(context.runtime, (RubyClass) klazz);
+    Html4SaxParserContext ctx = Html4SaxParserContext.newInstance(context.runtime, (RubyClass) klazz);
     String javaEncoding = findEncodingName(context, encoding);
     if (javaEncoding != null) {
       CharSequence input = applyEncoding(rubyStringToString(data.convertToString()), javaEncoding);
@@ -231,7 +231,7 @@ public class HtmlSaxParserContext extends XmlSaxParserContext
              IRubyObject data,
              IRubyObject encoding)
   {
-    HtmlSaxParserContext ctx = HtmlSaxParserContext.newInstance(context.runtime, (RubyClass) klass);
+    Html4SaxParserContext ctx = Html4SaxParserContext.newInstance(context.runtime, (RubyClass) klass);
     ctx.setInputSourceFile(context, data);
     String javaEncoding = findEncodingName(context, encoding);
     if (javaEncoding != null) {
@@ -247,7 +247,7 @@ public class HtmlSaxParserContext extends XmlSaxParserContext
            IRubyObject data,
            IRubyObject encoding)
   {
-    HtmlSaxParserContext ctx = HtmlSaxParserContext.newInstance(context.runtime, (RubyClass) klass);
+    Html4SaxParserContext ctx = Html4SaxParserContext.newInstance(context.runtime, (RubyClass) klass);
     ctx.setIOInputSource(context, data, context.nil);
     String javaEncoding = findEncodingName(context, encoding);
     if (javaEncoding != null) {
@@ -258,12 +258,12 @@ public class HtmlSaxParserContext extends XmlSaxParserContext
 
   /**
    * Create a new parser context that will read from a raw input stream.
-   * Meant to be run in a separate thread by HtmlSaxPushParser.
+   * Meant to be run in a separate thread by Html4SaxPushParser.
    */
-  static HtmlSaxParserContext
+  static Html4SaxParserContext
   parse_stream(final Ruby runtime, RubyClass klass, InputStream stream)
   {
-    HtmlSaxParserContext ctx = HtmlSaxParserContext.newInstance(runtime, klass);
+    Html4SaxParserContext ctx = Html4SaxParserContext.newInstance(runtime, klass);
     ctx.setInputSource(stream);
     return ctx;
   }

data/ext/java/nokogiri/{HtmlSaxPushParser.java → Html4SaxPushParser.java}

@@ -27,13 +27,13 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
 /**
- * Class for Nokogiri::HTML::SAX::PushParser
+ * Class for Nokogiri::HTML4::SAX::PushParser
  *
  * @author
  * @author Piotr Szmielew <p.szmielew@ava.waw.pl> - based on Nokogiri::XML::SAX::PushParser
  */
-@JRubyClass(name = "Nokogiri::HTML::SAX::PushParser")
-public class HtmlSaxPushParser extends RubyObject
+@JRubyClass(name = "Nokogiri::HTML4::SAX::PushParser")
+public class Html4SaxPushParser extends RubyObject
 {
   ParserContext.Options options;
   IRubyObject saxParser;
@@ -41,11 +41,11 @@ public class HtmlSaxPushParser extends RubyObject
   NokogiriBlockingQueueInputStream stream;
 
   private ParserTask parserTask = null;
-  private FutureTask<HtmlSaxParserContext> futureTask = null;
+  private FutureTask<Html4SaxParserContext> futureTask = null;
   private ExecutorService executor = null;
 
   public
-  HtmlSaxPushParser(Ruby ruby, RubyClass rubyClass)
+  Html4SaxPushParser(Ruby ruby, RubyClass rubyClass)
   {
     super(ruby, rubyClass);
   }
@@ -111,7 +111,7 @@ public class HtmlSaxPushParser extends RubyObject
     final ByteArrayInputStream data = NokogiriHelpers.stringBytesToStream(chunk);
     if (data == null) {
       terminateTask(context.runtime);
-      throw XmlSyntaxError.createHTMLSyntaxError(context.runtime).toThrowable(); // Nokogiri::HTML::SyntaxError
+      throw XmlSyntaxError.createHTMLSyntaxError(context.runtime).toThrowable(); // Nokogiri::HTML4::SyntaxError
     }
 
     int errorCount0 = parserTask.getErrorCount();
@@ -149,12 +149,12 @@ public class HtmlSaxPushParser extends RubyObject
 
       assert saxParser != null : "saxParser null";
       parserTask = new ParserTask(context, saxParser, stream);
-      futureTask = new FutureTask<HtmlSaxParserContext>((Callable) parserTask);
+      futureTask = new FutureTask<Html4SaxParserContext>((Callable) parserTask);
       executor = Executors.newSingleThreadExecutor(new ThreadFactory() {
         @Override
         public Thread newThread(Runnable r) {
           Thread t = new Thread(r);
-          t.setName("HtmlSaxPushParser");
+          t.setName("Html4SaxPushParser");
           t.setDaemon(true);
           return t;
         }
@@ -187,14 +187,14 @@ public class HtmlSaxPushParser extends RubyObject
     futureTask = null;
   }
 
-  private static HtmlSaxParserContext
+  private static Html4SaxParserContext
   parse(final Ruby runtime, final InputStream stream)
   {
-    RubyClass klazz = getNokogiriClass(runtime, "Nokogiri::HTML::SAX::ParserContext");
-    return HtmlSaxParserContext.parse_stream(runtime, klazz, stream);
+    RubyClass klazz = getNokogiriClass(runtime, "Nokogiri::HTML4::SAX::ParserContext");
+    return Html4SaxParserContext.parse_stream(runtime, klazz, stream);
   }
 
-  static class ParserTask extends XmlSaxPushParser.ParserTask /* <HtmlSaxPushParser> */
+  static class ParserTask extends XmlSaxPushParser.ParserTask /* <Html4SaxPushParser> */
   {
 
     private
@@ -204,10 +204,10 @@ public class HtmlSaxPushParser extends RubyObject
     }
 
     @Override
-    public HtmlSaxParserContext
+    public Html4SaxParserContext
     call() throws Exception
     {
-      return (HtmlSaxParserContext) super.call();
+      return (Html4SaxParserContext) super.call();
     }
 
   }

data/ext/java/nokogiri/NokogiriService.java

@@ -40,9 +40,9 @@ public class NokogiriService implements BasicLibraryService
   {
     Map<String, RubyClass> nokogiriClassCache = new HashMap<String, RubyClass>();
     nokogiriClassCache.put("Nokogiri::EncodingHandler", (RubyClass)ruby.getClassFromPath("Nokogiri::EncodingHandler"));
-    nokogiriClassCache.put("Nokogiri::HTML::Document", (RubyClass)ruby.getClassFromPath("Nokogiri::HTML::Document"));
-    nokogiriClassCache.put("Nokogiri::HTML::ElementDescription",
-                           (RubyClass)ruby.getClassFromPath("Nokogiri::HTML::ElementDescription"));
+    nokogiriClassCache.put("Nokogiri::HTML4::Document", (RubyClass)ruby.getClassFromPath("Nokogiri::HTML4::Document"));
+    nokogiriClassCache.put("Nokogiri::HTML4::ElementDescription",
+                           (RubyClass)ruby.getClassFromPath("Nokogiri::HTML4::ElementDescription"));
     nokogiriClassCache.put("Nokogiri::XML::Attr", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::Attr"));
     nokogiriClassCache.put("Nokogiri::XML::Document", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::Document"));
     nokogiriClassCache.put("Nokogiri::XML::DocumentFragment",
@@ -81,7 +81,7 @@ public class NokogiriService implements BasicLibraryService
     RubyModule nokogiri = ruby.defineModule("Nokogiri");
     RubyModule xmlModule = nokogiri.defineModuleUnder("XML");
     RubyModule xmlSaxModule = xmlModule.defineModuleUnder("SAX");
-    RubyModule htmlModule = nokogiri.defineModuleUnder("HTML");
+    RubyModule htmlModule = nokogiri.defineModuleUnder("HTML4");
     RubyModule htmlSaxModule = htmlModule.defineModuleUnder("SAX");
     RubyModule xsltModule = nokogiri.defineModuleUnder("XSLT");
 
@@ -201,11 +201,11 @@ public class NokogiriService implements BasicLibraryService
   {
     RubyClass htmlElemDesc = htmlModule.defineClassUnder("ElementDescription", ruby.getObject(),
                              HTML_ELEMENT_DESCRIPTION_ALLOCATOR);
-    htmlElemDesc.defineAnnotatedMethods(HtmlElementDescription.class);
+    htmlElemDesc.defineAnnotatedMethods(Html4ElementDescription.class);
 
     RubyClass htmlEntityLookup = htmlModule.defineClassUnder("EntityLookup", ruby.getObject(),
                                  HTML_ENTITY_LOOKUP_ALLOCATOR);
-    htmlEntityLookup.defineAnnotatedMethods(HtmlEntityLookup.class);
+    htmlEntityLookup.defineAnnotatedMethods(Html4EntityLookup.class);
   }
 
   private void
@@ -216,7 +216,7 @@ public class NokogiriService implements BasicLibraryService
 
     //RubyModule htmlDoc = html.defineOrGetClassUnder("Document", document);
     RubyModule htmlDocument = htmlModule.defineClassUnder("Document", xmlDocument, HTML_DOCUMENT_ALLOCATOR);
-    htmlDocument.defineAnnotatedMethods(HtmlDocument.class);
+    htmlDocument.defineAnnotatedMethods(Html4Document.class);
   }
 
   private void
@@ -231,11 +231,11 @@ public class NokogiriService implements BasicLibraryService
 
     RubyClass htmlSaxPushParser = htmlSaxModule.defineClassUnder("PushParser", ruby.getObject(),
                                   HTML_SAXPUSHPARSER_ALLOCATOR);
-    htmlSaxPushParser.defineAnnotatedMethods(HtmlSaxPushParser.class);
+    htmlSaxPushParser.defineAnnotatedMethods(Html4SaxPushParser.class);
 
     RubyClass htmlSaxParserContext = htmlSaxModule.defineClassUnder("ParserContext", xmlSaxParserContext,
                                      HTML_SAXPARSER_CONTEXT_ALLOCATOR);
-    htmlSaxParserContext.defineAnnotatedMethods(HtmlSaxParserContext.class);
+    htmlSaxParserContext.defineAnnotatedMethods(Html4SaxParserContext.class);
   }
 
   private void
@@ -255,30 +255,30 @@ public class NokogiriService implements BasicLibraryService
 
   public static final ObjectAllocator HTML_DOCUMENT_ALLOCATOR = new ObjectAllocator()
   {
-    private HtmlDocument htmlDocument = null;
+    private Html4Document htmlDocument = null;
     public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-      if (htmlDocument == null) { htmlDocument = new HtmlDocument(runtime, klazz); }
+      if (htmlDocument == null) { htmlDocument = new Html4Document(runtime, klazz); }
       try {
-        HtmlDocument clone = (HtmlDocument) htmlDocument.clone();
+        Html4Document clone = (Html4Document) htmlDocument.clone();
         clone.setMetaClass(klazz);
         return clone;
       } catch (CloneNotSupportedException e) {
-        return new HtmlDocument(runtime, klazz);
+        return new Html4Document(runtime, klazz);
       }
     }
   };
 
   private static final ObjectAllocator HTML_SAXPARSER_CONTEXT_ALLOCATOR = new ObjectAllocator()
   {
-    private HtmlSaxParserContext htmlSaxParserContext = null;
+    private Html4SaxParserContext htmlSaxParserContext = null;
     public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-      if (htmlSaxParserContext == null) { htmlSaxParserContext = new HtmlSaxParserContext(runtime, klazz); }
+      if (htmlSaxParserContext == null) { htmlSaxParserContext = new Html4SaxParserContext(runtime, klazz); }
       try {
-        HtmlSaxParserContext clone = (HtmlSaxParserContext) htmlSaxParserContext.clone();
+        Html4SaxParserContext clone = (Html4SaxParserContext) htmlSaxParserContext.clone();
         clone.setMetaClass(klazz);
         return clone;
       } catch (CloneNotSupportedException e) {
-        return new HtmlSaxParserContext(runtime, klazz);
+        return new Html4SaxParserContext(runtime, klazz);
       }
     }
   };
@@ -287,7 +287,7 @@ public class NokogiriService implements BasicLibraryService
     new ObjectAllocator()
   {
     public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-      return new HtmlElementDescription(runtime, klazz);
+      return new Html4ElementDescription(runtime, klazz);
     }
   };
 
@@ -295,7 +295,7 @@ public class NokogiriService implements BasicLibraryService
     new ObjectAllocator()
   {
     public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-      return new HtmlEntityLookup(runtime, klazz);
+      return new Html4EntityLookup(runtime, klazz);
     }
   };
 
@@ -571,7 +571,7 @@ public class NokogiriService implements BasicLibraryService
   private static final ObjectAllocator HTML_SAXPUSHPARSER_ALLOCATOR = new ObjectAllocator()
   {
     public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-      return new HtmlSaxPushParser(runtime, klazz);
+      return new Html4SaxPushParser(runtime, klazz);
     }
   };
 

data/ext/java/nokogiri/XmlAttr.java

@@ -117,7 +117,7 @@ public class XmlAttr extends XmlNode
     String attrName = ((Attr) node).getName();
     if (attrName == null) { return context.nil; }
 
-    if (node.getNamespaceURI() != null && !(document(context.runtime) instanceof HtmlDocument)) {
+    if (node.getNamespaceURI() != null && !(document(context.runtime) instanceof Html4Document)) {
       attrName = NokogiriHelpers.getLocalPart(attrName);
       if (attrName == null) { return context.nil; }
     }
@@ -137,7 +137,7 @@ public class XmlAttr extends XmlNode
   isHtml(ThreadContext context)
   {
     return document(context).getMetaClass().isKindOfModule(getNokogiriClass(context.getRuntime(),
-           "Nokogiri::HTML::Document"));
+           "Nokogiri::HTML4::Document"));
   }
 
   @Override

data/ext/java/nokogiri/XmlDocument.java

@@ -280,8 +280,8 @@ public class XmlDocument extends XmlNode
     XmlDocument xmlDocument;
     try {
       Document docNode = createNewDocument(runtime);
-      if ("Nokogiri::HTML::Document".equals(((RubyClass)klazz).getName())) {
-        xmlDocument = new HtmlDocument(context.runtime, (RubyClass) klazz, docNode);
+      if ("Nokogiri::HTML4::Document".equals(((RubyClass)klazz).getName())) {
+        xmlDocument = new Html4Document(context.runtime, (RubyClass) klazz, docNode);
       } else {
         xmlDocument = new XmlDocument(context.runtime, (RubyClass) klazz, docNode);
       }
@@ -443,7 +443,7 @@ public class XmlDocument extends XmlNode
       return new_root;
     }
     if (!(new_root instanceof XmlNode)) {
-        throw context.runtime.newArgumentError("expected Nokogiri::XML::Node but received " + new_root.getType());
+      throw context.runtime.newArgumentError("expected Nokogiri::XML::Node but received " + new_root.getType());
     }
     XmlNode newRoot = asXmlNode(context, new_root);
 
@@ -657,17 +657,17 @@ public class XmlDocument extends XmlNode
     }
     String algorithmURI = null;
     switch (mode) {
-    case 0:  // XML_C14N_1_0
-      if (with_comments) { algorithmURI = Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS; }
-      else { algorithmURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS; }
-      break;
-    case 1:  // XML_C14N_EXCLUSIVE_1_0
-      if (with_comments) { algorithmURI = Canonicalizer.ALGO_ID_C14N_EXCL_WITH_COMMENTS; }
-      else { algorithmURI = Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS; }
-      break;
-    case 2: // XML_C14N_1_1 = 2
-      if (with_comments) { algorithmURI = Canonicalizer.ALGO_ID_C14N11_WITH_COMMENTS; }
-      else { algorithmURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS; }
+      case 0:  // XML_C14N_1_0
+        if (with_comments) { algorithmURI = Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS; }
+        else { algorithmURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS; }
+        break;
+      case 1:  // XML_C14N_EXCLUSIVE_1_0
+        if (with_comments) { algorithmURI = Canonicalizer.ALGO_ID_C14N_EXCL_WITH_COMMENTS; }
+        else { algorithmURI = Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS; }
+        break;
+      case 2: // XML_C14N_1_1 = 2
+        if (with_comments) { algorithmURI = Canonicalizer.ALGO_ID_C14N11_WITH_COMMENTS; }
+        else { algorithmURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS; }
     }
     try {
       Canonicalizer canonicalizer = Canonicalizer.getInstance(algorithmURI);

data/ext/java/nokogiri/XmlElementContent.java

@@ -142,11 +142,11 @@ public class XmlElementContent extends RubyObject
     right = runtime.getNil();
 
     switch (type) {
-    case SEQ:
-    case OR:
-      applyGroup(runtime, klass, doc, iter);
-    default:
-      // noop
+      case SEQ:
+      case OR:
+        applyGroup(runtime, klass, doc, iter);
+      default:
+        // noop
     }
   }
 

data/ext/java/nokogiri/XmlNode.java

@@ -645,7 +645,7 @@ public class XmlNode extends RubyObject
 
     final XmlDocument doc = document(context.runtime);
     for (int i = 0; i < nodeMap.getLength(); i++) {
-      if ((doc instanceof HtmlDocument) || !NokogiriHelpers.isNamespace(nodeMap.item(i))) {
+      if ((doc instanceof Html4Document) || !NokogiriHelpers.isNamespace(nodeMap.item(i))) {
         attr.append(getCachedNodeOrCreate(runtime, nodeMap.item(i)));
       }
     }
@@ -811,8 +811,8 @@ public class XmlNode extends RubyObject
     XmlDocument document = document(runtime);
     if (document == null) { return context.nil; }
 
-    if (document instanceof HtmlDocument) {
-      klass = getNokogiriClass(runtime, "Nokogiri::HTML::Document");
+    if (document instanceof Html4Document) {
+      klass = getNokogiriClass(runtime, "Nokogiri::HTML4::Document");
       ctx = new HtmlDomParserContext(runtime, options);
       ((HtmlDomParserContext) ctx).enableDocumentFragment();
       ctx.setStringInputSource(context, str, context.nil);
@@ -824,7 +824,7 @@ public class XmlNode extends RubyObject
 
     // TODO: for some reason, document.getEncoding() can be null or nil (don't know why)
     // run `test_parse_with_unparented_html_text_context_node' few times to see this happen
-    if (document instanceof HtmlDocument && !(document.getEncoding() == null || document.getEncoding().isNil())) {
+    if (document instanceof Html4Document && !(document.getEncoding() == null || document.getEncoding().isNil())) {
       HtmlDomParserContext htmlCtx = (HtmlDomParserContext) ctx;
       htmlCtx.setEncoding(document.getEncoding().asJavaString());
     }
@@ -1148,7 +1148,7 @@ public class XmlNode extends RubyObject
   namespace(ThreadContext context)
   {
     final XmlDocument doc = document(context.runtime);
-    if (doc instanceof HtmlDocument) { return context.nil; }
+    if (doc instanceof Html4Document) { return context.nil; }
 
     String namespaceURI = node.getNamespaceURI();
     if (namespaceURI == null || namespaceURI.isEmpty()) {
@@ -1183,7 +1183,7 @@ public class XmlNode extends RubyObject
     // updated.
     final XmlDocument doc = document(context.runtime);
     if (doc == null) { return context.runtime.newEmptyArray(); }
-    if (doc instanceof HtmlDocument) { return context.runtime.newEmptyArray(); }
+    if (doc instanceof Html4Document) { return context.runtime.newEmptyArray(); }
 
     List<XmlNamespace> namespaces = doc.getNamespaceCache().get(node);
     return context.runtime.newArray((List) namespaces);
@@ -1199,7 +1199,7 @@ public class XmlNode extends RubyObject
   {
     final XmlDocument doc = document(context.runtime);
     if (doc == null) { return context.runtime.newEmptyArray(); }
-    if (doc instanceof HtmlDocument) { return context.runtime.newEmptyArray(); }
+    if (doc instanceof Html4Document) { return context.runtime.newEmptyArray(); }
 
     Node previousNode;
     if (node.getNodeType() == Node.ELEMENT_NODE) {
@@ -1335,7 +1335,7 @@ public class XmlNode extends RubyObject
   private boolean
   isHtmlDoc(ThreadContext context)
   {
-    return document(context).getMetaClass().isKindOfModule(getNokogiriClass(context.runtime, "Nokogiri::HTML::Document"));
+    return document(context).getMetaClass().isKindOfModule(getNokogiriClass(context.runtime, "Nokogiri::HTML4::Document"));
   }
 
   private boolean
@@ -1516,56 +1516,56 @@ public class XmlNode extends RubyObject
   {
     String type;
     switch (node.getNodeType()) {
-    case Node.ELEMENT_NODE:
-      if (this instanceof XmlElementDecl) {
-        type = "ELEMENT_DECL";
-      } else if (this instanceof XmlAttributeDecl) {
-        type = "ATTRIBUTE_DECL";
-      } else if (this instanceof XmlEntityDecl) {
-        type = "ENTITY_DECL";
-      } else {
-        type = "ELEMENT_NODE";
-      }
-      break;
-    case Node.ATTRIBUTE_NODE:
-      type = "ATTRIBUTE_NODE";
-      break;
-    case Node.TEXT_NODE:
-      type = "TEXT_NODE";
-      break;
-    case Node.CDATA_SECTION_NODE:
-      type = "CDATA_SECTION_NODE";
-      break;
-    case Node.ENTITY_REFERENCE_NODE:
-      type = "ENTITY_REF_NODE";
-      break;
-    case Node.ENTITY_NODE:
-      type = "ENTITY_NODE";
-      break;
-    case Node.PROCESSING_INSTRUCTION_NODE:
-      type = "PI_NODE";
-      break;
-    case Node.COMMENT_NODE:
-      type = "COMMENT_NODE";
-      break;
-    case Node.DOCUMENT_NODE:
-      if (this instanceof HtmlDocument) {
-        type = "HTML_DOCUMENT_NODE";
-      } else {
-        type = "DOCUMENT_NODE";
-      }
-      break;
-    case Node.DOCUMENT_TYPE_NODE:
-      type = "DOCUMENT_TYPE_NODE";
-      break;
-    case Node.DOCUMENT_FRAGMENT_NODE:
-      type = "DOCUMENT_FRAG_NODE";
-      break;
-    case Node.NOTATION_NODE:
-      type = "NOTATION_NODE";
-      break;
-    default:
-      return context.runtime.newFixnum(0);
+      case Node.ELEMENT_NODE:
+        if (this instanceof XmlElementDecl) {
+          type = "ELEMENT_DECL";
+        } else if (this instanceof XmlAttributeDecl) {
+          type = "ATTRIBUTE_DECL";
+        } else if (this instanceof XmlEntityDecl) {
+          type = "ENTITY_DECL";
+        } else {
+          type = "ELEMENT_NODE";
+        }
+        break;
+      case Node.ATTRIBUTE_NODE:
+        type = "ATTRIBUTE_NODE";
+        break;
+      case Node.TEXT_NODE:
+        type = "TEXT_NODE";
+        break;
+      case Node.CDATA_SECTION_NODE:
+        type = "CDATA_SECTION_NODE";
+        break;
+      case Node.ENTITY_REFERENCE_NODE:
+        type = "ENTITY_REF_NODE";
+        break;
+      case Node.ENTITY_NODE:
+        type = "ENTITY_NODE";
+        break;
+      case Node.PROCESSING_INSTRUCTION_NODE:
+        type = "PI_NODE";
+        break;
+      case Node.COMMENT_NODE:
+        type = "COMMENT_NODE";
+        break;
+      case Node.DOCUMENT_NODE:
+        if (this instanceof Html4Document) {
+          type = "HTML_DOCUMENT_NODE";
+        } else {
+          type = "DOCUMENT_NODE";
+        }
+        break;
+      case Node.DOCUMENT_TYPE_NODE:
+        type = "DOCUMENT_TYPE_NODE";
+        break;
+      case Node.DOCUMENT_FRAGMENT_NODE:
+        type = "DOCUMENT_FRAG_NODE";
+        break;
+      case Node.NOTATION_NODE:
+        type = "NOTATION_NODE";
+        break;
+      default:
+        return context.runtime.newFixnum(0);
     }
 
     return getNokogiriClass(context.runtime, "Nokogiri::XML::Node").getConstant(type);
@@ -1676,23 +1676,23 @@ public class XmlNode extends RubyObject
       Node parent = thisNode.getParentNode();
 
       switch (scheme) {
-      case CHILD:
-        Node[] children = adoptAsChild(thisNode, otherNode);
-        if (children.length == 1 && otherNode == children[0]) {
+        case CHILD:
+          Node[] children = adoptAsChild(thisNode, otherNode);
+          if (children.length == 1 && otherNode == children[0]) {
+            break;
+          } else {
+            nodeOrTags = nodeArrayToRubyArray(context.runtime, children);
+          }
+          break;
+        case PREV_SIBLING:
+          adoptAsPrevSibling(context, parent, thisNode, otherNode);
+          break;
+        case NEXT_SIBLING:
+          adoptAsNextSibling(context, parent, thisNode, otherNode);
+          break;
+        case REPLACEMENT:
+          adoptAsReplacement(context, parent, thisNode, otherNode);
           break;
-        } else {
-          nodeOrTags = nodeArrayToRubyArray(context.runtime, children);
-        }
-        break;
-      case PREV_SIBLING:
-        adoptAsPrevSibling(context, parent, thisNode, otherNode);
-        break;
-      case NEXT_SIBLING:
-        adoptAsNextSibling(context, parent, thisNode, otherNode);
-        break;
-      case REPLACEMENT:
-        adoptAsReplacement(context, parent, thisNode, otherNode);
-        break;
       }
     } catch (Exception e) {
       throw context.runtime.newRuntimeError(e.toString());