nokogiri 1.5.6.rc3-java → 1.5.7-java

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/java/nokogiri/internals/XmlDomParserContext.java

@@ -33,7 +33,7 @@
 package nokogiri.internals;
 
 import static nokogiri.internals.NokogiriHelpers.getNokogiriClass;
-import java.io.ByteArrayInputStream;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -53,8 +53,6 @@ import org.jruby.runtime.builtin.IRubyObject;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
 /**
@@ -246,7 +244,12 @@ public class XmlDomParserContext extends ParserContext {
     }
 
     protected Document do_parse() throws SAXException, IOException {
-        parser.parse(getInputSource());
+        try {
+          parser.parse(getInputSource());
+        } catch (NullPointerException ex) {
+          // FIXME: this is really a hack to fix #838. Xerces will throw a NullPointerException
+          // if we tried to parse '<? ?>'. We should submit a patch to Xerces.
+        }
         if (options.noBlanks) {
             List<Node> emptyNodes = new ArrayList<Node>();
             findEmptyTexts(parser.getDocument(), emptyNodes);

data/ext/nokogiri/extconf.rb

@@ -8,6 +8,7 @@ RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
 ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 LIBDIR = RbConfig::CONFIG['libdir']
+@libdir_basename = "lib" # shrug, ruby 2.0 won't work for me.
 INCLUDEDIR = RbConfig::CONFIG['includedir']
 
 if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'macruby'

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/ext/nokogiri/xml_sax_parser.c

@@ -239,14 +239,17 @@ static void cdata_block(void * ctx, const xmlChar * value, int len)
 
 static void processing_instruction(void * ctx, const xmlChar * name, const xmlChar * content)
 {
+  VALUE rb_content;
   VALUE self = NOKOGIRI_SAX_SELF(ctx);
   VALUE doc = rb_iv_get(self, "@document");
 
+  rb_content = content ? NOKOGIRI_STR_NEW2(content) : Qnil;
+
   rb_funcall( doc,
               id_processing_instruction,
               2,
               NOKOGIRI_STR_NEW2(name),
-              NOKOGIRI_STR_NEW2(content)
+              rb_content
   );
 }
 

data/lib/nokogiri.rb

@@ -16,6 +16,7 @@ if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
   # should skip loading xml jars. This is because those are in WEB-INF/lib and 
   # already set in the classpath.
   unless $LOAD_PATH.to_s.include?("appengine-rack")
+    require 'stringio'
     require 'isorelax.jar'
     require 'jing.jar'
     require 'nekohtml.jar'

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.6.rc3'
+  VERSION = '1.5.7'
 
   class VersionInfo # :nodoc:
     def jruby?
@@ -52,6 +52,9 @@ module Nokogiri
         hash_info['libxml']['compiled']  = compiled_parser_version
         hash_info['libxml']['loaded']    = loaded_parser_version
         hash_info['warnings']            = warnings
+      elsif jruby?
+        hash_info['xerces']   = Nokogiri::XERCES_VERSION
+        hash_info['nekohtml'] = Nokogiri::NEKO_VERSION
       end
 
       hash_info

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/lib/nokogiri/xml/sax/parser.rb

@@ -114,6 +114,7 @@ module Nokogiri
 
         private
         def check_encoding(encoding)
+          encoding.upcase!
           raise ArgumentError.new("'#{encoding}' is not a valid encoding") unless ENCODINGS[encoding]
         end
       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
@@ -48,7 +48,7 @@ namespace :cross do
       end
     end
 
-    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
     unless File.exist?(checkpoint)
       recipe.cook
       touch checkpoint
@@ -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}",
@@ -69,7 +69,7 @@ namespace :cross do
       "LDFLAGS=-mno-cygwin"
     ]
 
-    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
     unless File.exist?(checkpoint)
       recipe.cook
       touch checkpoint
@@ -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'"
@@ -100,7 +100,7 @@ namespace :cross do
       end
     end
 
-    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
     unless File.exist?(checkpoint)
       recipe.cook
       touch checkpoint
@@ -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'"
@@ -130,7 +130,7 @@ namespace :cross do
       end
     end
 
-    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}.installed"
+    checkpoint = "#{CROSS_DIR}/#{recipe.name}-#{recipe.version}-#{recipe.host}.installed"
     unless File.exist?(checkpoint)
       recipe.cook
       touch checkpoint
@@ -140,7 +140,7 @@ namespace :cross do
 
   task :file_list do
     HOE.spec.files += Dir["lib/nokogiri/nokogiri.rb"]
-    HOE.spec.files += Dir["lib/nokogiri/1.{8,9}/nokogiri.so"]
+    HOE.spec.files += Dir["lib/nokogiri/{1.8,1.9,2.0}/nokogiri.so"]
   end
 end
 

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