nokogiri 1.11.1-java → 1.11.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d85f8024902ba0c8e8000b2e697368ccd2b5f3cb24daa6d2696baf09ca8efeb
-  data.tar.gz: a34653303414cf3670c64ba5e820d804efa566575b6e6fd0372c587da253e96f
+  metadata.gz: d7566c9ba7c4bfc525562b8f80e7da42f28780dd7ffa7fb2904e2cea4c6c5d7d
+  data.tar.gz: 570824e9e3a95884c947544fd59205a916f580f8c4ecfd36e92ceebe7b84e3af
 SHA512:
-  metadata.gz: d402f90c16cfbecb8746b9afa8b918735c083b1d6363a86d313911a3329fc936ac9fc2ac12122d2fe21c49d212ba95d7b09d2309dd69ea713afb16e7e5f79814
-  data.tar.gz: ec647fdf9fe11f57374ed845cd5cafded912b3ec239cf72cf7a08621772166bb5c9386b271e5513925f0d6ee63d0877629d0c83b721a66fa872df3500c548c69
+  metadata.gz: c2dfd6bec1a38767f3aa2ed4ef45d110d32e72f357a8ff2b6c1cde04b6300f30d136a81b67d429b2991aed4c5687e341577ea3e76be625addaabf68cabdfcdfa
+  data.tar.gz: 618f739f628a5df78c18415ecb0f1fee22b4aa0c5292b349eb7e5e561bd0929b863b5b937c21e4f724b050d54942f469d584374b5a0e0b5c5eda4908bb8413f9

data/LICENSE-DEPENDENCIES.md

@@ -7,22 +7,22 @@ Note that this document is broken into multiple sections, each of which describe
 <!-- toc -->
 
 - [Default platform release ("ruby")](#default-platform-release-ruby)
-- [Native LinuxⓇ platform releases ("x86_64-linux" and "arm64-linux")](#native-linux-platform-releases-x86_64-linux-and-arm64-linux)
+- [Native LinuxⓇ platform releases ("x86_64-linux" and "arm64-linux")](#native-linux%E2%93%A1-platform-releases-x86_64-linux-and-arm64-linux)
 - [Native Darwin (macOSⓇ) platform releases ("x86_64-darwin" and "arm64-darwin")](#native-darwin-macos%E2%93%A1-platform-releases-x86_64-darwin-and-arm64-darwin)
 - [Native WindowsⓇ platform releases ("x86-mingw32" and "x64-mingw32")](#native-windows%E2%93%A1-platform-releases-x86-mingw32-and-x64-mingw32)
 - [JavaⓇ (JRuby) platform release ("java")](#java%E2%93%A1-jruby-platform-release-java)
 - [Appendix: Dependencies' License Texts](#appendix-dependencies-license-texts)
-  * [libxml2](#libxml2)
-  * [libxslt](#libxslt)
-  * [zlib](#zlib)
-  * [libiconv](#libiconv)
-  * [isorelax](#isorelax)
-  * [jing](#jing)
-  * [nekodtd](#nekodtd)
-  * [nekohtml](#nekohtml)
-  * [xalan](#xalan)
-  * [xerces](#xerces)
-  * [xml-apis](#xml-apis)
+    * [libxml2](#libxml2)
+    * [libxslt](#libxslt)
+    * [zlib](#zlib)
+    * [libiconv](#libiconv)
+    * [isorelax](#isorelax)
+    * [jing](#jing)
+    * [nekodtd](#nekodtd)
+    * [nekohtml](#nekohtml)
+    * [xalan](#xalan)
+    * [xerces](#xerces)
+    * [xml-apis](#xml-apis)
 
 <!-- tocstop -->
 

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright 2008 -- 2018 by Aaron Patterson, Mike Dalessio, Charles Nutter, Sergio Arbeo, Patrick Mahoney, Yoko Harada, Akinori MUSHA, John Shahid, Lars Kanis
+Copyright 2008 -- 2021 by Mike Dalessio, Aaron Patterson, Yoko Harada, Akinori MUSHA, John Shahid, Karol Bucek, Lars Kanis, Sergio Arbeo, Timothy Elliott, Nobuyoshi Nakada, Charles Nutter, Patrick Mahoney.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.md

@@ -27,7 +27,7 @@ Some guiding principles Nokogiri tries to follow:
 ## Status
 
 [![Concourse CI](https://ci.nokogiri.org/api/v1/teams/nokogiri-core/pipelines/nokogiri/jobs/cruby-2.7/badge)](https://ci.nokogiri.org/teams/nokogiri-core/pipelines/nokogiri)
-[![Appveyor CI](https://ci.appveyor.com/api/projects/status/xj2pqwvlxwuwgr06/branch/master?svg=true)](https://ci.appveyor.com/project/flavorjones/nokogiri/branch/master)
+[![Appveyor CI](https://ci.appveyor.com/api/projects/status/xj2pqwvlxwuwgr06/branch/main?svg=true)](https://ci.appveyor.com/project/flavorjones/nokogiri/branch/main)
 [![Code Climate](https://codeclimate.com/github/sparklemotion/nokogiri.svg)](https://codeclimate.com/github/sparklemotion/nokogiri)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/59c67b0e8976027a45ad/test_coverage)](https://codeclimate.com/github/sparklemotion/nokogiri/test_coverage)
 
@@ -36,31 +36,39 @@ Some guiding principles Nokogiri tries to follow:
 [![Tidelift dependencies](https://tidelift.com/badges/package/rubygems/nokogiri)](https://tidelift.com/subscription/pkg/rubygems-nokogiri?utm_source=rubygems-nokogiri&utm_medium=referral&utm_campaign=readme)
 
 
-## Support and Help
+## Support, Getting Help, and Reporting Issues
 
 All official documentation is posted at https://nokogiri.org (the source for which is at https://github.com/sparklemotion/nokogiri.org/, and we welcome contributions).
 
+Consider subscribing to [Tidelift][tidelift] which provides license assurances and timely security notifications for your open source dependencies, including Nokogiri. [Tidelift][tidelift] subscriptions also help the Nokogiri maintainers fund our [automated testing](https://ci.nokogiri.org) which in turn allows us to ship releases, bugfixes, and security updates more often.
+
+  [tidelift]: https://tidelift.com/subscription/pkg/rubygems-nokogiri?utm_source=rubygems-nokogiri&utm_medium=referral&utm_campaign=readme
+
 ### Reading
 
-Your first stops for API documentation should be:
+Your first stops for learning more about Nokogiri should be:
 
-- RDocs: https://nokogiri.org/rdoc/index.html
+- [API Documentation](https://nokogiri.org/rdoc/index.html)
+- [Tutorials](https://nokogiri.org/tutorials/toc.html)
 - An excellent community-maintained [Cheat Sheet](https://github.com/sparklemotion/nokogiri/wiki/Cheat-sheet)
 
 
-### Questions
+### Ask For Help
 
-If you'd like to talk to a human:
+There are a few ways to ask exploratory questions:
 
-- The Discord chat channel is `#nokogiri-💎` at https://discord.gg/UyQnKrT
-- The Gitter chat channel is https://gitter.im/sparklemotion/nokogiri
-- The IRC chat channel is `#nokogiri` on freenode.
+- The Ruby Discord chat server is active at https://discord.gg/UyQnKrT
 - The Nokogiri mailing list is active at https://groups.google.com/group/nokogiri-talk
-- The Nokogiri bug tracker is at https://github.com/sparklemotion/nokogiri/issues
+- Open an issue using the "Help Request" template at https://github.com/sparklemotion/nokogiri/issues
 
-Consider subscribing to [Tidelift][tidelift] which provides license assurances and timely security notifications for your open source dependencies, including Nokogiri. [Tidelift][tidelift] subscriptions also help the Nokogiri maintainers fund our [automated testing](https://ci.nokogiri.org) which in turn allows us to ship releases, bugfixes, and security updates more often.
+Please do not mail the maintainers at their personal addresses.
 
-  [tidelift]: https://tidelift.com/subscription/pkg/rubygems-nokogiri?utm_source=rubygems-nokogiri&utm_medium=referral&utm_campaign=readme
+
+### Report A Bug
+
+The Nokogiri bug tracker is at https://github.com/sparklemotion/nokogiri/issues
+
+Please use the "Bug Report" or "Installation Difficulties" templates.
 
 
 ### Security and Vulnerability Reporting
@@ -235,10 +243,7 @@ See [`LICENSE-DEPENDENCIES.md`](LICENSE-DEPENDENCIES.md) for more information on
 
 ## Contributing
 
-```bash
-bundle install
-bundle exec rake compile test
-```
+See [`CONTRIBUTING.md`](CONTRIBUTING.md) for an intro guide to developing Nokogiri.
 
 
 ## Code of Conduct

data/dependencies.yml

@@ -1,10 +1,10 @@
 libxml2:
-  version: "2.9.10"
-  sha256: "aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f"
+  version: "2.9.12"
+  sha256: "c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92"
   #  manually verified checksum:
   #
-  #    $ gpg --verify libxml2-2.9.10.tar.gz.asc ports/archives/libxml2-2.9.10.tar.gz 
-  #    gpg: Signature made Wed 30 Oct 2019 03:15:42 PM EDT
+  #    $ gpg --verify libxml2-2.9.12.tar.gz.asc ports/archives/libxml2-2.9.12.tar.gz
+  #    gpg: Signature made Thu 13 May 2021 02:59:16 PM EDT
   #    gpg:                using RSA key DB46681BB91ADCEA170FA2D415588B26596BEA5D
   #    gpg: Good signature from "Daniel Veillard (Red Hat work email) <veillard@redhat.com>" [unknown]
   #    gpg:                 aka "Daniel Veillard <Daniel.Veillard@w3.org>" [unknown]
@@ -17,14 +17,14 @@ libxml2:
   #
   #    -----BEGIN PGP SIGNATURE-----
   #    
-  #    iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAl254V4ACgkQFViLJllr
-  #    6l0ldAf6Azt4/oKDfMKRd+xaykUrb+34dr2ZRsjRDS1cnelAtL9TCWhE5lOkLI3c
-  #    3FyNRaLhOEOOluZmKTJYyzS42JSSHDhxGj14gIeyafOjvRhHG3h1m5GvMmvgKWkd
-  #    qzxFrVFSG26iWJxMvxIA88t7M+QHb7ff7xR29ETJscewEmAd3LmZITglK02lWeGz
-  #    LfxfLuakM6RnCUu0dzacJKO0nMOKju+RL/N9bciI/UOhNYEkWqPnzC0GzbvFLqDu
-  #    rM+OvCSewSTziiejpdrUwYXkY5Ui2+cxUbacLauEr8iRLg7xXKqv27NORE4yeQcS
-  #    LgIhxG/qSNfihMS6E1ZO5bK2DbGCZQ==
-  #    =ZNuc
+  #    iQEzBAABCAAdFiEE20ZoG7ka3OoXD6LUFViLJllr6l0FAmCddwQACgkQFViLJllr
+  #    6l11LQgAioRTdfmcC+uK/7+6HPtF/3c5zkX6j8VGYuvFBwZ0jayqMRBAl++fcpjE
+  #    JUU/JKebSZ/KCYjzyeOWK/i3Gq77iqm3UbZFB85rqu4a5P3gmj/4STWVyAx0KU3z
+  #    G3jKqDhJOt7c0acXb5lh2DngfDa1dn/VGcQcIXsqplNxNr4ET7MnSJjZ3nlxYfW2
+  #    E5vWBdPCMUeXDBl6MjYvw9XnGGBLUAaEJWoFToG6jKmVf4GAd9nza20jj5dtbcJq
+  #    QEOaSDKDr+f9h2NS8haOhJ9vOpy52PdeGzaFlbRkXarGXuAr8kITgATVs8FAqcgv
+  #    MoVhmrO5r2hJf0dCM9fZoYqzpMfmNA==
+  #    =KfJ9
   #    -----END PGP SIGNATURE-----
   #
 

data/ext/java/nokogiri/EncodingHandler.java

@@ -1,35 +1,3 @@
-/**
- * (The MIT License)
- *
- * Copyright (c) 2008 - 2011:
- *
- * * {Aaron Patterson}[http://tenderlovemaking.com]
- * * {Mike Dalessio}[http://mike.daless.io]
- * * {Charles Nutter}[http://blog.headius.com]
- * * {Sergio Arbeo}[http://www.serabe.com]
- * * {Patrick Mahoney}[http://polycrystal.org]
- * * {Yoko Harada}[http://yokolet.blogspot.com]
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * 'Software'), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
 package nokogiri;
 
 import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
@@ -52,73 +20,92 @@ import org.jruby.runtime.builtin.IRubyObject;
  *
  * @author Patrick Mahoney <pat@polycrstal.org>
  */
-@JRubyClass(name="Nokogiri::EncodingHandler")
-public class EncodingHandler extends RubyObject {
-    protected static HashMap<String,String> map = new HashMap<String,String>();
-    static {
-        addInitial();
-    }
+@JRubyClass(name = "Nokogiri::EncodingHandler")
+public class EncodingHandler extends RubyObject
+{
+  protected static HashMap<String, String> map = new HashMap<String, String>();
+  static
+  {
+    addInitial();
+  }
 
-    protected String name;
+  protected String name;
 
-    protected static void addInitial() {
-        map.put("UTF-8", "UTF-8");
-    }
-
-    public EncodingHandler(Ruby ruby, RubyClass klass, String value) {
-        super(ruby, klass);
-        name = value;
-    }
+  protected static void
+  addInitial()
+  {
+    map.put("UTF-8", "UTF-8");
+  }
 
-    @JRubyMethod(name="[]", meta=true)
-    public static IRubyObject get(ThreadContext context,
-                                  IRubyObject _klass,
-                                  IRubyObject keyObj) {
-        Ruby ruby = context.getRuntime();
-        String key = keyObj.toString();
-        String value = map.get(key);
-        if (value == null)
-            return ruby.getNil();
+  public
+  EncodingHandler(Ruby ruby, RubyClass klass, String value)
+  {
+    super(ruby, klass);
+    name = value;
+  }
 
-        return new EncodingHandler(
-            ruby,
-            getNokogiriClass(ruby, "Nokogiri::EncodingHandler"),
-            value);
+  @JRubyMethod(name = "[]", meta = true)
+  public static IRubyObject
+  get(ThreadContext context,
+      IRubyObject _klass,
+      IRubyObject keyObj)
+  {
+    Ruby ruby = context.getRuntime();
+    String key = keyObj.toString();
+    String value = map.get(key);
+    if (value == null) {
+      return ruby.getNil();
     }
 
-    @JRubyMethod(meta=true)
-    public static IRubyObject delete(ThreadContext context,
-                                     IRubyObject _klass,
-                                     IRubyObject keyObj) {
-        String key = keyObj.toString();
-        String value = map.remove(key);
-        if (value == null)
-            return context.getRuntime().getNil();
-        return context.getRuntime().newString(value);
-    }
+    return new EncodingHandler(
+             ruby,
+             getNokogiriClass(ruby, "Nokogiri::EncodingHandler"),
+             value);
+  }
 
-    @JRubyMethod(name="clear_aliases!", meta=true)
-    public static IRubyObject clear_aliases(ThreadContext context,
-                                            IRubyObject _klass) {
-        map.clear();
-        addInitial();
-        return context.getRuntime().getNil();
+  @JRubyMethod(meta = true)
+  public static IRubyObject
+  delete (ThreadContext context,
+          IRubyObject _klass,
+          IRubyObject keyObj)
+  {
+    String key = keyObj.toString();
+    String value = map.remove(key);
+    if (value == null) {
+      return context.getRuntime().getNil();
     }
+    return context.getRuntime().newString(value);
+  }
 
-    @JRubyMethod(meta=true)
-    public static IRubyObject alias(ThreadContext context,
-                                    IRubyObject _klass,
-                                    IRubyObject orig,
-                                    IRubyObject alias) {
-        String value = map.get(orig.toString());
-        if (value != null)
-            map.put(alias.toString(), value);
+  @JRubyMethod(name = "clear_aliases!", meta = true)
+  public static IRubyObject
+  clear_aliases(ThreadContext context,
+                IRubyObject _klass)
+  {
+    map.clear();
+    addInitial();
+    return context.getRuntime().getNil();
+  }
 
-        return context.getRuntime().getNil();
+  @JRubyMethod(meta = true)
+  public static IRubyObject
+  alias(ThreadContext context,
+        IRubyObject _klass,
+        IRubyObject orig,
+        IRubyObject alias)
+  {
+    String value = map.get(orig.toString());
+    if (value != null) {
+      map.put(alias.toString(), value);
     }
 
-    @JRubyMethod
-    public IRubyObject name(ThreadContext context) {
-        return context.getRuntime().newString(name);
-    }
+    return context.getRuntime().getNil();
+  }
+
+  @JRubyMethod
+  public IRubyObject
+  name(ThreadContext context)
+  {
+    return context.getRuntime().newString(name);
+  }
 }

data/ext/java/nokogiri/HtmlDocument.java

@@ -1,35 +1,3 @@
-/**
- * (The MIT License)
- *
- * Copyright (c) 2008 - 2012:
- *
- * * {Aaron Patterson}[http://tenderlovemaking.com]
- * * {Mike Dalessio}[http://mike.daless.io]
- * * {Charles Nutter}[http://blog.headius.com]
- * * {Sergio Arbeo}[http://www.serabe.com]
- * * {Patrick Mahoney}[http://polycrystal.org]
- * * {Yoko Harada}[http://yokolet.blogspot.com]
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * 'Software'), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
 package nokogiri;
 
 import org.jruby.Ruby;
@@ -55,124 +23,147 @@ import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
  * @author sergio
  * @author Yoko Harada <yokolet@gmail.com>
  */
-@JRubyClass(name="Nokogiri::HTML::Document", parent="Nokogiri::XML::Document")
-public class HtmlDocument extends XmlDocument {
-    private static final String DEFAULT_CONTENT_TYPE = "html";
-    private static final String DEFAULT_PUBLIC_ID = "-//W3C//DTD HTML 4.01//EN";
-    private static final String DEFAULT_SYTEM_ID = "http://www.w3.org/TR/html4/strict.dtd";
-
-    private String parsed_encoding = null;
-
-    public HtmlDocument(Ruby ruby, RubyClass klazz) {
-        super(ruby, klazz);
+@JRubyClass(name = "Nokogiri::HTML::Document", parent = "Nokogiri::XML::Document")
+public class HtmlDocument extends XmlDocument
+{
+  private static final String DEFAULT_CONTENT_TYPE = "html";
+  private static final String DEFAULT_PUBLIC_ID = "-//W3C//DTD HTML 4.01//EN";
+  private static final String DEFAULT_SYTEM_ID = "http://www.w3.org/TR/html4/strict.dtd";
+
+  private String parsed_encoding = null;
+
+  public
+  HtmlDocument(Ruby ruby, RubyClass klazz)
+  {
+    super(ruby, klazz);
+  }
+
+  public
+  HtmlDocument(Ruby runtime, Document document)
+  {
+    this(runtime, getNokogiriClass(runtime, "Nokogiri::XML::Document"), document);
+  }
+
+  public
+  HtmlDocument(Ruby ruby, RubyClass klazz, Document doc)
+  {
+    super(ruby, klazz, doc);
+  }
+
+  @JRubyMethod(name = "new", meta = true, rest = true, required = 0)
+  public static IRubyObject
+  rbNew(ThreadContext context, IRubyObject klazz, IRubyObject[] args)
+  {
+    final Ruby runtime = context.runtime;
+    HtmlDocument htmlDocument;
+    try {
+      Document docNode = createNewDocument(runtime);
+      htmlDocument = (HtmlDocument) NokogiriService.HTML_DOCUMENT_ALLOCATOR.allocate(runtime, (RubyClass) klazz);
+      htmlDocument.setDocumentNode(context.runtime, docNode);
+    } catch (Exception ex) {
+      throw asRuntimeError(runtime, "couldn't create document: ", ex);
     }
 
-    public HtmlDocument(Ruby runtime, Document document) {
-        this(runtime, getNokogiriClass(runtime, "Nokogiri::XML::Document"), document);
+    Helpers.invoke(context, htmlDocument, "initialize", args);
+
+    return htmlDocument;
+  }
+
+  public IRubyObject
+  getInternalSubset(ThreadContext context)
+  {
+    IRubyObject internalSubset = super.getInternalSubset(context);
+
+    // html documents are expected to have a default internal subset
+    // the default values are the same ones used when the following
+    // feature is turned on
+    // "http://cyberneko.org/html/features/insert-doctype"
+    // the reason we don't turn it on, is because it overrides the document's
+    // declared doctype declaration.
+
+    if (internalSubset.isNil()) {
+      internalSubset = XmlDtd.newEmpty(context.getRuntime(),
+                                       getDocument(),
+                                       context.getRuntime().newString(DEFAULT_CONTENT_TYPE),
+                                       context.getRuntime().newString(DEFAULT_PUBLIC_ID),
+                                       context.getRuntime().newString(DEFAULT_SYTEM_ID));
+      setInternalSubset(internalSubset);
     }
 
-    public HtmlDocument(Ruby ruby, RubyClass klazz, Document doc) {
-        super(ruby, klazz, doc);
+    return internalSubset;
+  }
+
+  @Override
+  void
+  init(Ruby runtime, Document document)
+  {
+    stabilizeTextContent(document);
+    document.normalize();
+    setInstanceVariable("@decorators", runtime.getNil());
+    if (document.getDocumentElement() != null) {
+      stabilizeAttrs(document.getDocumentElement());
     }
-
-    @JRubyMethod(name="new", meta = true, rest = true, required=0)
-    public static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject[] args) {
-        final Ruby runtime = context.runtime;
-        HtmlDocument htmlDocument;
-        try {
-            Document docNode = createNewDocument(runtime);
-            htmlDocument = (HtmlDocument) NokogiriService.HTML_DOCUMENT_ALLOCATOR.allocate(runtime, (RubyClass) klazz);
-            htmlDocument.setDocumentNode(context.runtime, docNode);
-        } catch (Exception ex) {
-            throw asRuntimeError(runtime, "couldn't create document: ", ex);
+  }
+
+  private static void
+  stabilizeAttrs(Node node)
+  {
+    if (node.hasAttributes()) {
+      NamedNodeMap nodeMap = node.getAttributes();
+      for (int i = 0; i < nodeMap.getLength(); i++) {
+        Node n = nodeMap.item(i);
+        if (n instanceof Attr) {
+          stabilizeAttr((Attr) n);
         }
-
-        Helpers.invoke(context, htmlDocument, "initialize", args);
-
-        return htmlDocument;
+      }
     }
-
-    public IRubyObject getInternalSubset(ThreadContext context) {
-        IRubyObject internalSubset = super.getInternalSubset(context);
-
-        // html documents are expected to have a default internal subset
-        // the default values are the same ones used when the following
-        // feature is turned on
-        // "http://cyberneko.org/html/features/insert-doctype"
-        // the reason we don't turn it on, is because it overrides the document's
-        // declared doctype declaration.
-
-        if (internalSubset.isNil()) {
-            internalSubset = XmlDtd.newEmpty(context.getRuntime(),
-                                             getDocument(),
-                                             context.getRuntime().newString(DEFAULT_CONTENT_TYPE),
-                                             context.getRuntime().newString(DEFAULT_PUBLIC_ID),
-                                             context.getRuntime().newString(DEFAULT_SYTEM_ID));
-            setInternalSubset(internalSubset);
-        }
-
-        return internalSubset;
-    }
-
-    @Override
-    void init(Ruby runtime, Document document) {
-        stabilizeTextContent(document);
-        document.normalize();
-        setInstanceVariable("@decorators", runtime.getNil());
-        if (document.getDocumentElement() != null) {
-            stabilizeAttrs(document.getDocumentElement());
-        }
-    }
-
-    private static void stabilizeAttrs(Node node) {
-        if (node.hasAttributes()) {
-            NamedNodeMap nodeMap = node.getAttributes();
-            for (int i=0; i<nodeMap.getLength(); i++) {
-                Node n = nodeMap.item(i);
-                if (n instanceof Attr) {
-                    stabilizeAttr((Attr) n);
-                }
-            }
-        }
-        NodeList children = node.getChildNodes();
-        for (int i=0; i<children.getLength(); i++) {
-            stabilizeAttrs(children.item(i));
-        }
-    }
-    
-    public void setParsedEncoding(String encoding) {
-        parsed_encoding = encoding;
-    }
-    
-    public String getPraedEncoding() {
-        return parsed_encoding;
-    }
-
-    /*
-     * call-seq:
-     *  read_io(io, url, encoding, options)
-     *
-     * Read the HTML document from +io+ with given +url+, +encoding+,
-     * and +options+.  See Nokogiri::HTML.parse
-     */
-    @JRubyMethod(meta = true, required = 4)
-    public static IRubyObject read_io(ThreadContext context, IRubyObject klass, IRubyObject[] args) {
-        HtmlDomParserContext ctx = new HtmlDomParserContext(context.runtime, args[2], args[3]);
-        ctx.setIOInputSource(context, args[0], args[1]);
-        return ctx.parse(context, (RubyClass) klass, args[1]);
-    }
-
-    /*
-     * call-seq:
-     *  read_memory(string, url, encoding, options)
-     *
-     * Read the HTML document contained in +string+ with given +url+, +encoding+,
-     * and +options+.  See Nokogiri::HTML.parse
-     */
-    @JRubyMethod(meta = true, required = 4)
-    public static IRubyObject read_memory(ThreadContext context, IRubyObject klass, IRubyObject[] args) {
-        HtmlDomParserContext ctx = new HtmlDomParserContext(context.runtime, args[2], args[3]);
-        ctx.setStringInputSource(context, args[0], args[1]);
-        return ctx.parse(context, (RubyClass) klass, args[1]);
+    NodeList children = node.getChildNodes();
+    for (int i = 0; i < children.getLength(); i++) {
+      stabilizeAttrs(children.item(i));
     }
+  }
+
+  public void
+  setParsedEncoding(String encoding)
+  {
+    parsed_encoding = encoding;
+  }
+
+  public String
+  getPraedEncoding()
+  {
+    return parsed_encoding;
+  }
+
+  /*
+   * call-seq:
+   *  read_io(io, url, encoding, options)
+   *
+   * Read the HTML document from +io+ with given +url+, +encoding+,
+   * and +options+.  See Nokogiri::HTML.parse
+   */
+  @JRubyMethod(meta = true, required = 4)
+  public static IRubyObject
+  read_io(ThreadContext context, IRubyObject klass, IRubyObject[] args)
+  {
+    HtmlDomParserContext ctx = new HtmlDomParserContext(context.runtime, args[2], args[3]);
+    ctx.setIOInputSource(context, args[0], args[1]);
+    return ctx.parse(context, (RubyClass) klass, args[1]);
+  }
+
+  /*
+   * call-seq:
+   *  read_memory(string, url, encoding, options)
+   *
+   * Read the HTML document contained in +string+ with given +url+, +encoding+,
+   * and +options+.  See Nokogiri::HTML.parse
+   */
+  @JRubyMethod(meta = true, required = 4)
+  public static IRubyObject
+  read_memory(ThreadContext context, IRubyObject klass, IRubyObject[] args)
+  {
+    HtmlDomParserContext ctx = new HtmlDomParserContext(context.runtime, args[2], args[3]);
+    ctx.setStringInputSource(context, args[0], args[1]);
+    return ctx.parse(context, (RubyClass) klass, args[1]);
+  }
 }