nokogiri 1.6.8.rc3-java → 1.6.8.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a5e58bb62530c4c55b141723a110e00128ff051
-  data.tar.gz: 7102867999ccfaf4220369ffa366ca0cbc28b5ac
+  metadata.gz: 851e5661ef0fc4070c2305cc3b6f70187b48966c
+  data.tar.gz: 113797bd7cbf2ffe3df45f178b14c7b891639108
 SHA512:
-  metadata.gz: 2c647157a41f0e818d30359b07b1a2d365a8cb71efa3f42426f841d86476b9691a1d06dbb75572a138f0da9b1e930d41047c0a1850c1661175cd23488156ae9d
-  data.tar.gz: 86559f6d4d4eb562ab8589b3411187b595711d40c5dcedccea46a24546dbe2a6a0e918a421ad66af43dbbd0bf3fa65f0caefc2b1d9747b7bb6f2cb043cc3996c
+  metadata.gz: ff8deb5980f4fd7b6f14dad2d4f1e6d916a6e67bf341b813d030e81d9b2b7e9b7383d17e92a6cd642cda6c3f687b949d00f59e74ee7f9c870c5637c9c681c402
+  data.tar.gz: 35575f378e879b96d02f1d029a383066d1182f9df98061ac7df7d1df01085a2a7c00af6f00afa93fda55c4d181907a44164d5bc5e129cf0b3be9e5f658cacbff

data/.travis.yml

@@ -10,8 +10,9 @@ rvm:
 - 2.2.3
 - 2.3.0
 - jruby-19mode
-- jruby-1.7.23
+- jruby
 - jruby-9.0.4.0
+- jruby-head
 - rbx-19mode
 - rbx-2
 
@@ -24,13 +25,14 @@ matrix:
   # https://github.com/travis-ci/travis-ci/issues/5361
   - os: osx
     rvm: 2.3.0
+  - rvm: jruby-head
   exclude:
   - os: osx
     rvm: ruby-1.9.2
   - os: osx
     rvm: jruby-19mode
   - os: osx
-    rvm: jruby-1.7.23
+    rvm: jruby
   - os: osx
     rvm: jruby-9.0.4.0
   - os: osx
@@ -42,7 +44,7 @@ notifications:
   irc:
     channels:
       - "chat.freenode.net#nokogiri"
-    on_success: change
+    on_success: always
     on_failure: always
     template:
       - "%{repository} (%{branch}:%{commit} by %{author}): %{message} (%{build_url})"

data/CHANGELOG.rdoc

@@ -1,10 +1,37 @@
-=== 1.6.8 / unreleased
+=== 1.6.8.1 / 2016-10-03
 
-==== Security Note
+==== Dependency License Notes
+
+Removes required dependency on the `pkg-config` gem. This dependency
+was introduced in v1.6.8 and, because it's distributed under LGPL, was
+objectionable to many Nokogiri users (#1488, #1496).
+
+This version makes `pkg-config` an optional dependency. If it's
+installed, it's used; but otherwise Nokogiri will attempt to work
+around its absence.
+
+
+=== 1.6.8 / 2016-06-06
+
+==== Security Notes
+
+[MRI] Bundled libxml2 is upgraded to 2.9.4, which fixes many security issues. Many of these had previously been patched in the vendored libxml 2.9.2 in the 1.6.7.x branch, but some are newer.
+
+See these libxml2 email posts for more:
+
+* https://mail.gnome.org/archives/xml/2015-November/msg00012.html
+* https://mail.gnome.org/archives/xml/2016-May/msg00023.html
+
+For a more detailed analysis, you may care to read Canonical's take on these security issues:
+
+* http://www.ubuntu.com/usn/usn-2994-1
+
+
+[MRI] Bundled libxslt is upgraded to 1.1.29, which fixes a security issue as well as many long-known outstanding bugs, some features, some portability improvements, and general cleanup.
+
+See this libxslt email post for more:
 
-* (MRI) Bundled Libxml2 is upgraded to 2.9.3, which fixes a series of security issues.
-  These security issues had been patched in the vendored libxml 2.9.2 in the 1.6.7.x branch.
-  See https://mail.gnome.org/archives/xml/2015-November/msg00012.html for more.
+* https://mail.gnome.org/archives/xslt/2016-May/msg00004.html
 
 
 ==== Features
@@ -16,19 +43,28 @@ Several changes were made to improve performance:
 * Use Symbol#to_proc where we weren't previously. (#1296) (Thanks, Bruno Sutic!)
 * XML::DTD#each uses implicit block calls. (Thanks, @glaucocustodio!)
 * Fall back to the `pkg-config` gem if we're having trouble finding the system libxml2. This should help many FreeBSD users. (#1417)
+* Set document encoding appropriately even on blank document. (#1043) (Thanks, @batter!)
 
 
 ==== Bug Fixes
 
+* [JRuby] fix slow add_child (#692)
 * [JRuby] fix load errors when deploying to JRuby/Torquebox (#1114) (Thanks, @atambo and @jvshahid!)
 * [JRuby] fix NPE when inspecting nodes returned by NodeSet#drop (#1042) (Thanks, @mkristian!)
 * [JRuby] fix nil attriubte node's namespace in reader (#1327) (Thanks, @codekitchen!)
 * [JRuby] fix Nokogiri munging unicode characters that require more than 2 bytes (#1113) (Thanks, @mkristian!)
+* [JRuby] allow unlinking an unparented node (#1112, #1152) (Thanks, @esse!)
+* [JRuby] allow Fragment parsing on a frozen string (#444, #1077)
+* [JRuby] HTML `style` tags are no longer encoded (#1316) (Thanks, @tbeauvais!)
 * [MRI] fix assertion failure while accessing attribute node's namespace in reader (#843) (Thanks, @2potatocakes!)
 * [MRI] fix issue with GCing namespace nodes returned in an xpath query. (#1155)
 * [MRI] Ensure C strings are null-terminated. (#1381)
 * [MRI] Ensure Rubygems is loaded before using mini_portile2 at installation. (#1393, #1411) (Thanks, @JonRowe!)
 * [MRI] Handling another edge case where the `libxml-ruby` gem's global callbacks were smashing the heap. (#1426). (Thanks to @bbergstrom for providing an isolated test case!)
+* [MRI] Ensure encodings are passed to Sax::Parser xmldecl callback. (#844)
+* [MRI] Ensure default ns prefix is applied correctly when reparenting nodes to another document. (#391) (Thanks, @ylecuyer!)
+* [MRI] Ensure Reader handles non-existent attributes as expected. (#1254) (Thanks, @ccutrer!)
+* [MRI] Cleanup around namespace handling when reparenting nodes. (#1332, #1333, #1444) (Thanks, @cuttrer and @bradleybeddoes!)
 * unescape special characters in CSS queries (#1303) (Thanks, @twalpole!)
 * consistently handle empty documents (#1349)
 * Update to mini_portile2 2.1.0 to address whitespace-handling during patching. (#1402)

data/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Issue and Pull Request Guidlines
+# Issue and Pull Request Guidelines
 
 Thank you for getting involved in making Nokogiri better!
 

data/Gemfile

@@ -5,19 +5,18 @@
 source "https://rubygems.org/"
 
 gem "mini_portile2", "~>2.1.0"
-gem "pkg-config", "~>1.1.7"
 
 gem "rdoc", "~>4.0", :group => [:development, :test]
-gem "hoe-bundler", ">=1.1", :group => [:development, :test]
+gem "hoe-bundler", "~>1.2.0", :group => [:development, :test]
 gem "hoe-debugging", "~>1.2.1", :group => [:development, :test]
-gem "hoe-gemspec", ">=1.0", :group => [:development, :test]
-gem "hoe-git", ">=1.4", :group => [:development, :test]
-gem "minitest", "~>2.2.2", :group => [:development, :test]
-gem "rake", ">=0.9", :group => [:development, :test]
+gem "hoe-gemspec", "~>1.0.0", :group => [:development, :test]
+gem "hoe-git", "~>1.6.0", :group => [:development, :test]
+gem "minitest", "~>5.8.4", :group => [:development, :test]
+gem "rake", "~>10.5.0", :group => [:development, :test]
 gem "rake-compiler", "~>0.9.2", :group => [:development, :test]
 gem "rake-compiler-dock", "~>0.5.1", :group => [:development, :test]
-gem "racc", ">=1.4.6", :group => [:development, :test], :platform => :ruby
-gem "rexical", ">=1.0.5", :group => [:development, :test], :platform => :ruby
+gem "racc", "~>1.4.14", :group => [:development, :test], :platform => :ruby
+gem "rexical", "~>1.0.5", :group => [:development, :test], :platform => :ruby
 gem "hoe", "~>3.14", :group => [:development, :test]
 
 # vim: syntax=ruby

data/Manifest.txt

@@ -319,7 +319,6 @@ test/test_css_cache.rb
 test/test_encoding_handler.rb
 test/test_memory_leak.rb
 test/test_nokogiri.rb
-test/test_reader.rb
 test/test_soap4r_sax.rb
 test/test_xslt_transforms.rb
 test/xml/node/test_save_options.rb
@@ -351,6 +350,7 @@ test/xml/test_node_reparenting.rb
 test/xml/test_node_set.rb
 test/xml/test_parse_options.rb
 test/xml/test_processing_instruction.rb
+test/xml/test_reader.rb
 test/xml/test_reader_encoding.rb
 test/xml/test_relax_ng.rb
 test/xml/test_schema.rb

data/README.md

@@ -22,9 +22,6 @@ Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among
 Nokogiri's many features is the ability to search documents via XPath
 or CSS3 selectors.
 
-XML is like violence - if it doesn’t solve your problems, you are not
-using enough of it.
-
 
 ## Features
 

data/Rakefile

@@ -8,7 +8,6 @@ Hoe.plugin :debugging
 Hoe.plugin :git
 Hoe.plugin :gemspec
 Hoe.plugin :bundler
-Hoe.add_include_dirs '.'
 
 GENERATED_PARSER    = "lib/nokogiri/css/parser.rb"
 GENERATED_TOKENIZER = "lib/nokogiri/css/tokenizer.rb"
@@ -129,21 +128,20 @@ HOE = Hoe.spec 'nokogiri' do
   unless java?
     self.extra_deps += [
       ["mini_portile2",    "~> 2.1.0"], # keep version in sync with extconf.rb
-      ["pkg-config",       "~> 1.1.7"], # keep version in sync with extconf.rb
     ]
   end
 
   self.extra_dev_deps += [
-    ["hoe-bundler",        ">= 1.1"],
+    ["hoe-bundler",        "~> 1.2.0"],
     ["hoe-debugging",      "~> 1.2.1"],
-    ["hoe-gemspec",        ">= 1.0"],
-    ["hoe-git",            ">= 1.4"],
-    ["minitest",           "~> 2.2.2"],
-    ["rake",               ">= 0.9"],
+    ["hoe-gemspec",        "~> 1.0.0"],
+    ["hoe-git",            "~> 1.6.0"],
+    ["minitest",           "~> 5.8.4"],
+    ["rake",               "~> 10.5.0"],
     ["rake-compiler",      "~> 0.9.2"],
     ["rake-compiler-dock", "~> 0.5.1"],
-    ["racc",               ">= 1.4.6"],
-    ["rexical",            ">= 1.0.5"]
+    ["racc",               "~> 1.4.14"],
+    ["rexical",            "~> 1.0.5"]
   ]
 
   if java?
@@ -207,7 +205,7 @@ else
 
   task gem_build_path do
     %w[libxml2 libxslt].each do |lib|
-      version = dependencies[lib]
+      version = dependencies[lib]["version"]
       archive = File.join("ports", "archives", "#{lib}-#{version}.tar.gz")
       add_file_to_gem archive
       patchesdir = File.join("patches", lib)
@@ -232,7 +230,7 @@ else
       ext.cross_platform = CROSS_RUBIES.map(&:platform).uniq
       ext.cross_config_options << "--enable-cross-build"
       ext.cross_compiling do |spec|
-        libs = dependencies.map { |name, version| "#{name}-#{version}" }.join(', ')
+        libs = dependencies.map { |name, dep| "#{name}-#{dep["version"]}" }.join(', ')
 
         spec.required_ruby_version = [
           '>= 1.9.2',
@@ -293,7 +291,7 @@ task :debug do
   ENV['CFLAGS'] += " -DDEBUG"
 end
 
-require 'tasks/test'
+require File.join File.dirname(__FILE__), 'tasks/test'
 
 task :java_debug do
   ENV['JRUBY_OPTS'] = "#{ENV['JRUBY_OPTS']} --debug --dev"

data/build_all

@@ -16,7 +16,7 @@ else
 fi
 
 set -o errexit
-set -x
+#set -x
 
 rm -rf tmp pkg
 bundle exec rake clean clobber

data/dependencies.yml

@@ -1,4 +1,29 @@
-libxml2: "2.9.3"
-libxslt: "1.1.28"
-zlib: "1.2.8"
-libiconv: "1.14"
+libxml2:
+  version: "2.9.4"
+  md5: "ae249165c173b1ff386ee8ad676815f5" # manually confirmed via `gpg --verify`
+  # gpg: Signature made Mon 23 May 2016 04:02:13 AM EDT using DSA key ID DE95BC1F
+  # gpg: Good signature from "Daniel Veillard (Red Hat work email) <veillard@redhat.com>"
+  # gpg:                 aka "Daniel Veillard <Daniel.Veillard@w3.org>"
+  # gpg: WARNING: This key is not certified with a trusted signature!
+  # gpg:          There is no indication that the signature belongs to the owner.
+  # Primary key fingerprint: C744 15BA 7C9C 7F78 F02E  1DC3 4606 B8A5 DE95 BC1F
+
+libxslt:
+  version: "1.1.29"
+  md5: "a129d3c44c022de3b9dcf6d6f288d72e"
+  # gpg: Signature made Mon 23 May 2016 09:58:52 PM EDT using DSA key ID DE95BC1F
+  # gpg: Good signature from "Daniel Veillard (Red Hat work email) <veillard@redhat.com>"
+  # gpg:                 aka "Daniel Veillard <Daniel.Veillard@w3.org>"
+  # gpg: WARNING: This key is not certified with a trusted signature!
+  # gpg:          There is no indication that the signature belongs to the owner.
+  # Primary key fingerprint: C744 15BA 7C9C 7F78 F02E  1DC3 4606 B8A5 DE95 BC1F
+
+zlib:
+  version: "1.2.8"
+  md5: "44d667c142d7cda120332623eab69f40"
+
+libiconv:
+  version: "1.14"
+  md5: "e34509b1623cec449dfeb73d7ce9c6c6"
+  # gpg: Signature made Sun 07 Aug 2011 01:58:18 PM EDT using DSA key ID F059B1D1
+  # gpg: BAD signature from "Bruno Haible (Open Source Development) <bruno@clisp.org>"

data/ext/java/nokogiri/XmlAttr.java

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

data/ext/java/nokogiri/XmlDocumentFragment.java

@@ -54,7 +54,6 @@ import org.jruby.javasupport.util.RuntimeHelpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 
 /**
@@ -90,7 +89,6 @@ 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]);
             if (XmlDocumentFragment.isTag((RubyString)args[1])) {
                 args[1] = RubyString.newString(context.getRuntime(), addNamespaceDeclIfNeeded(doc, rubyStringToString(args[1])));
             }
@@ -107,18 +105,6 @@ public class XmlDocumentFragment extends XmlNode {
         RuntimeHelpers.invoke(context, fragment, "initialize", args);
         return fragment;
     }
-    
-    private static IRubyObject trim(ThreadContext context, XmlDocument xmlDocument, RubyString str) {
-        // checks whether schema is given. if exists, allows whitespace processing to a parser
-        Document document = (Document)xmlDocument.node;
-        if (document.getDoctype() != null) return str;
-        // strips trailing \n off forcefully
-        // not to return new object in case of no chomp needed, chomp! is used here.
-        IRubyObject result;
-        if (context.getRuntime().is1_9()) result = str.chomp_bang19(context);
-        else result = str.chomp_bang(context);
-        return result.isNil() ? str : result;
-    }
 
     private static boolean isTag(RubyString ruby_string) {
         String str = rubyStringToString(ruby_string);

data/ext/java/nokogiri/XmlNode.java

@@ -333,15 +333,11 @@ public class XmlNode extends RubyObject {
         Element element = null;
         String node_name = rubyStringToString(name);
         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);
+        String namespace_uri = null;
+        if (document.getDocumentElement() != null) {
+            namespace_uri = document.getDocumentElement().lookupNamespaceURI(prefix);
         }
+        element = document.createElementNS(namespace_uri, node_name);
         setNode(context, element);
     }
 
@@ -454,57 +450,77 @@ public class XmlNode extends RubyObject {
     public void post_add_child(ThreadContext context, XmlNode current, XmlNode child) {
     }
 
+    /**
+     * This method should be called after a node has been adopted in a new
+     * document. This method will ensure that the node is renamed with the
+     * appriopriate NS uri. First the prefix of the node is extracted, then is
+     * used to lookup the namespace uri in the new document starting at the
+     * current node and traversing the ancestors. If the namespace uri wasn't
+     * empty (or null) all children and the node has attributes and/or children
+     * then the algorithm is recursively applied to the children.
+     */
     public void relink_namespace(ThreadContext context) {
-        if (node instanceof Element) {
-            clearCachedNode(node);
-            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);
-            String nsURI = e.lookupNamespaceURI(prefix);
-            this.node = NokogiriHelpers.renameNode(e, nsURI, e.getNodeName());
-
-            if (e.hasAttributes()) {
-                NamedNodeMap attrs = e.getAttributes();
-
-                for (int i = 0; i < attrs.getLength(); i++) {
-                    Attr attr = (Attr) attrs.item(i);
-                    String nsUri = "";
-                    String attrPrefix = attr.getPrefix();
-                    if (attrPrefix == null) {
-                        attrPrefix = NokogiriHelpers.getPrefix(attr.getNodeName());
-                    }
-                    String nodeName = attr.getNodeName();
-                    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 (!(node instanceof Element)) {
+            return;
+        }
 
-                    if (nsUri == e.getNamespaceURI()) {
-                        nsUri = null;
-                    }
+        // TODO: this feels kind of weird, why are we clearing the XmlNode
+        // cache here !!!
+        clearCachedNode(node);
+        Element e = (Element) node;
 
-                    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);
+        // disable error checking to prevent lines like the following
+        // from throwing a `NAMESPACE_ERR' exception:
+        // Nokogiri::XML::DocumentFragment.parse("<o:div>a</o:div>")
+        // since the `o' prefix isn't defined anywhere.
+        e.getOwnerDocument().setStrictErrorChecking(false);
+
+        String prefix = e.getPrefix();
+        String nsURI = e.lookupNamespaceURI(prefix);
+        this.node = NokogiriHelpers.renameNode(e, nsURI, e.getNodeName());
+
+        if (nsURI == null || nsURI == "") {
+            return;
+        }
+
+        if (e.hasAttributes()) {
+            NamedNodeMap attrs = e.getAttributes();
+
+            for (int i = 0; i < attrs.getLength(); i++) {
+                Attr attr = (Attr) attrs.item(i);
+                String nsUri = "";
+                String attrPrefix = attr.getPrefix();
+                if (attrPrefix == null) {
+                    attrPrefix = NokogiriHelpers.getPrefix(attr.getNodeName());
+                }
+                String nodeName = attr.getNodeName();
+                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 == e.getNamespaceURI()) {
+                    nsUri = null;
                 }
-            }
 
-            if (this.node.hasChildNodes()) {
-                XmlNodeSet nodeSet = (XmlNodeSet)(children(context));
-                nodeSet.relink_namespace(context);
+                if (!(nsUri == null || "".equals(nsUri) || "http://www.w3.org/XML/1998/namespace".equals(nsUri))) {
+                    // Create a new namespace object and add it to the document
+                    // namespace cache.
+                    // TODO: why do we need the namespace cache ?
+                    XmlNamespace.createFromAttr(context.getRuntime(), attr);
+                }
+                clearCachedNode(attr);
+                NokogiriHelpers.renameNode(attr, nsUri, nodeName);
             }
         }
+
+        if (this.node.hasChildNodes()) {
+            XmlNodeSet nodeSet = (XmlNodeSet)(children(context));
+            nodeSet.relink_namespace(context);
+        }
     }
 
     // Users might extend XmlNode. This method works for such a case.
@@ -605,6 +621,7 @@ public class XmlNode extends RubyObject {
 
         NokogiriNamespaceCache nsCache = NokogiriHelpers.getNamespaceCacheFormNode(node);
         XmlNamespace cachedNamespace = nsCache.get(prefixString, hrefString);
+
         if (cachedNamespace != null) return cachedNamespace;
 
         Node namespaceOwner;
@@ -615,12 +632,14 @@ public class XmlNode extends RubyObject {
             final String uri = "http://www.w3.org/2000/xmlns/";
             String qName =
                 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());
         }
         updateNodeNamespaceIfNecessary(context, ns);
@@ -1323,7 +1342,7 @@ public class XmlNode extends RubyObject {
             } else if (prefix.equals("xmlns")) {
                 uri = "http://www.w3.org/2000/xmlns/";
             } else {
-                uri = findNamespaceHref(context, prefix);
+                uri = node.lookupNamespaceURI(prefix);
             }
         }
 
@@ -1413,13 +1432,10 @@ public class XmlNode extends RubyObject {
 
     @JRubyMethod(name = {"unlink", "remove"})
     public IRubyObject unlink(ThreadContext context) {
-        if(node.getParentNode() == null) {
-            throw context.getRuntime().newRuntimeError("TYPE: " + node.getNodeType()+ " PARENT NULL");
-        } else {
+        if (node.getParentNode() != null) {
             clearXpathContext(node.getParentNode());
             node.getParentNode().removeChild(node);
         }
-
         return this;
     }
 
@@ -1582,7 +1598,7 @@ public class XmlNode extends RubyObject {
             ((XmlDocument) this).resetNamespaceCache(context);
         }
 
-        relink_namespace(context);
+        other.relink_namespace(context);
         // post_add_child(context, this, other);
 
         return nodeOrTags;