nokogiri 1.5.0.beta.3-java → 1.5.0.beta.4-java

data/ext/java/nokogiri/NokogiriService.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2010:
+ * Copyright (c) 2008 - 2011:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -32,11 +32,14 @@
 
 package nokogiri;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.RubyFixnum;
-import org.jruby.RubyHash;
 import org.jruby.RubyModule;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -47,9 +50,11 @@ import org.jruby.runtime.load.BasicLibraryService;
  * in JRuby. Also, this class holds a Ruby type cache and allocators of Ruby types.
  * 
  * @author headius
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 public class NokogiriService implements BasicLibraryService {
     public static final String nokogiriClassCacheGvarName = "$NOKOGIRI_CLASS_CACHE";
+    public static Map<String, RubyClass> nokogiriClassCache;
 
     public boolean basicLoad(Ruby ruby) {
         init(ruby);
@@ -57,9 +62,11 @@ public class NokogiriService implements BasicLibraryService {
         return true;
     }
     
-    private void createNokogiriClassCahce(Ruby ruby) {
-        RubyHash nokogiriClassCache = RubyHash.newHash(ruby);
+    private static void createNokogiriClassCahce(Ruby ruby) {
+        nokogiriClassCache = Collections.synchronizedMap(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::XML::Attr", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::Attr"));
         nokogiriClassCache.put("Nokogiri::XML::Document", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::Document"));
         nokogiriClassCache.put("Nokogiri::XML::DocumentFragment", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::DocumentFragment"));
@@ -74,13 +81,11 @@ public class NokogiriService implements BasicLibraryService {
         nokogiriClassCache.put("Nokogiri::XML::Node", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::Node"));
         nokogiriClassCache.put("Nokogiri::XML::NodeSet", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::NodeSet"));
         nokogiriClassCache.put("Nokogiri::XML::Namespace", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::Namespace"));
+        nokogiriClassCache.put("Nokogiri::XML::SyntaxError", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::SyntaxError"));
         nokogiriClassCache.put("Nokogiri::XML::RelaxNG", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::RelaxNG"));
-        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::XML::Schema", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::Schema"));
         nokogiriClassCache.put("Nokogiri::XML::AttributeDecl", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::AttributeDecl"));
         nokogiriClassCache.put("Nokogiri::XML::SAX::ParserContext", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::SAX::ParserContext"));
-
-        ruby.getGlobalVariables().set(nokogiriClassCacheGvarName, nokogiriClassCache);
     }
 
     private void init(Ruby ruby) {
@@ -201,13 +206,13 @@ public class NokogiriService implements BasicLibraryService {
     }
     
     private void createSaxModule(Ruby ruby, RubyModule xmlSaxModule, RubyModule htmlSaxModule) {
-        RubyClass xmlSaxParserContext = xmlSaxModule.defineClassUnder("ParserContext", ruby.getObject(), XML_SAXPARSER_ALLOCATOR);
+        RubyClass xmlSaxParserContext = xmlSaxModule.defineClassUnder("ParserContext", ruby.getObject(), XML_SAXPARSER_CONTEXT_ALLOCATOR);
         xmlSaxParserContext.defineAnnotatedMethods(XmlSaxParserContext.class);
         
         RubyClass xmlSaxPushParser = xmlSaxModule.defineClassUnder("PushParser", ruby.getObject(), XML_SAXPUSHPARSER_ALLOCATOR);
         xmlSaxPushParser.defineAnnotatedMethods(XmlSaxPushParser.class);
         
-        RubyClass htmlSaxParserContext = htmlSaxModule.defineClassUnder("ParserContext", xmlSaxParserContext, HTML_SAXPARSER_ALLOCATOR);
+        RubyClass htmlSaxParserContext = htmlSaxModule.defineClassUnder("ParserContext", xmlSaxParserContext, HTML_SAXPARSER_CONTEXT_ALLOCATOR);
         htmlSaxParserContext.defineAnnotatedMethods(HtmlSaxParserContext.class);
     }
     
@@ -223,7 +228,7 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    private static ObjectAllocator HTML_DOCUMENT_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator HTML_DOCUMENT_ALLOCATOR = new ObjectAllocator() {
         private HtmlDocument htmlDocument = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
             if (htmlDocument == null) htmlDocument = new HtmlDocument(runtime, klazz);
@@ -237,9 +242,17 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    private static ObjectAllocator HTML_SAXPARSER_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator HTML_SAXPARSER_CONTEXT_ALLOCATOR = new ObjectAllocator() {
+        private HtmlSaxParserContext htmlSaxParserContext = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new HtmlSaxParserContext(runtime, klazz);
+            if (htmlSaxParserContext == null) htmlSaxParserContext = new HtmlSaxParserContext(runtime, klazz);
+            try {
+                HtmlSaxParserContext clone = (HtmlSaxParserContext) htmlSaxParserContext.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new HtmlSaxParserContext(runtime, klazz);
+            }
         }
     };
 
@@ -257,7 +270,7 @@ public class NokogiriService implements BasicLibraryService {
             }
         };
 
-    private static ObjectAllocator XML_ATTR_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator XML_ATTR_ALLOCATOR = new ObjectAllocator() {
         private XmlAttr xmlAttr = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
             if (xmlAttr == null) xmlAttr = new XmlAttr(runtime, klazz);
@@ -271,7 +284,7 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    private static ObjectAllocator XML_CDATA_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator XML_CDATA_ALLOCATOR = new ObjectAllocator() {
         private XmlCdata xmlCdata = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
             if (xmlCdata == null) xmlCdata = new XmlCdata(runtime, klazz);
@@ -285,7 +298,7 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    private static ObjectAllocator XML_COMMENT_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator XML_COMMENT_ALLOCATOR = new ObjectAllocator() {
         private XmlComment xmlComment = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
             if (xmlComment == null) xmlComment = new XmlComment(runtime, klazz);
@@ -306,7 +319,7 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    private static ObjectAllocator XML_DOCUMENT_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator XML_DOCUMENT_ALLOCATOR = new ObjectAllocator() {
         private XmlDocument xmlDocument = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
             if (xmlDocument == null) xmlDocument = new XmlDocument(runtime, klazz);
@@ -320,9 +333,17 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    private static ObjectAllocator XML_DOCUMENT_FRAGMENT_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator XML_DOCUMENT_FRAGMENT_ALLOCATOR = new ObjectAllocator() {
+        private XmlDocumentFragment xmlDocumentFragment = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new XmlDocumentFragment(runtime, klazz);
+            if (xmlDocumentFragment == null) xmlDocumentFragment = new XmlDocumentFragment(runtime, klazz);
+            try {
+                XmlDocumentFragment clone = (XmlDocumentFragment)xmlDocumentFragment.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlDocumentFragment(runtime, klazz);
+            }
         }
     };
 
@@ -332,7 +353,7 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    private static ObjectAllocator XML_ELEMENT_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator XML_ELEMENT_ALLOCATOR = new ObjectAllocator() {
         private XmlElement xmlElement = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
             if (xmlElement == null) xmlElement = new XmlElement(runtime, klazz);
@@ -352,7 +373,7 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    private static ObjectAllocator XML_NAMESPACE_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator XML_NAMESPACE_ALLOCATOR = new ObjectAllocator() {
         private XmlNamespace xmlNamespace = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
             if (xmlNamespace == null) xmlNamespace = new XmlNamespace(runtime, klazz);
@@ -366,7 +387,7 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    private static ObjectAllocator XML_NODE_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator XML_NODE_ALLOCATOR = new ObjectAllocator() {
         private XmlNode xmlNode = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
             if (xmlNode == null) xmlNode = new XmlNode(runtime, klazz);
@@ -380,9 +401,17 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    private static ObjectAllocator XML_NODESET_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator XML_NODESET_ALLOCATOR = new ObjectAllocator() {
+        private XmlNodeSet xmlNodeSet = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new XmlNodeSet(runtime, klazz, RubyArray.newEmptyArray(runtime));
+            if (xmlNodeSet == null) xmlNodeSet = new XmlNodeSet(runtime, klazz);
+            try {
+                XmlNodeSet clone  = (XmlNodeSet) xmlNodeSet.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlNodeSet(runtime, klazz, RubyArray.newEmptyArray(runtime));
+            }
         }
     };
 
@@ -416,15 +445,31 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    private static ObjectAllocator XML_RELAXNG_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator XML_RELAXNG_ALLOCATOR = new ObjectAllocator() {
+        private XmlRelaxng xmlRelaxng = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new XmlRelaxng(runtime, klazz);
+            if (xmlRelaxng == null) xmlRelaxng = new XmlRelaxng(runtime, klazz);
+            try {
+                XmlRelaxng clone  = (XmlRelaxng) xmlRelaxng.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlRelaxng(runtime, klazz);
+            }
         }
     };
 
-    private static ObjectAllocator XML_SAXPARSER_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator XML_SAXPARSER_CONTEXT_ALLOCATOR = new ObjectAllocator() {
+        private XmlSaxParserContext xmlSaxParserContext = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new XmlSaxParserContext(runtime, klazz);
+            if (xmlSaxParserContext == null) xmlSaxParserContext = new XmlSaxParserContext(runtime, klazz);
+            try {
+                XmlSaxParserContext clone = (XmlSaxParserContext) xmlSaxParserContext.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlSaxParserContext(runtime, klazz);
+            }
         }
     };
 
@@ -434,21 +479,45 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    private static ObjectAllocator XML_SCHEMA_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator XML_SCHEMA_ALLOCATOR = new ObjectAllocator() {
+        private XmlSchema xmlSchema = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new XmlSchema(runtime, klazz);
+            if (xmlSchema == null) xmlSchema = new XmlSchema(runtime, klazz);
+            try {
+                XmlSchema clone  = (XmlSchema) xmlSchema.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlSchema(runtime, klazz);
+            }
         }
     };
 
-    private static ObjectAllocator XML_SYNTAXERROR_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator XML_SYNTAXERROR_ALLOCATOR = new ObjectAllocator() {
+        private XmlSyntaxError xmlSyntaxError = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new XmlSyntaxError(runtime, klazz);
+            if (xmlSyntaxError == null) xmlSyntaxError = new XmlSyntaxError(runtime, klazz);
+            try {
+                XmlSyntaxError clone  = (XmlSyntaxError) xmlSyntaxError.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlSyntaxError(runtime, klazz);
+            }
         }
     };
 
-    private static ObjectAllocator XML_TEXT_ALLOCATOR = new ObjectAllocator() {
+    public static final ObjectAllocator XML_TEXT_ALLOCATOR = new ObjectAllocator() {
+        private XmlText xmlText = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new XmlText(runtime, klazz);
+            if (xmlText == null) xmlText = new XmlText(runtime, klazz);
+            try {
+                XmlText clone  = (XmlText) xmlText.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlText(runtime, klazz);
+            }
         }
     };
 

data/ext/java/nokogiri/XmlAttr.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2010:
+ * Copyright (c) 2008 - 2011:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -38,6 +38,7 @@ import nokogiri.internals.NokogiriHelpers;
 import nokogiri.internals.SaveContext;
 
 import org.jruby.Ruby;
+import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
@@ -51,6 +52,8 @@ import org.w3c.dom.Node;
 /**
  * Class for Nokogiri::XML::Attr
  *
+ * @author sergio
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 
 @JRubyClass(name="Nokogiri::XML::Attr", parent="Nokogiri::XML::Node")
@@ -106,7 +109,7 @@ public class XmlAttr extends XmlNode{
     }
 
 
-    private String serializeAttrTextContent(String s) {
+    private String serializeAttrTextContent(String s, boolean htmlDoc) {
         if (s == null) return "";
 
         char[] c = s.toCharArray();
@@ -117,9 +120,9 @@ public class XmlAttr extends XmlNode{
             case '\n': buffer.append("&#10;"); break;
             case '\r': buffer.append("&#13;"); break;
             case '\t': buffer.append("&#9;"); break;
-          //case '"': buffer.append("&quot;"); break;
-          // TODO: is replacing '"' with '%22' always correct?
-            case '"': buffer.append("%22"); break;
+            case '"': if (htmlDoc) buffer.append("%22"); 
+                else buffer.append("&quot;");
+                break;
             case '<': buffer.append("&lt;"); break;
             case '>': buffer.append("&gt;"); break;
             case '&': buffer.append("&amp;"); break;
@@ -158,6 +161,7 @@ public class XmlAttr extends XmlNode{
 
     @Override
     public void saveContent(ThreadContext context, SaveContext ctx) {
+        boolean docType = isHtml(context);
         Attr attr = (Attr) node;
 
         ctx.maybeSpace();
@@ -166,10 +170,14 @@ public class XmlAttr extends XmlNode{
         if (!ctx.asHtml() || !isHtmlBooleanAttr()) {
             ctx.append("=");
             ctx.append("\"");
-            ctx.append(serializeAttrTextContent(attr.getValue()));
+            ctx.append(serializeAttrTextContent(attr.getValue(), docType));
             ctx.append("\"");
         }
     }
+    
+    private boolean isHtml(ThreadContext context) {
+        return document(context).getMetaClass().isKindOfModule(getNokogiriClass(context.getRuntime(), "Nokogiri::HTML::Document"));
+    }
 
     @Override
     public IRubyObject unlink(ThreadContext context) {

data/ext/java/nokogiri/XmlAttributeDecl.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2010:
+ * Copyright (c) 2008 - 2011:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]

data/ext/java/nokogiri/XmlCdata.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2010:
+ * Copyright (c) 2008 - 2011:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -48,6 +48,8 @@ import org.w3c.dom.Node;
 /**
  * Class for Nokogiri::XML::CDATA
  *
+ * @author sergio
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 
 @JRubyClass(name="Nokogiri::XML::CDATA", parent="Nokogiri::XML::Text")

data/ext/java/nokogiri/XmlComment.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2010:
+ * Copyright (c) 2008 - 2011:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -46,6 +46,8 @@ import org.w3c.dom.Node;
 /**
  * Class for Nokogiri::XML::Comment
  *
+ * @author sergio
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 
 @JRubyClass(name="Nokogiri::XML::Comment", parent="Nokogiri::XML::CharacterData")

data/ext/java/nokogiri/XmlDocument.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2010:
+ * Copyright (c) 2008 - 2011:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -66,6 +66,8 @@ import org.w3c.dom.NodeList;
 /**
  * Class for Nokogiri::XML::Document
  *
+ * @author sergio
+ * @author Yoko Harada <yokolet@gmail.com>
  */
 
 @JRubyClass(name="Nokogiri::XML::Document", parent="Nokogiri::XML::Node")
@@ -76,6 +78,11 @@ public class XmlDocument extends XmlNode {
     public final static String DTD_RAW_DOCUMENT = "DTD_RAW_DOCUMENT";
     protected final static String DTD_INTERNAL_SUBSET = "DTD_INTERNAL_SUBSET";
     protected final static String DTD_EXTERNAL_SUBSET = "DTD_EXTERNAL_SUBSET";
+    
+    /* DocumentBuilderFactory implementation class name. This needs to set a classloader into it.
+     * Setting an appropriate classloader resolves issue 380.
+     */
+    private static final String DOCUMENTBUILDERFACTORY_IMPLE_NAME = "org.apache.xerces.jaxp.DocumentBuilderFactoryImpl";
 
     private static boolean substituteEntities = false;
     private static boolean loadExternalSubset = false; // TODO: Verify this.
@@ -86,7 +93,6 @@ public class XmlDocument extends XmlNode {
 
     public XmlDocument(Ruby ruby, RubyClass klazz) {
         super(ruby, klazz, createNewDocument());
-        nsCache = new NokogiriNamespaceCache();
     }
     
     public XmlDocument(Ruby ruby, Document document) {
@@ -104,6 +110,7 @@ public class XmlDocument extends XmlNode {
     @Override
     public void setNode(ThreadContext context, Node node) {
         super.setNode(context, node);
+        if (nsCache == null) nsCache = new NokogiriNamespaceCache();
         Ruby runtime = context.getRuntime();
         if (node != null) {
             Document document = (Document)node;
@@ -210,7 +217,8 @@ public class XmlDocument extends XmlNode {
 
     protected static Document createNewDocument() {
         try {
-            return DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(DOCUMENTBUILDERFACTORY_IMPLE_NAME, NokogiriService.class.getClassLoader());
+            return factory.newDocumentBuilder().newDocument();
         } catch (ParserConfigurationException e) {
             return null;        // this will end is disaster...
         }
@@ -223,18 +231,25 @@ public class XmlDocument extends XmlNode {
      * Create a new document with +version+ (defaults to "1.0")
      */
     @JRubyMethod(name="new", meta = true, rest = true, required=0)
-    public static IRubyObject rbNew(ThreadContext context, IRubyObject cls, IRubyObject[] args) {
-        XmlDocument doc = null;
+    public static IRubyObject rbNew(ThreadContext context, IRubyObject klazz, IRubyObject[] args) {
+        XmlDocument xmlDocument = null;
         try {
             Document docNode = createNewDocument();
-            doc = new XmlDocument(context.getRuntime(), (RubyClass) cls, docNode);
+            if ("Nokogiri::HTML::Document".equals(((RubyClass)klazz).getName())) {
+                xmlDocument = (XmlDocument) NokogiriService.HTML_DOCUMENT_ALLOCATOR.allocate(context.getRuntime(), (RubyClass) klazz);
+                xmlDocument.setNode(context, docNode);
+            } else {
+                // XML::Document and sublass
+                xmlDocument = (XmlDocument) NokogiriService.XML_DOCUMENT_ALLOCATOR.allocate(context.getRuntime(), (RubyClass) klazz);
+                xmlDocument.setNode(context, docNode);
+            }
         } catch (Exception ex) {
             throw context.getRuntime().newRuntimeError("couldn't create document: "+ex.toString());
         }
 
-        RuntimeHelpers.invoke(context, doc, "initialize", args);
+        RuntimeHelpers.invoke(context, xmlDocument, "initialize", args);
 
-        return doc;
+        return xmlDocument;
     }
     
     @JRubyMethod(required=1, optional=4)
@@ -332,6 +347,12 @@ public class XmlDocument extends XmlNode {
         if (node.getNodeType() == Node.ELEMENT_NODE) {
             node.setPrefix(null);
             node.getOwnerDocument().renameNode(node, null, node.getLocalName());
+            NamedNodeMap attrs = node.getAttributes();
+            for (int i=0; i<attrs.getLength(); i++) {
+                Node attr = attrs.item(i);
+                attr.setPrefix(null);
+                attr.getOwnerDocument().renameNode(attr, null, attr.getLocalName());
+            }
         }
         XmlNodeSet nodeSet = (XmlNodeSet) xmlNode.children(context);
         for (long i=0; i < nodeSet.length(); i++) {