nokogiri 1.5.0.beta.2 → 1.5.0.beta.3

data/ext/java/nokogiri/XmlEntityDecl.java

@@ -1,3 +1,35 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2010:
+ *
+ * * {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;

data/ext/java/nokogiri/XmlEntityReference.java

@@ -1,3 +1,35 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2010:
+ *
+ * * {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.rubyStringToString;
@@ -11,7 +43,8 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 
 /**
- *
+ * Class for Nokogiri::XML::EntityReference
+ * 
  * @author sergio
  * @author Patrick Mahoney <pat@polycrystal.org>
  */
@@ -36,7 +69,7 @@ public class XmlEntityReference extends XmlNode{
 
         Document document = ((XmlNode) doc).getOwnerDocument();
         Node node = document.createEntityReference(rubyStringToString(name));
-        setNode(node);
+        setNode(context, node);
     }
 
 }

data/ext/java/nokogiri/XmlNamespace.java

@@ -1,3 +1,35 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2010:
+ *
+ * * {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.getLocalNameForNamespace;
@@ -7,6 +39,7 @@ import nokogiri.internals.SaveContext;
 import org.jruby.Ruby;
 import org.jruby.RubyClass;
 import org.jruby.RubyObject;
+import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.runtime.ThreadContext;
@@ -14,7 +47,8 @@ import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Node;
 
 /**
- *
+ * Class for Nokogiri::XML::Namespace
+ * 
  * @author serabe
  */
 @JRubyClass(name="Nokogiri::XML::Namespace")
@@ -33,8 +67,8 @@ public class XmlNamespace extends RubyObject {
 
     public XmlNamespace(Ruby ruby, RubyClass klazz, String prefix, String href) {
         super(ruby, klazz);
-        this.prefix = (prefix == null) ? ruby.getNil() : ruby.newString(prefix);
-        this.href = (href == null) ? ruby.getNil() : ruby.newString(href);
+        this.prefix = (prefix == null) ? ruby.getNil() : RubyString.newString(ruby, prefix);
+        this.href = (href == null) ? ruby.getNil() : RubyString.newString(ruby, href);
     }
 
     public XmlNamespace(Ruby ruby, IRubyObject prefix, IRubyObject href) {
@@ -46,11 +80,27 @@ public class XmlNamespace extends RubyObject {
         this.prefix = prefix;
         this.href = href;
     }
+    
+    public void setDefinition(Ruby runtime, String prefix, String href) {
+        this.prefix = (prefix == null) ? runtime.getNil() : RubyString.newString(runtime, prefix);
+        this.href = (href == null) ? runtime.getNil() : RubyString.newString(runtime, href);
+    }
+    
+    /**
+     * Create and return a copy of this object.
+     *
+     * @return a clone of this object
+     */
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
 
     public static XmlNamespace fromNode(Ruby ruby, Node node) {
         String localName = getLocalNameForNamespace(node.getNodeName());
-
-        return new XmlNamespace(ruby, getNokogiriClass(ruby, "Nokogiri::XML::Namespace"), localName, node.getNodeValue());
+        XmlNamespace namespace = (XmlNamespace) getNokogiriClass(ruby, "Nokogiri::XML::Namespace").allocate();
+        namespace.setDefinition(ruby, localName, node.getNodeValue());
+        return namespace;
     }
 
     public boolean isEmpty() {

data/ext/java/nokogiri/XmlNode.java

@@ -1,3 +1,35 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2010:
+ *
+ * * {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 java.lang.Math.max;
@@ -12,17 +44,16 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.regex.Matcher;
 
 import nokogiri.internals.HtmlDomParserContext;
 import nokogiri.internals.NokogiriHelpers;
 import nokogiri.internals.NokogiriNamespaceCache;
-import nokogiri.internals.NokogiriNamespaceContext;
 import nokogiri.internals.SaveContext;
 import nokogiri.internals.XmlDomParserContext;
 
 import org.jruby.Ruby;
 import org.jruby.RubyArray;
+import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
 import org.jruby.RubyFixnum;
 import org.jruby.RubyModule;
@@ -30,7 +61,6 @@ import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
-import org.jruby.javasupport.JavaUtil;
 import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
@@ -44,6 +74,10 @@ import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Text;
 
+/**
+ * Class for Nokogiri::XML::Node
+ *
+ */
 @JRubyClass(name="Nokogiri::XML::Node")
 public class XmlNode extends RubyObject {
 
@@ -156,7 +190,7 @@ public class XmlNode extends RubyObject {
      * called from Ruby code.
      */
     public XmlNode(Ruby ruby, RubyClass cls) {
-        this(ruby, cls, null);
+        super(ruby, cls);
     }
 
     /**
@@ -178,9 +212,20 @@ public class XmlNode extends RubyObject {
                 }
             }
         }
+        
+    }
+    
+    /**
+     * Create and return a copy of this object.
+     *
+     * @return a clone of this object
+     */
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        return super.clone();
     }
     
-    private void resetCache() {
+    protected void resetCache() {
         node.setUserData(NokogiriHelpers.CACHED_NODE, this, null);
     }
 
@@ -231,12 +276,12 @@ public class XmlNode extends RubyObject {
             klazz = getNokogiriClass(ruby, "Nokogiri::XML::Element");
         }
 
-        XmlNode node = (XmlNode) klazz.allocate();
-        node.init(context, args);
-        node.callInit(args, block);
-        if (node.node == null) System.out.println("NODE IS NULL");
-        if (block.isGiven()) block.call(context, node);
-        return node;
+        XmlNode xmlNode = (XmlNode) klazz.allocate();
+        xmlNode.init(context, args);
+        xmlNode.callInit(args, block);
+        if (xmlNode.node == null) context.getRuntime().newRuntimeError("NODE IS NULL");
+        if (block.isGiven()) block.call(context, xmlNode);
+        return xmlNode;
     }
 
     /**
@@ -266,14 +311,9 @@ public class XmlNode extends RubyObject {
         if (document == null) {
             throw getRuntime().newArgumentError("node must have owner document");
         }
-        XmlDocument xmlDoc =
-            (XmlDocument) getCachedNodeOrCreate(getRuntime(), document);
 
-        Element element =
-            document.createElementNS(null, rubyStringToString(name));
-        setNode(element);
-        setDocument(xmlDoc);
-        RuntimeHelpers.invoke(context, xmlDoc, "decorate", this);
+        Element element = document.createElementNS(null, rubyStringToString(name));
+        setNode(context, element);
     }
 
     /**
@@ -313,7 +353,7 @@ public class XmlNode extends RubyObject {
 
         String curLine;
         boolean closingTag = false;
-        String indentString = (String)indentStringObject.toJava(String.class);
+        String indentString = rubyStringToString(indentStringObject);
         int lengthInd = indentString.length();
         StringBuffer curInd = new StringBuffer();
 
@@ -394,25 +434,35 @@ public class XmlNode extends RubyObject {
         this.name = name;
     }
 
-    public void setDocument(IRubyObject doc) {
+    public void setDocument(ThreadContext context, IRubyObject doc) {
         this.doc = doc;
+        setInstanceVariable("@document", doc);
+        if (doc != null) {
+            RuntimeHelpers.invoke(context, doc, "decorate", this);
+        }
     }
 
-    protected void setNode(Node node) {
+    public void setNode(ThreadContext context, Node node) {
         this.node = node;
-        resetCache();
+        
+        if (node != null) {
+            resetCache();
+            if (node.getNodeType() != Node.DOCUMENT_NODE) {
+                doc = document(context);
+            }
+        }
     }
 
     public void updateNodeNamespaceIfNecessary(ThreadContext context, XmlNamespace ns) {
         String oldPrefix = this.node.getPrefix();
-        String uri = (String)ns.href(context).toJava(String.class);
+        String uri = rubyStringToString(ns.href(context));
 
         /*
          * Update if both prefixes are null or equal
          */
         boolean update = (oldPrefix == null && ns.prefix(context).isNil()) ||
                             (oldPrefix != null && !ns.prefix(context).isNil()
-                && oldPrefix.equals((String)ns.prefix(context).toJava(String.class)));
+                && oldPrefix.equals(rubyStringToString(ns.prefix(context))));
 
         if(update) {
             this.node.getOwnerDocument().renameNode(this.node, uri, this.node.getNodeName());
@@ -428,7 +478,7 @@ public class XmlNode extends RubyObject {
             str = NokogiriHelpers.getLocalPart(str);
         }
         if (str == null) str = "";
-        name = JavaUtil.convertJavaToUsableRubyObject(context.getRuntime(), str);
+        name = context.getRuntime().newString(str);
         return name;
     }
 
@@ -488,7 +538,7 @@ public class XmlNode extends RubyObject {
     @JRubyMethod(name = {"attribute", "attr"})
     public IRubyObject attribute(ThreadContext context, IRubyObject name){
         NamedNodeMap attrs = this.node.getAttributes();
-        Node attr = attrs.getNamedItem((String)name.toJava(String.class));
+        Node attr = attrs.getNamedItem(rubyStringToString(name));
         if(attr == null) {
             return  context.getRuntime().newString(ERR_INSECURE_SET_INST_VAR);
         }
@@ -517,8 +567,8 @@ public class XmlNode extends RubyObject {
 
     @JRubyMethod
     public IRubyObject attribute_with_ns(ThreadContext context, IRubyObject name, IRubyObject namespace) {
-        String namej = (String)name.toJava(String.class);
-        String nsj = (namespace.isNil()) ? null : (String)namespace.toJava(String.class);
+        String namej = rubyStringToString(name);
+        String nsj = (namespace.isNil()) ? null : rubyStringToString(namespace);
 
         Node el = this.node.getAttributes().getNamedItemNS(nsj, namej);
 
@@ -581,7 +631,6 @@ public class XmlNode extends RubyObject {
                 nodes.add(child);
                 if (isFirstOnly) return;
             }
-            addElements(child, nodes, isFirstOnly);
         }
     }
 
@@ -626,7 +675,7 @@ public class XmlNode extends RubyObject {
      * 'in_context' is supposed to do.  Also should take
      * <code>options</code> into account.
      */
-    @JRubyMethod(visibility=Visibility.PRIVATE)
+    @JRubyMethod(required = 2, visibility = Visibility.PRIVATE)
     public IRubyObject in_context(ThreadContext context,
                                   IRubyObject str,
                                   IRubyObject options) {
@@ -636,94 +685,76 @@ public class XmlNode extends RubyObject {
         XmlDocument document;
         
         IRubyObject d = document(context);
+        Ruby runtime = context.getRuntime();
         if (d != null && d instanceof XmlDocument) {
             document = (XmlDocument)d;
         } else {
-            return context.getRuntime().getNil();
+            return runtime.getNil();
         }
         
         if (document instanceof HtmlDocument) {
-            klass = getNokogiriClass(context.getRuntime(), "Nokogiri::HTML::Document");
-            ctx = new HtmlDomParserContext(context.getRuntime(), options);
+            klass = getNokogiriClass(runtime, "Nokogiri::HTML::Document");
+            ctx = new HtmlDomParserContext(runtime, options);
             ((HtmlDomParserContext)ctx).enableDocumentFragment();
-            istream = new ByteArrayInputStream(((String)str.toJava(String.class)).getBytes());
+            istream = new ByteArrayInputStream((rubyStringToString(str)).getBytes());
         } else if (document instanceof XmlDocument) {
-            klass = getNokogiriClass(context.getRuntime(), "Nokogiri::XML::Document");
-            ctx = new XmlDomParserContext(context.getRuntime(), options);
-            String input = addTemporaryRootTagIfNecessary(context, (String)str.toJava(String.class));
+            klass = getNokogiriClass(runtime, "Nokogiri::XML::Document");
+            ctx = new XmlDomParserContext(runtime, options);
+            String input = rubyStringToString(str);
             istream = new ByteArrayInputStream(input.getBytes());
         } else {
-            return context.getRuntime().getNil();
+            return runtime.getNil();
         }
 
         ctx.setInputSource(istream);
-        XmlDocument doc = ctx.parse(context, klass, getRuntime().getNil());
+        XmlDocument doc = ctx.parse(context, klass, runtime.getNil());
+        
+        RubyArray documentErrors = getErrorArray(document);
+        RubyArray docErrors = getErrorArray(doc);
+        if (isErrorIncreated(documentErrors, docErrors)) {
+            for (int i = 0; i < docErrors.getLength(); i++) {
+                documentErrors.add(docErrors.get(i));
+            }
+            document.setInstanceVariable("@errors", documentErrors);
+            return new XmlNodeSet(getRuntime(), RubyArray.newArray(runtime));
+        }
         
-        if (isErrorIncreated(document, doc)) {
-            saveErrorsOfCreatedDocument(document, doc);
-            return new XmlNodeSet(getRuntime(), RubyArray.newArray(context.getRuntime()));
+        // The first child might be document type node (dtd declaration).
+        // XmlNodeSet to be return should not have dtd decl in its list.
+        Node first;
+        if (doc.node.getFirstChild().getNodeType() == Node.DOCUMENT_TYPE_NODE) {
+            first = doc.node.getFirstChild().getNextSibling();
+        } else {
+            first = doc.node.getFirstChild();
         }
-        NodeList childNodes = removeTemporaryRootIfNecessary(doc.node.getChildNodes());
-        XmlNodeSet nodes = new XmlNodeSet(getRuntime(), childNodes);
+        RubyArray nodeArray = RubyArray.newArray(runtime);
+        nodeArray.add(NokogiriHelpers.getCachedNodeOrCreate(runtime, first));
+        
+        NokogiriHelpers.nodeListToRubyArray(runtime, first.getChildNodes(), nodeArray);
+        XmlNodeSet nodes = new XmlNodeSet(getRuntime(), nodeArray);
         return nodes;
     }
     
-    private int getErrorNumbers(XmlDocument document) {
+    private RubyArray getErrorArray(XmlDocument document) {
         IRubyObject obj = document.getInstanceVariable("@errors");
         if (obj != null && obj instanceof RubyArray) {
-            return ((RubyArray)obj).getLength();
+            return (RubyArray)obj;
         }
-        return 0;
+        return RubyArray.newArray(document.getRuntime());
     }
-    
-    private boolean isErrorIncreated(XmlDocument base, XmlDocument created) {
-        int baseDocumentErrors = getErrorNumbers(base);
-        int createdDocumentErrors = getErrorNumbers(created);
-        return createdDocumentErrors > baseDocumentErrors;
-    }
-    
-    private void saveErrorsOfCreatedDocument(XmlDocument base, XmlDocument created) {
-        RubyArray newErrors = (RubyArray)created.getInstanceVariable("@errors");
-        RubyArray existingErrors = null;
-        IRubyObject obj = base.getInstanceVariable("@errors");
-        if (obj != null && obj instanceof RubyArray) {
-            existingErrors = (RubyArray)obj;
-        } else {
-            existingErrors = RubyArray.newArray(base.getRuntime());
-        }
-        for (int i=0; i<newErrors.getLength(); i++) {
-            existingErrors.add(newErrors.get(i));
-        }
-        base.setInstanceVariable("@errors", existingErrors);
-    }
-    
-    private String addTemporaryRootTagIfNecessary(ThreadContext context, String tags) {
-        Matcher matcher = XmlDocumentFragment.wellformed_pattern.matcher(tags);
-        while(matcher.find()) {
-            if (matcher.start() == 0 && matcher.end() == tags.length()) return tags;
-            break;
-        }
-        tags = "<"+ NokogiriNamespaceContext.NOKOGIRI_TEMPORARY_ROOT_TAG + ">" + tags + "</" + NokogiriNamespaceContext.NOKOGIRI_TEMPORARY_ROOT_TAG + ">";
-        return tags;
-    }
-    
-    private NodeList removeTemporaryRootIfNecessary(NodeList nodes) {
-        if (nodes != null && nodes.getLength() > 0) {
-            Node n = nodes.item(0);
-            if (n.getNodeType() == Node.ELEMENT_NODE && n.getNodeName().equals(NokogiriNamespaceContext.NOKOGIRI_TEMPORARY_ROOT_TAG)) {
-                return n.getChildNodes();
-            }
-        }
-        return nodes;
+
+    private boolean isErrorIncreated(RubyArray baseErrors, RubyArray createdErrors) {
+        RubyBoolean result = baseErrors.compare(baseErrors.getRuntime().getCurrentContext(), "eql?", createdErrors, null);
+        return result.isFalse();
     }
 
     @JRubyMethod(name = {"content", "text", "inner_text"})
     public IRubyObject content(ThreadContext context) {
         if (content != null && content.isNil()) return content;
         String textContent;
-        if (content != null) textContent = (String)content.toJava(String.class);
+        if (content != null) textContent = rubyStringToString(content);
         else if (this instanceof XmlDocument) {
-            textContent = this.node.getChildNodes().item(0).getTextContent();
+            textContent = ((Document)this.node).getDocumentElement().getTextContent().trim();
         } else {
             textContent = this.node.getTextContent();
         }
@@ -759,7 +790,7 @@ public class XmlNode extends RubyObject {
         } catch (CloneNotSupportedException e) {
             throw context.getRuntime().newRuntimeError(e.toString());
         }
-        if (node == null) throw getRuntime().newRuntimeError("FFFFFFFFFUUUUUUU");
+        if (node == null) throw context.getRuntime().newRuntimeError("FFFFFFFFFUUUUUUU");
         Node newNode = node.cloneNode(deep);
         clone.node = newNode;
         return clone;
@@ -767,7 +798,7 @@ public class XmlNode extends RubyObject {
 
     public static IRubyObject encode_special_chars(ThreadContext context,
                                                    IRubyObject string) {
-        String s = (String)string.toJava(String.class);
+        String s = rubyStringToString(string);
         String enc = NokogiriHelpers.encodeJavaString(s);
         return context.getRuntime().newString(enc);
     }
@@ -945,7 +976,7 @@ public class XmlNode extends RubyObject {
 
     protected void setContent(IRubyObject content) {
         this.content = content;
-        this.node.setTextContent((String)content.toJava(String.class));
+        this.node.setTextContent(rubyStringToString(content));
     }
 
     private void setContent(String content) {
@@ -974,10 +1005,10 @@ public class XmlNode extends RubyObject {
         IRubyObject indentString = args[2];
         IRubyObject options = args[3];
 
-        String encString = encoding.isNil() ? null : (String)encoding.toJava(String.class);
+        String encString = encoding.isNil() ? null : rubyStringToString(encoding);
 
         SaveContext ctx = new SaveContext(context, (Integer)options.toJava(Integer.class),
-                (String)indentString.toJava(String.class),
+                rubyStringToString(indentString),
                 encString);
 
         saveContent(context, ctx);
@@ -1012,7 +1043,7 @@ public class XmlNode extends RubyObject {
 
     @JRubyMethod(name = {"node_name=", "name="})
     public IRubyObject node_name_set(ThreadContext context, IRubyObject nodeName) {
-        String newName = (String)nodeName.toJava(String.class);
+        String newName = rubyStringToString(nodeName);
         getOwnerDocument().renameNode(node, null, newName);
         setName(nodeName);
         return this;
@@ -1064,8 +1095,8 @@ public class XmlNode extends RubyObject {
             }
         } else {
             XmlNamespace ns = (XmlNamespace) namespace;
-            String prefix = (String)ns.prefix(context).toJava(String.class);
-            String href = (String)ns.href(context).toJava(String.class);
+            String prefix = rubyStringToString(ns.prefix(context));
+            String href = rubyStringToString(ns.href(context));
 
             // Assigning node = ...renameNode() or not seems to make no
             // difference.  Why not? -pmahoney
@@ -1191,7 +1222,7 @@ public class XmlNode extends RubyObject {
         XmlNode other = asXmlNode(context, other_);
         // this.doc might be null since this node can be empty node.
         if (this.doc != null) {
-            other.doc = this.doc;
+            other.setDocument(context, this.doc);
         }
         IRubyObject nodeOrTags = other;
         Node thisNode = node;
@@ -1243,10 +1274,6 @@ public class XmlNode extends RubyObject {
 
     protected Node[] adoptAsChild(ThreadContext context, Node parent,
                                 Node otherNode) {
-        if (hasTemporaryRoot(parent, otherNode)) {
-            return adoptRealChildrenAsChild(context, parent, otherNode);
-        }
-        
         /*
          * This is a bit of a hack.  C-Nokogiri allows adding a bare
          * text node as the root element.  Java (and XML spec?) does
@@ -1264,40 +1291,6 @@ public class XmlNode extends RubyObject {
         nodes[0] = otherNode;
         return nodes;
     }
-    
-    private boolean hasTemporaryRoot(Node parent, Node child) {
-        if (parent.getNodeType() == Node.DOCUMENT_FRAGMENT_NODE
-                && child.getNodeName().equals(NokogiriNamespaceContext.NOKOGIRI_TEMPORARY_ROOT_TAG)) {
-            return true;
-        }
-        return false;
-    }
-    
-    private Node[] adoptRealChildrenAsChild(ThreadContext context, Node parent, Node otherNode) {
-        NodeList children = otherNode.getChildNodes();
-        int length = children.getLength();
-        List<Node> nodes = new ArrayList<Node>();
-        for (int i=0; i < length; i++) {
-            nodes.add(children.item(i).cloneNode(true));
-        }
-        //cut out leading and trailing whitespaces
-        if (nodes.get(0).getNodeType() == Node.TEXT_NODE && nodes.get(0).getTextContent().trim().length() == 0) {
-            nodes.remove(0);
-        }
-        int lastIndex = nodes.size() - 1;
-        if (nodes.get(lastIndex).getNodeType() == Node.TEXT_NODE && nodes.get(lastIndex).getTextContent().trim().length() == 0) {
-            nodes.remove(lastIndex);
-        }
-        
-        Node[] nodeArray = new Node[nodes.size()];
-        for (int i=0; i < nodeArray.length; i++) {
-            Node child = nodes.get(i);
-            addNamespaceURIIfNeeded(child);
-            parent.appendChild(child);
-            nodeArray[i] = child;
-        }
-        return nodeArray;
-    }
 
     private void addNamespaceURIIfNeeded(Node child) {
         if (this instanceof XmlDocumentFragment && ((XmlDocumentFragment)this).getFragmentContext() != null) {