nokogiri 1.6.3.rc2-java → 1.6.3.rc3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fe2e8d07f52df71f080e08f85e149374fbcabbd
-  data.tar.gz: f924e1807f51738cd1a0b58f14493c0684629510
+  metadata.gz: 76cd7f9d1052ba69f2a34be1bb3fbb4c605560e4
+  data.tar.gz: 6439b977d5972946a353d619809768a099e96e3d
 SHA512:
-  metadata.gz: b4353244adddeb08c390f4ebc5f80b96de03fc034cd8d001cd989fb1fed02a9715dbd07b0b9fb14dffb3b5d66a6c7e540fc7cebab11afdb210d7c739ffeef59b
-  data.tar.gz: 381222c91a0c88f0ad65a89d94fd28ce672c2e356d45be52cad896ab8fe6b0a0f68691947fb64bb7289daf2522882f063f9cc1ff56554aed837e78633d95cc14
+  metadata.gz: 4e47f8b7d7a34e13d2ff8dfc1d9b3ecb5b6ace664c836da42a9fc49a3d0e9bd57a9a06f65628a2ffedb2be58290a72a69f6c6eed10b3703bbeb04a0716a43088
+  data.tar.gz: 5090be6e68a1e360973fa4e19f5a6eca2bda8e8d4b25ab4791cfbde45e4a8b2343053c72ad3776c3d09a26bbdb918f4934885af15387fde7da00718dfb1b69a0

data/CHANGELOG.ja.rdoc

@@ -1,10 +1,17 @@
 === 1.6.3 / unreleased
 
+==== Features
+
+* Added Node#document? and Node#processing_instruction?
+
+
 ==== Bug fixes
 
 * [JRuby] Fix Ruby memory exhaustion vulnerability. #1087 (Thanks, @ocher)
 * [MRI] Fix segfault during GC when using `libxml-ruby` and `nokogiri` together in multi-threaded environment. #895 (Thanks, @ender672!)
 * Building on OSX 10.9 stock ruby 2.0.0 now works. #1101 (Thanks, @zenspider!)
+* Node#parse now works again for HTML document nodes (broken in 1.6.2+).
+* Processing instructions can now be added via Node#add_next_sibling.
 
 
 === 1.6.2.1 / 2014年5月13日

data/CHANGELOG.rdoc

@@ -1,10 +1,17 @@
 === 1.6.3 / unreleased
 
+==== Features
+
+* Added Node#document? and Node#processing_instruction?
+
+
 ==== Bug fixes
 
 * [JRuby] Fix Ruby memory exhaustion vulnerability. #1087 (Thanks, @ocher)
 * [MRI] Fix segfault during GC when using `libxml-ruby` and `nokogiri` together in multi-threaded environment. #895 (Thanks, @ender672!)
 * Building on OSX 10.9 stock ruby 2.0.0 now works. #1101 (Thanks, @zenspider!)
+* Node#parse now works again for HTML document nodes (broken in 1.6.2+).
+* Processing instructions can now be added via Node#add_next_sibling.
 
 
 === 1.6.2.1 / 2014-05-13

data/lib/nokogiri/version.rb

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

data/lib/nokogiri/xml/node.rb

@@ -287,7 +287,7 @@ module Nokogiri
       def prepend_child node_or_tags
         if first = children.first
           # Mimic the error add_child would raise.
-          raise RuntimeError, "Document already has a root node" if is_a?(XML::Document) && !node_or_tags.is_a?(XML::ProcessingInstruction)
+          raise RuntimeError, "Document already has a root node" if document? && !node_or_tags.processing_instruction?
           first.__send__(:add_sibling, :previous, node_or_tags)
         else
           add_child(node_or_tags)
@@ -313,7 +313,7 @@ module Nokogiri
       #
       # Also see related method +before+.
       def add_previous_sibling node_or_tags
-        raise ArgumentError.new("A document may not have multiple root nodes.") if parent.is_a?(XML::Document) && !node_or_tags.is_a?(XML::ProcessingInstruction)
+        raise ArgumentError.new("A document may not have multiple root nodes.") if (parent && parent.document?) && !node_or_tags.processing_instruction?
 
         add_sibling :previous, node_or_tags
       end
@@ -326,7 +326,7 @@ module Nokogiri
       #
       # Also see related method +after+.
       def add_next_sibling node_or_tags
-        raise ArgumentError.new("A document may not have multiple root nodes.") if parent.is_a?(XML::Document)
+        raise ArgumentError.new("A document may not have multiple root nodes.") if (parent && parent.document?) && !node_or_tags.processing_instruction?
         
         add_sibling :next, node_or_tags
       end
@@ -513,7 +513,7 @@ module Nokogiri
         # document as the parsing context instead. Otherwise, the in-context
         # parser cannot find an element or a document node.
         # Document Fragments are also not usable by the in-context parser.
-        if !element? && !xml? && (!parent || parent.fragment?)
+        if !element? && !document? && (!parent || parent.fragment?)
           return document.parse(string_or_io, options)
         end
 
@@ -601,6 +601,16 @@ module Nokogiri
         type == HTML_DOCUMENT_NODE
       end
 
+      # Returns true if this is a Document
+      def document?
+        is_a? XML::Document
+      end
+
+      # Returns true if this is a ProcessingInstruction node
+      def processing_instruction?
+        type == PI_NODE
+      end
+
       # Returns true if this is a Text node
       def text?
         type == TEXT_NODE

data/test/xml/test_node.rb

@@ -136,7 +136,29 @@ module Nokogiri
       def test_parse_with_unparented_text_context_node
         doc = XML::Document.new
         elem = XML::Text.new("foo", doc)
-        elem.parse("<bar/>")
+        x = elem.parse("<bar/>") # should not raise an exception
+        assert_equal x.first.name, "bar"
+      end
+
+      def test_parse_with_unparented_html_text_context_node
+        doc = HTML::Document.new
+        elem = XML::Text.new("div", doc)
+        x = elem.parse("<div/>") # should not raise an exception
+        assert_equal x.first.name, "div"
+      end
+
+      def test_parse_with_unparented_fragment_text_context_node
+        doc = XML::DocumentFragment.parse "<div><span>foo</span></div>"
+        elem = doc.at_css "span"
+        x = elem.parse("<span/>") # should not raise an exception
+        assert_equal x.first.name, "span"
+      end
+
+      def test_parse_with_unparented_html_fragment_text_context_node
+        doc = HTML::DocumentFragment.parse "<div><span>foo</span></div>"
+        elem = doc.at_css "span"
+        x = elem.parse("<span/>") # should not raise an exception
+        assert_equal x.first.name, "span"
       end
 
       def test_subclass_dup
@@ -836,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
@@ -1150,6 +1172,26 @@ eoxml
         root << "<a>hello:with_colon</a>"
         assert_match(/hello:with_colon/, document.to_xml)
       end
+
+      def test_document_eh
+        html_doc = Nokogiri::HTML "<div>foo</div>"
+        xml_doc = Nokogiri::XML "<div>foo</div>"
+        html_node = html_doc.at_css "div"
+        xml_node = xml_doc.at_css "div"
+
+        assert html_doc.document?
+        assert xml_doc.document?
+        assert ! html_node.document?
+        assert ! xml_node.document?
+      end
+
+      def test_processing_instruction_eh
+        xml_doc = Nokogiri::XML %Q{<?xml version="1.0"?>\n<?xml-stylesheet type="text/xsl" href="foo.xsl"?>\n<?xml-stylesheet type="text/xsl" href="foo2.xsl"?>\n<root><div>foo</div></root>}
+        pi_node = xml_doc.children.first
+        div_node = xml_doc.at_css "div"
+        assert pi_node.processing_instruction?
+        assert ! div_node.processing_instruction?
+      end
     end
   end
 end

data/test/xml/test_unparented_node.rb

@@ -248,12 +248,17 @@ module Nokogiri
         end
       end
 
-      def test_add_pi_as_previous_sibling_to_root_is_ok
+      def test_add_pi_as_previous_and_next_sibling_to_root_is_ok
         doc = Nokogiri::XML "<root>foo</root>"
         pi = Nokogiri::XML::ProcessingInstruction.new(doc, "xml-stylesheet", %q{type="text/xsl" href="foo.xsl"})
         doc.root.add_previous_sibling pi
         expected_doc = %Q{<?xml version="1.0"?>\n<?xml-stylesheet type="text/xsl" href="foo.xsl"?>\n<root>foo</root>}
         assert_includes doc.to_xml, expected_doc
+
+        pi2 = Nokogiri::XML::ProcessingInstruction.new(doc, "xml-stylesheet", %q{type="text/xsl" href="foo2.xsl"})
+        pi.add_next_sibling pi2
+        expected_doc = %Q{<?xml version="1.0"?>\n<?xml-stylesheet type="text/xsl" href="foo.xsl"?>\n<?xml-stylesheet type="text/xsl" href="foo2.xsl"?>\n<root>foo</root>}
+        assert_includes doc.to_xml, expected_doc
       end
 
       def test_find_by_css_with_tilde_eql

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nokogiri
 version: !ruby/object:Gem::Version
-  version: 1.6.3.rc2
+  version: 1.6.3.rc3
 platform: java
 authors:
 - Aaron Patterson
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-06-17 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc