RubyGems - nokogiri - Versions diffs - 1.6.5-java → 1.6.6.1-java - Mend

nokogiri 1.6.5-java → 1.6.6.1-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of nokogiri might be problematic. Click here for more details.

Files changed (52) hide show

checksums.yaml +4 -4
data/.cross_rubies +5 -0
data/.travis.yml +10 -20
data/CHANGELOG.ja.rdoc +28 -1
data/CHANGELOG.rdoc +28 -1
data/Gemfile +1 -1
data/Manifest.txt +5 -1
data/README.ja.rdoc +10 -9
data/README.rdoc +6 -9
data/ROADMAP.md +15 -3
data/Rakefile +1 -3
data/bin/nokogiri +48 -8
data/ext/java/nokogiri/HtmlSaxParserContext.java +1 -1
data/ext/java/nokogiri/HtmlSaxPushParser.java +244 -0
data/ext/java/nokogiri/NokogiriService.java +9 -0
data/ext/java/nokogiri/XmlComment.java +2 -0
data/ext/java/nokogiri/XmlNode.java +57 -30
data/ext/java/nokogiri/XmlSyntaxError.java +11 -9
data/ext/nokogiri/extconf.rb +18 -3
data/ext/nokogiri/xml_comment.c +17 -2
data/ext/nokogiri/xml_node.c +66 -6
data/ext/nokogiri/xml_syntax_error.c +4 -0
data/ext/nokogiri/xml_syntax_error.h +1 -0
data/lib/nokogiri.rb +2 -2
data/lib/nokogiri/decorators/slop.rb +7 -8
data/lib/nokogiri/html/document_fragment.rb +0 -2
data/lib/nokogiri/html/sax/push_parser.rb +22 -2
data/lib/nokogiri/nokogiri.jar +0 -0
data/lib/nokogiri/version.rb +1 -1
data/lib/nokogiri/xml.rb +1 -0
data/lib/nokogiri/xml/document.rb +4 -4
data/lib/nokogiri/xml/document_fragment.rb +39 -2
data/lib/nokogiri/xml/node.rb +11 -181
data/lib/nokogiri/xml/node_set.rb +41 -85
data/lib/nokogiri/xml/searchable.rb +221 -0
data/ports/patches/sort-patches-by-date +25 -0
data/test/css/test_nthiness.rb +1 -1
data/test/html/sax/test_push_parser.rb +87 -0
data/test/html/test_document.rb +20 -5
data/test/html/test_document_fragment.rb +25 -0
data/test/xml/test_attr.rb +5 -2
data/test/xml/test_builder.rb +27 -1
data/test/xml/test_comment.rb +11 -0
data/test/xml/test_document.rb +34 -0
data/test/xml/test_document_fragment.rb +40 -9
data/test/xml/test_namespace.rb +1 -0
data/test/xml/test_node.rb +37 -1
data/test/xml/test_node_set.rb +56 -36
data/test/xml/test_xpath.rb +65 -19
data/test_all +11 -1
metadata +12 -7
data/tasks/nokogiri.org.rb +0 -24

data/test/html/test_document.rb CHANGED

@@ -355,7 +355,7 @@ eohtml
         File.open(HTML_FILE, 'rb') { |f| temp_html_file.write f.read }
         temp_html_file.close
         temp_html_file.open
-        assert_equal Nokogiri::HTML.parse(File.read(HTML_FILE)).xpath('//div/a').length,
+        assert_equal Nokogiri::HTML.parse(File.read(HTML_FILE)).xpath('//div/a').length,
           Nokogiri::HTML.parse(temp_html_file).xpath('//div/a').length
       end
@@ -450,7 +450,7 @@ eohtml
         assert_equal "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd", html.internal_subset.system_id
         assert_equal "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">", html.to_s[0,97]
       end
       def test_content_size
         html = Nokogiri::HTML("<div>\n</div>")
         assert_equal 1, html.content.size
@@ -613,15 +613,30 @@ eohtml
         assert_equal "", Nokogiri::HTML.parse("").text
       end
-      def test_capturing_nonparse_errors_during_clone
+      def test_capturing_nonparse_errors_during_document_clone
         # see https://github.com/sparklemotion/nokogiri/issues/1196 for background
         original = Nokogiri::HTML.parse("<div id='unique'></div><div id='unique'></div>")
-        original_errors = original.errors
+        original_errors = original.errors.dup
         copy = original.dup
         assert_equal original_errors, copy.errors
       end
+      def test_capturing_nonparse_errors_during_node_copy_between_docs
+        skip("JRuby HTML parse errors are different than libxml2's") if Nokogiri.jruby?
+        doc1 = Nokogiri::HTML("<div id='unique'>one</div>")
+        doc2 = Nokogiri::HTML("<div id='unique'>two</div>")
+        node1 = doc1.at_css("#unique")
+        node2 = doc2.at_css("#unique")
+        original_errors = doc1.errors.dup
+        node1.add_child node2
+        assert_equal original_errors.length+1, doc1.errors.length
+        assert_match(/ID unique already defined/, doc1.errors.last.to_s)
+      end
     end
   end
 end

data/test/html/test_document_fragment.rb CHANGED

@@ -267,6 +267,31 @@ module Nokogiri
         assert frag.errors.any?{|err| err.to_s =~ /Tag hello invalid/}, "errors should be on the context node's document"
         assert frag.errors.none?{|err| err.to_s =~ /jimmy/}, "errors should not include pre-existing document errors"
       end
+      def test_capturing_nonparse_errors_during_fragment_clone
+        # see https://github.com/sparklemotion/nokogiri/issues/1196 for background
+        original = Nokogiri::HTML.fragment("<div id='unique'></div>")
+        original_errors = original.errors.dup
+        copy = original.dup
+        assert_equal original_errors, copy.errors
+      end
+      def test_capturing_nonparse_errors_during_node_copy_between_fragments
+        skip("JRuby HTML parse errors are different than libxml2's") if Nokogiri.jruby?
+        frag1 = Nokogiri::HTML.fragment("<div id='unique'>one</div>")
+        frag2 = Nokogiri::HTML.fragment("<div id='unique'>two</div>")
+        node1 = frag1.at_css("#unique")
+        node2 = frag2.at_css("#unique")
+        original_errors = frag1.errors.dup
+        node1.add_child node2 # we should also not see an error on stderr
+        assert_equal original_errors.length+1, frag1.errors.length
+        assert_match(/ID unique already defined/, frag1.errors.last.to_s)
+      end
     end
   end
 end

data/test/xml/test_attr.rb CHANGED

@@ -27,12 +27,15 @@ module Nokogiri
         assert_equal "Y&ent1;", street.value
       end
-      def test_unlink
+      def test_unlink # aliased as :remove
         xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
         address = xml.xpath('/staff/employee/address').first
         assert_equal 'Yes', address['domestic']
-        address.attribute_nodes.first.unlink
+        attr = address.attribute_nodes.first
+        return_val = attr.unlink
         assert_nil address['domestic']
+        assert_equal attr, return_val
       end
       def test_parsing_attribute_namespace

data/test/xml/test_builder.rb CHANGED

@@ -305,7 +305,33 @@ module Nokogiri
           builder.to_xml.gsub(/\n/, ''))
       end
-    private
+      def test_builder_can_inherit_parent_namespace
+        builder = Nokogiri::XML::Builder.new
+        builder.products {
+          builder.parent.default_namespace = "foo"
+          builder.product {
+            builder.parent.default_namespace = nil
+          }
+        }
+        doc = builder.doc
+        ['product', 'products'].each do |n|
+          assert_equal doc.at_xpath("//*[local-name() = '#{n}']").namespace.href, 'foo'
+        end
+      end
+      def test_builder_can_handle_namespace_override
+        builder = Nokogiri::XML::Builder.new
+        builder.products('xmlns:foo' => 'bar') {
+          builder.product('xmlns:foo' => 'baz')
+        }
+        doc = builder.doc
+        assert_equal doc.at_xpath("//*[local-name() = 'product']").namespaces['xmlns:foo'], 'baz'
+        assert_equal doc.at_xpath("//*[local-name() = 'products']").namespaces['xmlns:foo'], 'bar'
+        assert_nil doc.at_xpath("//*[local-name() = 'products']").namespace
+      end
+      private
       def namespaces_defined_on(node)
         Hash[*node.namespace_definitions.collect{|n| ["xmlns:" + n.prefix, n.href]}.flatten]

data/test/xml/test_comment.rb CHANGED

@@ -19,6 +19,17 @@ module Nokogiri
         assert(!@xml.root.comment?)
       end
+      def test_passing_a_node_uses_the_node_document
+        comment = Nokogiri::XML::Comment.new(@xml.at_css("employee"), 'hello world')
+        assert_equal @xml, comment.document
+      end
+      def test_passing_anything_else
+        assert_raises ArgumentError do
+          Nokogiri::XML::Comment.new("NOT A NOKOGIRI CLASS", 'hello world')
+        end
+      end
       def test_many_comments
         100.times {
           Nokogiri::XML::Comment.new(@xml, 'hello world')

data/test/xml/test_document.rb CHANGED

@@ -701,6 +701,26 @@ module Nokogiri
         assert_equal 0, ns.length
       end
+      def test_document_search_with_multiple_queries
+        xml = '<document>
+                 <thing>
+                   <div class="title">important thing</div>
+                 </thing>
+                 <thing>
+                   <div class="content">stuff</div>
+                 </thing>
+                 <thing>
+                   <p class="blah">more stuff</div>
+                 </thing>
+               </document>'
+        document = Nokogiri::XML(xml)
+        assert_kind_of Nokogiri::XML::Document, document
+        assert_equal 3, document.xpath('.//div', './/p').length
+        assert_equal 3, document.css('.title', '.content', 'p').length
+        assert_equal 3, document.search('.//div', 'p.blah').length
+      end
       def test_bad_xpath_raises_syntax_error
         assert_raises(XML::XPath::SyntaxError) {
           @xml.xpath('\\')
@@ -832,6 +852,13 @@ module Nokogiri
         assert_equal 1, doc.xpath("//a:foo").length
         assert_equal 1, doc.xpath("//x:foo", "x" => "http://c.flavorjon.es/").length
         assert_match %r{foo c:attr}, doc.to_xml
+        doc.at_xpath("//x:foo", "x" => "http://c.flavorjon.es/").tap do |node|
+          assert_equal nil,          node["attr"]
+          assert_equal "attr-value", node["c:attr"]
+          assert_equal nil,          node.attribute_with_ns("attr", nil)
+          assert_equal "attr-value", node.attribute_with_ns("attr", "http://c.flavorjon.es/").value
+          assert_equal "attr-value", node.attributes["attr"].value
+        end
         doc.remove_namespaces!
@@ -842,6 +869,13 @@ module Nokogiri
         assert_equal 0, doc.xpath("//a:foo", namespaces).length
         assert_equal 0, doc.xpath("//x:foo", "x" => "http://c.flavorjon.es/").length
         assert_match %r{foo attr}, doc.to_xml
+        doc.at_xpath("//container/foo").tap do |node|
+          assert_equal "attr-value", node["attr"]
+          assert_equal nil,          node["c:attr"]
+          assert_equal "attr-value", node.attribute_with_ns("attr", nil).value
+          assert_equal nil,          node.attribute_with_ns("attr", "http://c.flavorjon.es/")
+          assert_equal "attr-value", node.attributes["attr"].value # doesn't change!
+        end
       end
       # issue #785

data/test/xml/test_document_fragment.rb CHANGED

@@ -125,18 +125,49 @@ module Nokogiri
         fragment = Nokogiri::XML::Document.new.fragment(
           '<div><p id="content">hi</p></div>'
         )
-        css     = fragment.children.css('p')
-        xpath   = fragment.children.xpath('.//p')
-        assert_equal css, xpath
+        expected = fragment.children.xpath('.//p')
+        assert_equal 1, expected.length
+        css          = fragment.children.css('p')
+        search_css   = fragment.children.search('p')
+        search_xpath = fragment.children.search('.//p')
+        assert_equal expected, css
+        assert_equal expected, search_css
+        assert_equal expected, search_xpath
       end
-      def test_fragment_search
-        frag = Nokogiri::XML::Document.new.fragment '<p id="content">hi</p>'
-        p_tag = frag.css('#content').first
-        assert_equal 'p', p_tag.name
+      def test_fragment_search_three_ways
+        frag = Nokogiri::XML::Document.new.fragment '<p id="content">foo</p><p id="content">bar</p>'
+        expected = frag.xpath('./*[@id = "content"]')
+        assert_equal 2, expected.length
+        [
+          [:css, '#content'],
+          [:search, '#content'],
+          [:search, './*[@id = \'content\']'],
+        ].each do |method, query|
+          result = frag.send(method, query)
+          assert_equal(expected, result,
+            "fragment search with :#{method} using '#{query}' expected '#{expected}' got '#{result}'")
+        end
+      end
-        assert_equal p_tag, frag.xpath('./*[@id = \'content\']').first
+      def test_fragment_search_with_multiple_queries
+        xml = '<thing>
+                 <div class="title">important thing</div>
+               </thing>
+               <thing>
+                 <div class="content">stuff</div>
+               </thing>
+               <thing>
+                 <p class="blah">more stuff</div>
+               </thing>'
+        fragment = Nokogiri::XML.fragment(xml)
+        assert_kind_of Nokogiri::XML::DocumentFragment, fragment
+        assert_equal 3, fragment.xpath('.//div', './/p').length
+        assert_equal 3, fragment.css('.title', '.content', 'p').length
+        assert_equal 3, fragment.search('.//div', 'p.blah').length
       end
       def test_fragment_without_a_namespace_does_not_get_a_namespace

data/test/xml/test_namespace.rb CHANGED

@@ -69,6 +69,7 @@ module Nokogiri
       def test_remove_entity_namespace
         s = %q{<?xml version='1.0'?><!DOCTYPE schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" [<!ENTITY % p ''>]>}
         Nokogiri::XML(s).remove_namespaces!
+        # TODO: we should probably assert something here. See commit 14d2f59.
       end
       def test_maintain_element_namespaces

data/test/xml/test_node.rb CHANGED

@@ -635,8 +635,17 @@ module Nokogiri
       def test_remove_attribute
         address = @xml.xpath('/staff/employee/address').first
         assert_equal 'Yes', address['domestic']
-        address.remove_attribute 'domestic'
+        attr = address.attributes['domestic']
+        returned_attr = address.remove_attribute 'domestic'
         assert_nil address['domestic']
+        assert_equal attr, returned_attr
+      end
+      def test_remove_attribute_when_not_found
+        address = @xml.xpath('/staff/employee/address').first
+        attr = address.remove_attribute 'not-an-attribute'
+        assert_nil attr
       end
       def test_attribute_setter_accepts_non_string
@@ -1192,6 +1201,33 @@ eoxml
         assert pi_node.processing_instruction?
         assert ! div_node.processing_instruction?
       end
+      def test_node_lang
+        document = Nokogiri::XML <<-EOXML
+          <root>
+            <div class='english'  xml:lang='en'>
+              <div class='english_child'>foo</div>
+            </div>
+            <div class='japanese' xml:lang='jp'>bar</div>
+            <div class='unspecified'>bar</div>
+          </root>
+        EOXML
+        assert_equal "en", document.at_css(".english").lang
+        assert_equal "en", document.at_css(".english_child").lang
+        assert_equal "jp", document.at_css(".japanese").lang
+        assert_nil document.at_css(".unspecified").lang
+      end
+      def test_set_node_lang
+        document = Nokogiri::XML "<root><div class='subject'>foo</div></root>"
+        subject = document.at_css(".subject")
+        subject.lang = "de"
+        assert_equal "de", subject.lang
+        subject.lang = "fr"
+        assert_equal "fr", subject.lang
+      end
     end
   end
 end

data/test/xml/test_node_set.rb CHANGED

@@ -124,26 +124,54 @@ module Nokogiri
         assert_equal 0, set.search('foo').length
       end
-      def test_xpath_with_custom_object
+      def test_node_set_search_with_multiple_queries
+        xml = '<document>
+                 <thing>
+                   <div class="title">important thing</div>
+                 </thing>
+                 <thing>
+                   <div class="content">stuff</div>
+                 </thing>
+                 <thing>
+                   <p class="blah">more stuff</div>
+                 </thing>
+               </document>'
+        set = Nokogiri::XML(xml).xpath(".//thing")
+        assert_kind_of Nokogiri::XML::NodeSet, set
+        assert_equal 3, set.xpath('./div', './p').length
+        assert_equal 3, set.css('.title', '.content', 'p').length
+        assert_equal 3, set.search('./div', 'p.blah').length
+      end
+      def test_search_with_custom_selector
         set = @xml.xpath('//staff')
-        custom_employees = set.xpath('//*[awesome(.)]', Class.new {
-          def awesome ns
-            ns.select { |n| n.name == 'employee' }
-          end
-        }.new)
-        assert_equal @xml.xpath('//employee'), custom_employees
+        [
+          [:xpath,  '//*[awesome(.)]'],
+          [:search, '//*[awesome(.)]'],
+          [:css,    '*:awesome'],
+          [:search, '*:awesome']
+        ].each do |method, query|
+          custom_employees = set.send(method, query, Class.new {
+              def awesome ns
+                ns.select { |n| n.name == 'employee' }
+              end
+            }.new)
+          assert_equal(@xml.xpath('//employee'), custom_employees,
+            "using #{method} with custom selector '#{query}'")
+        end
       end
-      def test_css_with_custom_object
+      def test_search_with_variable_bindings
         set = @xml.xpath('//staff')
-        custom_employees = set.css('*:awesome', Class.new {
-          def awesome ns
-            ns.select { |n| n.name == 'employee' }
-          end
-        }.new)
-        assert_equal @xml.xpath('//employee'), custom_employees
+        assert_equal(4, set.xpath('//address[@domestic=$value]', nil, :value => 'Yes').length,
+          "using #xpath with variable binding")
+        assert_equal(4, set.search('//address[@domestic=$value]', nil, :value => 'Yes').length,
+          "using #search with variable binding")
       end
       def test_search_self
@@ -151,26 +179,10 @@ module Nokogiri
         assert_equal set.to_a, set.search('.').to_a
       end
-      def test_search_with_custom_object
-        set = @xml.xpath('//staff')
-        custom_employees = set.search('//*[awesome(.)]', Class.new {
-          def awesome ns
-            ns.select { |n| n.name == 'employee' }
-          end
-        }.new)
-        assert_equal @xml.xpath('//employee'), custom_employees
-      end
       def test_css_searches_match_self
         html = Nokogiri::HTML("<html><body><div class='a'></div></body></html>")
         set = html.xpath("/html/body/div")
         assert_equal set.first, set.css(".a").first
-      end
-      def test_search_with_css_matches_self
-        html = Nokogiri::HTML("<html><body><div class='a'></div></body></html>")
-        set = html.xpath("/html/body/div")
         assert_equal set.first, set.search(".a").first
       end
@@ -311,9 +323,22 @@ module Nokogiri
         assert_equal node_set.xpath('./employeeId'), (node_set > 'employeeId')
       end
-      def test_at
+      def test_at_performs_a_search_with_css
+        assert node_set = @xml.search('//employee')
+        assert_equal node_set.first.first_element_child, node_set.at('employeeId')
+        assert_equal node_set.first.first_element_child, node_set.%('employeeId')
+      end
+      def test_at_performs_a_search_with_xpath
+        assert node_set = @xml.search('//employee')
+        assert_equal node_set.first.first_element_child, node_set.at('./employeeId')
+        assert_equal node_set.first.first_element_child, node_set.%('./employeeId')
+      end
+      def test_at_with_integer_index
         assert node_set = @xml.search('//employee')
         assert_equal node_set.first, node_set.at(0)
+        assert_equal node_set.first, node_set % 0
       end
       def test_at_xpath
@@ -326,11 +351,6 @@ module Nokogiri
         assert_equal node_set.first.first_element_child, node_set.at_css('employeeId')
       end
-      def test_percent
-        assert node_set = @xml.search('//employee')
-        assert_equal node_set.first, node_set % 0
-      end
       def test_to_ary
         assert node_set = @xml.search('//employee')
         foo = []