nokogiri 1.5.5.rc2-java → 1.5.5.rc3-java

data/lib/nokogiri/xml/node/save_options.rb

@@ -23,7 +23,7 @@ module Nokogiri
           # Save builder created document
           AS_BUILDER    = 128
           # the default for XML documents
-          DEFAULT_XML  = AS_XML # https://github.com/tenderlove/nokogiri/issues/#issue/415
+          DEFAULT_XML  = AS_XML # https://github.com/sparklemotion/nokogiri/issues/#issue/415
           # the default for HTML document
           DEFAULT_HTML = NO_DECLARATION | NO_EMPTY_TAGS | AS_HTML
         else

data/test/html/test_document.rb

@@ -89,11 +89,11 @@ module Nokogiri
         require 'open-uri'
         begin
           html = open('http://google.com').read
-          doc = Nokogiri::HTML html ,"/foo/", nil
-          refute_empty doc.to_s, "Document should not be empty"
         rescue
           skip("This test needs the internet. Skips if no internet available.")
         end
+        doc = Nokogiri::HTML html ,"http:/foobar.foobar/"
+        refute_empty doc.to_s, "Document should not be empty"
       end
 
       ###

data/test/xml/test_document.rb

@@ -268,7 +268,7 @@ module Nokogiri
           assert_equal 44, @xml.validate.length
         else
           xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE) {|cfg| cfg.dtdvalid}
-          assert_equal 37, xml.validate.length
+          assert_equal 40, xml.validate.length
         end
       end
 

data/test/xml/test_dtd.rb

@@ -14,12 +14,8 @@ module Nokogiri
       end
 
       def test_external_id
-        if Nokogiri.uses_libxml?
-          xml = Nokogiri::XML('<!DOCTYPE foo PUBLIC "bar"><foo />')
-        else
-          xml = Nokogiri::XML('<!DOCTYPE foo PUBLIC "bar" ""><foo />')
-        end
-        assert dtd = xml.internal_subset
+        xml = Nokogiri::XML('<!DOCTYPE foo PUBLIC "bar" ""><foo />')
+        assert dtd = xml.internal_subset, 'no internal subset'
         assert_equal 'bar', dtd.external_id
       end
 
@@ -74,7 +70,7 @@ module Nokogiri
         else
           xml = Nokogiri::XML(File.open(XML_FILE)) {|cfg| cfg.dtdvalid}
           list = xml.internal_subset.validate xml
-          assert_equal 37, list.length
+          assert_equal 40, list.length
         end
       end
 

data/test/xml/test_entity_reference.rb

@@ -17,5 +17,219 @@ module Nokogiri
         100.times { EntityReference.new(@xml, 'foo') }
       end
     end
+
+    module Common
+      PATH = 'test/files/test_document_url/'
+
+      attr_accessor :path, :parser
+
+      def xml_document
+        File.join path, 'document.xml'
+      end
+
+      def self.included base
+        def base.test_relative_and_absolute_path method_name, &block
+          test_relative_path method_name, &block
+          test_absolute_path method_name, &block
+        end
+
+        def base.test_absolute_path method_name, &block
+          define_method "#{method_name}_with_absolute_path" do
+            self.path = "#{File.expand_path PATH}/"
+            instance_eval(&block)
+          end
+        end
+
+        def base.test_relative_path method_name, &block
+          define_method method_name do
+            self.path = PATH
+            instance_eval(&block)
+          end
+        end
+      end
+    end
+
+    class TestDOMEntityReference < Nokogiri::TestCase
+      include Common
+
+      def setup
+        super
+        @parser = Nokogiri::XML::Document
+      end
+
+      test_relative_and_absolute_path :test_dom_entity_reference_with_dtdloda do
+        # Make sure that we can parse entity references and include them in the document
+        html = File.read xml_document
+        doc = @parser.parse html, path do |cfg|
+          cfg.default_xml
+          cfg.dtdload
+          cfg.noent
+        end
+        assert_equal [], doc.errors
+        assert_equal "foobar", doc.xpath('//blah').text
+      end
+
+      test_relative_and_absolute_path :test_dom_entity_reference_with_dtdvalid do
+        # Make sure that we can parse entity references and include them in the document
+        html = File.read xml_document
+        doc = @parser.parse html, path do |cfg|
+          cfg.default_xml
+          cfg.dtdvalid
+          cfg.noent
+        end
+        assert_equal [], doc.errors
+        assert_equal "foobar", doc.xpath('//blah').text
+      end
+
+      test_absolute_path :test_dom_dtd_loading_with_absolute_path do
+        # Make sure that we can parse entity references and include them in the document
+        html = %Q[<?xml version="1.0" encoding="UTF-8" ?>
+                  <!DOCTYPE document SYSTEM "#{path}/document.dtd">
+                    <document>
+                      <body>&bar;</body>
+                    </document>
+        ]
+        doc = @parser.parse html, xml_document do |cfg|
+          cfg.default_xml
+          cfg.dtdvalid
+          cfg.noent
+        end
+        assert_equal [], doc.errors
+        assert_equal "foobar", doc.xpath('//blah').text
+      end
+
+      test_relative_and_absolute_path :test_dom_entity_reference_with_io do
+        # Make sure that we can parse entity references and include them in the document
+        html = File.open xml_document
+        doc = @parser.parse html, nil do |cfg|
+          cfg.default_xml
+          cfg.dtdload
+          cfg.noent
+        end
+        assert_equal [], doc.errors
+        assert_equal "foobar", doc.xpath('//blah').text
+      end
+
+      test_relative_and_absolute_path :test_dom_entity_reference_without_noent do
+        # Make sure that we don't include entity references unless NOENT is set to true
+        html = File.read xml_document
+        doc = @parser.parse html, path do |cfg|
+          cfg.default_xml
+          cfg.dtdload
+        end
+        assert_equal [], doc.errors
+        assert_kind_of Nokogiri::XML::EntityReference, doc.xpath('//body').first.children.first
+      end
+
+      test_relative_and_absolute_path :test_dom_entity_reference_without_dtdload do
+        # Make sure that we don't include entity references unless NOENT is set to true
+        html = File.read xml_document
+        doc = @parser.parse html, path do |cfg|
+          cfg.default_xml
+        end
+        assert_kind_of Nokogiri::XML::EntityReference, doc.xpath('//body').first.children.first
+        if Nokogiri.uses_libxml?
+          assert_equal ["Entity 'bar' not defined"], doc.errors.map(&:to_s)
+        end
+      end
+
+      test_relative_and_absolute_path :test_document_dtd_loading_with_nonet do
+        # Make sure that we don't include remote entities unless NOENT is set to true
+        html = %Q[<?xml version="1.0" encoding="UTF-8" ?>
+                  <!DOCTYPE document SYSTEM "http://foo.bar.com/">
+                    <document>
+                      <body>&bar;</body>
+                    </document>
+        ]
+        doc = @parser.parse html, path do |cfg|
+          cfg.default_xml
+          cfg.dtdload
+        end
+        assert_kind_of Nokogiri::XML::EntityReference, doc.xpath('//body').first.children.first
+        if Nokogiri.uses_libxml?
+          assert_equal ["Attempt to load network entity http://foo.bar.com/", "Entity 'bar' not defined"], doc.errors.map(&:to_s)
+        else
+          assert_equal ["Attempt to load network entity http://foo.bar.com/"], doc.errors.map(&:to_s)
+        end
+      end
+      # TODO: can we retreive a resource pointing to localhost when NONET is set to true ?
+    end
+
+    class TestSaxEntityReference < Nokogiri::SAX::TestCase
+      include Common
+
+      def setup
+        super
+        @parser = XML::SAX::Parser.new(Doc.new) do |ctx|
+          ctx.replace_entities = true
+        end
+      end
+
+      test_relative_and_absolute_path :test_sax_entity_reference do
+        # Make sure that we can parse entity references and include them in the document
+        html = File.read xml_document
+        @parser.parse html
+        refute_nil @parser.document.errors
+        assert_equal ["Entity 'bar' not defined"], @parser.document.errors.map(&:to_s).map(&:strip)
+      end
+
+      test_relative_and_absolute_path :test_more_sax_entity_reference do
+        # Make sure that we don't include entity references unless NOENT is set to true
+        html = %Q[<?xml version="1.0" encoding="UTF-8" ?>
+                  <!DOCTYPE document SYSTEM "http://foo.bar.com/">
+                    <document>
+                      <body>&bar;</body>
+                    </document>
+        ]
+        @parser.parse html
+        refute_nil @parser.document.errors
+        assert_equal ["Entity 'bar' not defined"], @parser.document.errors.map(&:to_s).map(&:strip)
+      end
+    end
+
+    class TestReaderEntityReference < Nokogiri::TestCase
+      include Common
+
+      def setup
+        super
+      end
+
+      test_relative_and_absolute_path :test_reader_entity_reference do
+        # Make sure that we can parse entity references and include them in the document
+        html = File.read xml_document
+        reader = Nokogiri::XML::Reader html, path do |cfg|
+          cfg.default_xml
+          cfg.dtdload
+          cfg.noent
+        end
+        nodes = []
+        reader.each { |n| nodes << n.value }
+        assert_equal ['foobar'], nodes.compact.map(&:strip).reject(&:empty?)
+      end
+
+      test_relative_and_absolute_path :test_reader_entity_reference_without_noent do
+        # Make sure that we can parse entity references and include them in the document
+        html = File.read xml_document
+        reader = Nokogiri::XML::Reader html, path do |cfg|
+          cfg.default_xml
+          cfg.dtdload
+        end
+        nodes = []
+        reader.each { |n| nodes << n.value }
+        assert_equal [], nodes.compact.map(&:strip).reject(&:empty?)
+      end
+
+      test_relative_and_absolute_path :test_reader_entity_reference_without_dtdload do
+        # Make sure that we can parse entity references and include them in the document
+        html = File.read xml_document
+        assert_raises(Nokogiri::XML::SyntaxError) do
+          reader = Nokogiri::XML::Reader html, path do |cfg|
+            cfg.default_xml
+          end
+          nodes = []
+          reader.each { |n| nodes << n.value }
+        end
+      end
+    end
   end
 end

data/test/xml/test_node_reparenting.rb

@@ -329,7 +329,7 @@ module Nokogiri
 
         describe "unlinking a node and then reparenting it" do
           it "not blow up" do
-            # see http://github.com/tenderlove/nokogiri/issues#issue/22
+            # see http://github.com/sparklemotion/nokogiri/issues#issue/22
             10.times do
               begin
                 doc = Nokogiri::XML <<-EOHTML

data/test/xml/test_xpath.rb

@@ -217,7 +217,7 @@ module Nokogiri
       end
 
       def test_custom_xpath_handler_with_args_under_gc_pressure
-        # see http://github.com/tenderlove/nokogiri/issues/#issue/345
+        # see http://github.com/sparklemotion/nokogiri/issues/#issue/345
         tool_inspector = Class.new do
           def name_equals(nodeset, name, *args)
             nodeset.all? do |node|

metadata

@@ -2,7 +2,7 @@
 name: nokogiri
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.5.5.rc2
+  version: 1.5.5.rc3
 platform: java
 authors: 
   - Aaron Patterson
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-14 00:00:00 Z
+date: 2012-06-22 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: hoe-bundler