nokogiri 1.5.6.rc3-java → 1.5.7-java

data/Manifest.txt

@@ -66,6 +66,7 @@ ext/java/nokogiri/internals/ParserContext.java
 ext/java/nokogiri/internals/ReaderNode.java
 ext/java/nokogiri/internals/SaveContextVisitor.java
 ext/java/nokogiri/internals/SchemaErrorHandler.java
+ext/java/nokogiri/internals/UncloseableInputStream.java
 ext/java/nokogiri/internals/XmlDeclHandler.java
 ext/java/nokogiri/internals/XmlDomParserContext.java
 ext/java/nokogiri/internals/XmlSaxParser.java

data/Rakefile

@@ -7,7 +7,7 @@ Hoe.plugin :debugging
 Hoe.plugin :git
 Hoe.plugin :gemspec
 Hoe.plugin :bundler
-Hoe.add_include_dirs '.' # for ruby 1.9.2
+Hoe.add_include_dirs '.'
 
 GENERATED_PARSER    = "lib/nokogiri/css/parser.rb"
 GENERATED_TOKENIZER = "lib/nokogiri/css/tokenizer.rb"
@@ -35,7 +35,7 @@ HOE = Hoe.spec 'nokogiri' do
   self.clean_globs += [
     'nokogiri.gemspec',
     'lib/nokogiri/nokogiri.{bundle,jar,rb,so}',
-    'lib/nokogiri/1.{8,9}',
+    'lib/nokogiri/{1.8,1.9,2.0}',
     # GENERATED_PARSER,
     # GENERATED_TOKENIZER
   ]
@@ -48,7 +48,7 @@ HOE = Hoe.spec 'nokogiri' do
     ["mini_portile",    ">= 0.2.2"],
     ["minitest",        "~> 2.2.2"],
     ["rake",            ">= 0.9"],
-    ["rake-compiler",   "=  0.8.0"],
+    ["rake-compiler",   "~> 0.8.0"],
     ["racc",            ">= 1.4.6"],
     ["rexical",         ">= 1.0.5"]
   ]
@@ -67,6 +67,19 @@ end
 
 # ----------------------------------------
 
+def add_file_to_gem relative_path
+  target_path = File.join gem_build_path, relative_path
+  target_dir = File.dirname(target_path)
+  mkdir_p target_dir unless File.directory?(target_dir)
+  rm_f target_path
+  ln relative_path, target_path
+  HOE.spec.files += [relative_path]
+end
+
+def gem_build_path
+  File.join 'pkg', HOE.spec.full_name
+end
+
 if java?
   # TODO: clean this section up.
   require "rake/javaextensiontask"
@@ -78,17 +91,15 @@ if java?
     ext.classpath = jars.map { |x| File.expand_path x }.join ':'
   end
 
-  gem_build_path = File.join 'pkg', HOE.spec.full_name
-
   task gem_build_path => [:compile] do
-    cp 'lib/nokogiri/nokogiri.jar', File.join(gem_build_path, 'lib', 'nokogiri')
-    HOE.spec.files += ['lib/nokogiri/nokogiri.jar']
+    add_file_to_gem 'lib/nokogiri/nokogiri.jar'
   end
 else
   mingw_available = true
   begin
     require 'tasks/cross_compile'
   rescue
+    puts "WARNING: cross compilation not available: #{$!}"
     mingw_available = false
   end
   require "rake/extensiontask"
@@ -101,10 +112,10 @@ else
     if mingw_available
       ext.cross_compile  = true
       ext.cross_platform = ["x86-mswin32-60", "x86-mingw32"]
-      ext.cross_config_options << "--with-xml2-include=#{File.join($recipes[:libxml2].path, 'include', 'libxml2')}"
-      ext.cross_config_options << "--with-xml2-lib=#{File.join($recipes[:libxml2].path, 'lib')}"
-      ext.cross_config_options << "--with-iconv-dir=#{$recipes[:libiconv].path}"
-      ext.cross_config_options << "--with-xslt-dir=#{$recipes[:libxslt].path}"
+      ext.cross_config_options << "--with-xml2-include=#{File.join($recipes["libxml2"].path, 'include', 'libxml2')}"
+      ext.cross_config_options << "--with-xml2-lib=#{File.join($recipes["libxml2"].path, 'lib')}"
+      ext.cross_config_options << "--with-iconv-dir=#{$recipes["libiconv"].path}"
+      ext.cross_config_options << "--with-xslt-dir=#{$recipes["libxslt"].path}"
       ext.cross_config_options << "--with-zlib-dir=#{CROSS_DIR}"
     end
   end
@@ -183,8 +194,7 @@ end
 
 desc "build a windows gem without all the ceremony."
 task "gem:windows" => "gem" do
-  # TODO: 1.8.7-p358, 1.9.3-p194
-  cross_rubies = ["1.8.7-p330", "1.9.2-p136"]
+  cross_rubies = ["1.8.7-p358", "1.9.3-p194", "2.0.0-p0"]
   ruby_cc_version = cross_rubies.collect { |_| _.split("-").first }.join(":") # e.g., "1.8.7:1.9.2"
   rake_compiler_config_path = "#{ENV['HOME']}/.rake-compiler/config.yml"
 
@@ -205,10 +215,13 @@ task "gem:windows" => "gem" do
   end
 
   # verify that --export-all is in the 1.9 rbconfig. see #279,#374,#375.
-  rbconfig_19 = rake_compiler_config["rbconfig-1.9.2"]
+  rbconfig_19 = rake_compiler_config["rbconfig-1.9.3"]
   raise "rbconfig #{rbconfig_19} needs --export-all in its DLDFLAGS value" if File.read(rbconfig_19).split("\n").grep(/CONFIG\["DLDFLAGS"\].*--export-all/).empty?
 
-  pkg_config_path = [:libxslt, :libxml2].collect { |pkg| File.join($recipes[pkg].path, "lib/pkgconfig") }.join(":")
+  rbconfig_20 = rake_compiler_config["rbconfig-2.0.0"]
+  raise "rbconfig #{rbconfig_20} needs --export-all in its DLDFLAGS value" if File.read(rbconfig_20).split("\n").grep(/CONFIG\["DLDFLAGS"\].*--export-all/).empty?
+
+  pkg_config_path = %w[libxslt libxml2].collect { |pkg| File.join($recipes[pkg].path, "lib/pkgconfig") }.join(":")
   sh("env PKG_CONFIG_PATH=#{pkg_config_path} RUBY_CC_VERSION=#{ruby_cc_version} rake cross native gem") || raise("build failed!")
 end
 

data/build_all

@@ -31,7 +31,7 @@
 #      end
 #
 #  - you may also have to hack rubygems.rb to eliminate a reference to
-#    RUBY_ENGINE
+#    RUBY_ENGINE (just comment it out)
 #
 
 HOST=
@@ -71,11 +71,19 @@ if [[ $platform =~ "64" ]] ; then
     exit 1
 fi
 rvm_use 1.8.7
-if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.8.7-p330/lib/ruby/1.8.7/x86_64-linux/rbconfig.rb ]] ; then
-    bundle exec rake-compiler cross-ruby VERSION=1.8.7-p330
+if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.8.7-p358/lib/ruby/1.8.7/x86_64-linux/rbconfig.rb ]] ; then
+
+    # if this fails around the purelib.rb thing, try varying the ruby
+    # used to run this script, and whether the HOST env var is set
+    # below.
+
+    bundle exec rake-compiler cross-ruby VERSION=1.8.7-p358 # HOST=i386-mingw32
+fi
+if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.9.3-p194/lib/ruby/1.9.1/x86_64-linux/rbconfig.rb ]] ; then
+    bundle exec rake-compiler cross-ruby VERSION=1.9.3-p194
 fi
-if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-1.9.2-p136/lib/ruby/1.9.1/x86_64-linux/rbconfig.rb ]] ; then
-    bundle exec rake-compiler cross-ruby VERSION=1.9.2-p136
+if [[ ! -a ${HOME}/.rake-compiler/ruby/ruby-2.0.0-p0/lib/ruby/2.0.0/x86_64-linux/rbconfig.rb ]] ; then
+    bundle exec rake-compiler cross-ruby VERSION=2.0.0-p0
 fi
 bundle exec rake cross
 bundle exec rake gem:windows

data/ext/java/nokogiri/NokogiriService.java

@@ -90,6 +90,7 @@ public class NokogiriService implements BasicLibraryService {
         nokogiriClassCache.put("Nokogiri::XML::XPathContext", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::XPathContext"));
         nokogiriClassCache.put("Nokogiri::XML::AttributeDecl", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::AttributeDecl"));
         nokogiriClassCache.put("Nokogiri::XML::SAX::ParserContext", (RubyClass)ruby.getClassFromPath("Nokogiri::XML::SAX::ParserContext"));
+        nokogiriClassCache.put("StringIO", (RubyClass)ruby.getClassFromPath("StringIO"));
     }
 
     private void init(Ruby ruby) {
@@ -100,6 +101,7 @@ public class NokogiriService implements BasicLibraryService {
         RubyModule htmlSaxModule = htmlModule.defineModuleUnder("SAX");
         RubyModule xsltModule = nokogiri.defineModuleUnder("XSLT");
 
+        createJavaLibraryVersionConstants(ruby, nokogiri);
         createNokogiriModule(ruby, nokogiri);
         createSyntaxErrors(ruby, nokogiri, xmlModule);
         RubyClass xmlNode = createXmlModule(ruby, xmlModule);
@@ -108,7 +110,12 @@ public class NokogiriService implements BasicLibraryService {
         createSaxModule(ruby, xmlSaxModule, htmlSaxModule);
         createXsltModule(ruby, xsltModule);
     }
-    
+
+    private void createJavaLibraryVersionConstants(Ruby ruby, RubyModule nokogiri) {
+        nokogiri.defineConstant("XERCES_VERSION", ruby.newString(org.apache.xerces.impl.Version.getVersion()));
+        nokogiri.defineConstant("NEKO_VERSION", ruby.newString(org.cyberneko.html.Version.getVersion()));
+    }
+
     private void createNokogiriModule(Ruby ruby, RubyModule nokogiri) {;
         RubyClass encHandler = nokogiri.defineClassUnder("EncodingHandler", ruby.getObject(), ENCODING_HANDLER_ALLOCATOR);
         encHandler.defineAnnotatedMethods(EncodingHandler.class);

data/ext/java/nokogiri/XmlDocument.java

@@ -179,11 +179,11 @@ public class XmlDocument extends XmlNode {
         if (node == null) return;
         String nodePrefix = node.getPrefix();
         if (nodePrefix == null) { // default namespace
-            node.getOwnerDocument().renameNode(node, default_href, node.getNodeName());
+            NokogiriHelpers.renameNode(node, default_href, node.getNodeName());
         } else {
             XmlNamespace xmlNamespace = nsCache.get(nodePrefix);
             String href = rubyStringToString(xmlNamespace.href(context));
-            node.getOwnerDocument().renameNode(node, href, node.getNodeName());
+            NokogiriHelpers.renameNode(node, href, node.getNodeName());
         }
         resolveNamespaceIfNecessary(context, node.getNextSibling(), default_href);
         NodeList children = node.getChildNodes();
@@ -358,7 +358,7 @@ public class XmlDocument extends XmlNode {
         Node node = xmlNode.node;
         if (node.getNodeType() == Node.ELEMENT_NODE) {
             node.setPrefix(null);
-            node.getOwnerDocument().renameNode(node, null, node.getLocalName());
+            NokogiriHelpers.renameNode(node, null, node.getLocalName());
             NamedNodeMap attrs = node.getAttributes();
             for (int i=0; i<attrs.getLength(); i++) {
                 Attr attr = (Attr) attrs.item(i);
@@ -366,7 +366,7 @@ public class XmlDocument extends XmlNode {
                     ((org.w3c.dom.Element)node).removeAttributeNode(attr);
                 } else {
                     attr.setPrefix(null);
-                    attr.getOwnerDocument().renameNode(attr, null, attr.getLocalName());
+                    NokogiriHelpers.renameNode(attr, null, attr.getLocalName());
                 }
             }
         }

data/ext/java/nokogiri/XmlDtd.java

@@ -129,9 +129,20 @@ public class XmlDtd extends XmlNode {
                                   IRubyObject name,
                                   IRubyObject external_id,
                                   IRubyObject system_id) {
-        Element placeHolder = doc.createElement("dtd_placeholder");
+
+        DocumentType placeholder = null;
+        if (doc.getDoctype() == null) {
+          String javaName = NokogiriHelpers.rubyStringToString(name);
+          String javaExternalId = NokogiriHelpers.rubyStringToString(external_id);
+          String javaSystemId = NokogiriHelpers.rubyStringToString(system_id);
+          placeholder = doc.getImplementation().createDocumentType(javaName, javaExternalId, javaSystemId);
+          doc.appendChild(placeholder);
+        } else {
+          placeholder = doc.getDoctype();
+        }
+        // FIXME: what if the document had a doc type, why are we here ?
         XmlDtd dtd = (XmlDtd) NokogiriService.XML_DTD_ALLOCATOR.allocate(runtime, getNokogiriClass(runtime, "Nokogiri::XML::DTD"));
-        dtd.setNode(runtime, placeHolder);
+        dtd.setNode(runtime, placeholder);
         dtd.name = name;
         dtd.pubId = external_id;
         dtd.sysId = system_id;

data/ext/java/nokogiri/XmlElement.java

@@ -38,7 +38,6 @@ import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.anno.JRubyClass;
-import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.ThreadContext;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -62,17 +61,9 @@ public class XmlElement extends XmlNode {
     
     @Override
     public void setNode(ThreadContext context, Node node) {
-        this.node = node;
-        if (node != null) {
-            resetCache();
-            if (node.getNodeType() != Node.DOCUMENT_NODE) {
-                doc = document(context);
-                setInstanceVariable("@document", doc);
-                if (doc != null) {
-                    RuntimeHelpers.invoke(context, doc, "decorate", this);
-                }
-            }
-        }
+      super.setNode(context, node);
+      if (doc != null)
+        setInstanceVariable("@document", doc);
     }
     
     @Override

data/ext/java/nokogiri/XmlEntityReference.java

@@ -36,6 +36,7 @@ import static nokogiri.internals.NokogiriHelpers.getCachedNodeOrCreate;
 import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
 import nokogiri.internals.SaveContextVisitor;
 
+import org.apache.xerces.dom.CoreDocumentImpl;
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.anno.JRubyClass;
@@ -70,21 +71,19 @@ public class XmlEntityReference extends XmlNode {
         IRubyObject doc = args[0];
         IRubyObject name = args[1];
 
-        Document owner = ((XmlNode) doc).getOwnerDocument();
-        Node node = new NokogiriEntityReference(owner, rubyStringToString(name));
-        super.setNode(context, node);
-    }
-    
-    public void setNode(ThreadContext context, Node entityRef) {
-        Document owner = entityRef.getOwnerDocument();
-        String name = entityRef.getNodeName();
-        Node node = new NokogiriEntityReference(owner, name);
-        super.setNode(context, node);
+        Document document = ((XmlNode) doc).getOwnerDocument();
+        // FIXME: disable error checking as a workaround for #719. this depends on the internals of Xerces.
+        CoreDocumentImpl internalDocument = (CoreDocumentImpl) document;
+        boolean oldErrorChecking = internalDocument.getErrorChecking();
+        internalDocument.setErrorChecking(false);
+        Node node = document.createEntityReference(rubyStringToString(name));
+        internalDocument.setErrorChecking(oldErrorChecking);
+        setNode(context, node);
     }
     
     @Override
     public void accept(ThreadContext context, SaveContextVisitor visitor) {
-        visitor.enterEntityReference((NokogiriEntityReference)node);
+        visitor.enter(node);
         Node child = node.getFirstChild();
         while (child != null) {
             IRubyObject nokoNode = getCachedNodeOrCreate(context.getRuntime(), child);
@@ -97,25 +96,6 @@ public class XmlEntityReference extends XmlNode {
             }
             child = child.getNextSibling();
         }
-        visitor.leaveEntityReference((NokogiriEntityReference)node);
-    }
-    
-    public class NokogiriEntityReference extends org.apache.xerces.dom.TextImpl {
-        // Nokogiri's EntityReference should quack like a org.w3c.dom.Text node.
-        // EntityReference node should not raise exception for names such as #xa.
-        // This is reported bug in issue#719.
-        // Also, EntityReference node should not bother xpath.
-        // For this purpose, Node type should be Node.TEXT_NODE.
-        public NokogiriEntityReference(Document owner, String name) {
-            super((org.apache.xerces.dom.DocumentImpl)owner, name);
-        }
-        
-        public short getNodeType() {
-            return Node.TEXT_NODE;
-        }
-
-        public String getNodeName() {
-            return getNodeValue();
-        }        
+        visitor.leave(node);
     }
 }

data/ext/java/nokogiri/XmlNode.java

@@ -54,6 +54,7 @@ import nokogiri.internals.NokogiriNamespaceCache;
 import nokogiri.internals.SaveContextVisitor;
 import nokogiri.internals.XmlDomParserContext;
 
+import org.apache.xerces.dom.CoreDocumentImpl;
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
 import org.jruby.RubyClass;
@@ -211,22 +212,23 @@ public class XmlNode extends RubyObject {
      */
     public XmlNode(Ruby ruby, RubyClass cls, Node node) {
         super(ruby, cls);
-        this.node = node;
+        setNode(ruby.getCurrentContext(), node);
+    }
 
+    protected void decorate(Ruby ruby) {
         if (node != null) {
             resetCache();
 
             if (node.getNodeType() != Node.DOCUMENT_NODE) {
                 doc = document(ruby.getCurrentContext());
 
-                if (doc != null) {
+                if (doc != null && doc.isTrue()) {
                     RuntimeHelpers.invoke(ruby.getCurrentContext(), doc, "decorate", this);
                 }
             }
         }
-        
     }
-    
+
     /**
      * Create and return a copy of this object.
      *
@@ -326,12 +328,15 @@ public class XmlNode extends RubyObject {
 
         Element element = null;
         String node_name = rubyStringToString(name);
-        try {
-          element = document.createElementNS(null, node_name);
-        } catch (org.w3c.dom.DOMException e) {
-            // issue#683 NAMESPACE_ERR is thrown from RDF::RDFXML::Writer.new
-            // retry without namespace
+        String prefix = NokogiriHelpers.getPrefix(node_name);
+        if (prefix == null) {
             element = document.createElement(node_name);
+        } else {
+            String namespace_uri = null;
+            if (document.getDocumentElement() != null) {
+                namespace_uri = document.getDocumentElement().lookupNamespaceURI(prefix);
+            }
+            element = document.createElementNS(namespace_uri, node_name);
         }
         setNode(context, element);
     }
@@ -449,8 +454,16 @@ public class XmlNode extends RubyObject {
     public void relink_namespace(ThreadContext context) {
         if (node instanceof Element) {
             Element e = (Element) node;
+            String prefix = e.getPrefix();
+            String currentNS = e.getNamespaceURI();
+            if (prefix == null && currentNS == null) {
+                prefix = NokogiriHelpers.getPrefix(e.getNodeName());
+            } else if (currentNS != null) {
+                prefix = e.lookupPrefix(currentNS);
+            }
             e.getOwnerDocument().setStrictErrorChecking(false);
-            e.getOwnerDocument().renameNode(e, e.lookupNamespaceURI(e.getPrefix()), e.getNodeName());
+            String nsURI = e.lookupNamespaceURI(prefix);
+            this.node = NokogiriHelpers.renameNode(e, nsURI, e.getNodeName());
 
             if (e.hasAttributes()) {
                 NamedNodeMap attrs = e.getAttributes();
@@ -458,24 +471,28 @@ public class XmlNode extends RubyObject {
                 for (int i = 0; i < attrs.getLength(); i++) {
                     Attr attr = (Attr) attrs.item(i);
                     String nsUri = "";
-                    String prefix = attr.getPrefix();
+                    String attrPrefix = attr.getPrefix();
+                    if (attrPrefix == null) {
+                        attrPrefix = NokogiriHelpers.getPrefix(attr.getNodeName());
+                    }
                     String nodeName = attr.getNodeName();
                     if ("xml".equals(prefix)) {
                         nsUri = "http://www.w3.org/XML/1998/namespace";
-                    } else if ("xmlns".equals(prefix) || nodeName.equals("xmlns")) {
+                    } else if ("xmlns".equals(attrPrefix) || nodeName.equals("xmlns")) {
                         nsUri = "http://www.w3.org/2000/xmlns/";
                     } else {
-                        nsUri = attr.getNamespaceURI();
+                        nsUri = attr.lookupNamespaceURI(attrPrefix);
                     }
                     if (!(nsUri == null || "".equals(nsUri))) {
                         XmlNamespace.createFromAttr(context.getRuntime(), attr);
                     }
-                    e.getOwnerDocument().renameNode(attr, nsUri, nodeName);
+                    NokogiriHelpers.renameNode(attr, nsUri, nodeName);
                 }
             }
 
-            if (e.hasChildNodes()) {
-                ((XmlNodeSet) children(context)).relink_namespace(context);
+            if (this.node.hasChildNodes()) {
+                XmlNodeSet nodeSet = (XmlNodeSet)(children(context));
+                nodeSet.relink_namespace(context);
             }
         }
     }
@@ -514,13 +531,8 @@ public class XmlNode extends RubyObject {
 
     public void setNode(ThreadContext context, Node node) {
         this.node = node;
-        
-        if (node != null) {
-            resetCache();
-            if (node.getNodeType() != Node.DOCUMENT_NODE) {
-                doc = document(context);
-            }
-        }
+
+        decorate(context.getRuntime());
 
         if (this instanceof XmlAttr) {
             ((XmlAttr)this).setNamespaceIfNecessary(context.getRuntime());
@@ -539,7 +551,7 @@ public class XmlNode extends RubyObject {
                 && oldPrefix.equals(rubyStringToString(ns.prefix(context))));
 
         if(update) {
-            this.node.getOwnerDocument().renameNode(this.node, uri, this.node.getNodeName());
+            this.node = NokogiriHelpers.renameNode(this.node, uri, this.node.getNodeName());
         }
     }
 
@@ -579,7 +591,7 @@ public class XmlNode extends RubyObject {
         else namespaceOwner = node.getParentNode();
         XmlNamespace ns = XmlNamespace.createFromPrefixAndHref(namespaceOwner, prefix, href);
         if (node != namespaceOwner) {
-            node.getOwnerDocument().renameNode(node, ns.getHref(), ns.getPrefix() + node.getLocalName());
+            this.node = NokogiriHelpers.renameNode(node, ns.getHref(), ns.getPrefix() + node.getLocalName());
         }
         
         updateNodeNamespaceIfNecessary(context, ns);
@@ -915,8 +927,9 @@ public class XmlNode extends RubyObject {
             if (rbkey == null || rbkey.isNil()) context.getRuntime().getNil();
             String key = rubyStringToString(rbkey);
             Element element = (Element) node;
+            if (!element.hasAttribute(key)) return context.getRuntime().getNil();
             String value = element.getAttribute(key);
-            return nonEmptyStringOrNil(context.getRuntime(), value);
+            return stringOrNil(context.getRuntime(), value);
         }
         return context.getRuntime().getNil();
     }
@@ -1174,7 +1187,7 @@ public class XmlNode extends RubyObject {
     @JRubyMethod(name = {"node_name=", "name="})
     public IRubyObject node_name_set(ThreadContext context, IRubyObject nodeName) {
         String newName = rubyStringToString(nodeName);
-        getOwnerDocument().renameNode(node, null, newName);
+        this.node = NokogiriHelpers.renameNode(node, null, newName);
         setName(nodeName);
         return this;
     }
@@ -1192,6 +1205,8 @@ public class XmlNode extends RubyObject {
               String uri = null;
               if (prefix.equals("xml")) {
                 uri = "http://www.w3.org/XML/1998/namespace";
+              } else if (prefix.equals("xmlns")) {
+                uri = "http://www.w3.org/2000/xmlns/";
               } else {
                 uri = findNamespaceHref(context, prefix);
               }
@@ -1216,7 +1231,11 @@ public class XmlNode extends RubyObject {
             return namespace.getHref();
           }
         }
-        currentNode = (XmlNode) currentNode.parent(context);
+        if (currentNode.parent(context).isNil()) {
+            break;
+        } else {
+            currentNode = (XmlNode) currentNode.parent(context);
+        }
       }
       return null;
     }
@@ -1263,7 +1282,7 @@ public class XmlNode extends RubyObject {
                 String prefix = n.getPrefix();
                 String href = n.getNamespaceURI();
                 ((XmlDocument)doc).getNamespaceCache().remove(prefix == null ? "" : prefix, href);
-                n.getOwnerDocument().renameNode(n, null, n.getNodeName());
+                this.node = NokogiriHelpers.renameNode(n, null, NokogiriHelpers.getLocalPart(n.getNodeName()));
             }
         } else {
             XmlNamespace ns = (XmlNamespace) namespace;
@@ -1272,7 +1291,14 @@ public class XmlNode extends RubyObject {
 
             // Assigning node = ...renameNode() or not seems to make no
             // difference.  Why not? -pmahoney
-            node = node.getOwnerDocument().renameNode(node, href, NokogiriHelpers.newQName(prefix, node));
+
+            // It actually makes a great deal of difference. renameNode()
+            // will operate in place if it can, but sometimes it can't.
+            // The node you passed in *might* come back as you expect, but
+            // it might not. It's much safer to throw away the original
+            // and keep the return value. -mbklein
+            String new_name = NokogiriHelpers.newQName(prefix, node);
+            this.node = NokogiriHelpers.renameNode(node, href, new_name);
         }
 
         return this;
@@ -1401,12 +1427,16 @@ public class XmlNode extends RubyObject {
         Node otherNode = other.node;
 
          try {
+            Document prev = otherNode.getOwnerDocument();
             Document doc = thisNode.getOwnerDocument();
             if (doc != null && doc != otherNode.getOwnerDocument()) {
                 Node ret = doc.adoptNode(otherNode);
+                // FIXME: this is really a hack, see documentation of fixUserData() for more details.
+                fixUserData(prev, ret);
                 if (ret == null) {
                     throw context.getRuntime().newRuntimeError("Failed to take ownership of node");
                 }
+                otherNode = ret;
             }
 
             Node parent = thisNode.getParentNode();
@@ -1444,6 +1474,20 @@ public class XmlNode extends RubyObject {
         return nodeOrTags;
     }
 
+    /**
+     * This is a hack to fix #839. We should submit a patch to Xerces.
+     * It looks like CoreDocumentImpl.adoptNode() doesn't copy
+     * the user data associated with child nodes (recursively).
+     */
+    private void fixUserData(Document previous, Node ret) {
+      String key = NokogiriHelpers.ENCODED_STRING;
+      for (Node child = ret.getFirstChild(); child != null; child = child.getNextSibling()) {
+        CoreDocumentImpl previousDocument = (CoreDocumentImpl) previous;
+        child.setUserData(key, previousDocument.getUserData(child, key), null);
+        fixUserData(previous, child);
+      }
+    }
+
     protected Node[] adoptAsChild(ThreadContext context, Node parent,
                                 Node otherNode) {
         /*
@@ -1469,7 +1513,7 @@ public class XmlNode extends RubyObject {
             XmlElement fragmentContext = ((XmlDocumentFragment)this).getFragmentContext();
             String namespace_uri = fragmentContext.node.getNamespaceURI();
             if (namespace_uri != null && namespace_uri.length() > 0) {
-                node.getOwnerDocument().renameNode(child, namespace_uri, child.getNodeName());
+                NokogiriHelpers.renameNode(child, namespace_uri, child.getNodeName());
             }
         }
     }
@@ -1526,7 +1570,7 @@ public class XmlNode extends RubyObject {
         try {
             parentNode.replaceChild(otherNode, thisNode);
             if (otherNode.getNodeType() != Node.TEXT_NODE) {
-                otherNode.getOwnerDocument().renameNode(otherNode, thisNode.getNamespaceURI(), otherNode.getNodeName());
+                NokogiriHelpers.renameNode(otherNode, thisNode.getNamespaceURI(), otherNode.getNodeName());
             }
         } catch (Exception e) {
             String prefix = "could not replace child: ";