nokogiri 1.6.2.rc2-java → 1.6.2.rc3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 066de4a9647ab7b6481daa9841e0746fb2c6cfdc
-  data.tar.gz: c85b73edcd0e10fe8bb73c5a72dfcebeab20d113
+  metadata.gz: 0dfa0556a5cd5aa7896420b87b700daeb9f93e78
+  data.tar.gz: dd9a7086d2ee770791d40f7791417ad3d1d5d5d2
 SHA512:
-  metadata.gz: 5ab8909f82512a86ae50eb545e9afd0577a12405dabd3736b820a3e269b7618362a5073f0c453f6d8531c2efd76c575e71da7a9e42a77105b755d0b641c27e3d
-  data.tar.gz: 2380c14c9d492263ab9bcb7766db0adf9017145421c5de0f3b979878ceadbe8e9540626190e16a9a6118360409050192d3740d4090340a6aef7d7cf9262349e5
+  metadata.gz: cd80730fb14c2140c9f9865c2c097ef8999f4a627fde6497c7ba694380256af7e81902900f989df185018a2fdda7af878254841ecea6bcf109ad9f97dff7f3a7
+  data.tar.gz: de6cc13b34efd97c9fd4be5bd4728d5e5225de7f1d4360d11fbda86c058f153f1f0543f25d9640dac1bd05fc11f3b117d903844df6d37e3b2fa68745e68ad891

data/.travis.yml

@@ -14,6 +14,8 @@ jdk:
 matrix:
   allow_failures:
     - rvm: rbx-19mode
+    # currently broken on Travis CI
+    - rvm: jruby-20mode
   exclude:
     - rvm: 1.9.3
       jdk: openjdk7

data/CHANGELOG.ja.rdoc

@@ -10,6 +10,7 @@
     and add support for native builds on Windows. #864, #989, #1072
   * (MRI) iconvが Windows-31J をサポートしていない場合は CP932 のエイリアスとして扱うようにした #836
   * (MRI) 同梱ライブラリを静的にリンクするようになった (静的リンクをオフにするにはextconf.rbに --disable-static を渡す) #923
+  * (MRI) CRubyのバグ #9760 に起因するライブラリパス(LIBPATH)の優先順位問題に対応した
   * (MRI) 同梱ライブラリのビルド後に不要になったディレクトリ群を自動的に削除するようになった (デバッグ等の目的で残すようにするにはextconf.rbに --disable-clean を渡す) #952
   * (MRI) FreeBSDなど、libiconvがシステム標準ディレクトリ外にある環境でlibxml2がiconvサポート付きで正しくビルドされるようになった
   * nthセレクタにおいてan-bを認識するようになった #886 (Magnus Bergmarkに感謝!)
@@ -27,13 +28,20 @@
   * :only-child疑似クラスが:not疑似クラスの中にある場合に正常な動作が行われるようになった #858 (Yamagishi Kazutoshiに感謝!)
   * 同梱のライブラリを使う場合にはextconf.rbでpkg_configを呼ばなくなった #931 (Shota Fukumoriに感謝!)
   * Nokogiri.parse()がRSS文書などをHTML文書として誤認する問題を修正 #932 (Yamagishi Kazutoshiに感謝!)
+  * (MRI) ノードに対して子ノードを追加する際、ノードタイプをチェックするようにした。従来はテキストノードに別のテキストノードを追加する操作によりSEGVが発生していた。 #1092
   * (JRuby) XSD validation crashes in Java version. #373
   * (JRuby) Document already has a root node error while using Builder. #646
   * (JRuby) c14n tests are all passing on JRuby. #226
   * Parsing empty documents raise SyntaxError in strict mode. #1005
   * (JRuby) Make xpath faster by caching the xpath context. #741
   * (JRuby) XML SAX push parser leaks memory on JRuby, but not on MRI. #998
-
+  * (JRUby) JRubyによるディフォルトネームスペースエイリアスの振る舞いがCRubyと同じではない。#940
+  * (JRuby) JRubyによるネームスペースのパースと追加の振る舞いが一致していない。 #943
+  * (JRuby) Builderで作ったドキュメントとクローンしたドキュメントではXpathの結果が違う。#1034
+  * (JRuby) Javaの実装はネームスペースを忘れることがある。 #902
+  * (JRuby) JRuby-Nokogiriはネームスペーススコープ内のアトリビュートを正しく認識しない。#1081
+  * (JRuby) JRuby-Nokogiriはコメントノードの名前が違う。#1080
+  * (JRuby) JAXPExtensionsProvider / Java 7 / Secure Processingに問題がある。 #1070
 
 === 1.6.1 / 2013年12月14日
 

data/CHANGELOG.rdoc

@@ -11,6 +11,8 @@
   * (MRI) Alias CP932 to Windows-31J if iconv does not support Windows-31J.
   * (MRI) Nokogiri now links packaged libraries statically.  To
     disable static linking, pass --disable-static to extconf.rb. #923
+  * (MRI) Fix a library path (LIBPATH) precedence problem caused by CRuby
+    bug #9760.
   * (MRI) Nokogiri automatically deletes directories of packaged
     libraries only used during build.  To keep them for debugging
     purposes, pass --disable-clean to extconf.rb. #952
@@ -41,13 +43,21 @@
     #931 (Thanks, Shota Fukumori!)
   * Nokogiri.parse() does not mistake a non-HTML document like a RSS
     document as HTML document. #932 (Thanks, Yamagishi Kazutoshi!)
+  * (MRI) Perform a node type check before adding a child node to another.  Previously adding a text node to another as a child could cause a SEGV. #1092
   * (JRuby) XSD validation crashes in Java version. #373
   * (JRuby) Document already has a root node error while using Builder. #646
   * (JRuby) c14n tests are all passing on JRuby. #226
   * Parsing empty documents raise SyntaxError in strict mode. #1005
   * (JRuby) Make xpath faster by caching the xpath context. #741
   * (JRuby) XML SAX push parser leaks memory on JRuby, but not on MRI. #998
-
+  * (JRUby) Inconsistent behavior aliasing the default namespace. #940
+  * (JRuby) Inconsistent behavior between parsing and adding namespaces. #943
+  * (JRuby) Xpath returns inconsistent result set on cloned document with
+    namespaces and attributes. #1034
+  * (JRuby) Java-Implementation forgets element namespaces #902
+  * (JRuby) JRuby-Nokogiri does not recognise attributes inside namespaces #1081
+  * (JRuby) JRuby-Nokogiri has different comment node name #1080
+  * (JRuby) JAXPExtensionsProvider / Java 7 / Secure Processing #1070
 
 === 1.6.1 / 2013-12-14
 

data/Rakefile

@@ -110,6 +110,8 @@ HOE = Hoe.spec 'nokogiri' do
   developer 'Tim Elliott',     'tle@holymonkey.com'
   developer 'Akinori MUSHA',   'knu@idaemons.org'
 
+  license "MIT"
+
   self.readme_file  = ['README',    ENV['HLANG'], 'rdoc'].compact.join('.')
   self.history_file = ['CHANGELOG', ENV['HLANG'], 'rdoc'].compact.join('.')
 
@@ -157,7 +159,6 @@ HOE = Hoe.spec 'nokogiri' do
 
   self.testlib = :minitest
 end
-HOE.spec.licenses = ['MIT']
 
 # ----------------------------------------
 

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]
@@ -186,7 +186,7 @@ public class XmlDocument extends XmlNode {
         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());
         }

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]
@@ -242,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);
     }
@@ -400,7 +400,7 @@ public class XmlNode extends RubyObject {
             }
 
             resultLines[i] = curInd.toString() + curLine;
-            
+
             if(!curLine.endsWith("/>") && !closingTag) {
                 curInd.append(indentString);
             }
@@ -451,7 +451,6 @@ public class XmlNode extends RubyObject {
         return value.length() == 0 ? null : value;
     }
 
-
     public void post_add_child(ThreadContext context, XmlNode current, XmlNode child) {
     }
 
@@ -575,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;
     }
 
@@ -588,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;
@@ -676,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>();
@@ -692,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>();
@@ -702,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;
@@ -764,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) {
@@ -772,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);
@@ -789,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)) {
@@ -800,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;
@@ -815,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) {
@@ -1046,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()) {
@@ -1085,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?")
@@ -1161,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;
@@ -1575,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 {
@@ -1601,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>.
      */
@@ -1633,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)

data/ext/java/nokogiri/XmlXpathContext.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 nokogiri.internals.NokogiriHelpers.getNokogiriClass;
 
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
 import java.util.Set;
 
 import javax.xml.transform.TransformerException;
@@ -88,18 +90,18 @@ public class XmlXpathContext extends RubyObject {
         variableResolver = NokogiriXPathVariableResolver.create();
     }
 
-    public void setNode(XmlNode node) {
+    private void setNode(XmlNode node) throws IllegalArgumentException, ClassNotFoundException, InstantiationException, IllegalAccessException, InvocationTargetException {
         Node doc = node.getNode().getOwnerDocument();
         if (doc == null) {
-          doc = node.getNode();
+            doc = node.getNode();
         }
         xpathSupport = (XPathContext) doc.getUserData(XPATH_CONTEXT);
 
         if (xpathSupport == null) {
-          JAXPExtensionsProvider jep = new JAXPExtensionsProvider(functionResolver);
-          xpathSupport = new XPathContext( jep );
-          xpathSupport.setVarStack(new JAXPVariableStack(variableResolver));
-          doc.setUserData(XPATH_CONTEXT, xpathSupport, null);
+            JAXPExtensionsProvider jep = getProviderInstance();
+            xpathSupport = new XPathContext(jep);
+            xpathSupport.setVarStack(new JAXPVariableStack(variableResolver));
+            doc.setUserData(XPATH_CONTEXT, xpathSupport, null);
         }
 
         context = node;
@@ -107,6 +109,20 @@ public class XmlXpathContext extends RubyObject {
         prefixResolver = new JAXPPrefixResolver(nsContext);
     }
 
+    private JAXPExtensionsProvider getProviderInstance() throws ClassNotFoundException, IllegalArgumentException, InstantiationException, IllegalAccessException, InvocationTargetException {
+        Class<?> clazz = Class.forName("com.sun.org.apache.xpath.internal.jaxp.JAXPExtensionsProvider");
+        Constructor[] constructors = clazz.getDeclaredConstructors();
+        for (int i = 0; i < constructors.length; i++) {
+            Class[] parameterTypes = constructors[i].getParameterTypes();
+            if (parameterTypes.length == 2) {
+                return (JAXPExtensionsProvider) constructors[i].newInstance(functionResolver, false);
+            } else if (parameterTypes.length == 1) {
+                return (JAXPExtensionsProvider) constructors[i].newInstance(functionResolver);
+            }
+        }
+        return null;
+    }
+
     /**
      * Create and return a copy of this object.
      *
@@ -122,7 +138,19 @@ public class XmlXpathContext extends RubyObject {
         XmlNode xmlNode = (XmlNode)node;
         XmlXpathContext xmlXpathContext = (XmlXpathContext) NokogiriService.XML_XPATHCONTEXT_ALLOCATOR.allocate(thread_context.getRuntime(), (RubyClass)klazz);
         XPathFactory.newInstance().newXPath();
-        xmlXpathContext.setNode(xmlNode);
+        try {
+            xmlXpathContext.setNode(xmlNode);
+        } catch (IllegalArgumentException e) {
+            throw thread_context.getRuntime().newRuntimeError(e.getMessage());
+        } catch (ClassNotFoundException e) {
+            throw thread_context.getRuntime().newRuntimeError(e.getMessage());
+        } catch (InstantiationException e) {
+            throw thread_context.getRuntime().newRuntimeError(e.getMessage());
+        } catch (IllegalAccessException e) {
+            throw thread_context.getRuntime().newRuntimeError(e.getMessage());
+        } catch (InvocationTargetException e) {
+            throw thread_context.getRuntime().newRuntimeError(e.getMessage());
+        }
         return xmlXpathContext;
     }
 

data/ext/java/nokogiri/internals/NokogiriHelpers.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]
@@ -557,7 +557,7 @@ public class NokogiriHelpers {
     private static Pattern decoded_pattern = Pattern.compile("&|>|<|\r");
     private static String[] encoded = {"&amp;", "&gt;", "&lt;", "&#13;"};
     private static String[] decoded = {"&", ">", "<", "\r"};
-    
+
     private static String convert(Pattern ptn, String input, String[] oldChars, String[] newChars)  {
         Matcher matcher = ptn.matcher(input);
         boolean result = matcher.find();
@@ -577,11 +577,11 @@ public class NokogiriHelpers {
         matcher.appendTail(sb);
         return sb.toString();
     }
-    
+
     public static String encodeJavaString(String s) {
         return convert(decoded_pattern, s, decoded, encoded);
     }
-    
+
     public static String decodeJavaString(String s) {
         return convert(encoded_pattern, s, encoded, decoded);
     }
@@ -617,7 +617,7 @@ public class NokogiriHelpers {
     public static boolean isXmlBase(String attrName) {
         return "xml:base".equals(attrName) || "xlink:href".equals(attrName);
     }
-    
+
     public static boolean isWhitespaceText(ThreadContext context, IRubyObject obj) {
         if (obj == null || obj.isNil()) return false;
 
@@ -628,11 +628,11 @@ public class NokogiriHelpers {
         String content = rubyStringToString(node.content(context));
         return content.trim().length() == 0;
     }
-    
+
     public static boolean isWhitespaceText(String s) {
         return s.trim().length() == 0;
     }
-    
+
     public static String canonicalizeWhitespce(String s) {
         StringBuilder sb = new StringBuilder();
         char[] chars = s.toCharArray();
@@ -663,14 +663,14 @@ public class NokogiriHelpers {
         RubyArray array = RubyArray.newArray(ruby, nodes.getLength());
         return nodeListToRubyArray(ruby, nodes, array);
     }
-    
+
     public static RubyArray nodeListToRubyArray(Ruby ruby, NodeList nodes, RubyArray array) {
         for(int i = 0; i < nodes.getLength(); i++) {
             array.append(NokogiriHelpers.getCachedNodeOrCreate(ruby, nodes.item(i)));
         }
         return array;
     }
-    
+
     public static RubyArray nodeArrayToRubyArray(Ruby ruby, Node[] nodes) {
         RubyArray n = RubyArray.newArray(ruby, nodes.length);
         for(int i = 0; i < nodes.length; i++) {
@@ -678,7 +678,7 @@ public class NokogiriHelpers {
         }
         return n;
     }
-    
+
     public static RubyArray namedNodeMapToRubyArray(Ruby ruby, NamedNodeMap map) {
         RubyArray n = RubyArray.newArray(ruby, map.getLength());
         for(int i = 0; i < map.getLength(); i++) {
@@ -686,7 +686,7 @@ public class NokogiriHelpers {
         }
         return n;
     }
-    
+
     public static String getValidEncoding(Ruby runtime, IRubyObject encoding) {
         if (encoding.isNil()) {
             return guessEncoding();
@@ -694,7 +694,7 @@ public class NokogiriHelpers {
             return ignoreInvalidEncoding(runtime, encoding);
         }
     }
-    
+
     private static String guessEncoding() {
         String name = null;
         if (name == null) name = System.getProperty("file.encoding");
@@ -709,7 +709,7 @@ public class NokogiriHelpers {
         if (charsetNames.contains(givenEncoding)) return givenEncoding;
         else return guessEncoding();
     }
-    
+
     public static String adjustSystemIdIfNecessary(String currentDir, String scriptFileName, String baseURI, String systemId) {
         if (systemId == null) return systemId;
         File file = new File(systemId);
@@ -720,7 +720,7 @@ public class NokogiriHelpers {
         if (path != null) return path;
         return resolveSystemId(scriptFileName, systemId);
     }
-    
+
     private static String resolveSystemId(String baseName, String systemId) {
         if (baseName == null || baseName.length() < 1) return null;
         String parentName = null;
@@ -734,13 +734,13 @@ public class NokogiriHelpers {
         if (dtdFile.exists()) return dtdFile.getPath();
         return null;
     }
-    
+
     public static boolean isUTF8(String encoding) {
         if (encoding == null) return true;   // no need to convert encoding
         int ret = Charset.forName(encoding).compareTo(Charset.forName("UTF-8"));
         return ret == 0;
     }
-    
+
     public static byte[] convertEncoding(Charset output_charset, String input_string) throws CharacterCodingException {
         CharsetEncoder encoder = output_charset.newEncoder();
         CharBuffer charBuffer = CharBuffer.wrap(input_string);
@@ -761,7 +761,6 @@ public class NokogiriHelpers {
         } else {
             return NokogiriHelpers.nkf(runtime, ruby_encoding, thing);
         }
-        
     }
 
     // This method is used from HTML documents. HTML meta tag with encoding specification
@@ -813,7 +812,7 @@ public class NokogiriHelpers {
             return thing;
         }
     }
-    
+
     private static Charset shift_jis = Charset.forName("Shift_JIS");
     private static Charset jis = Charset.forName("ISO-2022-JP");
     private static Charset euc_jp = Charset.forName("EUC-JP");
@@ -827,11 +826,14 @@ public class NokogiriHelpers {
       return !shouldEncode(text);
     }
 
+    public static NokogiriNamespaceCache getNamespaceCacheFormNode(Node n) {
+        XmlDocument xmlDoc = (XmlDocument)getCachedNode(n.getOwnerDocument());
+        return xmlDoc.getNamespaceCache();
+    }
+
     public static Node renameNode(Node n, String namespaceURI, String qualifiedName) throws DOMException {
         Document doc = n.getOwnerDocument();
-        XmlDocument xmlDoc = (XmlDocument)getCachedNode(doc);
-        NokogiriNamespaceCache nsCache = xmlDoc.getNamespaceCache();
-        int oldHash = n.hashCode();
+        NokogiriNamespaceCache nsCache = getNamespaceCacheFormNode(n);
         Node result = doc.renameNode(n, namespaceURI, qualifiedName);
         if (result != n) {
             nsCache.replaceNode(n, result);

data/ext/java/nokogiri/internals/NokogiriNamespaceCache.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]
@@ -53,52 +53,65 @@ import org.w3c.dom.Node;
  */
 public class NokogiriNamespaceCache {
 
-    private List<Long> keys;  // order matters.
-    private Map<Integer, CacheEntry> cache;  // pair of the index of a given key and entry
+    private List<String[]> keys;
+    private Map<String[], CacheEntry> cache;  // pair of the index of a given key and entry
     private XmlNamespace defaultNamespace = null;
 
     public NokogiriNamespaceCache() {
-        keys = new ArrayList<Long>();
-        cache = new LinkedHashMap<Integer, CacheEntry>();
+        keys = new ArrayList<String[]>(); // keys are [prefix, href]
+        cache = new LinkedHashMap<String[], CacheEntry>();
     }
-    
-    private Long hashCode(String prefix, String href) {
-        long prefix_hash = prefix.hashCode();
-        long href_hash = href.hashCode();
-        return prefix_hash << 31 | href_hash;
+
+    public XmlNamespace getDefault() {
+        return defaultNamespace;
+    }
+
+    private String[] getKey(String prefix, String href) {
+        for (String[] key : keys) {
+            if (key[0].equals(prefix) && key[1].equals(href)) return key;
+        }
+        return null;
     }
 
     public XmlNamespace get(String prefix, String href) {
         // prefix should not be null.
         // In case of a default namespace, an empty string should be given to prefix argument.
         if (prefix == null || href == null) return null;
-        Long hash = hashCode(prefix, href);
-        Integer index = keys.indexOf(hash);
-        if (index != -1) return cache.get(index).namespace;
+        String[] key = getKey(prefix, href);
+        if (key != null) {
+            return cache.get(key).namespace;
+        }
         return null;
     }
-    
-    public XmlNamespace getDefault() {
-        return defaultNamespace;
-    }
-    
-    public XmlNamespace get(String prefix) {
+
+    public XmlNamespace get(Node node, String prefix) {
         if (prefix == null) return defaultNamespace;
-        long h = prefix.hashCode();
-        Long hash = h << 31;
-        Long mask = 0xFF00L;
-        for (int i=0; i < keys.size(); i++) {
-            if ((keys.get(i) & mask) == hash) {
-                return cache.get(i).namespace;
+        for (String[] key : keys) {
+            if (key[0].equals(prefix) && cache.get(key) != null && cache.get(key).isOwner(node)) {
+                return cache.get(key).namespace;
             }
         }
         return null;
     }
-    
+
+    public List<XmlNamespace> get(String prefix) {
+        List<XmlNamespace> namespaces = new ArrayList<XmlNamespace>();
+        if (prefix == null) {
+            namespaces.add(defaultNamespace);
+            return namespaces;
+        }
+        for (String[] key : keys) {
+            if (key[0].equals(prefix) && cache.get(key) != null) {
+                namespaces.add(cache.get(key).namespace);
+            }
+        }
+        return namespaces;
+    }
+
     public List<XmlNamespace> get(Node node) {
         List<XmlNamespace> namespaces = new ArrayList<XmlNamespace>();
-        for (int i=0; i < keys.size(); i++) {
-            CacheEntry entry = cache.get(i);
+        for (String[] key : keys) {
+            CacheEntry entry = cache.get(key);
             if (entry.isOwner(node)) {
                 namespaces.add(entry.namespace);
             }
@@ -111,33 +124,25 @@ public class NokogiriNamespaceCache {
         // In case of a default namespace, an empty string should be given to prefix argument.
         String prefixString = namespace.getPrefix();
         String hrefString = namespace.getHref();
-        Long hash = hashCode(prefixString, hrefString);
-        Integer index;
-        if ((index = keys.indexOf(hash)) != -1) {
-            return;
-        } else {
-            keys.add(hash);
-            index = keys.size() - 1;
-            CacheEntry entry = new CacheEntry(namespace, ownerNode);
-            cache.put(index, entry);
-            if ("".equals(prefixString)) defaultNamespace = namespace;
-        }
+        if (getKey(prefixString, hrefString) != null) return;
+        String[] key = {prefixString, hrefString};
+        keys.add(key);
+        CacheEntry entry = new CacheEntry(namespace, ownerNode);
+        cache.put(key, entry);
+        if ("".equals(prefixString)) defaultNamespace = namespace;
     }
 
     public void remove(String prefix, String href) {
-        if (prefix == null || href == null) return;
-        Long hash = hashCode(prefix, href);
-        Integer index = keys.indexOf(hash);
-        if (index != -1) {
-            cache.remove(index);
-        }
-        keys.remove(index);
+        String[] key = getKey(prefix, href);
+        if (key == null) return;
+        keys.remove(key);
+        cache.remove(key);
     }
-    
+
     public void clear() {
         // removes namespace declarations from node
-        for (int i=0; i < keys.size(); i++) {
-            CacheEntry entry = cache.get(i);
+        for (String[] key : cache.keySet()) {
+            CacheEntry entry = cache.get(key);
             NamedNodeMap attributes = entry.ownerNode.getAttributes();
             for (int j=0; j<attributes.getLength(); j++) {
                 String name = ((Attr)attributes.item(j)).getName();
@@ -150,10 +155,10 @@ public class NokogiriNamespaceCache {
         cache.clear();
         defaultNamespace = null;
     }
-    
+
     public void replaceNode(Node oldNode, Node newNode) {
-        for (int i=0; i < keys.size(); i++) {
-            CacheEntry entry = cache.get(i);
+        for (String[] key : keys) {
+            CacheEntry entry = cache.get(key);
             if (entry.isOwner(oldNode)) {
                 entry.replaceOwner(newNode);
             }
@@ -163,14 +168,14 @@ public class NokogiriNamespaceCache {
     private class CacheEntry {
         private XmlNamespace namespace;
         private Node ownerNode;
-        
+
         CacheEntry(XmlNamespace namespace, Node ownerNode) {
             this.namespace = namespace;
             this.ownerNode = ownerNode;
         }
 
         public Boolean isOwner(Node n) {
-            return this.ownerNode.isSameNode(n);
+            return ownerNode.isSameNode(n);
         }
 
         public void replaceOwner(Node newNode) {

data/ext/nokogiri/extconf.rb

@@ -51,6 +51,20 @@ ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 # https://bugs.ruby-lang.org/issues/8074
 @libdir_basename = "lib" if RUBY_VERSION < '2.1.0'
 
+# Workaround for Ruby bug #9760, will be fixed in Ruby 2.2
+class Array
+  alias orig_or |
+
+  def | other
+    if self.equal?($DEFLIBPATH) && other.equal?($LIBPATH)
+      # Make sure library directories we set take precedence over $(libdir)
+      other.orig_or(self)
+    else
+      self.orig_or(other)
+    end
+  end
+end if RUBY_VERSION < '2.2.0'
+
 if arg_config('--clean')
   require 'pathname'
   require 'fileutils'

data/ext/nokogiri/xml_node.c

@@ -139,7 +139,7 @@ static xmlNodePtr xmlReplaceNodeWrapper(xmlNodePtr pivot, xmlNodePtr new_node)
 static VALUE reparent_node_with(VALUE pivot_obj, VALUE reparentee_obj, pivot_reparentee_func prf)
 {
   VALUE reparented_obj ;
-  xmlNodePtr reparentee, pivot, reparented, next_text, new_next_text ;
+  xmlNodePtr reparentee, pivot, reparented, next_text, new_next_text, parent ;
 
   if(!rb_obj_is_kind_of(reparentee_obj, cNokogiriXmlNode))
     rb_raise(rb_eArgError, "node must be a Nokogiri::XML::Node");
@@ -149,9 +149,71 @@ static VALUE reparent_node_with(VALUE pivot_obj, VALUE reparentee_obj, pivot_rep
   Data_Get_Struct(reparentee_obj, xmlNode, reparentee);
   Data_Get_Struct(pivot_obj, xmlNode, pivot);
 
-  if(XML_DOCUMENT_NODE == reparentee->type || XML_HTML_DOCUMENT_NODE == reparentee->type)
-    rb_raise(rb_eArgError, "cannot reparent a document node");
+  /*
+   * Check if nodes given are appropriate to have a parent-child
+   * relationship, based on the DOM specification.
+   *
+   * cf. http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#ID-1590626202
+   */
+  if (prf == xmlAddChild) {
+    parent = pivot;
+  } else {
+    parent = pivot->parent;
+  }
+
+  if (parent) {
+    switch (parent->type) {
+    case XML_DOCUMENT_NODE:
+    case XML_HTML_DOCUMENT_NODE:
+      switch (reparentee->type) {
+        case XML_ELEMENT_NODE:
+        case XML_PI_NODE:
+        case XML_COMMENT_NODE:
+        case XML_DOCUMENT_TYPE_NODE:
+      /*
+       * The DOM specification says no to adding text-like nodes
+       * directly to a document, but we allow it for compatibility.
+       */
+        case XML_TEXT_NODE:
+        case XML_CDATA_SECTION_NODE:
+        case XML_ENTITY_REF_NODE:
+          goto ok;
+      }
+      break;
+    case XML_DOCUMENT_FRAG_NODE:
+    case XML_ENTITY_REF_NODE:
+    case XML_ELEMENT_NODE:
+      switch (reparentee->type) {
+      case XML_ELEMENT_NODE:
+      case XML_PI_NODE:
+      case XML_COMMENT_NODE:
+      case XML_TEXT_NODE:
+      case XML_CDATA_SECTION_NODE:
+      case XML_ENTITY_REF_NODE:
+        goto ok;
+      }
+      break;
+    case XML_ATTRIBUTE_NODE:
+      switch (reparentee->type) {
+      case XML_TEXT_NODE:
+      case XML_ENTITY_REF_NODE:
+        goto ok;
+      }
+      break;
+    case XML_TEXT_NODE:
+      /*
+       * xmlAddChild() breaks the DOM specification in that it allows
+       * adding a text node to another, in which case text nodes are
+       * coalesced, but since our JRuby version does not support such
+       * operation, we should inhibit it.
+       */
+      break;
+    }
+
+    rb_raise(rb_eArgError, "cannot reparent %s there", rb_obj_classname(reparentee_obj));
+  }
 
+ok:
   xmlUnlinkNode(reparentee);
 
   if (reparentee->doc != pivot->doc || reparentee->type == XML_TEXT_NODE) {

data/lib/nokogiri/css/xpath_visitor.rb

@@ -36,7 +36,7 @@ module Nokogiri
           if node.value[1].is_a?(Nokogiri::CSS::Node) and node.value[1].type == :NTH
             nth(node.value[1], :last => true, :child => true)
           else
-            "count(following-sbiling::*) = #{node.value[1].to_i-1}"
+            "count(following-sibling::*) = #{node.value[1].to_i-1}"
           end
         when /^(first|first-of-type)\(/
           "position() = 1"

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.6.2.rc2'
+  VERSION = '1.6.2.rc3'
 
   class VersionInfo # :nodoc:
     def jruby?

data/test/css/test_parser.rb

@@ -174,11 +174,11 @@ module Nokogiri
       end
 
       def test_nth_child_selectors
-        assert_xpath '//a[count(preceding-sibling::*) = 0]',         @parser.parse('a:first-child')
-        assert_xpath '//a[count(preceding-sibling::*) = 98]',          @parser.parse('a:nth-child(99)')
-        assert_xpath '//a[count(following-sibling::*) = 0]',      @parser.parse('a:last-child')
-        assert_xpath '//a[count(following-sbiling::*) = 0]',      @parser.parse('a:nth-last-child(1)')
-        assert_xpath '//a[count(following-sbiling::*) = 98]', @parser.parse('a:nth-last-child(99)')
+        assert_xpath '//a[count(preceding-sibling::*) = 0]',  @parser.parse('a:first-child')
+        assert_xpath '//a[count(preceding-sibling::*) = 98]', @parser.parse('a:nth-child(99)')
+        assert_xpath '//a[count(following-sibling::*) = 0]',  @parser.parse('a:last-child')
+        assert_xpath '//a[count(following-sibling::*) = 0]',  @parser.parse('a:nth-last-child(1)')
+        assert_xpath '//a[count(following-sibling::*) = 98]', @parser.parse('a:nth-last-child(99)')
       end
 
       def test_miscellaneous_selectors

data/test/html/test_document_fragment.rb

@@ -164,6 +164,12 @@ module Nokogiri
         assert_match %r%     \n<div>b</div> *%, fragment.to_s
       end
 
+      def test_html_fragment_with_input_and_intermediate_whitespace
+        doc = "<label>Label</label><input type=\"text\"> <span>span</span>"
+        fragment = Nokogiri::HTML::Document.new.fragment(doc)
+        assert_equal "<label>Label</label><input type=\"text\"> <span>span</span>", fragment.to_s
+      end
+
       def test_html_fragment_with_leading_text_and_newline
         fragment = HTML::Document.new.fragment("First line\nSecond line<br>Broken line")
         assert_equal fragment.to_s, "First line\nSecond line<br>Broken line"

data/test/namespaces/test_namespaces_aliased_default.rb

@@ -0,0 +1,24 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestAliasedDefaultNamespaces < Nokogiri::TestCase
+      def setup
+        super
+      end
+
+      def test_alised_default_namespace_on_parse
+        doc = Nokogiri::XML('<apple xmlns="ns:fruit" xmlns:fruit="ns:fruit" />')
+        ns = doc.root.namespaces
+        assert_equal  "ns:fruit", ns["xmlns:fruit"], "Should have parsed aliased default namespace"
+      end
+
+      def test_add_aliased_default_namespace
+        doc = Nokogiri::XML('<apple xmlns="ns:fruit" />')
+        doc.root.add_namespace_definition("fruit", "ns:fruit")
+        ns = doc.root.namespaces
+        assert_equal  "ns:fruit", ns["xmlns:fruit"],"Should have added aliased default namespace"
+      end
+    end
+  end
+end

data/test/namespaces/test_namespaces_preservation.rb

@@ -0,0 +1,31 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestNamespacePreservation < Nokogiri::TestCase
+
+      def setup
+        @xml = Nokogiri.XML <<-eoxml
+              <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                <xs:element xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+                <xs:element xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+              </xs:schema>
+            eoxml
+      end
+
+      def test_xpath   
+        first = @xml.at_xpath('//xs:element', 'xs' => 'http://www.w3.org/2001/XMLSchema')
+        last = @xml.at_xpath('//xs:element[last()]', 'xs' => 'http://www.w3.org/2001/XMLSchema')
+        assert_equal 'http://api.geotrust.com/webtrust/query' , first.namespaces['xmlns:quer'], "Should contain quer namespace"
+        assert_equal 'http://api.geotrust.com/webtrust/query' , last.namespaces['xmlns:quer'], "Should contain quer namespace"
+      end
+
+      def test_traversing   
+        first = @xml.root.element_children.first
+        last = @xml.root.element_children.last
+        assert_equal 'http://api.geotrust.com/webtrust/query' , first.namespaces['xmlns:quer'], "Should contain quer namespace"
+        assert_equal 'http://api.geotrust.com/webtrust/query' , last.namespaces['xmlns:quer'], "Should contain quer namespace"
+      end
+    end
+  end
+end

data/test/xml/test_text.rb

@@ -40,6 +40,21 @@ module Nokogiri
         assert_equal('& <foo> &amp;', node.content)
         assert_equal('&amp; &lt;foo&gt; &amp;amp;', node.to_xml)
       end
+
+      def test_add_child
+        node = Text.new('foo', Document.new)
+        if Nokogiri.jruby?
+          exc = RuntimeError
+        else
+          exc = ArgumentError
+        end
+        assert_raises(exc) {
+          node.add_child Text.new('bar', Document.new)
+        }
+        assert_raises(exc) {
+          node << Text.new('bar', Document.new)
+        }
+      end
     end
   end
 end

data/test_all

@@ -10,7 +10,7 @@
 #  (e.g., 1.9.3's glob_helper). ["rake test:valgrind:suppression"]
 #
 
-RUBIES="ruby-1.9.3-p327 jruby-1.7.3 jruby-1.6.5.1 jruby-1.6.7.2 ruby-1.9.2-p320"
+RUBIES="ruby-1.9.3 ruby-1.9.2 ruby-2.0 ruby-2.1 jruby-1.7"
 TEST_LOG=test.log
 VALGRIND_LOG=valgrind.log
 
@@ -34,7 +34,7 @@ function rvm_use {
 
 function generate_parser_and_tokenizer {
     old_ruby=$current_ruby
-    rvm_use ruby-1.9.3-p327
+    rvm_use ruby-1.9.3
     bundle exec rake generate 2>&1 > /dev/null
     rvm_use $old_ruby
 }
@@ -51,7 +51,7 @@ function compile {
 
 for ruby in $RUBIES ; do
     rvm_use ${ruby}
-    if ! which bundle ; then
+    if ! [[ $(bundle -v) =~ "1.6." ]] ; then
         gem install bundler
     fi
     bundle install --quiet --local || bundle install

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.2.rc2
+  version: 1.6.2.rc3
 platform: java
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -550,10 +550,12 @@ files:
 - test/html/test_node.rb
 - test/html/test_node_encoding.rb
 - test/namespaces/test_additional_namespaces_in_builder_doc.rb
+- test/namespaces/test_namespaces_aliased_default.rb
 - test/namespaces/test_namespaces_in_builder_doc.rb
 - test/namespaces/test_namespaces_in_cloned_doc.rb
 - test/namespaces/test_namespaces_in_created_doc.rb
 - test/namespaces/test_namespaces_in_parsed_doc.rb
+- test/namespaces/test_namespaces_preservation.rb
 - test/test_convert_xpath.rb
 - test/test_css_cache.rb
 - test/test_encoding_handler.rb
@@ -692,7 +694,9 @@ test_files:
 - test/css/test_nthiness.rb
 - test/css/test_xpath_visitor.rb
 - test/namespaces/test_namespaces_in_parsed_doc.rb
+- test/namespaces/test_namespaces_aliased_default.rb
 - test/namespaces/test_namespaces_in_cloned_doc.rb
+- test/namespaces/test_namespaces_preservation.rb
 - test/namespaces/test_namespaces_in_created_doc.rb
 - test/namespaces/test_additional_namespaces_in_builder_doc.rb
 - test/namespaces/test_namespaces_in_builder_doc.rb