nokogiri 1.6.3.1-x86-mingw32 → 1.6.4-x86-mingw32

data/lib/nokogiri/css/parser.y

@@ -10,13 +10,12 @@ rule
         result = [val.first, val.last].flatten
       }
     | prefixless_combinator_selector { result = val.flatten }
-    | simple_selector_1toN { result = val.flatten }
+    | optional_S simple_selector_1toN { result = [val.last].flatten }
     ;
   combinator
     : PLUS { result = :DIRECT_ADJACENT_SELECTOR }
     | GREATER { result = :CHILD_SELECTOR }
     | TILDE { result = :FOLLOWING_SELECTOR }
-    | S { result = :DESCENDANT_SELECTOR }
     | DOUBLESLASH { result = :DESCENDANT_SELECTOR }
     | SLASH { result = :CHILD_SELECTOR }
     ;
@@ -50,6 +49,9 @@ rule
     : simple_selector combinator simple_selector_1toN {
         result = Node.new(val[1], [val.first, val.last])
       }
+    | simple_selector S simple_selector_1toN {
+        result = Node.new(:DESCENDANT_SELECTOR, [val.first, val.last])
+      }
     | simple_selector
     ;
   class
@@ -241,6 +243,10 @@ rule
     | element_name hcap_1toN
     | hcap_1toN
     ;
+  optional_S
+    : S
+    |
+    ;
 end
 
 ---- header

data/lib/nokogiri/css/tokenizer.rb

@@ -94,7 +94,7 @@ class Tokenizer # :nodoc:
       when (text = @ss.scan(/[\s]*\)/))
          action { [:RPAREN, text] }
 
-      when (text = @ss.scan(/[\s]*\[[\s]*/))
+      when (text = @ss.scan(/\[[\s]*/))
          action { [:LSQUARE, text] }
 
       when (text = @ss.scan(/[\s]*\]/))

data/lib/nokogiri/css/tokenizer.rex

@@ -34,7 +34,7 @@ rule
             {w}!={w}         { [:NOT_EQUAL, text] }
             {w}={w}          { [:EQUAL, text] }
             {w}\)            { [:RPAREN, text] }
-            {w}\[{w}         { [:LSQUARE, text] }
+            \[{w}            { [:LSQUARE, text] }
             {w}\]            { [:RSQUARE, text] }
             {w}\+{w}         { [:PLUS, text] }
             {w}>{w}          { [:GREATER, text] }

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.6.3.1'
+  VERSION = '1.6.4'
 
   class VersionInfo # :nodoc:
     def jruby?
@@ -61,6 +61,8 @@ module Nokogiri
           hash_info['libxml']['source']  = "packaged"
           hash_info['libxml']['libxml2_path'] = NOKOGIRI_LIBXML2_PATH
           hash_info['libxml']['libxslt_path'] = NOKOGIRI_LIBXSLT_PATH
+          hash_info['libxml']['libxml2_patches'] = NOKOGIRI_LIBXML2_PATCHES
+          hash_info['libxml']['libxslt_patches'] = NOKOGIRI_LIBXSLT_PATCHES
         else
           hash_info['libxml']['source']  = "system"
         end

data/test/css/test_parser.rb

@@ -274,6 +274,11 @@ module Nokogiri
                       @parser.parse('a:active.foo')
       end
 
+      def test_significant_space
+        assert_xpath "//x//*[count(preceding-sibling::*) = 0]//*[@a]//*[@b]", @parser.parse("x :first-child [a] [b]")
+        assert_xpath "//*[@a]//*[@b]", @parser.parse(" [a] [b]")
+      end
+
       def test_star
         assert_xpath "//*", @parser.parse('*')
         assert_xpath "//*[contains(concat(' ', normalize-space(@class), ' '), ' pastoral ')]",

data/test/css/test_tokenizer.rb

@@ -186,6 +186,23 @@ module Nokogiri
         ], @scanner)
       end
 
+      def test_significant_space
+        @scanner.scan('x :first-child [a] [b]')
+        assert_tokens([ [:IDENT, 'x'],
+                        [:S, ' '],
+                        [':', ':'],
+                        [:IDENT, 'first-child'],
+                        [:S, ' '],
+                        [:LSQUARE, '['],
+                        [:IDENT, 'a'],
+                        [:RSQUARE, ']'],
+                        [:S, ' '],
+                        [:LSQUARE, '['],
+                        [:IDENT, 'b'],
+                        [:RSQUARE, ']'],
+        ], @scanner)
+      end
+
       def assert_tokens(tokens, scanner)
         toks = []
         while tok = @scanner.next_token

data/test/html/test_document.rb

@@ -221,7 +221,7 @@ eohtml
         title = doc.at('/html/head/title')
         assert_not_nil title
         assert_equal 'new', title.text
-        assert_equal -1, doc.at('meta[@http-equiv]') <=> title
+        assert_equal(-1, doc.at('meta[@http-equiv]') <=> title)
 
         doc = Nokogiri::HTML(<<eohtml)
 <html>
@@ -236,7 +236,7 @@ eohtml
         title = doc.at('/html//title')
         assert_not_nil title
         assert_equal 'new', title.text
-        assert_equal -1, title <=> doc.at('body')
+        assert_equal(-1, title <=> doc.at('body'))
 
         doc = Nokogiri::HTML(<<eohtml)
 <html>
@@ -248,14 +248,14 @@ eohtml
 eohtml
         doc.title = 'new'
         assert_equal 'new', doc.title
-        assert_equal -1, doc.at('meta[@charset]') <=> doc.at('title')
-        assert_equal -1, doc.at('title') <=> doc.at('body')
+        assert_equal(-1, doc.at('meta[@charset]') <=> doc.at('title'))
+        assert_equal(-1, doc.at('title') <=> doc.at('body'))
 
         doc = Nokogiri::HTML('<!DOCTYPE html><p>hello')
         doc.title = 'new'
         assert_equal 'new', doc.title
         assert_instance_of Nokogiri::XML::DTD, doc.children.first
-        assert_equal -1, doc.at('title') <=> doc.at('p')
+        assert_equal(-1, doc.at('title') <=> doc.at('p'))
 
         doc = Nokogiri::HTML('')
         doc.title = 'new'

data/test/html/test_document_fragment.rb

@@ -230,6 +230,11 @@ module Nokogiri
           fragment.to_s)
       end
 
+      def test_element_children_counts
+        doc = Nokogiri::HTML::DocumentFragment.parse("   <div>  </div>\n   ")
+        assert doc.element_children.count == 1
+      end
+
       def test_malformed_fragment_is_corrected
         fragment = HTML::DocumentFragment.parse("<div </div>")
         assert_equal "<div></div>", fragment.to_s

data/test/xml/test_builder.rb

@@ -14,7 +14,7 @@ module Nokogiri
       end
 
       def test_builder_multiple_nodes
-        builder = Nokogiri::XML::Builder.new do |xml|
+        Nokogiri::XML::Builder.new do |xml|
           0.upto(10) do
             xml.text "test"
           end

data/test/xml/test_document.rb

@@ -54,7 +54,7 @@ module Nokogiri
         root << txt
         root << ent
         d << root
-        assert_match /&#8217;/, d.to_html
+        assert_match(/&#8217;/, d.to_html)
       end
 
       def test_document_with_initial_space
@@ -376,14 +376,6 @@ module Nokogiri
         end
       end
 
-      def test_prepend_child_fragment_with_multiple_nodes
-        doc = Nokogiri::XML::Document.new
-        fragment = doc.fragment('<hello /><goodbye />')
-        assert_raises(RuntimeError) do
-          doc.prepend_child fragment
-        end
-      end
-
       def test_prepend_child_with_multiple_roots
         assert_raises(RuntimeError) do
           @xml.prepend_child Node.new('foo', @xml)

data/test/xml/test_entity_reference.rb

@@ -26,7 +26,7 @@ EOF
         doc = Nokogiri::XML xml
         lf_node = Nokogiri::XML::EntityReference.new(doc, "#xa")
         doc.xpath('/item').first.add_child(lf_node)
-        assert_match /
/, doc.to_xml
+        assert_match(/
/, doc.to_xml)
       end
     end
 
@@ -236,9 +236,15 @@ EOF
         reader = Nokogiri::XML::Reader html, path do |cfg|
           cfg.default_xml
         end
-        assert_raises(Nokogiri::XML::SyntaxError) do
-          reader.each { |n| n }
+        if Nokogiri.uses_libxml? && Nokogiri::LIBXML_PARSER_VERSION.to_i >= 20900
+          # Unknown entity is not fatal in libxml2 >= 2.9
+          assert_equal 8, reader.count
+        else
+          assert_raises(Nokogiri::XML::SyntaxError) {
+            assert_equal 5, reader.count
+          }
         end
+        assert_operator reader.errors.size, :>, 0
       end
     end
   end

data/test/xml/test_node.rb

@@ -858,7 +858,7 @@ b"></div>
         ne = d1.root.xpath('//a').first.dup(1)
         ne.content += "& < & > \" &"
         d2.root << ne
-        assert_match /<a>&amp;&amp; &lt; &amp; &gt; \" &amp;<\/a>/, d2.to_s
+        assert_match(/<a>&amp;&amp; &lt; &amp; &gt; \" &amp;<\/a>/, d2.to_s)
       end
 
       def test_content_after_appending_text

data/test/xml/test_syntax_error.rb

@@ -7,6 +7,24 @@ module Nokogiri
         error = Nokogiri::XML::SyntaxError.new 'hello'
         assert_equal 'hello', error.message
       end
+
+      def test_pushing_to_array
+        reader = Nokogiri::XML::Reader(StringIO.new('&bogus;'))
+        assert_raises(SyntaxError) {
+          reader.read
+        }
+        assert_equal [SyntaxError], reader.errors.map(&:class) unless Nokogiri.jruby? # needs investigation
+      end
+
+      def test_pushing_to_non_array
+        reader = Nokogiri::XML::Reader(StringIO.new('&bogus;'))
+        def reader.errors
+          1
+        end
+        assert_raises(TypeError) {
+          reader.read
+        }
+      end unless Nokogiri.jruby? # which does not internally call `errors`
     end
   end
 end

data/test/xml/test_xpath.rb

@@ -156,6 +156,8 @@ module Nokogiri
 
       # issue #741 (xpath() around 10x slower in JRuby)
       def test_slow_jruby_xpath
+        skip("MRI will exceed this timeout when running under valgrind") unless Nokogiri.jruby?
+
         doc = Nokogiri::XML(File.open(XPATH_FILE))
         start = Time.now
 

data/test_all

@@ -10,7 +10,7 @@
 #  (e.g., 1.9.3's glob_helper). ["rake test:valgrind:suppression"]
 #
 
-RUBIES="ruby-1.9.3 ruby-1.9.2 ruby-2.0 ruby-2.1 jruby-1.7"
+RUBIES="ruby-2.2.0-preview1 ruby-2.1 ruby-2.0.0-p481 ruby-1.9.3 jruby-1.7.15"
 TEST_LOG=test.log
 VALGRIND_LOG=valgrind.log
 
@@ -29,7 +29,7 @@ set -o errexit
 
 function rvm_use {
     current_ruby=$1
-    rvm use "${1}@nokogiri" --create || rvm -v
+    rvm use "${1}@nokogiri" --create
 }
 
 function generate_parser_and_tokenizer {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.3.1
+  version: 1.6.4
 platform: x86-mingw32
 authors:
 - Aaron Patterson
@@ -12,20 +12,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
@@ -174,14 +174,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.13'
 description: |-
   Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri's
   many features is the ability to search documents via XPath or CSS3 selectors.
@@ -513,7 +513,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: |
-  Nokogiri is built with the packaged libraries: libxml2-2.8.0, libxslt-1.1.28, zlib-1.2.8, libiconv-1.14.
+  Nokogiri is built with the packaged libraries: libxml2-2.9.2, libxslt-1.1.28, zlib-1.2.8, libiconv-1.14.
 rdoc_options:
 - --main
 - README.rdoc
@@ -530,8 +530,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: nokogiri
-rubygems_version: 2.2.2
+rubyforge_project: 
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser