nokogiri 1.5.0-java → 1.5.1-java

data/ext/java/nokogiri/NokogiriService.java

@@ -582,9 +582,17 @@ public class NokogiriService implements BasicLibraryService {
         }
     };
 
-    private static ObjectAllocator XSLT_STYLESHEET_ALLOCATOR = new ObjectAllocator() {
+    public static ObjectAllocator XSLT_STYLESHEET_ALLOCATOR = new ObjectAllocator() {
+        private XsltStylesheet xsltStylesheet = null;
         public IRubyObject allocate(Ruby runtime, RubyClass klazz) {
-            return new XsltStylesheet(runtime, klazz);
+            if (xsltStylesheet == null) xsltStylesheet = new XsltStylesheet(runtime, klazz);
+            try {
+                XsltStylesheet clone  = (XsltStylesheet) xsltStylesheet.clone();
+                clone.setMetaClass(klazz);
+                return clone;
+            } catch (CloneNotSupportedException e) {
+                return new XmlText(runtime, klazz);
+            }
         }
     };
 }

data/ext/java/nokogiri/XmlAttr.java

@@ -154,7 +154,7 @@ public class XmlAttr extends XmlNode{
     protected IRubyObject getNodeName(ThreadContext context) {
         if (name != null) return name;
         String attrName = ((Attr)node).getName();
-        attrName = NokogiriHelpers.getLocalPart(attrName);
+        if (!(doc instanceof HtmlDocument)) attrName = NokogiriHelpers.getLocalPart(attrName);
         return attrName == null ? context.getRuntime().getNil() : RubyString.newString(context.getRuntime(), attrName);
     }
 

data/ext/java/nokogiri/XmlDocument.java

@@ -33,12 +33,13 @@
 package nokogiri;
 
 import static nokogiri.internals.NokogiriHelpers.getCachedNodeOrCreate;
-import static nokogiri.internals.NokogiriHelpers.getLocalNameForNamespace;
 import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
 import static nokogiri.internals.NokogiriHelpers.isNamespace;
 import static nokogiri.internals.NokogiriHelpers.rubyStringToString;
 import static nokogiri.internals.NokogiriHelpers.stringOrNil;
 
+import java.util.List;
+
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -48,14 +49,17 @@ import nokogiri.internals.SaveContextVisitor;
 import nokogiri.internals.XmlDomParserContext;
 
 import org.jruby.Ruby;
+import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.RubyFixnum;
 import org.jruby.RubyNil;
+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.Arity;
+import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Attr;
@@ -108,8 +112,7 @@ public class XmlDocument extends XmlNode {
         setInstanceVariable("@decorators", ruby.getNil());
     }
     
-    @Override
-    public void setNode(ThreadContext context, Node node) {
+    public void setDocumentNode(ThreadContext context, Node node) {
         super.setNode(context, node);
         if (nsCache == null) nsCache = new NokogiriNamespaceCache();
         Ruby runtime = context.getRuntime();
@@ -128,7 +131,7 @@ public class XmlDocument extends XmlNode {
     // not sure, but like attribute values, text value will be lost
     // unless it is referred once before this document is used.
     // this seems to happen only when the fragment is parsed from Node#in_context.
-    private void stabilizeTextContent(Document document) {
+    protected void stabilizeTextContent(Document document) {
         if (document.getDocumentElement() != null) document.getDocumentElement().getTextContent();
     }
 
@@ -215,7 +218,7 @@ public class XmlDocument extends XmlNode {
         return getUrl();
     }
 
-    protected static Document createNewDocument() {
+    public static Document createNewDocument() {
         try {
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(DOCUMENTBUILDERFACTORY_IMPLE_NAME, NokogiriService.class.getClassLoader());
             return factory.newDocumentBuilder().newDocument();
@@ -237,11 +240,11 @@ public class XmlDocument extends XmlNode {
             Document docNode = createNewDocument();
             if ("Nokogiri::HTML::Document".equals(((RubyClass)klazz).getName())) {
                 xmlDocument = (XmlDocument) NokogiriService.HTML_DOCUMENT_ALLOCATOR.allocate(context.getRuntime(), (RubyClass) klazz);
-                xmlDocument.setNode(context, docNode);
+                xmlDocument.setDocumentNode(context, docNode);
             } else {
                 // XML::Document and sublass
                 xmlDocument = (XmlDocument) NokogiriService.XML_DOCUMENT_ALLOCATOR.allocate(context.getRuntime(), (RubyClass) klazz);
-                xmlDocument.setNode(context, docNode);
+                xmlDocument.setDocumentNode(context, docNode);
             }
         } catch (Exception ex) {
             throw context.getRuntime().newRuntimeError("couldn't create document: "+ex.toString());
@@ -349,9 +352,13 @@ public class XmlDocument extends XmlNode {
             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());
+                Attr attr = (Attr) attrs.item(i);
+                if (isNamespace(attr.getNodeName())) {
+                    ((org.w3c.dom.Element)node).removeAttributeNode(attr);
+                } else {
+                    attr.setPrefix(null);
+                    attr.getOwnerDocument().renameNode(attr, null, attr.getLocalName());
+                }
             }
         }
         XmlNodeSet nodeSet = (XmlNodeSet) xmlNode.children(context);
@@ -508,7 +515,7 @@ public class XmlDocument extends XmlNode {
     public static IRubyObject wrapJavaDocument(ThreadContext context, IRubyObject klazz, IRubyObject arg) {
         XmlDocument xmlDocument = (XmlDocument) NokogiriService.XML_DOCUMENT_ALLOCATOR.allocate(context.getRuntime(), getNokogiriClass(context.getRuntime(), "Nokogiri::XML::Document"));
         Document document = (Document)arg.toJava(Document.class);
-        xmlDocument.setNode(context, document);
+        xmlDocument.setDocumentNode(context, document);
         return xmlDocument;
     }
     
@@ -516,4 +523,54 @@ public class XmlDocument extends XmlNode {
     public IRubyObject toJavaDocument(ThreadContext context) {
         return JavaUtil.convertJavaToUsableRubyObject(context.getRuntime(), (org.w3c.dom.Document)node);
     }
+    
+    /* call-seq:
+     *  doc.canonicalize(mode=XML_C14N_1_0,inclusive_namespaces=nil,with_comments=false)
+     *  doc.canonicalize { |obj, parent| ... }
+     *
+     * Canonicalize a document and return the results.  Takes an optional block
+     * that takes two parameters: the +obj+ and that node's +parent+.  
+     * The  +obj+ will be either a Nokogiri::XML::Node, or a Nokogiri::XML::Namespace
+     * The block must return a non-nil, non-false value if the +obj+ passed in 
+     * should be included in the canonicalized document.
+     */
+    @JRubyMethod(optional=3)
+    public IRubyObject canonicalize(ThreadContext context, IRubyObject[] args, Block block) {
+        XmlNode startingNode = getStartingNode(block);
+        int canonicalOpts = 1;
+        int mode = 0;
+        if (args.length == 3) {
+            mode = (Integer)(args[0].isNil() ? 0 : args[0].toJava(Integer.class));
+            if (mode == 1) canonicalOpts = canonicalOpts | 16; // exclusive
+            // inclusive prefix list for exclusive c14n
+            canonicalOpts = args[2].isTrue() ? (canonicalOpts | 4) : canonicalOpts;
+        }
+        if (startingNode != this) canonicalOpts = canonicalOpts | 8; // subsets
+        // 38 = NO_DECL | NO_EMPTY | AS_XML
+        SaveContextVisitor visitor = new SaveContextVisitor(38, null, "UTF-8", false, false, canonicalOpts);
+        if (args.length == 3 && !args[1].isNil()) {
+            visitor.setC14nExclusiveInclusivePrefixes((List<String>)NokogiriHelpers.rubyStringArrayToJavaList((RubyArray)args[1]));
+        }
+        startingNode.accept(context, visitor);
+        Ruby runtime = context.getRuntime();
+        IRubyObject result = runtime.getTrue();
+        if (block.isGiven()) {
+            List<Node> list = visitor.getC14nNodeList();
+            for (Node n : list) {
+                IRubyObject currentNode = getCachedNodeOrCreate(runtime, n);
+                IRubyObject parentNode = getCachedNodeOrCreate(runtime, n.getParentNode());
+                result = block.call(context, currentNode, parentNode);
+            }
+        }
+        return result.isTrue() ? stringOrNil(runtime, visitor.toString()) : RubyString.newEmptyString(runtime);
+    }
+    
+    private XmlNode getStartingNode(Block block) {
+        if (block.isGiven()) {
+            if (block.getBinding().getSelf() instanceof XmlNode) {
+                return (XmlNode)block.getBinding().getSelf();
+            }
+        }
+        return this;
+    }
 }

data/ext/java/nokogiri/XmlDocumentFragment.java

@@ -92,8 +92,10 @@ public class XmlDocumentFragment extends XmlNode {
         // make wellformed fragment, ignore invalid namespace, or add appropriate namespace to parse
         if (args.length > 1 && args[1] instanceof RubyString) {
             args[1] = trim(context, doc, (RubyString)args[1]);
-            args[1] = RubyString.newString(context.getRuntime(), ignoreNamespaceIfNeeded(doc, rubyStringToString(args[1])));
-            args[1] = RubyString.newString(context.getRuntime(), addNamespaceDeclIfNeeded(doc, rubyStringToString(args[1])));
+            if (XmlDocumentFragment.isTag((RubyString)args[1])) {
+                args[1] = RubyString.newString(context.getRuntime(), ignoreNamespaceIfNeeded(doc, rubyStringToString(args[1])));
+                args[1] = RubyString.newString(context.getRuntime(), addNamespaceDeclIfNeeded(doc, rubyStringToString(args[1])));
+            }
         }
 
         XmlDocumentFragment fragment = (XmlDocumentFragment) NokogiriService.XML_DOCUMENT_FRAGMENT_ALLOCATOR.allocate(context.getRuntime(), (RubyClass)cls);
@@ -120,18 +122,27 @@ public class XmlDocumentFragment extends XmlNode {
         return result.isNil() ? str : result;
     }
 
+    private static boolean isTag(RubyString ruby_string) {
+        String str = rubyStringToString(ruby_string);
+        if (str.startsWith("<") && str.endsWith(">")) return true;
+        return false;
+    }
+    
     private static Pattern qname_pattern = Pattern.compile("[^</:>\\s]+:[^</:>=\\s]+");
     private static Pattern starttag_pattern = Pattern.compile("<[^</>]+>");
     
     private static String ignoreNamespaceIfNeeded(XmlDocument doc, String tags) {
         if (doc.getDocument() == null) return tags;
-        if (doc.getDocument().getDocumentElement() == null) return tags;
         Matcher matcher = qname_pattern.matcher(tags);
         Map<String, String> rewriteTable = new HashMap<String, String>();
         while(matcher.find()) {
             String qName = matcher.group();
-            NamedNodeMap nodeMap = doc.getDocument().getDocumentElement().getAttributes();
-            if (!isNamespaceDefined(qName, nodeMap)) {
+            if (doc.getDocument().getDocumentElement() != null) {
+                NamedNodeMap nodeMap = doc.getDocument().getDocumentElement().getAttributes();
+                if (!isNamespaceDefined(qName, nodeMap)) {
+                    rewriteTable.put(qName, getLocalPart(qName));
+                }
+            } else {
                 rewriteTable.put(qName, getLocalPart(qName));
             }
         }

data/ext/java/nokogiri/XmlElement.java

@@ -42,7 +42,6 @@ import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Element;
@@ -102,45 +101,6 @@ public class XmlElement extends XmlNode {
     @Override
     public boolean isElement() { return true; }
 
-    @Override
-    @JRubyMethod(visibility = Visibility.PRIVATE)
-    public IRubyObject get(ThreadContext context, IRubyObject rbkey) {
-        if (rbkey == null || rbkey.isNil()) context.getRuntime().getNil();
-        String key = rubyStringToString(rbkey);
-        Element element = (Element) node;
-        String value = element.getAttribute(key);
-        if(!value.equals("")){
-            return context.getRuntime().newString(value);
-        }
-        return context.getRuntime().getNil();
-    }
-
-    @Override
-    public IRubyObject key_p(ThreadContext context, IRubyObject rbkey) {
-        String key = rubyStringToString(rbkey);
-        Element element = (Element) node;
-        return context.getRuntime().newBoolean(element.hasAttribute(key));
-    }
-
-    @Override
-    public IRubyObject op_aset(ThreadContext context,
-                               IRubyObject rbkey,
-                               IRubyObject rbval) {
-        String key = rubyStringToString(rbkey);
-        String val = rubyStringToString(rbval);
-        Element element = (Element) node;
-        element.setAttribute(key, val);
-        return this;
-    }
-
-    @Override
-    public IRubyObject remove_attribute(ThreadContext context, IRubyObject name) {
-        String key = name.convertToString().asJavaString();
-        Element element = (Element) node;
-        element.removeAttribute(key);
-        return this;
-    }
-
     @Override
     public void relink_namespace(ThreadContext context) {
         Element e = (Element) node;

data/ext/java/nokogiri/XmlNamespace.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2011:
+ * Copyright (c) 2008 - 2012:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -36,6 +36,7 @@ import static nokogiri.internals.NokogiriHelpers.CACHED_NODE;
 import static nokogiri.internals.NokogiriHelpers.getCachedNodeOrCreate;
 import static nokogiri.internals.NokogiriHelpers.getLocalNameForNamespace;
 import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
+import nokogiri.internals.NokogiriHelpers;
 import nokogiri.internals.SaveContextVisitor;
 
 import org.jruby.Ruby;
@@ -79,6 +80,12 @@ public class XmlNamespace extends RubyObject {
     public String getHref() {
         return hrefString;
     }
+    
+    void deleteHref() {
+        hrefString = "http://www.w3.org/XML/1998/namespace";
+        href = NokogiriHelpers.stringOrNil(getRuntime(), hrefString);
+        attr.getOwnerElement().removeAttributeNode(attr);
+    }
 
     public void init(Attr attr, IRubyObject prefix, IRubyObject href, IRubyObject xmlDocument) {
         init(attr, prefix, href, (String) prefix.toJava(String.class), (String) href.toJava(String.class), xmlDocument);

data/ext/java/nokogiri/XmlNode.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2011:
+ * Copyright (c) 2008 - 2012:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -42,6 +42,13 @@ import static nokogiri.internals.NokogiriHelpers.stringOrNil;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -53,7 +60,6 @@ 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;
@@ -61,6 +67,7 @@ import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
+import org.jruby.exceptions.RaiseException;
 import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.ThreadContext;
@@ -431,7 +438,25 @@ public class XmlNode extends RubyObject {
         //this should delegate to subclasses' implementation
     }
 
-    public void accept(ThreadContext context, SaveContextVisitor visitor) {}
+    // Users might extend XmlNode. This method works for such a case.
+    public void accept(ThreadContext context, SaveContextVisitor visitor) {
+        visitor.enter(node);
+        XmlNodeSet xmlNodeSet = (XmlNodeSet) children(context);
+        if (xmlNodeSet.length() > 0) {
+            RubyArray array = (RubyArray) xmlNodeSet.to_a(context);
+            for(int i = 0; i < array.getLength(); i++) {
+                Object item = array.get(i);
+                if (item instanceof XmlNode) {
+                  XmlNode cur = (XmlNode) item;
+                  cur.accept(context, visitor);
+                } else if (item instanceof XmlNamespace) {
+                    XmlNamespace cur = (XmlNamespace)item;
+                    cur.accept(context, visitor);
+                }
+            }
+        }
+        visitor.leave(node);
+    }
 
     public void setName(IRubyObject name) {
         this.name = name;
@@ -502,6 +527,8 @@ public class XmlNode extends RubyObject {
         if (node != namespaceOwner) {
             node.getOwnerDocument().renameNode(node, ns.getHref(), ns.getPrefix() + node.getLocalName());
         }
+        
+        updateNodeNamespaceIfNecessary(context, ns);
 
         return ns;
     }
@@ -528,7 +555,7 @@ public class XmlNode extends RubyObject {
         RubyArray attr = ruby.newArray();
 
         for(int i = 0; i < nodeMap.getLength(); i++) {
-            if (!NokogiriHelpers.isNamespace(nodeMap.item(i))) {
+            if ((doc instanceof HtmlDocument) || !NokogiriHelpers.isNamespace(nodeMap.item(i))) {
                 attr.append(getCachedNodeOrCreate(context.getRuntime(), nodeMap.item(i)));
             }
         }
@@ -551,8 +578,13 @@ public class XmlNode extends RubyObject {
 
     @JRubyMethod(name = "blank?")
     public IRubyObject blank_p(ThreadContext context) {
-        String data = node.getTextContent();
-        if ("".equals(data.trim())) return context.getRuntime().getTrue();
+        // according to libxml doc, 
+        // a node is blank if if it is a Text or CDATA node consisting of whitespace only
+        if (node.getNodeType() == Node.TEXT_NODE || node.getNodeType() == Node.CDATA_SECTION_NODE) {
+            String data = node.getTextContent();
+            if (data == null) return context.getRuntime().getTrue();
+            if ("".equals(data.trim())) return context.getRuntime().getTrue();
+        }
         return context.getRuntime().getFalse();
     }
 
@@ -683,7 +715,7 @@ public class XmlNode extends RubyObject {
         
         RubyArray documentErrors = getErrorArray(document);
         RubyArray docErrors = getErrorArray(doc);
-        if (isErrorIncreated(documentErrors, docErrors)) {
+        if (isErrorIncreased(documentErrors, docErrors)) {
             for (int i = 0; i < docErrors.getLength(); i++) {
                 documentErrors.add(docErrors.get(i));
             }
@@ -702,8 +734,7 @@ public class XmlNode extends RubyObject {
         }
         RubyArray nodeArray = RubyArray.newArray(runtime);
         nodeArray.add(NokogiriHelpers.getCachedNodeOrCreate(runtime, first));
-        
-        NokogiriHelpers.nodeListToRubyArray(runtime, first.getChildNodes(), nodeArray);
+
         XmlNodeSet xmlNodeSet = XmlNodeSet.newXmlNodeSet(context, nodeArray);
         return xmlNodeSet;
     }
@@ -716,9 +747,10 @@ public class XmlNode extends RubyObject {
         return RubyArray.newArray(document.getRuntime());
     }
 
-    private boolean isErrorIncreated(RubyArray baseErrors, RubyArray createdErrors) {
-        RubyBoolean result = baseErrors.compare(baseErrors.getRuntime().getCurrentContext(), "eql?", createdErrors, null);
-        return result.isFalse();
+    private boolean isErrorIncreased(RubyArray baseErrors, RubyArray createdErrors) {
+        RubyFixnum length = ((RubyArray)createdErrors.op_diff(baseErrors)).length();
+        int diff_in_length = (Integer)length.toJava(Integer.class);
+        return diff_in_length > 0;
     }
 
     @JRubyMethod(name = {"content", "text", "inner_text"})
@@ -792,10 +824,19 @@ public class XmlNode extends RubyObject {
     /**
      * Get the attribute at the given key, <code>key</code>.
      * Assumes that this node has attributes (i.e. that key? returned
-     * true). Overridden in XmlElement.
+     * true).
      */
     @JRubyMethod(visibility = Visibility.PRIVATE)
-    public IRubyObject get(ThreadContext context, IRubyObject key) {
+    public IRubyObject get(ThreadContext context, IRubyObject rbkey) {
+        if (node instanceof Element) {
+            if (rbkey == null || rbkey.isNil()) context.getRuntime().getNil();
+            String key = rubyStringToString(rbkey);
+            Element element = (Element) node;
+            String value = element.getAttribute(key);
+            if (value != null) {
+                return context.getRuntime().newString(value);
+            }
+        }
         return context.getRuntime().getNil();
     }
 
@@ -888,11 +929,18 @@ public class XmlNode extends RubyObject {
      */
     @JRubyMethod(name = {"key?", "has_attribute?"})
     public IRubyObject key_p(ThreadContext context, IRubyObject rbkey) {
-        return context.getRuntime().getNil();
+        if (node instanceof Element) {
+            String key = rubyStringToString(rbkey);
+            Element element = (Element) node;
+            return context.getRuntime().newBoolean(element.hasAttribute(key));
+        } else {
+            return context.getRuntime().getNil();
+        }
     }
 
     @JRubyMethod
-    public IRubyObject namespace(ThreadContext context){
+    public IRubyObject namespace(ThreadContext context) {
+        if (doc instanceof HtmlDocument) return context.getRuntime().getNil();
         XmlDocument xmlDocument = (XmlDocument) doc;
         NokogiriNamespaceCache nsCache = xmlDocument.getNamespaceCache();
         String prefix = node.getPrefix();
@@ -917,6 +965,7 @@ public class XmlNode extends RubyObject {
         Ruby ruby = context.getRuntime();
         RubyArray namespace_definitions = ruby.newArray();
         if (doc == null) return namespace_definitions;
+        if (doc instanceof HtmlDocument) return namespace_definitions;
         List<XmlNamespace> namespaces = ((XmlDocument)doc).getNamespaceCache().get(node);
         for (XmlNamespace namespace : namespaces) {
             ((RubyArray)namespace_definitions).append(namespace);
@@ -953,7 +1002,11 @@ public class XmlNode extends RubyObject {
 
     protected void setContent(IRubyObject content) {
         this.content = content;
-        this.node.setTextContent(rubyStringToString(content));
+        String javaContent = rubyStringToString(content);
+        node.setTextContent(javaContent);
+        if (javaContent.length() == 0) return;
+        if (node.getNodeType() == Node.TEXT_NODE || node.getNodeType() == Node.CDATA_SECTION_NODE) return;
+        node.getFirstChild().setUserData(NokogiriHelpers.ENCODED_STRING, true, null);
     }
 
     private void setContent(String content) {
@@ -974,8 +1027,7 @@ public class XmlNode extends RubyObject {
      *              IRubyObject options}
      */
     @JRubyMethod(required=4, visibility=Visibility.PRIVATE)
-    public IRubyObject native_write_to(ThreadContext context,
-                                       IRubyObject[] args) {
+    public IRubyObject native_write_to(ThreadContext context, IRubyObject[] args) {
 
         IRubyObject io = args[0];
         IRubyObject encoding = args[1];
@@ -985,10 +1037,20 @@ public class XmlNode extends RubyObject {
         String encString = encoding.isNil() ? null : rubyStringToString(encoding);
 
         SaveContextVisitor visitor = 
-            new SaveContextVisitor((Integer)options.toJava(Integer.class), rubyStringToString(indentString), encString,
-                    isHtmlDoc(context), isFragment());
+            new SaveContextVisitor((Integer) options.toJava(Integer.class), rubyStringToString(indentString), encString, isHtmlDoc(context), isFragment(), 0);
         accept(context, visitor);
-        IRubyObject rubyString = stringOrNil(context.getRuntime(), visitor.toString());
+
+        IRubyObject rubyString = null;
+        if (NokogiriHelpers.isUTF8(encString)) {
+            rubyString = stringOrNil(context.getRuntime(), visitor.toString());
+        } else {
+            try {
+                byte[] bytes = NokogiriHelpers.convertEncoding(Charset.forName(encString), visitor.toString());
+                rubyString = stringOrNil(context.getRuntime(), bytes);
+            } catch (CharacterCodingException e) {
+                throw context.getRuntime().newRuntimeError(e.getMessage());
+            }
+        }
         RuntimeHelpers.invoke(context, io, "write", rubyString);
 
         return io;
@@ -1035,9 +1097,17 @@ public class XmlNode extends RubyObject {
         return this;
     }
 
-    @JRubyMethod(name = {"[]=", "set_attribute"})
-    public IRubyObject op_aset(ThreadContext context, IRubyObject index, IRubyObject val) {
-        return val;
+    @JRubyMethod(visibility = Visibility.PRIVATE)
+    public IRubyObject set(ThreadContext context, IRubyObject rbkey, IRubyObject rbval) {
+        if (node instanceof Element) {
+            String key = rubyStringToString(rbkey);
+            String val = rubyStringToString(rbval);
+            Element element = (Element) node;
+            element.setAttribute(key, val);
+            return this;
+        } else {
+            return rbval;
+        }
     }
 
     @JRubyMethod
@@ -1066,6 +1136,11 @@ public class XmlNode extends RubyObject {
 
     @JRubyMethod(name = {"remove_attribute", "delete"})
     public IRubyObject remove_attribute(ThreadContext context, IRubyObject name) {
+        if (node instanceof Element) {
+            String key = name.convertToString().asJavaString();
+            Element element = (Element) node;
+            element.removeAttribute(key);
+        }
         return this;
     }
 
@@ -1297,10 +1372,12 @@ public class XmlNode extends RubyObject {
              * otherNode parentless also. */
             if (otherNode.getParentNode() != null)
                 otherNode.getParentNode().removeChild(otherNode);
-
             return;
         }
-
+        if (thisNode.getPreviousSibling() != null &&
+            thisNode.getPreviousSibling().getNodeType() == Node.TEXT_NODE &&
+            otherNode.getNodeType() == Node.TEXT_NODE) return;
+        
         parent.insertBefore(otherNode, thisNode);
     }
 
@@ -1318,6 +1395,11 @@ public class XmlNode extends RubyObject {
         }
 
         Node nextSib = thisNode.getNextSibling();
+
+        if (nextSib != null &&
+            nextSib.getNodeType() == Node.TEXT_NODE &&
+            otherNode.getNodeType() == Node.TEXT_NODE) return;
+        
         if (nextSib != null) {
             parent.insertBefore(otherNode, nextSib);
         } else {
@@ -1375,4 +1457,26 @@ public class XmlNode extends RubyObject {
     public IRubyObject add_next_sibling_node(ThreadContext context, IRubyObject other) {
         return adoptAs(context, AdoptScheme.NEXT_SIBLING, other);
     }
+    
+    /**
+     * call-seq:
+     *   process_xincludes(options)
+     *
+     * Loads and substitutes all xinclude elements below the node. The
+     * parser context will be initialized with +options+.
+     * 
+     */
+    @JRubyMethod(visibility=Visibility.PRIVATE)
+    public IRubyObject process_xincludes(ThreadContext context, IRubyObject options) {
+        XmlDocument xmlDocument = (XmlDocument)document(context);
+        RubyArray errors = (RubyArray)xmlDocument.getInstanceVariable("@errors");
+        while(errors.getLength() > 0) {
+            XmlSyntaxError error = (XmlSyntaxError)errors.shift(context);
+            if (error.toString().contains("Include operation failed")) {
+                throw new RaiseException(error);
+            }
+        }
+        return this;
+    }
+
 }