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

data/ext/java/nokogiri/internals/NokogiriHelpers.java

@@ -71,9 +71,11 @@ import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
 import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.w3c.dom.DOMException;
 
 /**
  * A class for various utility methods.
@@ -634,10 +636,11 @@ public class NokogiriHelpers {
     }
 
     public static String newQName(String newPrefix, Node node) {
+        String tagName = getLocalPart(node.getNodeName());
         if(newPrefix == null) {
-            return node.getLocalName();
+            return tagName;
         } else {
-            return newPrefix + ":" + node.getLocalName();
+            return newPrefix + ":" + tagName;
         }
     }
 
@@ -807,4 +810,16 @@ public class NokogiriHelpers {
     public static boolean shouldDecode(Node text) {
       return !shouldEncode(text);
     }
+
+    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();
+        Node result = doc.renameNode(n, namespaceURI, qualifiedName);
+        if (result != n) {
+            nsCache.replaceNode(n, result);
+        }
+        return result;
+    }
 }

data/ext/java/nokogiri/internals/NokogiriNamespaceCache.java

@@ -99,7 +99,7 @@ public class NokogiriNamespaceCache {
         List<XmlNamespace> namespaces = new ArrayList<XmlNamespace>();
         for (int i=0; i < keys.size(); i++) {
             CacheEntry entry = cache.get(i);
-            if (entry.ownerNode == node) {
+            if (entry.isOwner(node)) {
                 namespaces.add(entry.namespace);
             }
         }
@@ -151,6 +151,15 @@ public class NokogiriNamespaceCache {
         defaultNamespace = null;
     }
     
+    public void replaceNode(Node oldNode, Node newNode) {
+        for (int i=0; i < keys.size(); i++) {
+            CacheEntry entry = cache.get(i);
+            if (entry.isOwner(oldNode)) {
+                entry.replaceOwner(newNode);
+            }
+        }
+    }
+
     private class CacheEntry {
         private XmlNamespace namespace;
         private Node ownerNode;
@@ -159,5 +168,13 @@ public class NokogiriNamespaceCache {
             this.namespace = namespace;
             this.ownerNode = ownerNode;
         }
+
+        public Boolean isOwner(Node n) {
+            return this.ownerNode.isSameNode(n);
+        }
+
+        public void replaceOwner(Node newNode) {
+            this.ownerNode = newNode;
+        }
     }
 }

data/ext/java/nokogiri/internals/UncloseableInputStream.java

@@ -0,0 +1,102 @@
+/**
+ * (The MIT License)
+ *
+ * Copyright (c) 2008 - 2012:
+ *
+ * * {Aaron Patterson}[http://tenderlovemaking.com]
+ * * {Mike Dalessio}[http://mike.daless.io]
+ * * {Charles Nutter}[http://blog.headius.com]
+ * * {Sergio Arbeo}[http://www.serabe.com]
+ * * {Patrick Mahoney}[http://polycrystal.org]
+ * * {Yoko Harada}[http://yokolet.blogspot.com]
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * 'Software'), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * 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.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package nokogiri.internals;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Delegates all the methods to another InputStream except the
+ * close() method, which is ignored. This is used to fix #495.
+ *
+ * @author John Shahid <jvshahid@gmail.com>
+ */
+public class UncloseableInputStream extends InputStream {
+  private final InputStream delegate;
+
+  /**
+   * Create a new uncloseable stream.
+   *
+   * @param delegate The InputStream to which all methods (except close)
+   * will be delegated.
+   */
+  public UncloseableInputStream(InputStream delegate) {
+    this.delegate = delegate;
+  }
+
+  @Override
+  public int read() throws IOException {
+    return delegate.read();
+  }
+
+  @Override
+  public int read(byte []b) throws IOException {
+    return delegate.read(b);
+  }
+
+  @Override
+  public int read(byte []b, int offset, int len) throws IOException {
+    return delegate.read(b, offset, len);
+  }
+
+  @Override
+  public long skip(long n) throws IOException {
+    return delegate.skip(n);
+  }
+
+  @Override
+  public int available() throws IOException {
+    return delegate.available();
+  }
+
+  @Override
+  public void close() {
+    // don't forward this to the InputStream we're delegating from
+    // we don't want the InputStream of the RubyIO to be closed
+  }
+
+  @Override
+  public void mark(int readlimit) {
+    delegate.mark(readlimit);
+  }
+
+  @Override
+  public void reset() throws IOException {
+    delegate.reset();
+  }
+
+  @Override
+  public boolean markSupported() {
+    return delegate.markSupported();
+  }
+}

data/ext/nokogiri/nokogiri.h

@@ -157,4 +157,8 @@ void nokogiri_root_nsdef(xmlNsPtr, xmlDocPtr);
 # endif
 #endif
 
+#define XMLNS_PREFIX "xmlns"
+#define XMLNS_PREFIX_LEN 6 /* including either colon or \0 */
+#define XMLNS_BUFFER_LEN 128
+
 #endif

data/ext/nokogiri/xml_node.c

@@ -23,10 +23,34 @@ typedef xmlNodePtr (*pivot_reparentee_func)(xmlNodePtr, xmlNodePtr);
 /* :nodoc: */
 static void relink_namespace(xmlNodePtr reparented)
 {
+  xmlChar *name, *prefix;
   xmlNodePtr child;
+  xmlNsPtr ns;
+
+  if (reparented->type != XML_ATTRIBUTE_NODE &&
+      reparented->type != XML_ELEMENT_NODE) return;
+
+  if (reparented->ns == NULL || reparented->ns->prefix == NULL) {
+    name = xmlSplitQName2(reparented->name, &prefix);
+
+    if(reparented->type == XML_ATTRIBUTE_NODE) {
+      if (prefix == NULL || strcmp((char*)prefix, XMLNS_PREFIX) == 0) return;
+    }
+
+    ns = xmlSearchNs(reparented->doc, reparented, prefix);
+
+    if (ns == NULL && reparented->parent) {
+      ns = xmlSearchNs(reparented->doc, reparented->parent, prefix);
+    }
+
+    if (ns != NULL) {
+      xmlNodeSetName(reparented, name);
+      xmlSetNs(reparented, ns);
+    }
+  }
 
   /* Avoid segv when relinking against unlinked nodes. */
-  if(!reparented->parent) return;
+  if (reparented->type != XML_ELEMENT_NODE || !reparented->parent) return;
 
   /* Make sure that our reparented node has the correct namespaces */
   if(!reparented->ns && reparented->doc != (xmlDocPtr)reparented->parent)
@@ -70,6 +94,14 @@ static void relink_namespace(xmlNodePtr reparented)
     relink_namespace(child);
     child = child->next;
   }
+
+  if (reparented->type == XML_ELEMENT_NODE) {
+    child = (xmlNodePtr)((xmlElementPtr)reparented)->attributes;
+    while(NULL != child) {
+      relink_namespace(child);
+      child = child->next;
+    }
+  }
 }
 
 /* :nodoc: */

data/ext/nokogiri/xml_reader.c

@@ -25,9 +25,6 @@ static int has_attributes(xmlTextReaderPtr reader)
   return(0);
 }
 
-#define XMLNS_PREFIX "xmlns"
-#define XMLNS_PREFIX_LEN 6 /* including either colon or \0 */
-#define XMLNS_BUFFER_LEN 128
 static void Nokogiri_xml_node_namespaces(xmlNodePtr node, VALUE attr_hash)
 {
   xmlNsPtr ns;

data/lib/nokogiri/css/xpath_visitor.rb

@@ -120,7 +120,7 @@ module Nokogiri
       end
 
       def visit_class_condition node
-        "contains(concat(' ', @class, ' '), ' #{node.value.first} ')"
+        "contains(concat(' ', normalize-space(@class), ' '), ' #{node.value.first} ')"
       end
 
       {

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml/builder.rb

@@ -327,7 +327,8 @@ module Nokogiri
           return self if @ns
         end
 
-        raise ArgumentError, "Namespace #{ns} has not been defined"
+        @ns = { :pending => ns.to_s }
+        return self
       end
 
       ###
@@ -355,11 +356,20 @@ module Nokogiri
         else
           node = @doc.create_element(method.to_s.sub(/[_!]$/, ''),*args) { |n|
             # Set up the namespace
-            if @ns
+            if @ns.is_a? Nokogiri::XML::Namespace
               n.namespace = @ns
               @ns = nil
             end
           }
+
+          if @ns.is_a? Hash
+            node.namespace = node.namespace_definitions.find { |x| x.prefix == @ns[:pending] }
+            if node.namespace.nil?
+              raise ArgumentError, "Namespace #{@ns[:pending]} has not been defined"
+            end
+            @ns = nil
+          end
+
           insert(node, &block)
         end
       end

data/lib/nokogiri/xml/document.rb

@@ -87,7 +87,6 @@ module Nokogiri
               if key =~ NCNAME_RE
                 ns_name = key.split(":", 2)[1]
                 elm.add_namespace_definition ns_name, v
-                next
               end
               elm[k.to_s] = v.to_s
             }
@@ -95,6 +94,9 @@ module Nokogiri
             elm.content = arg
           end
         end
+        if ns = elm.namespace_definitions.find { |n| n.prefix.nil? or n.prefix == '' }
+          elm.namespace = ns
+        end
         elm
       end
 

data/tasks/cross_compile.rb

@@ -4,10 +4,10 @@ HOST = Rake::ExtensionCompiler.mingw_host
 
 require 'mini_portile'
 $recipes = {}
-$recipes[:zlib]     = MiniPortile.new "zlib",     "1.2.7"
-$recipes[:libiconv] = MiniPortile.new "libiconv", "1.13.1"
-$recipes[:libxml2]  = MiniPortile.new "libxml2",  "2.7.7"
-$recipes[:libxslt]  = MiniPortile.new "libxslt",  "1.1.26"
+$recipes["zlib"]     = MiniPortile.new "zlib",     "1.2.7"
+$recipes["libiconv"] = MiniPortile.new "libiconv", "1.13.1"
+$recipes["libxml2"]  = MiniPortile.new "libxml2",  "2.7.7"
+$recipes["libxslt"]  = MiniPortile.new "libxslt",  "1.1.26"
 $recipes.each { |_, recipe| recipe.host = HOST }
 
 file "lib/nokogiri/nokogiri.rb" do
@@ -18,7 +18,7 @@ end
 
 namespace :cross do
   task :zlib do
-    recipe = $recipes[:zlib]
+    recipe = $recipes["zlib"]
     recipe.files = ["http://zlib.net/#{recipe.name}-#{recipe.version}.tar.gz"]
     class << recipe
       def configure
@@ -57,7 +57,7 @@ namespace :cross do
   end
 
   task :libiconv do
-    recipe = $recipes[:libiconv]
+    recipe = $recipes["libiconv"]
     recipe.files = ["http://ftp.gnu.org/pub/gnu/libiconv/#{recipe.name}-#{recipe.version}.tar.gz"]
     recipe.configure_options = [
       "--host=#{HOST}",
@@ -78,14 +78,14 @@ namespace :cross do
   end
 
   task :libxml2 => ["cross:zlib", "cross:libiconv"] do
-    recipe = $recipes[:libxml2]
+    recipe = $recipes["libxml2"]
     recipe.files = ["ftp://ftp.xmlsoft.org/libxml2/#{recipe.name}-#{recipe.version}.tar.gz"]
     recipe.configure_options = [
       "--host=#{HOST}",
       "--enable-static",
       "--disable-shared",
       "--with-zlib=#{CROSS_DIR}",
-      "--with-iconv=#{$recipes[:libiconv].path}",
+      "--with-iconv=#{$recipes["libiconv"].path}",
       "--without-python",
       "--without-readline",
       "CFLAGS='-DIN_LIBXML'"
@@ -109,13 +109,13 @@ namespace :cross do
   end
 
   task :libxslt => ['cross:libxml2'] do
-    recipe = $recipes[:libxslt]
+    recipe = $recipes["libxslt"]
     recipe.files = ["ftp://ftp.xmlsoft.org/libxml2/#{recipe.name}-#{recipe.version}.tar.gz"]
     recipe.configure_options = [
       "--host=#{HOST}",
       "--enable-static",
       "--disable-shared",
-      "--with-libxml-prefix=#{$recipes[:libxml2].path}",
+      "--with-libxml-prefix=#{$recipes["libxml2"].path}",
       "--without-python",
       "--without-crypto",
       "CFLAGS='-DIN_LIBXML'"

data/test/css/test_parser.rb

@@ -263,33 +263,33 @@ module Nokogiri
         assert_xpath "//a[visited(.)]", @parser.parse('a:visited')
         assert_xpath "//a[hover(.)]", @parser.parse('a:hover')
         assert_xpath "//a[active(.)]", @parser.parse('a:active')
-        assert_xpath  "//a[active(.) and contains(concat(' ', @class, ' '), ' foo ')]",
+        assert_xpath  "//a[active(.) and contains(concat(' ', normalize-space(@class), ' '), ' foo ')]",
                       @parser.parse('a:active.foo')
       end
 
       def test_star
         assert_xpath "//*", @parser.parse('*')
-        assert_xpath "//*[contains(concat(' ', @class, ' '), ' pastoral ')]",
+        assert_xpath "//*[contains(concat(' ', normalize-space(@class), ' '), ' pastoral ')]",
                       @parser.parse('*.pastoral')
       end
 
       def test_class
-        assert_xpath  "//*[contains(concat(' ', @class, ' '), ' a ') and contains(concat(' ', @class, ' '), ' b ')]",
+        assert_xpath  "//*[contains(concat(' ', normalize-space(@class), ' '), ' a ') and contains(concat(' ', normalize-space(@class), ' '), ' b ')]",
                       @parser.parse('.a.b')
-        assert_xpath  "//*[contains(concat(' ', @class, ' '), ' awesome ')]",
+        assert_xpath  "//*[contains(concat(' ', normalize-space(@class), ' '), ' awesome ')]",
                       @parser.parse('.awesome')
-        assert_xpath  "//foo[contains(concat(' ', @class, ' '), ' awesome ')]",
+        assert_xpath  "//foo[contains(concat(' ', normalize-space(@class), ' '), ' awesome ')]",
                       @parser.parse('foo.awesome')
-        assert_xpath  "//foo//*[contains(concat(' ', @class, ' '), ' awesome ')]",
+        assert_xpath  "//foo//*[contains(concat(' ', normalize-space(@class), ' '), ' awesome ')]",
                       @parser.parse('foo .awesome')
       end
 
       def test_not_so_simple_not
-        assert_xpath "//*[@id = 'p' and not(contains(concat(' ', @class, ' '), ' a '))]",
+        assert_xpath "//*[@id = 'p' and not(contains(concat(' ', normalize-space(@class), ' '), ' a '))]",
                      @parser.parse('#p:not(.a)')
-        assert_xpath "//p[contains(concat(' ', @class, ' '), ' a ') and not(contains(concat(' ', @class, ' '), ' b '))]",
+        assert_xpath "//p[contains(concat(' ', normalize-space(@class), ' '), ' a ') and not(contains(concat(' ', normalize-space(@class), ' '), ' b '))]",
                      @parser.parse('p.a:not(.b)')
-        assert_xpath "//p[@a = 'foo' and not(contains(concat(' ', @class, ' '), ' b '))]",
+        assert_xpath "//p[@a = 'foo' and not(contains(concat(' ', normalize-space(@class), ' '), ' b '))]",
                      @parser.parse("p[a='foo']:not(.b)")
       end
 

data/test/css/test_xpath_visitor.rb

@@ -45,7 +45,7 @@ module Nokogiri
       end
 
       def test_class_selectors
-        assert_xpath  "//*[contains(concat(' ', @class, ' '), ' red ')]",
+        assert_xpath  "//*[contains(concat(' ', normalize-space(@class), ' '), ' red ')]",
                       @parser.parse(".red")
       end
 

data/test/html/sax/test_parser.rb

@@ -17,8 +17,7 @@ module Nokogiri
 
         def test_parse_empty_file
           # Make sure empty files don't break stuff
-          empty_file_name =  File.join(Dir.tmpdir, 'bogus.xml')
-          FileUtils.touch empty_file_name
+          empty_file_name =  File.join(ASSETS_DIR, 'bogus.xml')
           # assert_nothing_raised do
             @parser.parse_file empty_file_name
           # end