nokogiri 1.5.7.rc1-java → 1.5.7.rc2-java

data/CHANGELOG.ja.rdoc

@@ -1,9 +1,23 @@
-== 1.5.7 / unreleased
+== 1.5.x
+
+=== 1.5.7 / unreleased
 
 * Bugfixes
+  * SAX::Parser.parse_io throw an error when used with lower case encoding. #828
   * (JRuby) Java Nokogiri is finally green (passes all tests) under 1.8 and 1.9 mode. High five everyone. #798, #705
+  * (JRuby) Nokogiri::XML::Reader broken (as a pull parser) on jruby - reads the whole XML document. #831
+  * (JRuby) JRuby hangs parsing "&". #837
+  * (JRuby) JRuby NPE parsing an invalid XML instruction. #838
+  * (JRuby) Node#content= incompatibility. #839
+  * (JRuby) to_xhtml doesn't print the last slash for self-closing tags in JRuby. #834
+  * (JRuby) Adding an EntityReference after a Text node mangles the entity in JRuby. #835
+  * (JRuby) JRuby version inconsistency: nil for empty attributes. #818
+  * CSS queries for classes (e.g., ".foo") now treat all whitespace identically. #854
+  * Namespace behavior cleaned up and made consistent between JRuby and MRI. #846, #801 (Thanks, Michael Klein!)
+  * (MRI) SAX parser handles empty processing instructions. #845
+
 
-== 1.5.6 / 2012年12月19日
+=== 1.5.6 / 2012年12月19日
 
 * Features
 
@@ -41,7 +55,7 @@
   * (JRuby) builder requires textwrappers for valid utf8 in jruby, not in mri. #784
 
 
-== 1.5.5 / ２０１２年６月２４日
+=== 1.5.5 / ２０１２年６月２４日
 
 * Features
 
@@ -63,7 +77,7 @@
   * JRuby の Entity 解決は C version の Nokogiri と同じ結果にならないといけない。#704, #647, #703
 
 
-== 1.5.4 / ２０１２年６月１２日
+=== 1.5.4 / ２０１２年６月１２日
 
 * Features
 
@@ -87,7 +101,7 @@
     ここに、自分ならではの二重否定のジョークをうめこむとなおよし。
 
 
-== 1.5.3 / ２０１２年６月１日
+=== 1.5.3 / ２０１２年６月１日
 
 * Features
 
@@ -115,12 +129,12 @@
   * (JRuby) Concurrency issue in XPath parsing. #682
 
 
-== 1.5.2 / 2012-03-09
+=== 1.5.2 / 2012-03-09
 
 Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631, #632.
 
 
-== 1.5.1 / 2012年3月9日
+=== 1.5.1 / 2012年3月9日
 
 * 新機能
 
@@ -165,7 +179,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Node#set is a private method (JRuby). #564 (thanks, Nick Sieger!)
   * C14n cleanup and Node#canonicalize (thanks, Ivan Pirlik!) #563
 
-== 1.5.0 / 2011年7月1日
+=== 1.5.0 / 2011年7月1日
 
 * 註
 
@@ -185,7 +199,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * <meta charset="..."> を認識するようになった.
 
 
-== 1.5.0 beta3 ２０１０年１２月２日
+=== 1.5.0 beta3 ２０１０年１２月２日
 
 * 註
 
@@ -196,13 +210,13 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 
   * Node#inner_textはnilを返さなくなった. (JRuby) #264
 
-== 1.5.0 beta2 ２０１０年７月３０日
+=== 1.5.0 beta2 ２０１０年７月３０日
 
 * 註
 
   * 1.4.3からの変更点を参照
 
-== 1.5.0 beta1 ２０１０年５月２２日
+=== 1.5.0 beta1 ２０１０年５月２２日
 
 * 註
 
@@ -214,6 +228,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * LibXML 2.6.16および古いバージョンは非推奨. インストールできない.
   * FFIサポートは削除された.
 
+
+== 1.4.x
+
 === 1.4.7 / 2011年7月1日
 
 * バグの修正
@@ -423,6 +440,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 
   * Hpricot用の互換性レイヤーを削除
 
+
+== 1.3.x
+
 === 1.3.3 / ２００９年７月２６日
 
 * 新しい機能
@@ -529,6 +549,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Node#before/after/inner_html=で値なしのHTML属性が受け入れられなかった問題を
     修正　(GH#35)
 
+
+== 1.2.x
+
 === 1.2.3 / ２００９年３月２２日
 
 * バグの修正
@@ -609,6 +632,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 
   * Nokogiri::HTML.fragment は XML::DocumentFragment (LH #32)で返す
 
+
+== 1.1.x
+
 === 1.1.1
 
 * 新しい機能
@@ -641,6 +667,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * XML::Node#dup が引数任意のdepthを取る 
   * XML::Node#add_previous_sibling が新しい兄弟ノードで返す
 
+
+== 1.0.x
+
 === 1.0.7
 
 * バグの修正

data/CHANGELOG.rdoc

@@ -1,4 +1,6 @@
-== 1.5.7 / unreleased
+== 1.5.x
+
+=== 1.5.7 / unreleased
 
 * Bugfixes
   * SAX::Parser.parse_io throw an error when used with lower case encoding. #828
@@ -10,8 +12,12 @@
   * (JRuby) to_xhtml doesn't print the last slash for self-closing tags in JRuby. #834
   * (JRuby) Adding an EntityReference after a Text node mangles the entity in JRuby. #835
   * (JRuby) JRuby version inconsistency: nil for empty attributes. #818
+  * CSS queries for classes (e.g., ".foo") now treat all whitespace identically. #854
+  * Namespace behavior cleaned up and made consistent between JRuby and MRI. #846, #801 (Thanks, Michael Klein!)
+  * (MRI) SAX parser handles empty processing instructions. #845
+
 
-== 1.5.6 / 2012-12-19
+=== 1.5.6 / 2012-12-19
 
 * Features
 
@@ -49,7 +55,7 @@
   * (JRuby) builder requires textwrappers for valid utf8 in jruby, not in mri. #784
 
 
-== 1.5.5 / 2012-06-24
+=== 1.5.5 / 2012-06-24
 
 * Features
 
@@ -71,7 +77,7 @@
   * JRuby's Entity resolving should be consistent with C-Nokogiri #704, #647, #703
 
 
-== 1.5.4 / 2012-06-12
+=== 1.5.4 / 2012-06-12
 
 * Features
 
@@ -97,7 +103,7 @@
     Insert your own joke about double-negatives here.
 
 
-== 1.5.3 / 2012-06-01
+=== 1.5.3 / 2012-06-01
 
 * Features
 
@@ -127,12 +133,12 @@
   * (JRuby) Concurrency issue in XPath parsing. #682
 
 
-== 1.5.2 / 2012-03-09
+=== 1.5.2 / 2012-03-09
 
 Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631, #632.
 
 
-== 1.5.1 / 2012-03-09
+=== 1.5.1 / 2012-03-09
 
 * Features
 
@@ -177,7 +183,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * C14n cleanup and Node#canonicalize (thanks, Ivan Pirlik!) #563
 
 
-== 1.5.0 / 2011-07-01
+=== 1.5.0 / 2011-07-01
 
 * Notes
 
@@ -197,7 +203,7 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
     encoding.
   * Add support for <meta charset="...">.
 
-== 1.5.0 beta3 / 2010/12/02
+=== 1.5.0 beta3 / 2010/12/02
 
 * Notes
 
@@ -208,13 +214,13 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 
   * Node#inner_text no longer returns nil. (JRuby) #264
 
-== 1.5.0 beta2 / 2010/07/30
+=== 1.5.0 beta2 / 2010/07/30
 
 * Notes
 
   * See changelog from 1.4.3
 
-== 1.5.0 beta1 / 2010/05/22
+=== 1.5.0 beta1 / 2010/05/22
 
 * Notes
 
@@ -226,6 +232,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * LibXML 2.6.16 and earlier are deprecated. Nokogiri will refuse to install.
   * FFI support is removed.
 
+
+== 1.4.x
+
 === 1.4.7 / 2011-07-01
 
 * Bugfixes
@@ -437,6 +446,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 
   * Hpricot compatibility layer removed
 
+
+== 1.3.x
+
 === 1.3.3 / 2009/07/26
 
 * New Features
@@ -530,6 +542,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * Fixed a bug with attribute conditions in CSS selectors (GH#36)
   * Fixed intolerance of HTML attributes without values in Node#before/after/inner_html=. (GH#35)
 
+
+== 1.2.x
+
 === 1.2.3 / 2009-03-22
 
 * Bugfixes
@@ -610,6 +625,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
 
   * Nokogiri::HTML.fragment now returns an XML::DocumentFragment (LH #32)
 
+
+== 1.1.x
+
 === 1.1.1
 
 * New features
@@ -643,6 +661,9 @@ Repackaging of 1.5.1 with a gemspec that is compatible with older Rubies. #631,
   * XML::Node#dup takes an optional depth argument
   * XML::Node#add_previous_sibling returns new sibling node.
 
+
+== 1.0.x
+
 === 1.0.7
 
 * Bugfixes

data/Manifest.txt

@@ -66,6 +66,7 @@ ext/java/nokogiri/internals/ParserContext.java
 ext/java/nokogiri/internals/ReaderNode.java
 ext/java/nokogiri/internals/SaveContextVisitor.java
 ext/java/nokogiri/internals/SchemaErrorHandler.java
+ext/java/nokogiri/internals/UncloseableInputStream.java
 ext/java/nokogiri/internals/XmlDeclHandler.java
 ext/java/nokogiri/internals/XmlDomParserContext.java
 ext/java/nokogiri/internals/XmlSaxParser.java

data/Rakefile

@@ -67,6 +67,19 @@ end
 
 # ----------------------------------------
 
+def add_file_to_gem relative_path
+  target_path = File.join gem_build_path, relative_path
+  target_dir = File.dirname(target_path)
+  mkdir_p target_dir unless File.directory?(target_dir)
+  rm_f target_path
+  ln relative_path, target_path
+  HOE.spec.files += [relative_path]
+end
+
+def gem_build_path
+  File.join 'pkg', HOE.spec.full_name
+end
+
 if java?
   # TODO: clean this section up.
   require "rake/javaextensiontask"
@@ -78,17 +91,15 @@ if java?
     ext.classpath = jars.map { |x| File.expand_path x }.join ':'
   end
 
-  gem_build_path = File.join 'pkg', HOE.spec.full_name
-
   task gem_build_path => [:compile] do
-    cp 'lib/nokogiri/nokogiri.jar', File.join(gem_build_path, 'lib', 'nokogiri')
-    HOE.spec.files += ['lib/nokogiri/nokogiri.jar']
+    add_file_to_gem 'lib/nokogiri/nokogiri.jar'
   end
 else
   mingw_available = true
   begin
     require 'tasks/cross_compile'
   rescue
+    puts "WARNING: cross compilation not available: #{$!}"
     mingw_available = false
   end
   require "rake/extensiontask"
@@ -101,10 +112,10 @@ else
     if mingw_available
       ext.cross_compile  = true
       ext.cross_platform = ["x86-mswin32-60", "x86-mingw32"]
-      ext.cross_config_options << "--with-xml2-include=#{File.join($recipes[:libxml2].path, 'include', 'libxml2')}"
-      ext.cross_config_options << "--with-xml2-lib=#{File.join($recipes[:libxml2].path, 'lib')}"
-      ext.cross_config_options << "--with-iconv-dir=#{$recipes[:libiconv].path}"
-      ext.cross_config_options << "--with-xslt-dir=#{$recipes[:libxslt].path}"
+      ext.cross_config_options << "--with-xml2-include=#{File.join($recipes["libxml2"].path, 'include', 'libxml2')}"
+      ext.cross_config_options << "--with-xml2-lib=#{File.join($recipes["libxml2"].path, 'lib')}"
+      ext.cross_config_options << "--with-iconv-dir=#{$recipes["libiconv"].path}"
+      ext.cross_config_options << "--with-xslt-dir=#{$recipes["libxslt"].path}"
       ext.cross_config_options << "--with-zlib-dir=#{CROSS_DIR}"
     end
   end
@@ -207,7 +218,7 @@ task "gem:windows" => "gem" do
   rbconfig_19 = rake_compiler_config["rbconfig-1.9.2"]
   raise "rbconfig #{rbconfig_19} needs --export-all in its DLDFLAGS value" if File.read(rbconfig_19).split("\n").grep(/CONFIG\["DLDFLAGS"\].*--export-all/).empty?
 
-  pkg_config_path = [:libxslt, :libxml2].collect { |pkg| File.join($recipes[pkg].path, "lib/pkgconfig") }.join(":")
+  pkg_config_path = %w[libxslt libxml2].collect { |pkg| File.join($recipes[pkg].path, "lib/pkgconfig") }.join(":")
   sh("env PKG_CONFIG_PATH=#{pkg_config_path} RUBY_CC_VERSION=#{ruby_cc_version} rake cross native gem") || raise("build failed!")
 end
 

data/ext/java/nokogiri/XmlDocument.java

@@ -179,11 +179,11 @@ public class XmlDocument extends XmlNode {
         if (node == null) return;
         String nodePrefix = node.getPrefix();
         if (nodePrefix == null) { // default namespace
-            node.getOwnerDocument().renameNode(node, default_href, node.getNodeName());
+            NokogiriHelpers.renameNode(node, default_href, node.getNodeName());
         } else {
             XmlNamespace xmlNamespace = nsCache.get(nodePrefix);
             String href = rubyStringToString(xmlNamespace.href(context));
-            node.getOwnerDocument().renameNode(node, href, node.getNodeName());
+            NokogiriHelpers.renameNode(node, href, node.getNodeName());
         }
         resolveNamespaceIfNecessary(context, node.getNextSibling(), default_href);
         NodeList children = node.getChildNodes();
@@ -358,7 +358,7 @@ public class XmlDocument extends XmlNode {
         Node node = xmlNode.node;
         if (node.getNodeType() == Node.ELEMENT_NODE) {
             node.setPrefix(null);
-            node.getOwnerDocument().renameNode(node, null, node.getLocalName());
+            NokogiriHelpers.renameNode(node, null, node.getLocalName());
             NamedNodeMap attrs = node.getAttributes();
             for (int i=0; i<attrs.getLength(); i++) {
                 Attr attr = (Attr) attrs.item(i);
@@ -366,7 +366,7 @@ public class XmlDocument extends XmlNode {
                     ((org.w3c.dom.Element)node).removeAttributeNode(attr);
                 } else {
                     attr.setPrefix(null);
-                    attr.getOwnerDocument().renameNode(attr, null, attr.getLocalName());
+                    NokogiriHelpers.renameNode(attr, null, attr.getLocalName());
                 }
             }
         }

data/ext/java/nokogiri/XmlNode.java

@@ -328,12 +328,15 @@ public class XmlNode extends RubyObject {
 
         Element element = null;
         String node_name = rubyStringToString(name);
-        try {
-          element = document.createElementNS(null, node_name);
-        } catch (org.w3c.dom.DOMException e) {
-            // issue#683 NAMESPACE_ERR is thrown from RDF::RDFXML::Writer.new
-            // retry without namespace
+        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);
         }
         setNode(context, element);
     }
@@ -451,8 +454,16 @@ public class XmlNode extends RubyObject {
     public void relink_namespace(ThreadContext context) {
         if (node instanceof Element) {
             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);
-            e.getOwnerDocument().renameNode(e, e.lookupNamespaceURI(e.getPrefix()), e.getNodeName());
+            String nsURI = e.lookupNamespaceURI(prefix);
+            this.node = NokogiriHelpers.renameNode(e, nsURI, e.getNodeName());
 
             if (e.hasAttributes()) {
                 NamedNodeMap attrs = e.getAttributes();
@@ -460,24 +471,28 @@ public class XmlNode extends RubyObject {
                 for (int i = 0; i < attrs.getLength(); i++) {
                     Attr attr = (Attr) attrs.item(i);
                     String nsUri = "";
-                    String prefix = attr.getPrefix();
+                    String attrPrefix = attr.getPrefix();
+                    if (attrPrefix == null) {
+                        attrPrefix = NokogiriHelpers.getPrefix(attr.getNodeName());
+                    }
                     String nodeName = attr.getNodeName();
                     if ("xml".equals(prefix)) {
                         nsUri = "http://www.w3.org/XML/1998/namespace";
-                    } else if ("xmlns".equals(prefix) || nodeName.equals("xmlns")) {
+                    } else if ("xmlns".equals(attrPrefix) || nodeName.equals("xmlns")) {
                         nsUri = "http://www.w3.org/2000/xmlns/";
                     } else {
-                        nsUri = attr.getNamespaceURI();
+                        nsUri = attr.lookupNamespaceURI(attrPrefix);
                     }
                     if (!(nsUri == null || "".equals(nsUri))) {
                         XmlNamespace.createFromAttr(context.getRuntime(), attr);
                     }
-                    e.getOwnerDocument().renameNode(attr, nsUri, nodeName);
+                    NokogiriHelpers.renameNode(attr, nsUri, nodeName);
                 }
             }
 
-            if (e.hasChildNodes()) {
-                ((XmlNodeSet) children(context)).relink_namespace(context);
+            if (this.node.hasChildNodes()) {
+                XmlNodeSet nodeSet = (XmlNodeSet)(children(context));
+                nodeSet.relink_namespace(context);
             }
         }
     }
@@ -536,7 +551,7 @@ public class XmlNode extends RubyObject {
                 && oldPrefix.equals(rubyStringToString(ns.prefix(context))));
 
         if(update) {
-            this.node.getOwnerDocument().renameNode(this.node, uri, this.node.getNodeName());
+            this.node = NokogiriHelpers.renameNode(this.node, uri, this.node.getNodeName());
         }
     }
 
@@ -576,7 +591,7 @@ public class XmlNode extends RubyObject {
         else namespaceOwner = node.getParentNode();
         XmlNamespace ns = XmlNamespace.createFromPrefixAndHref(namespaceOwner, prefix, href);
         if (node != namespaceOwner) {
-            node.getOwnerDocument().renameNode(node, ns.getHref(), ns.getPrefix() + node.getLocalName());
+            this.node = NokogiriHelpers.renameNode(node, ns.getHref(), ns.getPrefix() + node.getLocalName());
         }
         
         updateNodeNamespaceIfNecessary(context, ns);
@@ -1172,7 +1187,7 @@ public class XmlNode extends RubyObject {
     @JRubyMethod(name = {"node_name=", "name="})
     public IRubyObject node_name_set(ThreadContext context, IRubyObject nodeName) {
         String newName = rubyStringToString(nodeName);
-        getOwnerDocument().renameNode(node, null, newName);
+        this.node = NokogiriHelpers.renameNode(node, null, newName);
         setName(nodeName);
         return this;
     }
@@ -1190,6 +1205,8 @@ public class XmlNode extends RubyObject {
               String uri = null;
               if (prefix.equals("xml")) {
                 uri = "http://www.w3.org/XML/1998/namespace";
+              } else if (prefix.equals("xmlns")) {
+                uri = "http://www.w3.org/2000/xmlns/";
               } else {
                 uri = findNamespaceHref(context, prefix);
               }
@@ -1214,7 +1231,11 @@ public class XmlNode extends RubyObject {
             return namespace.getHref();
           }
         }
-        currentNode = (XmlNode) currentNode.parent(context);
+        if (currentNode.parent(context).isNil()) {
+            break;
+        } else {
+            currentNode = (XmlNode) currentNode.parent(context);
+        }
       }
       return null;
     }
@@ -1261,7 +1282,7 @@ public class XmlNode extends RubyObject {
                 String prefix = n.getPrefix();
                 String href = n.getNamespaceURI();
                 ((XmlDocument)doc).getNamespaceCache().remove(prefix == null ? "" : prefix, href);
-                n.getOwnerDocument().renameNode(n, null, n.getNodeName());
+                this.node = NokogiriHelpers.renameNode(n, null, NokogiriHelpers.getLocalPart(n.getNodeName()));
             }
         } else {
             XmlNamespace ns = (XmlNamespace) namespace;
@@ -1270,7 +1291,14 @@ public class XmlNode extends RubyObject {
 
             // Assigning node = ...renameNode() or not seems to make no
             // difference.  Why not? -pmahoney
-            node = node.getOwnerDocument().renameNode(node, href, NokogiriHelpers.newQName(prefix, node));
+
+            // It actually makes a great deal of difference. renameNode()
+            // will operate in place if it can, but sometimes it can't.
+            // The node you passed in *might* come back as you expect, but
+            // it might not. It's much safer to throw away the original
+            // and keep the return value. -mbklein
+            String new_name = NokogiriHelpers.newQName(prefix, node);
+            this.node = NokogiriHelpers.renameNode(node, href, new_name);
         }
 
         return this;
@@ -1485,7 +1513,7 @@ public class XmlNode extends RubyObject {
             XmlElement fragmentContext = ((XmlDocumentFragment)this).getFragmentContext();
             String namespace_uri = fragmentContext.node.getNamespaceURI();
             if (namespace_uri != null && namespace_uri.length() > 0) {
-                node.getOwnerDocument().renameNode(child, namespace_uri, child.getNodeName());
+                NokogiriHelpers.renameNode(child, namespace_uri, child.getNodeName());
             }
         }
     }
@@ -1542,7 +1570,7 @@ public class XmlNode extends RubyObject {
         try {
             parentNode.replaceChild(otherNode, thisNode);
             if (otherNode.getNodeType() != Node.TEXT_NODE) {
-                otherNode.getOwnerDocument().renameNode(otherNode, thisNode.getNamespaceURI(), otherNode.getNodeName());
+                NokogiriHelpers.renameNode(otherNode, thisNode.getNamespaceURI(), otherNode.getNodeName());
             }
         } catch (Exception e) {
             String prefix = "could not replace child: ";