nokogiri 1.6.1-java → 1.6.2-java

data/dependencies.yml

@@ -1,4 +1,4 @@
 libxml2: "2.8.0"
-libxslt: "1.1.26"
-zlib: "1.2.7"
-libiconv: "1.13.1"
+libxslt: "1.1.28"
+zlib: "1.2.8"
+libiconv: "1.14"

data/ext/java/nokogiri/NokogiriService.java

@@ -54,16 +54,18 @@ import org.jruby.runtime.load.BasicLibraryService;
  */
 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);
-        createNokogiriClassCahce(ruby);
         return true;
     }
-    
-    private static void createNokogiriClassCahce(Ruby ruby) {
-        nokogiriClassCache = Collections.synchronizedMap(new HashMap<String, RubyClass>());
+
+    public static Map<String, RubyClass> getNokogiriClassCache(Ruby ruby) {
+        return (Map<String, RubyClass>) ruby.getModule("Nokogiri").getInternalVariable("cache");
+    }
+
+    private static Map<String, RubyClass> populateNokogiriClassCahce(Ruby ruby) {
+        Map<String, RubyClass> 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"));
@@ -91,6 +93,7 @@ public class NokogiriService implements BasicLibraryService {
         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"));
+        return nokogiriClassCache;
     }
 
     private void init(Ruby ruby) {
@@ -109,6 +112,7 @@ public class NokogiriService implements BasicLibraryService {
         createDocuments(ruby, xmlModule, htmlModule, xmlNode);
         createSaxModule(ruby, xmlSaxModule, htmlSaxModule);
         createXsltModule(ruby, xsltModule);
+        nokogiri.setInternalVariable("cache", populateNokogiriClassCahce(ruby));
     }
 
     private void createJavaLibraryVersionConstants(Ruby ruby, RubyModule nokogiri) {

data/ext/java/nokogiri/XmlDocument.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2011:
+ * Copyright (c) 2008 - 2014:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -17,10 +17,10 @@
  * 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.
@@ -32,12 +32,14 @@
 
 package nokogiri;
 
+import static nokogiri.internals.NokogiriHelpers.clearXpathContext;
 import static nokogiri.internals.NokogiriHelpers.getCachedNodeOrCreate;
 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.io.UnsupportedEncodingException;
 import java.util.List;
 
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -47,13 +49,15 @@ import nokogiri.internals.NokogiriHelpers;
 import nokogiri.internals.NokogiriNamespaceCache;
 import nokogiri.internals.SaveContextVisitor;
 import nokogiri.internals.XmlDomParserContext;
+import nokogiri.internals.c14n.CanonicalFilter;
+import nokogiri.internals.c14n.CanonicalizationException;
+import nokogiri.internals.c14n.Canonicalizer;
 
 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;
@@ -74,17 +78,18 @@ import org.w3c.dom.NodeList;
  *
  * @author sergio
  * @author Yoko Harada <yokolet@gmail.com>
+ * @author John Shahid <jvshahid@gmail.com>
  */
 
 @JRubyClass(name="Nokogiri::XML::Document", parent="Nokogiri::XML::Node")
 public class XmlDocument extends XmlNode {
     private NokogiriNamespaceCache nsCache;
-    
+
     /* UserData keys for storing extra info in the document node. */
     public final static String DTD_RAW_DOCUMENT = "DTD_RAW_DOCUMENT";
     public final static String DTD_INTERNAL_SUBSET = "DTD_INTERNAL_SUBSET";
     public 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.
      */
@@ -100,7 +105,7 @@ public class XmlDocument extends XmlNode {
     public XmlDocument(Ruby ruby, RubyClass klazz) {
         super(ruby, klazz, createNewDocument());
     }
-    
+
     public XmlDocument(Ruby ruby, Document document) {
         this(ruby, getNokogiriClass(ruby, "Nokogiri::XML::Document"), document);
     }
@@ -112,7 +117,7 @@ public class XmlDocument extends XmlNode {
         stabilizeTextContent(document);
         setInstanceVariable("@decorators", ruby.getNil());
     }
-    
+
     public void setDocumentNode(ThreadContext context, Node node) {
         super.setNode(context, node);
         initializeNamespaceCacheIfNecessary();
@@ -128,11 +133,11 @@ public class XmlDocument extends XmlNode {
     public void setEncoding(IRubyObject encoding) {
         this.encoding = encoding;
     }
-    
+
     public IRubyObject getEncoding() {
         return encoding;
     }
-    
+
     // 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.
@@ -164,7 +169,7 @@ public class XmlDocument extends XmlNode {
             createAndCacheNamespaces(ruby, children.item(i));
         }
     }
-    
+
     // When a document is created from fragment with a context (reference) document,
     // namespace should be resolved based on the context document.
     public XmlDocument(Ruby ruby, RubyClass klass, Document document, XmlDocument contextDoc) {
@@ -174,14 +179,14 @@ public class XmlDocument extends XmlNode {
         String default_href = rubyStringToString(default_ns.href(ruby.getCurrentContext()));
         resolveNamespaceIfNecessary(ruby.getCurrentContext(), document.getDocumentElement(), default_href);
     }
-    
+
     private void resolveNamespaceIfNecessary(ThreadContext context, Node node, String default_href) {
         if (node == null) return;
         String nodePrefix = node.getPrefix();
         if (nodePrefix == null) { // default namespace
             NokogiriHelpers.renameNode(node, default_href, node.getNodeName());
         } else {
-            XmlNamespace xmlNamespace = nsCache.get(nodePrefix);
+            XmlNamespace xmlNamespace = nsCache.get(node, nodePrefix);
             String href = rubyStringToString(xmlNamespace.href(context));
             NokogiriHelpers.renameNode(node, href, node.getNodeName());
         }
@@ -189,17 +194,17 @@ public class XmlDocument extends XmlNode {
         NodeList children = node.getChildNodes();
         for (int i=0; i<children.getLength(); i++) {
             resolveNamespaceIfNecessary(context, children.item(i), default_href);
-        }   
+        }
     }
 
     public NokogiriNamespaceCache getNamespaceCache() {
         return nsCache;
     }
-    
+
     public void initializeNamespaceCacheIfNecessary() {
         if (nsCache == null) nsCache = new NokogiriNamespaceCache();
     }
-    
+
     public void setNamespaceCache(NokogiriNamespaceCache nsCache) {
         this.nsCache = nsCache;
     }
@@ -207,7 +212,7 @@ public class XmlDocument extends XmlNode {
     public Document getDocument() {
         return (Document) node;
     }
-    
+
     @Override
     protected IRubyObject getNodeName(ThreadContext context) {
         if (name == null) name = context.getRuntime().newString("document");
@@ -263,7 +268,7 @@ public class XmlDocument extends XmlNode {
 
         return xmlDocument;
     }
-    
+
     @JRubyMethod(required=1, optional=4)
     public IRubyObject create_entity(ThreadContext context, IRubyObject[] argv) {
         // FIXME: Entity node should be create by some right way.
@@ -346,14 +351,15 @@ public class XmlDocument extends XmlNode {
                            getNokogiriClass(context.getRuntime(), "Nokogiri::XML::Document"),
                            args);
     }
-    
+
     @JRubyMethod(name="remove_namespaces!")
     public IRubyObject remove_namespaces(ThreadContext context) {
         removeNamespceRecursively(context, this);
         nsCache.clear();
+        clearXpathContext(getNode());
         return this;
     }
-    
+
     private void removeNamespceRecursively(ThreadContext context, XmlNode xmlNode) {
         Node node = xmlNode.node;
         if (node.getNodeType() == Node.ELEMENT_NODE) {
@@ -395,7 +401,7 @@ public class XmlDocument extends XmlNode {
     @JRubyMethod(name="root=")
     public IRubyObject root_set(ThreadContext context, IRubyObject newRoot_) {
         // in case of document fragment, temporary root node should be deleted.
-        
+
         // Java can't have a root whose value is null. Instead of setting null,
         // the method sets user data so that other methods are able to know the root
         // should be nil.
@@ -444,11 +450,22 @@ public class XmlDocument extends XmlNode {
                 dtd = XmlDtd.newFromInternalSubset(context.getRuntime(), document);
             } else if (document.getDoctype() != null) {
                 DocumentType docType = document.getDoctype();
+                IRubyObject name, publicId, systemId;
+                name = publicId = systemId = context.getRuntime().getNil();
+                if (docType.getName() != null) {
+                    name = context.getRuntime().newString(docType.getName());
+                }
+                if (docType.getPublicId() != null) {
+                    publicId = context.getRuntime().newString(docType.getPublicId());
+                }
+                if (docType.getSystemId() != null) {
+                    systemId = context.getRuntime().newString(docType.getSystemId());
+                }
                 dtd = XmlDtd.newEmpty(context.getRuntime(),
                                       document,
-                                      context.getRuntime().newString(docType.getName()),
-                                      context.getRuntime().newString(docType.getPublicId()),
-                                      context.getRuntime().newString(docType.getSystemId()));
+                                      name,
+                                      publicId,
+                                      systemId);
             } else {
                 dtd = context.getRuntime().getNil();
             }
@@ -531,7 +548,7 @@ public class XmlDocument extends XmlNode {
         }
         visitor.leave(document);
     }
-    
+
     @JRubyMethod(meta=true)
     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"));
@@ -540,53 +557,77 @@ public class XmlDocument extends XmlNode {
         xmlDocument.setDocumentNode(context, document);
         return xmlDocument;
     }
-    
+
     @JRubyMethod
     public IRubyObject toJavaDocument(ThreadContext context) {
-        return JavaUtil.convertJavaToUsableRubyObject(context.getRuntime(), (org.w3c.dom.Document)node);
+        return JavaUtil.convertJavaToUsableRubyObject(context.getRuntime(), 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+.  
+     * 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 
+     * 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;
+        Integer mode = 0;
+        String inclusive_namespace = null;
+        Boolean with_comments = false;
+        if (args.length > 0 && !(args[0].isNil())) {
+            mode = RubyFixnum.fix2int(args[0]);
         }
-        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]));
+        if (args.length > 1 ) {
+            if (!args[1].isNil() && !(args[1] instanceof List)) {
+                throw context.getRuntime().newTypeError("Expected array");
+            }
+            if (!args[1].isNil()) {
+                inclusive_namespace = (String)((RubyArray)args[1]).get(0);
+            }
         }
-        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);
+        if (args.length > 2) {
+            with_comments = args[2].isTrue();
+        }
+        String algorithmURI = null;
+        switch(mode) {
+        case 0:  // XML_C14N_1_0
+            if (with_comments) algorithmURI = Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS;
+            else algorithmURI = Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
+            break;
+        case 1:  // XML_C14N_EXCLUSIVE_1_0
+            if (with_comments) algorithmURI = Canonicalizer.ALGO_ID_C14N_EXCL_WITH_COMMENTS;
+            else algorithmURI = Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS;
+            break;
+        case 2: // XML_C14N_1_1 = 2
+            if (with_comments) algorithmURI = Canonicalizer.ALGO_ID_C14N11_WITH_COMMENTS;
+            else algorithmURI = Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
+        }
+        try {
+            Canonicalizer canonicalizer = Canonicalizer.getInstance(algorithmURI);
+            XmlNode startingNode = getStartingNode(block);
+            byte[] result;
+            CanonicalFilter filter = new CanonicalFilter(context, block);
+            if (inclusive_namespace == null) {
+                result = canonicalizer.canonicalizeSubtree(startingNode.getNode(), filter);
+            } else {
+                result = canonicalizer.canonicalizeSubtree(startingNode.getNode(), inclusive_namespace, filter);
             }
+            String resultString = new String(result, "UTF-8");
+            return stringOrNil(context.getRuntime(), resultString);
+        } catch (CanonicalizationException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        } catch (UnsupportedEncodingException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
         }
-        return result.isTrue() ? stringOrNil(runtime, visitor.toString()) : RubyString.newEmptyString(runtime);
+        return context.getRuntime().getNil();
     }
-    
+
     private XmlNode getStartingNode(Block block) {
         if (block.isGiven()) {
             if (block.getBinding().getSelf() instanceof XmlNode) {

data/ext/java/nokogiri/XmlNode.java

@@ -1,7 +1,7 @@
 /**
  * (The MIT License)
  *
- * Copyright (c) 2008 - 2012:
+ * Copyright (c) 2008 - 2014:
  *
  * * {Aaron Patterson}[http://tenderlovemaking.com]
  * * {Mike Dalessio}[http://mike.daless.io]
@@ -34,6 +34,8 @@ package nokogiri;
 
 import static java.lang.Math.max;
 import static nokogiri.internals.NokogiriHelpers.getCachedNodeOrCreate;
+import static nokogiri.internals.NokogiriHelpers.clearCachedNode;
+import static nokogiri.internals.NokogiriHelpers.clearXpathContext;
 import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
 import static nokogiri.internals.NokogiriHelpers.nodeArrayToRubyArray;
 import static nokogiri.internals.NokogiriHelpers.nonEmptyStringOrNil;
@@ -85,9 +87,11 @@ import org.w3c.dom.Text;
  * @author sergio
  * @author Patrick Mahoney <pat@polycrystal.org>
  * @author Yoko Harada <yokolet@gmail.com>
+ * @author John Shahid <jvshahid@gmail.com>
  */
 @JRubyClass(name="Nokogiri::XML::Node")
 public class XmlNode extends RubyObject {
+    protected static final String TEXT_WRAPPER_NAME = "nokogiri_text_wrapper";
 
     /** The underlying Node object. */
     protected Node node;
@@ -238,7 +242,7 @@ public class XmlNode extends RubyObject {
     public Object clone() throws CloneNotSupportedException {
         return super.clone();
     }
-    
+
     protected void resetCache() {
         node.setUserData(NokogiriHelpers.CACHED_NODE, this, null);
     }
@@ -396,7 +400,7 @@ public class XmlNode extends RubyObject {
             }
 
             resultLines[i] = curInd.toString() + curLine;
-            
+
             if(!curLine.endsWith("/>") && !closingTag) {
                 curInd.append(indentString);
             }
@@ -447,12 +451,12 @@ public class XmlNode extends RubyObject {
         return value.length() == 0 ? null : value;
     }
 
-
     public void post_add_child(ThreadContext context, XmlNode current, XmlNode child) {
     }
 
     public void relink_namespace(ThreadContext context) {
         if (node instanceof Element) {
+            clearCachedNode(node);
             Element e = (Element) node;
             String prefix = e.getPrefix();
             String currentNS = e.getNamespaceURI();
@@ -476,16 +480,22 @@ public class XmlNode extends RubyObject {
                         attrPrefix = NokogiriHelpers.getPrefix(attr.getNodeName());
                     }
                     String nodeName = attr.getNodeName();
-                    if ("xml".equals(prefix)) {
+                    if ("xml".equals(attrPrefix)) {
                         nsUri = "http://www.w3.org/XML/1998/namespace";
                     } else if ("xmlns".equals(attrPrefix) || nodeName.equals("xmlns")) {
                         nsUri = "http://www.w3.org/2000/xmlns/";
                     } else {
                         nsUri = attr.lookupNamespaceURI(attrPrefix);
                     }
-                    if (!(nsUri == null || "".equals(nsUri))) {
+
+                    if (nsUri == e.getNamespaceURI()) {
+                        nsUri = null;
+                    }
+
+                    if (!(nsUri == null || "".equals(nsUri) || "http://www.w3.org/XML/1998/namespace".equals(nsUri))) {
                         XmlNamespace.createFromAttr(context.getRuntime(), attr);
                     }
+                    clearCachedNode(attr);
                     NokogiriHelpers.renameNode(attr, nsUri, nodeName);
                 }
             }
@@ -564,7 +574,9 @@ public class XmlNode extends RubyObject {
             str = NokogiriHelpers.getLocalPart(str);
         }
         if (str == null) str = "";
+        if (str.startsWith("#")) str = str.substring(1);  // eliminates '#'
         name = NokogiriHelpers.stringOrBlank(context.getRuntime(), str);
+
         return name;
     }
 
@@ -577,23 +589,29 @@ public class XmlNode extends RubyObject {
     public IRubyObject add_namespace_definition(ThreadContext context,
                                                 IRubyObject prefix,
                                                 IRubyObject href) {
+        String prefixString = rubyStringToString(prefix);
+        String hrefString = rubyStringToString(href);
+
+        NokogiriNamespaceCache nsCache = NokogiriHelpers.getNamespaceCacheFormNode(node);
+        XmlNamespace cachedNamespace = nsCache.get(prefixString, hrefString);
+        if (cachedNamespace != null) return cachedNamespace;
+
         Node namespaceOwner;
         if (node.getNodeType() == Node.ELEMENT_NODE) {
             namespaceOwner = node;
             Element element = (Element) node;
-
+            // adds namespace as node's attribute
             final String uri = "http://www.w3.org/2000/xmlns/";
             String qName =
-                prefix.isNil() ? "xmlns" : "xmlns:" + rubyStringToString(prefix);
-            element.setAttributeNS(uri, qName, rubyStringToString(href));
+                prefix.isNil() ? "xmlns" : "xmlns:" + prefixString;
+            element.setAttributeNS(uri, qName, hrefString);
         }
         else if (node.getNodeType() == Node.ATTRIBUTE_NODE) namespaceOwner = ((Attr)node).getOwnerElement();
         else namespaceOwner = node.getParentNode();
         XmlNamespace ns = XmlNamespace.createFromPrefixAndHref(namespaceOwner, prefix, href);
         if (node != namespaceOwner) {
-            this.node = NokogiriHelpers.renameNode(node, ns.getHref(), ns.getPrefix() + node.getLocalName());
+            this.node = NokogiriHelpers.renameNode(node, ns.getHref(), ns.getPrefix() + ":" + node.getLocalName());
         }
-        
         updateNodeNamespaceIfNecessary(context, ns);
 
         return ns;
@@ -665,7 +683,7 @@ public class XmlNode extends RubyObject {
         xmlNodeSet.setNodeList(node.getChildNodes());
         return xmlNodeSet;
     }
-    
+
     @JRubyMethod
     public IRubyObject first_element_child(ThreadContext context) {
         List<Node> elementNodes = new ArrayList<Node>();
@@ -681,7 +699,7 @@ public class XmlNode extends RubyObject {
         if (elementNodes.size() == 0) return context.getRuntime().getNil();
         return getCachedNodeOrCreate(context.getRuntime(), elementNodes.get(elementNodes.size()-1));
     }
-    
+
     @JRubyMethod(name = {"element_children", "elements"})
     public IRubyObject element_children(ThreadContext context) {
         List<Node> elementNodes = new ArrayList<Node>();
@@ -691,7 +709,7 @@ public class XmlNode extends RubyObject {
         XmlNodeSet xmlNodeSet = XmlNodeSet.newXmlNodeSet(context, array);
         return xmlNodeSet;
     }
-    
+
     private void addElements(Node n, List<Node> nodes, boolean isFirstOnly) {
         NodeList children = n.getChildNodes();
         if (children.getLength() == 0) return;
@@ -753,7 +771,7 @@ public class XmlNode extends RubyObject {
         XmlDomParserContext ctx;
         InputStream istream;
         XmlDocument document;
-        
+
         IRubyObject d = document(context);
         Ruby runtime = context.getRuntime();
         if (d != null && d instanceof XmlDocument) {
@@ -761,7 +779,7 @@ public class XmlNode extends RubyObject {
         } else {
             return runtime.getNil();
         }
-        
+
         if (document instanceof HtmlDocument) {
             klass = getNokogiriClass(runtime, "Nokogiri::HTML::Document");
             ctx = new HtmlDomParserContext(runtime, options);
@@ -778,7 +796,7 @@ public class XmlNode extends RubyObject {
 
         ctx.setInputSource(istream);
         XmlDocument doc = ctx.parse(context, klass, runtime.getNil());
-        
+
         RubyArray documentErrors = getErrorArray(document);
         RubyArray docErrors = getErrorArray(doc);
         if (isErrorIncreased(documentErrors, docErrors)) {
@@ -789,7 +807,7 @@ public class XmlNode extends RubyObject {
             XmlNodeSet xmlNodeSet = XmlNodeSet.newXmlNodeSet(context, RubyArray.newArray(runtime));
             return xmlNodeSet;
         }
-        
+
         // The first child might be document type node (dtd declaration).
         // XmlNodeSet to be return should not have dtd decl in its list.
         Node first;
@@ -804,7 +822,7 @@ public class XmlNode extends RubyObject {
         XmlNodeSet xmlNodeSet = XmlNodeSet.newXmlNodeSet(context, nodeArray);
         return xmlNodeSet;
     }
-    
+
     private RubyArray getErrorArray(XmlDocument document) {
         IRubyObject obj = document.getInstanceVariable("@errors");
         if (obj != null && obj instanceof RubyArray) {
@@ -1035,8 +1053,7 @@ public class XmlNode extends RubyObject {
     @JRubyMethod
     public IRubyObject namespace(ThreadContext context) {
         if (doc instanceof HtmlDocument) return context.getRuntime().getNil();
-        XmlDocument xmlDocument = (XmlDocument) doc;
-        NokogiriNamespaceCache nsCache = xmlDocument.getNamespaceCache();
+        NokogiriNamespaceCache nsCache = NokogiriHelpers.getNamespaceCacheFormNode(node);
         String prefix = node.getPrefix();
         XmlNamespace namespace = nsCache.get(prefix == null ? "" : prefix, node.getNamespaceURI());
         if (namespace == null || namespace.isEmpty()) {
@@ -1074,18 +1091,42 @@ public class XmlNode extends RubyObject {
      */
     @JRubyMethod
     public IRubyObject namespace_scopes(ThreadContext context) {
-        RubyArray parentNamespaces;
-        RubyArray namespaces = (RubyArray) namespace_definitions(context);
+        RubyArray scoped_namespaces = context.getRuntime().newArray();
+        if (doc == null) return scoped_namespaces;
+        if (doc instanceof HtmlDocument) return scoped_namespaces;
 
-        IRubyObject parent = parent(context);
-        if (!parent.isNil()) {
-            parentNamespaces = (RubyArray)
-                ((XmlNode) parent).namespace_scopes(context);
+        Node previousNode;
+        if (node.getNodeType() == Node.ELEMENT_NODE) {
+            previousNode = node;
+        } else if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
+            previousNode = ((Attr)node).getOwnerElement();
         } else {
-            parentNamespaces = getRuntime().newEmptyArray();
+            previousNode = findPreviousElement(node);
+        }
+        if (previousNode == null) return scoped_namespaces;
+
+        List<String> prefixes_in_scope = new ArrayList<String>();
+        NokogiriNamespaceCache nsCache = NokogiriHelpers.getNamespaceCacheFormNode(previousNode);
+        for (Node previous=previousNode; previous != null; ) {
+            List<XmlNamespace> namespaces = nsCache.get(previous);
+            for (XmlNamespace namespace : namespaces) {
+                if (prefixes_in_scope.contains(namespace.getPrefix())) continue;
+                scoped_namespaces.append(namespace);
+                prefixes_in_scope.add(namespace.getPrefix());
+            }
+            previous = findPreviousElement(previous);
         }
+        return scoped_namespaces;
+    }
 
-        return parentNamespaces.op_plus(namespaces);
+    private Node findPreviousElement(Node n) {
+        Node previous = n.getPreviousSibling() == null ? n.getParentNode() : n.getPreviousSibling();
+        if (previous == null || previous.getNodeType() == Node.DOCUMENT_NODE) return null;
+        if (previous.getNodeType() == Node.ELEMENT_NODE) {
+            return previous;
+        } else {
+            return findPreviousElement(previous);
+        }
     }
 
     @JRubyMethod(name="namespaced_key?")
@@ -1150,11 +1191,11 @@ public class XmlNode extends RubyObject {
 
         return io;
     }
-    
+
     private boolean isHtmlDoc(ThreadContext context) {
         return document(context).getMetaClass().isKindOfModule(getNokogiriClass(context.getRuntime(), "Nokogiri::HTML::Document"));
     }
-    
+
     private boolean isFragment() {
         if (node instanceof DocumentFragment) return true;
         if (node.getParentNode() != null && node.getParentNode() instanceof DocumentFragment) return true;
@@ -1217,6 +1258,7 @@ public class XmlNode extends RubyObject {
             } else {
               element.setAttribute(key, val);
             }
+            clearXpathContext(node);
             return this;
         } else {
             return rbval;
@@ -1304,6 +1346,8 @@ public class XmlNode extends RubyObject {
             this.node = NokogiriHelpers.renameNode(node, href, new_name);
         }
 
+        clearXpathContext(getNode());
+
         return this;
     }
 
@@ -1312,6 +1356,7 @@ public class XmlNode extends RubyObject {
         if(node.getParentNode() == null) {
             throw context.getRuntime().newRuntimeError("TYPE: " + node.getNodeType()+ " PARENT NULL");
         } else {
+            clearXpathContext(node.getParentNode());
             node.getParentNode().removeChild(node);
         }
 
@@ -1432,6 +1477,8 @@ public class XmlNode extends RubyObject {
          try {
             Document prev = otherNode.getOwnerDocument();
             Document doc = thisNode.getOwnerDocument();
+            clearXpathContext(prev);
+            clearXpathContext(doc);
             if (doc != null && doc != otherNode.getOwnerDocument()) {
                 Node ret = doc.adoptNode(otherNode);
                 // FIXME: this is really a hack, see documentation of fixUserData() for more details.
@@ -1498,14 +1545,18 @@ public class XmlNode extends RubyObject {
          * text node as the root element.  Java (and XML spec?) does
          * not.  So we wrap the text node in an element.
          */
-        if (parent.getNodeType() == Node.DOCUMENT_NODE &&
-            otherNode.getNodeType() == Node.TEXT_NODE) {
-            Element e = ((Document)parent).createElement("nokogiri_text_wrapper");
-            e.appendChild(otherNode);
-            otherNode = e;
-        }
-        addNamespaceURIIfNeeded(otherNode);
-        parent.appendChild(otherNode);
+        if (parent.getNodeType() == Node.DOCUMENT_NODE && otherNode.getNodeType() == Node.TEXT_NODE) {
+          Element e = (Element) parent.getFirstChild();
+          if (e == null || !e.getNodeName().equals(TEXT_WRAPPER_NAME)) {
+            e = ((Document)parent).createElement(TEXT_WRAPPER_NAME);
+            adoptAsChild(context, parent, e);
+          }
+          e.appendChild(otherNode);
+          otherNode = e;
+        } else {
+          addNamespaceURIIfNeeded(otherNode);
+          parent.appendChild(otherNode);
+        }
         Node[] nodes = new Node[1];
         nodes[0] = otherNode;
         return nodes;
@@ -1554,7 +1605,7 @@ public class XmlNode extends RubyObject {
         if (nextSib != null &&
             nextSib.getNodeType() == Node.TEXT_NODE &&
             otherNode.getNodeType() == Node.TEXT_NODE) return;
-        
+
         if (nextSib != null) {
             parent.insertBefore(otherNode, nextSib);
         } else {
@@ -1580,7 +1631,7 @@ public class XmlNode extends RubyObject {
             throw context.getRuntime().newRuntimeError(prefix + e.toString());
         }
     }
-    
+
     /**
      * Add <code>other</code> as a child of <code>this</code>.
      */
@@ -1612,7 +1663,7 @@ 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)