nokogiri 1.5.3.rc3-java → 1.5.3.rc4-java

data/lib/nokogiri/css/parser.y

@@ -9,12 +9,13 @@ rule
     : selector COMMA simple_selector_1toN {
         result = [val.first, val.last].flatten
       }
+    | prefixless_combinator_selector { result = val.flatten }
     | simple_selector_1toN { result = val.flatten }
     ;
   combinator
     : PLUS { result = :DIRECT_ADJACENT_SELECTOR }
     | GREATER { result = :CHILD_SELECTOR }
-    | TILDE { result = :PRECEDING_SELECTOR }
+    | TILDE { result = :FOLLOWING_SELECTOR }
     | S { result = :DESCENDANT_SELECTOR }
     | DOUBLESLASH { result = :DESCENDANT_SELECTOR }
     | SLASH { result = :CHILD_SELECTOR }
@@ -59,6 +60,11 @@ rule
         )
       }
     ;
+  prefixless_combinator_selector
+    : combinator simple_selector_1toN {
+        result = Node.new(val.first, [nil, val.last])
+      }
+    ;
   simple_selector_1toN
     : simple_selector combinator simple_selector_1toN {
         result = Node.new(val[1], [val.first, val.last])

data/lib/nokogiri/css/xpath_visitor.rb

@@ -126,13 +126,13 @@ module Nokogiri
       {
         'combinator'                => ' and ',
         'direct_adjacent_selector'  => "/following-sibling::*[1]/self::",
-        'preceding_selector'        => "/following-sibling::",
+        'following_selector'        => "/following-sibling::",
         'descendant_selector'       => '//',
         'child_selector'            => '/',
       }.each do |k,v|
         class_eval %{
           def visit_#{k} node
-            "\#{node.value.first.accept(self)}#{v}\#{node.value.last.accept(self)}"
+            "\#{node.value.first.accept(self) if node.value.first}#{v}\#{node.value.last.accept(self)}"
           end
         }
       end

data/lib/nokogiri/html/document.rb

@@ -6,7 +6,8 @@ module Nokogiri
       # then nil is returned.
       def meta_encoding
         meta = meta_content_type and
-          /charset\s*=\s*([\w-]+)/i.match(meta['content'])[1]
+          match = /charset\s*=\s*([\w-]+)/i.match(meta['content']) and
+          match[1]
       end
 
       ###

data/lib/nokogiri/html/element_description_defaults.rb

@@ -3,7 +3,7 @@ module Nokogiri
     class ElementDescription
 
       # Methods are defined protected by method_defined? because at
-      # this point the C-library or Java library is alraedy loaded,
+      # this point the C-library or Java library is already loaded,
       # and we don't want to clobber any methods that have been
       # defined there.
 

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml/document.rb

@@ -132,7 +132,7 @@ module Nokogiri
       # in the hash.
       #
       # Note this is a very expensive operation in current implementation, as it
-      # traverses the entire graph, and also has to bring each node accross the
+      # traverses the entire graph, and also has to bring each node across the
       # libxml bridge into a ruby object.
       def collect_namespaces
         ns = {}

data/lib/nokogiri/xml/parse_options.rb

@@ -25,11 +25,11 @@ module Nokogiri
       NOBLANKS    = 1 << 8
       # use the SAX1 interface internally
       SAX1        = 1 << 9
-      # Implement XInclude substitition
+      # Implement XInclude substitution
       XINCLUDE    = 1 << 10
       # Forbid network access
       NONET       = 1 << 11
-      # Do not reuse the context dictionnary
+      # Do not reuse the context dictionary
       NODICT      = 1 << 12
       # remove redundant namespaces declarations
       NSCLEAN     = 1 << 13

data/test/css/test_parser.rb

@@ -218,6 +218,33 @@ module Nokogiri
                       @parser.parse("E + F G")
       end
 
+      def test_child_selector
+        assert_xpath("//a//b/i", @parser.parse('a b>i'))
+        assert_xpath("//a//b/i", @parser.parse('a b > i'))
+        assert_xpath("//a/b/i", @parser.parse('a > b > i'))
+      end
+
+      def test_prefixless_child_selector
+        assert_xpath("./a", @parser.parse('>a'))
+        assert_xpath("./a", @parser.parse('> a'))
+        assert_xpath("./a//b/i", @parser.parse('>a b>i'))
+        assert_xpath("./a/b/i", @parser.parse('> a > b > i'))
+      end
+
+      def test_prefixless_preceding_sibling_selector
+        assert_xpath("./following-sibling::a", @parser.parse('~a'))
+        assert_xpath("./following-sibling::a", @parser.parse('~ a'))
+        assert_xpath("./following-sibling::a//b/following-sibling::i", @parser.parse('~a b~i'))
+        assert_xpath("./following-sibling::a//b/following-sibling::i", @parser.parse('~ a b ~ i'))
+      end
+
+      def test_prefixless_direct_adjacent_selector
+        assert_xpath("./following-sibling::*[1]/self::a", @parser.parse('+a'))
+        assert_xpath("./following-sibling::*[1]/self::a", @parser.parse('+ a'))
+        assert_xpath("./following-sibling::*[1]/self::a/following-sibling::*[1]/self::b", @parser.parse('+a+b'))
+        assert_xpath("./following-sibling::*[1]/self::a/following-sibling::*[1]/self::b", @parser.parse('+ a + b'))
+      end
+
       def test_attribute
         assert_xpath  "//h1[@a = 'Tender Lovemaking']",
                       @parser.parse("h1[a='Tender Lovemaking']")

data/test/html/test_document.rb

@@ -125,8 +125,10 @@ module Nokogiri
 
       def test_meta_encoding
         assert_equal 'UTF-8', @html.meta_encoding
+      end
 
-        html = Nokogiri::HTML(<<-eohtml)
+      def test_meta_encoding_is_strict_about_http_equiv
+        doc = Nokogiri::HTML(<<-eohtml)
 <html>
   <head>
     <meta http-equiv="X-Content-Type" content="text/html; charset=Shift_JIS">
@@ -136,7 +138,21 @@ module Nokogiri
   </body>
 </html>
         eohtml
-        assert_nil html.meta_encoding
+        assert_nil doc.meta_encoding
+      end
+
+      def test_meta_encoding_handles_malformed_content_charset
+        doc = Nokogiri::HTML(<<EOHTML)
+<html>
+  <head>
+    <meta http-equiv="Content-type" content="text/html; utf-8" />
+  </head>
+  <body>
+    foo
+  </body>
+</html>
+EOHTML
+        assert_nil doc.meta_encoding
       end
 
       def test_meta_encoding=

data/test/test_reader.rb

@@ -422,4 +422,67 @@ class TestReader < Nokogiri::TestCase
     end
   end
 
+  def test_correct_outer_xml_inclusion
+    xml = Nokogiri::XML::Reader.from_io(StringIO.new(<<-eoxml))
+      <root-element>
+        <children>
+          <child n="1">
+            <field>child-1</field>
+          </child>
+          <child n="2">
+            <field>child-2</field>
+          </child>
+          <child n="3">
+            <field>child-3</field>
+          </child>
+        </children>
+      </root-element>
+    eoxml
+
+    nodelengths = []
+    has_child2 = []
+
+    xml.each do |node|
+      if node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT and node.name == "child"
+        nodelengths << node.outer_xml.length
+        has_child2 << !!(node.outer_xml =~ /child-2/)
+      end
+    end
+
+    assert_equal(nodelengths[0], nodelengths[1])
+    assert(has_child2[1])
+    assert(!has_child2[0])
+  end
+
+  def test_correct_inner_xml_inclusion
+    xml = Nokogiri::XML::Reader.from_io(StringIO.new(<<-eoxml))
+      <root-element>
+        <children>
+          <child n="1">
+            <field>child-1</field>
+          </child>
+          <child n="2">
+            <field>child-2</field>
+          </child>
+          <child n="3">
+            <field>child-3</field>
+          </child>
+        </children>
+      </root-element>
+    eoxml
+
+    nodelengths = []
+    has_child2 = []
+
+    xml.each do |node|
+      if node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT and node.name == "child"
+        nodelengths << node.inner_xml.length
+        has_child2 << !!(node.inner_xml =~ /child-2/)
+      end
+    end
+
+    assert_equal(nodelengths[0], nodelengths[1])
+    assert(has_child2[1])
+    assert(!has_child2[0])
+  end
 end

data/test/xml/sax/test_push_parser.rb

@@ -142,6 +142,7 @@ module Nokogiri
         end
 
         def test_broken_encoding
+          skip("ultra hard to fix for pure Java version") if Nokogiri.jruby?
           @parser.options |= XML::ParseOptions::RECOVER
           # This is ISO_8859-1:
           @parser.<< "<?xml version='1.0' encoding='UTF-8'?><r>Gau\337</r>"

data/test/xml/test_node.rb

@@ -993,6 +993,27 @@ EOXML
         assert_no_match("<ul>\n  <li>", xml.to_xml(:save_with => XML::Node::SaveOptions::AS_XML))
         assert_no_match("<ul>\n  <li>", node.to_xml(:save_with => XML::Node::SaveOptions::AS_XML))
       end
+
+      # issue 647
+      def test_default_namespace_should_be_created
+        subject = Nokogiri::XML.parse('<foo xml:bar="http://bar.com"/>').root
+        ns = subject.attributes['bar'].namespace
+        assert_not_nil ns
+        assert_equal ns.class, Nokogiri::XML::Namespace
+        assert_equal 'xml', ns.prefix
+        assert_equal "http://www.w3.org/XML/1998/namespace", ns.href
+      end
+
+      # issue 648
+      def test_namespace_without_prefix_should_be_set
+        node = Nokogiri::XML.parse('<foo xmlns="http://bar.com"/>').root
+        subject = Nokogiri::XML::Node.new 'foo', node.document
+        subject.namespace = node.namespace
+        ns = subject.namespace
+        assert_equal ns.class, Nokogiri::XML::Namespace
+        assert_nil ns.prefix
+        assert_equal ns.href, "http://bar.com"
+      end
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: nokogiri
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.5.3.rc3
+  version: 1.5.3.rc4
 platform: java
 authors: 
   - Aaron Patterson
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-26 00:00:00 Z
+date: 2012-04-27 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: hoe-bundler
@@ -249,7 +249,6 @@ files:
   - ext/java/nokogiri/internals/NokogiriXPathVariableResolver.java
   - ext/java/nokogiri/internals/NokogiriXsltErrorListener.java
   - ext/java/nokogiri/internals/ParserContext.java
-  - ext/java/nokogiri/internals/PushInputStream.java
   - ext/java/nokogiri/internals/ReaderNode.java
   - ext/java/nokogiri/internals/SaveContextVisitor.java
   - ext/java/nokogiri/internals/SchemaErrorHandler.java

data/ext/java/nokogiri/internals/PushInputStream.java

@@ -1,411 +0,0 @@
-/**
- * (The MIT License)
- *
- * Copyright (c) 2008 - 2011:
- *
- * * {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;
-import java.nio.channels.ClosedChannelException;
-import java.util.ArrayList;
-
-
-/**
- * Implements a "push" InputStream.  An owner thread create an
- * InputStream and passes it to a second thread.  The owner thread
- * calls PushInputStream.write() to write data to the stream.  The
- * second thread calls PushInputStream.read() and other InputStream
- * methods.
- *
- * You should ensure that only one thread write to, and only one
- * thread reads to, this stream, though nothing enforces this
- * strictly.
- */
-public class PushInputStream extends InputStream {
-    /**
-     * Current position in the stream relative to the start of the
-     * buffer.
-     */
-    protected int pos;
-
-    /**
-     * Current mark position, or -1 if there is no mark.
-     */
-    protected int mark;
-
-    protected int readlimit;
-
-    /**
-     * State is open or closed.
-     */
-    protected boolean isOpen;
-
-    protected Buffer buffer;
-
-    public PushInputStream() {
-        pos = 0;
-        mark = -1;
-        readlimit = -1;
-        isOpen = true;
-
-        buffer = new Buffer(512);
-    }
-
-    protected synchronized void ensureOpen() throws IOException {
-        if (!isOpen) {
-            throw new ClosedChannelException();
-        }
-    }
-
-    /**
-     * Write data that can be read from the stream.
-     */
-    public synchronized void write(byte[] b) {
-        if (buffer == null) System.out.println("BUFFER IS NULL");
-        if (b == null) System.out.println("BYTE ARRAY IS NILL");
-        buffer.put(b);
-        notifyAll();            // notify readers waiting
-    }
-
-    /**
-     * Write data and then wait until all the data has been read
-     * (waits until the thread reading from this stream is blocked in
-     * a read()).
-     */
-    public synchronized void writeAndWaitForRead(byte[] b) throws IOException {
-        ensureOpen();
-        write(b);
-        for (;;) {
-            try {
-                wait();
-                break;
-            } catch (InterruptedException e) {
-                // continue waiting
-            }
-        }
-    }
-
-    /*
-     *------------------------------------------------------------
-     * InputStream methods
-     *------------------------------------------------------------
-     */
-
-    /**
-     * @see InputStream.available()
-     */
-    @Override
-    public synchronized int available() throws IOException {
-        ensureOpen();
-        return buffer.size() - pos;
-    }
-
-    int nClose = 0;
-    /**
-     * @see InputStream.close()
-     */
-    @Override
-    public synchronized void close() throws IOException {
-        if (!isOpen) return;
-        isOpen = false;
-        buffer = null;
-        notifyAll();
-    }
-
-    /**
-     * @see InputStream.mark()
-     */
-    @Override
-    public synchronized void mark(int readlimit) {
-        this.mark = pos;
-        this.readlimit = readlimit;
-    }
-
-    /**
-     * Mark the current position in this stream.  Supported by
-     * PushInputStream.
-     *
-     * @see InputStream.markSupported()
-     */
-    @Override
-    public synchronized boolean markSupported() {
-        return true;
-    }
-
-    /**
-     * @see InputStream.read()
-     */
-    @Override
-    public synchronized int read() throws IOException {
-        ensureOpen();
-        byte[] b = new byte[1];
-        read(b, 0, 1);
-        return (int) b[0];
-    }
-
-    /**
-     * @see InputStream.read(byte[])
-     */
-    @Override
-    public synchronized int read(byte[] b) throws IOException {
-        ensureOpen();
-        return read(b, 0, b.length);
-    }
-
-    protected synchronized boolean markIsValid() {
-        return (mark >= 0 && pos < mark+readlimit);
-    }
-
-    /**
-     * @see InputStream.read(byte[], int, int)
-     */
-    @Override
-    public synchronized int read(byte[] b, int off, int len) throws IOException {
-        while (isOpen && available() == 0) {
-            /* block until data available */
-            try {
-                notifyAll();    // notify writers waiting
-                wait();
-            } catch (InterruptedException e) {
-                // continue waiting
-            }
-        }
-
-        if (!isOpen) {
-            return -1;
-        }
-
-        int readLen = Math.min(available(), len);
-
-        buffer.get(pos, readLen, b, off);
-        pos += readLen;
-
-        int reduce;
-
-        if (markIsValid()) {
-            reduce = mark;
-        } else {
-            reduce = pos;
-        }
-
-        buffer.truncateFromStart(buffer.size - reduce);
-        pos -= reduce;
-        mark -= reduce;
-        if (mark < 0) mark = -1; // don't wrap mark around?
-
-        return readLen;
-    }
-
-    /**
-     * @see InputStream.reset()
-     */
-    @Override
-    public synchronized void reset() throws IOException {
-        ensureOpen();
-        if (markIsValid())
-            pos = mark;
-    }
-
-    /**
-     * @see InputStream.skip()
-     */
-    @Override
-    public synchronized long skip(long n) throws IOException {
-        ensureOpen();
-        pos += n;
-        return n;
-    }
-
-    /*
-     *------------------------------------------------------------
-     * Data Buffer
-     *------------------------------------------------------------
-     */
-
-    public static class Block {
-        protected byte[] data;
-
-        public Block(int size) {
-            data = new byte[size];
-        }
-
-        public void copyIn(byte[] src, int srcPos, int destPos, int length) {
-            System.arraycopy(src, srcPos, data, destPos, length);
-        }
-
-        public void copyOut(int srcPos, byte[] dest, int destPos, int length) {
-            System.arraycopy(data, srcPos, dest, destPos, length);
-        }
-    }
-
-    public static class BlockList extends ArrayList<Block> {
-        public BlockList() {
-            super();
-        }
-
-        @Override
-        public void removeRange(int fromIndex, int toIndex) {
-            super.removeRange(fromIndex, toIndex);
-        }
-    }
-
-    public static class Buffer {
-        protected int blockSize;
-        protected BlockList blocks;
-
-        /**
-         * Offset (position) to the first logical byte in the buffer.
-         */
-        protected int offset;
-
-        /**
-         * Logical size of the buffer.
-         */
-        protected int size;
-
-        public Buffer(int blockSize) {
-            this.blockSize = blockSize;
-            this.blocks = new BlockList();
-            this.offset = 0;
-            this.size = 0;
-        }
-
-        public int size() {
-            return size;
-        }
-
-        protected class Segment {
-            /**
-             * Block index.
-             */
-            protected int block;
-
-            /**
-             * Offset into the block.
-             */
-            protected int off;
-
-            /**
-             * Length of segment.
-             */
-            protected int len;
-
-            /**
-             * Calculate the block number and block offset given a position.
-             */
-            protected Segment(int pos) {
-                int absPos = offset + pos;
-                block = (int) (absPos / blockSize);
-                off = (int) (absPos % blockSize);
-                len = -1;
-            }
-        }
-
-        protected Segment[] accessList(int pos, int size) {
-            Segment start = new Segment(pos);
-            Segment end = new Segment(pos + size);
-            int nBlocks = end.block - start.block + 1;
-            Segment[] segs = new Segment[nBlocks];
-
-            start.len = Math.min(size, blockSize - start.off);
-            segs[0] = start;
-            int currPos = pos + start.len;
-            int currSize = start.len;
-            for (int i = 1; i < nBlocks; i++) {
-                Segment seg = new Segment(currPos);
-                seg.len = Math.min(blockSize, size - currSize);
-                segs[i] = seg;
-                currPos += seg.len;
-                currSize += seg.len;
-            }
-
-            return segs;
-        }
-
-        protected void ensureCapacity(int pos) {
-            Segment seg = new Segment(pos-1);
-
-            while (blocks.size() < (seg.block + 1))
-                blocks.add(new Block(blockSize));
-        }
-
-        public void put(byte b) {
-            byte[] buf = new byte[1];
-            buf[0] = b;
-            put(buf);
-        }
-
-        public void put(byte[] b) {
-            ensureCapacity(size + b.length);
-            Segment[] segs = accessList(size, b.length);
-
-            int off = 0;
-            for (int i = 0; i < segs.length; i++) {
-                Block block = blocks.get(segs[i].block);
-                block.copyIn(b, off, segs[i].off, segs[i].len);
-            }
-
-            size += b.length;
-        }
-
-        public byte[] get(int pos, int len) {
-            byte[] b = new byte[len];
-            get(pos, len, b, 0);
-            return b;
-        }
-
-        /**
-         * Throws IndexOutOfBoundsException.
-         */
-        public void get(int pos, int len, byte[] b, int off) {
-            Segment[] segs = accessList(pos, len);
-            for (int i = 0; i < segs.length; i++) {
-                Block block = blocks.get(segs[i].block);
-                block.copyOut(segs[i].off, b, off, segs[i].len);
-            }
-        }
-
-        /**
-         * Truncate the buffer to <code>newSize</code> by removing
-         * data from the start of the buffer.
-         */
-        public void truncateFromStart(int newSize) {
-            if (newSize > size || newSize < 0)
-                throw new RuntimeException("invalid size");
-
-            Segment newStart = new Segment(size - newSize);
-            blocks.removeRange(0, newStart.block);
-
-            size = newSize;
-            offset = newStart.off;
-        }
-    }
-}