nokogiri 1.5.0-x86-mingw32 → 1.5.1.rc1-x86-mingw32

data/test/xml/test_node_reparenting.rb

@@ -246,6 +246,22 @@ module Nokogiri
             replacee.add_previous_sibling "foo <p></p> bar"
             assert_equal "foo <p></p> bartext node", xml.root.children.to_html
           end
+
+          describe "with a text node before" do
+            it "should not defensively dup the 'before' text node" do
+              xml = Nokogiri::XML %Q(<root>before<p></p>after</root>)
+              pivot  = xml.at_css("p")
+              before = xml.root.children.first
+              after  = xml.root.children.last
+              pivot.add_previous_sibling("x")
+
+              assert_equal "after", after.content
+              assert !after.parent.nil?, "unrelated node should not be affected"
+
+              assert_equal "before", before.content
+              assert !before.parent.nil?, "no need to reparent"
+            end
+          end
         end
 
         describe "#add_next_sibling" do
@@ -255,6 +271,22 @@ module Nokogiri
             replacee.add_next_sibling "foo <p></p> bar"
             assert_equal "text nodefoo <p></p> bar", xml.root.children.to_html
           end
+
+          describe "with a text node after" do
+            it "should not defensively dup the 'after' text node" do
+              xml = Nokogiri::XML %Q(<root>before<p></p>after</root>)
+              pivot  = xml.at_css("p")
+              before = xml.root.children.first
+              after  = xml.root.children.last
+              pivot.add_next_sibling("x")
+
+              assert_equal "before", before.content
+              assert !before.parent.nil?, "unrelated node should not be affected"
+
+              assert_equal "after", after.content
+              assert !after.parent.nil?
+            end
+          end
         end
 
         describe "#replace" do

data/test/xml/test_node_set.rb

@@ -22,6 +22,12 @@ module Nokogiri
           @list.push @list.first
           @list.delete @list.first
         end
+        
+        def test_reference_after_delete
+          first = @list.first
+          @list.delete(first)
+          assert_equal 'http://www.w3.org/XML/1998/namespace', first.href
+        end        
       end
 
       def setup
@@ -634,14 +640,16 @@ module Nokogiri
       end
 
       def test_should_not_splode_when_accessing_namespace_declarations_in_a_node_set
-        xml = Nokogiri::XML "<foo></foo>"
-        node_set = xml.xpath("//namespace::*")
-        assert_equal 1, node_set.size
-        node = node_set.first
-        node.to_s # segfaults in 1.4.0 and earlier
-
-        # if we haven't segfaulted, let's make sure we handled it correctly
-        assert_instance_of Nokogiri::XML::Namespace, node
+        2.times do
+          xml = Nokogiri::XML "<foo></foo>"
+          node_set = xml.xpath("//namespace::*")
+          assert_equal 1, node_set.size
+          node = node_set.first
+          node.to_s # segfaults in 1.4.0 and earlier
+
+          # if we haven't segfaulted, let's make sure we handled it correctly
+          assert_instance_of Nokogiri::XML::Namespace, node
+        end
       end
 
       def test_should_not_splode_when_arrayifying_node_set_containing_namespace_declarations

data/test/xml/test_reader_encoding.rb

@@ -120,6 +120,22 @@ module Nokogiri
             assert_equal @reader.encoding, name.encoding.name
           end
         end
+
+        def test_value_lookup_segfault
+          skip("JRuby doesn't do GC.") if Nokogiri.jruby?
+          old_stress = GC.stress
+
+          begin
+            GC.stress = true
+
+            while node = @reader.read
+              nodes = node.send(:attr_nodes)
+              nodes.first.name if nodes.first
+            end
+          ensure
+            GC.stress = old_stress
+          end
+        end
       end
     end
   end

data/test/xml/test_unparented_node.rb

@@ -223,6 +223,30 @@ module Nokogiri
         right_space.add_next_sibling(left_space)
         assert_equal left_space, right_space
       end
+      
+      def test_add_next_sibling_to_root_raises_exception
+        xml = Nokogiri::XML(<<-eoxml)
+        <root />
+        eoxml
+        
+        node = Nokogiri::XML::Node.new 'child', xml
+
+        assert_raise(ArgumentError) do
+          xml.root.add_next_sibling(node)
+        end
+      end
+
+      def test_add_previous_sibling_to_root_raises_exception
+        xml = Nokogiri::XML(<<-eoxml)
+        <root />
+        eoxml
+        
+        node = Nokogiri::XML::Node.new 'child', xml
+
+        assert_raise(ArgumentError) do
+          xml.root.add_previous_sibling(node)
+        end
+      end
 
       def test_find_by_css_with_tilde_eql
         xml = Nokogiri::XML.parse(<<-eoxml)

data/test/xml/test_xinclude.rb

@@ -0,0 +1,83 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestXInclude < Nokogiri::TestCase
+      def setup
+        super
+        @xml = Nokogiri::XML.parse(File.read(XML_XINCLUDE_FILE), XML_XINCLUDE_FILE)
+        @included = "this snippet is to be included from xinclude.xml"
+      end
+
+      def test_xinclude_on_document_parse
+        skip("Pure Java version XInlcude has a conflict with NekoDTD setting. This will be fixed later.") if Nokogiri.jruby?
+        # first test that xinclude works when requested
+        xml_doc = nil
+
+        File.open(XML_XINCLUDE_FILE) do |fp|
+          xml_doc = Nokogiri::XML(fp) do |conf|
+            conf.strict.dtdload.noent.nocdata.xinclude
+          end
+        end
+
+        assert_not_nil xml_doc
+        assert_not_nil included = xml_doc.at_xpath('//included')
+        assert_equal @included, included.content
+
+        # no xinclude should happen when not requested
+        xml_doc = nil
+
+        File.open(XML_XINCLUDE_FILE) do |fp|
+          xml_doc = Nokogiri::XML(fp) do |conf|
+            conf.strict.dtdload.noent.nocdata
+          end
+        end
+
+        assert_not_nil xml_doc
+        assert_nil xml_doc.at_xpath('//included')
+      end
+
+      def test_xinclude_on_document_node
+        skip("Pure Java version turns XInlcude on against a parser.") if Nokogiri.jruby?
+        assert_nil @xml.at_xpath('//included')
+        @xml.do_xinclude
+        assert_not_nil included = @xml.at_xpath('//included')
+        assert_equal @included, included.content
+      end
+
+      def test_xinclude_on_element_subtree
+        skip("Pure Java version turns XInlcude on against a parser.") if Nokogiri.jruby? 
+        assert_nil @xml.at_xpath('//included')
+        @xml.root.do_xinclude
+        assert_not_nil included = @xml.at_xpath('//included')
+        assert_equal @included, included.content
+      end
+
+      def test_do_xinclude_accepts_block
+        non_default_options = Nokogiri::XML::ParseOptions::NOBLANKS | \
+          Nokogiri::XML::ParseOptions::XINCLUDE
+
+        @xml.do_xinclude(non_default_options) do |options|
+          assert_equal non_default_options, options.to_i
+        end
+      end
+
+      def test_include_nonexistent_throws_exception
+        skip("Pure Java version behaves differently") if Nokogiri.jruby?
+        # break inclusion deliberately
+        @xml.at_xpath('//xi:include')['href'] = "nonexistent.xml"
+
+        exception_raised = false
+        begin
+          @xml.do_xinclude { |opts| opts.nowarning }
+        rescue Exception => e
+          assert_equal Nokogiri::XML::SyntaxError, e.class
+          exception_raised = true
+        end
+
+        assert exception_raised
+      end
+
+    end
+  end
+end

data/test/xml/test_xpath.rb

@@ -58,6 +58,10 @@ module Nokogiri
           def saves_node_set node_set
             @things = node_set
           end
+
+          def value
+            123.456
+          end
         }.new
       end
 
@@ -130,6 +134,15 @@ module Nokogiri
         assert_equal(['asdf'] * set.length, @handler.things)
       end
 
+      def test_custom_xpath_function_returns_string
+        if Nokogiri.uses_libxml?
+          result = @xml.xpath('thing("asdf")', @handler)
+        else
+          result = @xml.xpath('nokogiri:thing("asdf")', @ns, @handler)
+        end
+        assert_equal 'asdf', result
+      end
+
       def test_custom_xpath_gets_true_booleans
         set = @xml.xpath('//employee')
         if Nokogiri.uses_libxml?
@@ -232,6 +245,15 @@ module Nokogiri
 
         assert_equal doc.xpath("//tool[@name='hammer']"), doc.xpath(xpath, tool_inspector)
       end
+
+      def test_custom_xpath_without_arguments
+        if Nokogiri.uses_libxml?
+          value = @xml.xpath('value()', @handler)
+        else
+          value = @xml.xpath('nokogiri:value()', @ns, @handler)
+        end
+        assert_equal 123.456, value
+      end
     end
   end
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  hash: 790212989
+  prerelease: 6
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  - rc
+  - 1
+  version: 1.5.1.rc1
 platform: x86-mingw32
 authors: 
 - Aaron Patterson
@@ -17,71 +19,67 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 -04:00
-default_executable: 
+date: 2012-02-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: racc
+  name: hoe-bundler
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 13
         segments: 
         - 1
-        - 4
-        - 6
-        version: 1.4.6
+        - 1
+        version: "1.1"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rexical
+  name: hoe-debugging
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 17
         segments: 
         - 1
         - 0
-        - 5
-        version: 1.0.5
+        - 3
+        version: 1.0.3
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
+  name: hoe-gemspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 7
-        - 9
-        version: 0.7.9
+        version: "1.0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: hoe-git
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 2
-        - 2
-        - 2
-        version: 2.2.2
+        - 1
+        - 4
+        version: "1.4"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -101,77 +99,99 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: hoe-debugging
+  name: minitest
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 2
+        - 2
+        version: 2.2.2
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: hoe-git
+  name: racc
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 11
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: hoe-gemspec
+  name: rake-compiler
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 63
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 0
+        version: 0.8.0
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: hoe-bundler
+  name: rexical
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 29
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 5
+        version: 1.0.5
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: rdoc
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 35
+        hash: 19
         segments: 
-        - 2
-        - 9
-        - 4
-        version: 2.9.4
+        - 3
+        - 10
+        version: "3.10"
   type: :development
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 2
+        - 13
+        version: "2.13"
+  type: :development
+  version_requirements: *id011
 description: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri's\n\
   many features is the ability to search documents via XPath or CSS3 selectors.\n\n\
   XML is like violence - if it doesn\xE2\x80\x99t solve your problems, you are not using\n\
@@ -186,43 +206,45 @@ extensions: []
 
 extra_rdoc_files: 
 - Manifest.txt
-- README.ja.rdoc
-- CHANGELOG.rdoc
 - CHANGELOG.ja.rdoc
+- README.ja.rdoc
 - README.rdoc
-- ext/nokogiri/xml_sax_push_parser.c
-- ext/nokogiri/xml_relax_ng.c
-- ext/nokogiri/html_sax_parser_context.c
-- ext/nokogiri/html_entity_lookup.c
+- C_CODING_STYLE.rdoc
+- CHANGELOG.rdoc
+- ext/nokogiri/xml_encoding_handler.c
+- ext/nokogiri/html_sax_push_parser.c
+- ext/nokogiri/xml_processing_instruction.c
 - ext/nokogiri/xml_text.c
+- ext/nokogiri/xml_entity_reference.c
+- ext/nokogiri/xml_relax_ng.c
 - ext/nokogiri/nokogiri.c
+- ext/nokogiri/xml_node.c
+- ext/nokogiri/xml_attr.c
+- ext/nokogiri/xml_reader.c
+- ext/nokogiri/xml_entity_decl.c
 - ext/nokogiri/xml_element_decl.c
-- ext/nokogiri/xml_encoding_handler.c
-- ext/nokogiri/html_document.c
-- ext/nokogiri/xslt_stylesheet.c
-- ext/nokogiri/xml_attribute_decl.c
-- ext/nokogiri/xml_io.c
-- ext/nokogiri/xml_document_fragment.c
-- ext/nokogiri/xml_namespace.c
-- ext/nokogiri/xml_libxml2_hacks.c
-- ext/nokogiri/xml_sax_parser_context.c
-- ext/nokogiri/xml_comment.c
-- ext/nokogiri/xml_sax_parser.c
 - ext/nokogiri/html_element_description.c
-- ext/nokogiri/xml_xpath_context.c
+- ext/nokogiri/xslt_stylesheet.c
 - ext/nokogiri/xml_syntax_error.c
 - ext/nokogiri/xml_document.c
-- ext/nokogiri/xml_entity_decl.c
-- ext/nokogiri/xml_node.c
-- ext/nokogiri/xml_node_set.c
-- ext/nokogiri/xml_reader.c
-- ext/nokogiri/xml_processing_instruction.c
-- ext/nokogiri/xml_element_content.c
 - ext/nokogiri/xml_dtd.c
-- ext/nokogiri/xml_attr.c
-- ext/nokogiri/xml_schema.c
 - ext/nokogiri/xml_cdata.c
-- ext/nokogiri/xml_entity_reference.c
+- ext/nokogiri/xml_sax_parser.c
+- ext/nokogiri/xml_comment.c
+- ext/nokogiri/xml_node_set.c
+- ext/nokogiri/xml_xpath_context.c
+- ext/nokogiri/html_entity_lookup.c
+- ext/nokogiri/xml_sax_push_parser.c
+- ext/nokogiri/xml_sax_parser_context.c
+- ext/nokogiri/xml_io.c
+- ext/nokogiri/xml_libxml2_hacks.c
+- ext/nokogiri/html_document.c
+- ext/nokogiri/xml_attribute_decl.c
+- ext/nokogiri/xml_document_fragment.c
+- ext/nokogiri/xml_schema.c
+- ext/nokogiri/xml_element_content.c
+- ext/nokogiri/html_sax_parser_context.c
+- ext/nokogiri/xml_namespace.c
 files: 
 - .autotest
 - .gemtest
@@ -243,6 +265,8 @@ files:
 - ext/nokogiri/html_entity_lookup.h
 - ext/nokogiri/html_sax_parser_context.c
 - ext/nokogiri/html_sax_parser_context.h
+- ext/nokogiri/html_sax_push_parser.c
+- ext/nokogiri/html_sax_push_parser.h
 - ext/nokogiri/nokogiri.c
 - ext/nokogiri/nokogiri.h
 - ext/nokogiri/xml_attr.c
@@ -321,6 +345,7 @@ files:
 - lib/nokogiri/html/entity_lookup.rb
 - lib/nokogiri/html/sax/parser.rb
 - lib/nokogiri/html/sax/parser_context.rb
+- lib/nokogiri/html/sax/push_parser.rb
 - lib/nokogiri/syntax_error.rb
 - lib/nokogiri/version.rb
 - lib/nokogiri/xml.rb
@@ -436,6 +461,7 @@ files:
 - test/xml/test_node_encoding.rb
 - test/xml/test_node_reparenting.rb
 - test/xml/test_node_set.rb
+- test/xml/test_node_inheritance.rb
 - test/xml/test_parse_options.rb
 - test/xml/test_processing_instruction.rb
 - test/xml/test_reader_encoding.rb
@@ -447,10 +473,12 @@ files:
 - test/xml/test_xpath.rb
 - test/xslt/test_custom_functions.rb
 - test/xslt/test_exception_handling.rb
+- test/xml/test_c14n.rb
+- test/xml/test_xinclude.rb
+- C_CODING_STYLE.rdoc
 - lib/nokogiri/nokogiri.rb
 - lib/nokogiri/1.8/nokogiri.so
 - lib/nokogiri/1.9/nokogiri.so
-has_rdoc: true
 homepage: http://nokogiri.org
 licenses: []
 
@@ -474,76 +502,81 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: nokogiri
-rubygems_version: 1.6.0
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser"
 test_files: 
-- test/test_convert_xpath.rb
-- test/test_soap4r_sax.rb
-- test/test_memory_leak.rb
 - test/test_nokogiri.rb
-- test/test_css_cache.rb
-- test/css/test_nthiness.rb
+- test/css/test_tokenizer.rb
 - test/css/test_xpath_visitor.rb
+- test/css/test_nthiness.rb
 - test/css/test_parser.rb
-- test/css/test_tokenizer.rb
-- test/decorators/test_slop.rb
-- test/html/test_document.rb
-- test/html/test_document_encoding.rb
-- test/html/test_named_characters.rb
-- test/html/test_document_fragment.rb
-- test/html/test_node.rb
-- test/html/test_builder.rb
-- test/html/sax/test_parser_context.rb
-- test/html/sax/test_parser.rb
-- test/html/test_node_encoding.rb
-- test/html/test_element_description.rb
-- test/test_reader.rb
-- test/xml/test_parse_options.rb
-- test/xml/test_unparented_node.rb
-- test/xml/test_element_decl.rb
-- test/xml/test_document.rb
-- test/xml/test_dtd.rb
+- test/xml/test_dtd_encoding.rb
 - test/xml/test_document_encoding.rb
+- test/xml/test_node_inheritance.rb
 - test/xml/test_entity_decl.rb
-- test/xml/test_dtd_encoding.rb
-- test/xml/node/test_save_options.rb
-- test/xml/node/test_subclass.rb
-- test/xml/test_document_fragment.rb
+- test/xml/test_node_reparenting.rb
+- test/xml/sax/test_parser_context.rb
+- test/xml/sax/test_push_parser.rb
+- test/xml/sax/test_parser.rb
+- test/xml/test_attr.rb
 - test/xml/test_cdata.rb
+- test/xml/test_document.rb
+- test/xml/test_node_encoding.rb
+- test/xml/test_document_fragment.rb
+- test/xml/test_c14n.rb
+- test/xml/test_dtd.rb
+- test/xml/test_node.rb
+- test/xml/test_comment.rb
 - test/xml/test_text.rb
-- test/xml/test_reader_encoding.rb
+- test/xml/node/test_save_options.rb
+- test/xml/node/test_subclass.rb
+- test/xml/test_schema.rb
+- test/xml/test_node_attributes.rb
+- test/xml/test_namespace.rb
+- test/xml/test_attribute_decl.rb
 - test/xml/test_xpath.rb
-- test/xml/test_element_content.rb
-- test/xml/test_node.rb
+- test/xml/test_processing_instruction.rb
+- test/xml/test_reader_encoding.rb
+- test/xml/test_element_decl.rb
 - test/xml/test_builder.rb
-- test/xml/sax/test_push_parser.rb
-- test/xml/sax/test_parser_context.rb
-- test/xml/sax/test_parser.rb
-- test/xml/test_schema.rb
 - test/xml/test_node_set.rb
-- test/xml/test_attr.rb
-- test/xml/test_processing_instruction.rb
-- test/xml/test_node_encoding.rb
 - test/xml/test_syntax_error.rb
-- test/xml/test_comment.rb
+- test/xml/test_parse_options.rb
+- test/xml/test_xinclude.rb
+- test/xml/test_element_content.rb
+- test/xml/test_unparented_node.rb
 - test/xml/test_entity_reference.rb
-- test/xml/test_node_reparenting.rb
-- test/xml/test_attribute_decl.rb
 - test/xml/test_relax_ng.rb
-- test/xml/test_namespace.rb
-- test/xml/test_node_attributes.rb
 - test/test_xslt_transforms.rb
-- test/xslt/test_custom_functions.rb
-- test/xslt/test_exception_handling.rb
+- test/test_memory_leak.rb
+- test/test_css_cache.rb
+- test/decorators/test_slop.rb
+- test/test_soap4r_sax.rb
 - test/test_encoding_handler.rb
+- test/html/test_document_encoding.rb
+- test/html/test_named_characters.rb
+- test/html/sax/test_parser_context.rb
+- test/html/sax/test_parser.rb
+- test/html/test_document.rb
+- test/html/test_node_encoding.rb
+- test/html/test_document_fragment.rb
+- test/html/test_node.rb
+- test/html/test_element_description.rb
+- test/html/test_builder.rb
+- test/xslt/test_exception_handling.rb
+- test/xslt/test_custom_functions.rb
+- test/test_reader.rb
+- test/test_convert_xpath.rb