RubyGems - nokogiri - Versions diffs - 1.3.3 → 1.4.0 - Mend

nokogiri 1.3.3 → 1.4.0

Potentially problematic release.

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

Files changed (201) hide show

data/CHANGELOG.ja.rdoc +48 -3
data/CHANGELOG.rdoc +42 -0
data/Manifest.txt +44 -29
data/README.ja.rdoc +0 -2
data/README.rdoc +4 -7
data/Rakefile +42 -6
data/bin/nokogiri +7 -5
data/ext/nokogiri/extconf.rb +5 -21
data/ext/nokogiri/html_document.c +14 -50
data/ext/nokogiri/html_element_description.c +7 -7
data/ext/nokogiri/html_entity_lookup.c +6 -4
data/ext/nokogiri/html_sax_parser_context.c +92 -0
data/ext/nokogiri/html_sax_parser_context.h +11 -0
data/ext/nokogiri/nokogiri.c +9 -3
data/ext/nokogiri/nokogiri.h +16 -20
data/ext/nokogiri/xml_attr.c +1 -1
data/ext/nokogiri/xml_attribute_decl.c +67 -0
data/ext/nokogiri/xml_attribute_decl.h +9 -0
data/ext/nokogiri/xml_cdata.c +6 -5
data/ext/nokogiri/xml_comment.c +3 -2
data/ext/nokogiri/xml_document.c +93 -23
data/ext/nokogiri/xml_document_fragment.c +1 -3
data/ext/nokogiri/xml_dtd.c +63 -6
data/ext/nokogiri/xml_element_content.c +123 -0
data/ext/nokogiri/xml_element_content.h +10 -0
data/ext/nokogiri/xml_element_decl.c +69 -0
data/ext/nokogiri/xml_element_decl.h +9 -0
data/ext/nokogiri/xml_entity_decl.c +97 -0
data/ext/nokogiri/xml_entity_decl.h +10 -0
data/ext/nokogiri/xml_entity_reference.c +1 -1
data/ext/nokogiri/xml_io.c +10 -3
data/ext/nokogiri/xml_io.h +1 -0
data/ext/nokogiri/xml_namespace.c +2 -2
data/ext/nokogiri/xml_node.c +139 -34
data/ext/nokogiri/xml_node.h +0 -1
data/ext/nokogiri/xml_node_set.c +23 -16
data/ext/nokogiri/xml_processing_instruction.c +1 -1
data/ext/nokogiri/xml_reader.c +78 -50
data/ext/nokogiri/xml_sax_parser.c +109 -168
data/ext/nokogiri/xml_sax_parser.h +33 -0
data/ext/nokogiri/xml_sax_parser_context.c +155 -0
data/ext/nokogiri/xml_sax_parser_context.h +10 -0
data/ext/nokogiri/xml_sax_push_parser.c +11 -6
data/ext/nokogiri/xml_syntax_error.c +63 -12
data/ext/nokogiri/xml_text.c +4 -3
data/ext/nokogiri/xml_xpath.c +1 -1
data/ext/nokogiri/xml_xpath_context.c +12 -25
data/ext/nokogiri/xslt_stylesheet.c +3 -3
data/lib/nokogiri.rb +4 -4
data/lib/nokogiri/css/generated_tokenizer.rb +1 -0
data/lib/nokogiri/css/node.rb +1 -9
data/lib/nokogiri/css/xpath_visitor.rb +11 -21
data/lib/nokogiri/ffi/html/document.rb +0 -9
data/lib/nokogiri/ffi/html/sax/parser_context.rb +38 -0
data/lib/nokogiri/ffi/io_callbacks.rb +4 -2
data/lib/nokogiri/ffi/libxml.rb +44 -10
data/lib/nokogiri/ffi/structs/common_node.rb +1 -1
data/lib/nokogiri/ffi/structs/xml_attribute.rb +27 -0
data/lib/nokogiri/ffi/structs/xml_dtd.rb +3 -1
data/lib/nokogiri/ffi/structs/xml_element.rb +26 -0
data/lib/nokogiri/ffi/structs/xml_element_content.rb +17 -0
data/lib/nokogiri/ffi/structs/xml_entity.rb +32 -0
data/lib/nokogiri/ffi/structs/xml_enumeration.rb +12 -0
data/lib/nokogiri/ffi/structs/xml_parser_context.rb +19 -0
data/lib/nokogiri/ffi/structs/xml_sax_push_parser_context.rb +4 -3
data/lib/nokogiri/ffi/structs/xml_syntax_error.rb +1 -1
data/lib/nokogiri/ffi/xml/attribute_decl.rb +27 -0
data/lib/nokogiri/ffi/xml/comment.rb +2 -2
data/lib/nokogiri/ffi/xml/document.rb +29 -12
data/lib/nokogiri/ffi/xml/document_fragment.rb +0 -5
data/lib/nokogiri/ffi/xml/dtd.rb +14 -3
data/lib/nokogiri/ffi/xml/element_content.rb +43 -0
data/lib/nokogiri/ffi/xml/element_decl.rb +19 -0
data/lib/nokogiri/ffi/xml/entity_decl.rb +27 -0
data/lib/nokogiri/ffi/xml/node.rb +45 -5
data/lib/nokogiri/ffi/xml/node_set.rb +1 -1
data/lib/nokogiri/ffi/xml/reader.rb +45 -24
data/lib/nokogiri/ffi/xml/sax/parser.rb +27 -34
data/lib/nokogiri/ffi/xml/sax/parser_context.rb +67 -0
data/lib/nokogiri/ffi/xml/sax/push_parser.rb +5 -4
data/lib/nokogiri/ffi/xml/syntax_error.rb +31 -16
data/lib/nokogiri/ffi/xml/text.rb +2 -2
data/lib/nokogiri/html.rb +1 -0
data/lib/nokogiri/html/document.rb +39 -24
data/lib/nokogiri/html/sax/parser.rb +2 -2
data/lib/nokogiri/html/sax/parser_context.rb +16 -0
data/lib/nokogiri/version.rb +1 -1
data/lib/nokogiri/xml.rb +6 -1
data/lib/nokogiri/xml/attr.rb +5 -0
data/lib/nokogiri/xml/attribute_decl.rb +18 -0
data/lib/nokogiri/xml/builder.rb +121 -13
data/lib/nokogiri/xml/character_data.rb +7 -0
data/lib/nokogiri/xml/document.rb +43 -29
data/lib/nokogiri/xml/document_fragment.rb +26 -6
data/lib/nokogiri/xml/dtd.rb +5 -5
data/lib/nokogiri/xml/element_content.rb +36 -0
data/lib/nokogiri/xml/element_decl.rb +13 -0
data/lib/nokogiri/xml/entity_decl.rb +15 -0
data/lib/nokogiri/xml/fragment_handler.rb +22 -11
data/lib/nokogiri/xml/namespace.rb +6 -0
data/lib/nokogiri/xml/node.rb +33 -15
data/lib/nokogiri/xml/node_set.rb +66 -44
data/lib/nokogiri/xml/pp.rb +2 -0
data/lib/nokogiri/xml/pp/character_data.rb +18 -0
data/lib/nokogiri/xml/pp/node.rb +56 -0
data/lib/nokogiri/xml/reader.rb +8 -0
data/lib/nokogiri/xml/sax.rb +1 -1
data/lib/nokogiri/xml/sax/document.rb +18 -1
data/lib/nokogiri/xml/sax/parser.rb +15 -8
data/lib/nokogiri/xml/sax/parser_context.rb +16 -0
data/lib/nokogiri/xml/sax/push_parser.rb +0 -3
data/lib/nokogiri/xml/syntax_error.rb +4 -0
data/lib/nokogiri/xslt/stylesheet.rb +1 -1
data/test/css/test_nthiness.rb +1 -1
data/test/css/test_parser.rb +1 -1
data/test/css/test_tokenizer.rb +1 -1
data/test/css/test_xpath_visitor.rb +1 -1
data/test/ffi/test_document.rb +1 -1
data/test/files/shift_jis.html +10 -0
data/test/files/staff.dtd +10 -0
data/test/helper.rb +12 -3
data/test/html/sax/test_parser.rb +1 -1
data/test/html/sax/test_parser_context.rb +48 -0
data/test/html/test_builder.rb +8 -2
data/test/html/test_document.rb +23 -1
data/test/html/test_document_encoding.rb +15 -1
data/test/html/test_document_fragment.rb +10 -1
data/test/html/test_element_description.rb +1 -2
data/test/html/test_named_characters.rb +1 -1
data/test/html/test_node.rb +61 -1
data/test/html/test_node_encoding.rb +27 -0
data/test/test_convert_xpath.rb +1 -3
data/test/test_css_cache.rb +1 -1
data/test/test_gc.rb +1 -1
data/test/test_memory_leak.rb +1 -1
data/test/test_nokogiri.rb +3 -3
data/test/test_reader.rb +29 -1
data/test/test_xslt_transforms.rb +1 -1
data/test/xml/node/test_save_options.rb +1 -1
data/test/xml/node/test_subclass.rb +1 -1
data/test/xml/sax/test_parser.rb +64 -3
data/test/xml/sax/test_parser_context.rb +56 -0
data/test/xml/sax/test_push_parser.rb +11 -1
data/test/xml/test_attr.rb +1 -1
data/test/xml/test_attribute_decl.rb +82 -0
data/test/xml/test_builder.rb +95 -1
data/test/xml/test_cdata.rb +1 -1
data/test/xml/test_comment.rb +7 -1
data/test/xml/test_document.rb +147 -6
data/test/xml/test_document_encoding.rb +1 -1
data/test/xml/test_document_fragment.rb +55 -5
data/test/xml/test_dtd.rb +40 -5
data/test/xml/test_dtd_encoding.rb +3 -1
data/test/xml/test_element_content.rb +56 -0
data/test/xml/test_element_decl.rb +73 -0
data/test/xml/test_entity_decl.rb +83 -0
data/test/xml/test_entity_reference.rb +1 -1
data/test/xml/test_namespace.rb +21 -1
data/test/xml/test_node.rb +70 -4
data/test/xml/test_node_attributes.rb +1 -1
data/test/xml/test_node_encoding.rb +1 -1
data/test/xml/test_node_set.rb +136 -2
data/test/xml/test_parse_options.rb +1 -1
data/test/xml/test_processing_instruction.rb +1 -1
data/test/xml/test_reader_encoding.rb +1 -1
data/test/xml/test_relax_ng.rb +1 -1
data/test/xml/test_schema.rb +1 -1
data/test/xml/test_syntax_error.rb +27 -0
data/test/xml/test_text.rb +13 -1
data/test/xml/test_unparented_node.rb +1 -1
data/test/xml/test_xpath.rb +1 -1
metadata +57 -40
data/ext/nokogiri/html_sax_parser.c +0 -57
data/ext/nokogiri/html_sax_parser.h +0 -11
data/lib/action-nokogiri.rb +0 -38
data/lib/nokogiri/decorators.rb +0 -2
data/lib/nokogiri/decorators/hpricot.rb +0 -3
data/lib/nokogiri/decorators/hpricot/node.rb +0 -56
data/lib/nokogiri/decorators/hpricot/node_set.rb +0 -54
data/lib/nokogiri/decorators/hpricot/xpath_visitor.rb +0 -30
data/lib/nokogiri/ffi/html/sax/parser.rb +0 -21
data/lib/nokogiri/hpricot.rb +0 -92
data/lib/nokogiri/xml/entity_declaration.rb +0 -11
data/lib/nokogiri/xml/sax/legacy_handlers.rb +0 -65
data/test/hpricot/files/basic.xhtml +0 -17
data/test/hpricot/files/boingboing.html +0 -2266
data/test/hpricot/files/cy0.html +0 -3653
data/test/hpricot/files/immob.html +0 -400
data/test/hpricot/files/pace_application.html +0 -1320
data/test/hpricot/files/tenderlove.html +0 -16
data/test/hpricot/files/uswebgen.html +0 -220
data/test/hpricot/files/utf8.html +0 -1054
data/test/hpricot/files/week9.html +0 -1723
data/test/hpricot/files/why.xml +0 -19
data/test/hpricot/load_files.rb +0 -11
data/test/hpricot/test_alter.rb +0 -68
data/test/hpricot/test_builder.rb +0 -20
data/test/hpricot/test_parser.rb +0 -350
data/test/hpricot/test_paths.rb +0 -15
data/test/hpricot/test_preserved.rb +0 -77
data/test/hpricot/test_xml.rb +0 -30

data/test/html/test_document_encoding.rb CHANGED

@@ -1,10 +1,24 @@
 # -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 module Nokogiri
   module HTML
     if RUBY_VERSION =~ /^1\.9/
       class TestDocumentEncoding < Nokogiri::TestCase
+        def test_encoding
+          doc = Nokogiri::HTML File.open(SHIFT_JIS_HTML, 'rb')
+          hello = "こんにちは"
+          assert_match doc.encoding, doc.to_html
+          assert_match hello.encode('Shift_JIS'), doc.to_html
+          assert_equal 'Shift_JIS', doc.to_html.encoding.name
+          assert_match hello, doc.to_html(:encoding => 'UTF-8')
+          assert_match 'UTF-8', doc.to_html(:encoding => 'UTF-8')
+          assert_match 'UTF-8', doc.to_html(:encoding => 'UTF-8').encoding.name
+        end
         def test_default_to_encoding_from_string
           bad_charset = <<-eohtml
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

data/test/html/test_document_fragment.rb CHANGED

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+# -*- coding: utf-8 -*-
+require "helper"
 module Nokogiri
   module HTML
@@ -8,6 +9,14 @@ module Nokogiri
         @html = Nokogiri::HTML.parse(File.read(HTML_FILE), HTML_FILE)
       end
+      def test_fun_encoding
+        string = %Q(<body>こんにちは</body>)
+        html = Nokogiri::HTML::DocumentFragment.parse(
+          string
+        ).to_html(:encoding => 'UTF-8')
+        assert_equal string, html
+      end
       def test_new
         fragment = Nokogiri::HTML::DocumentFragment.new(@html)
       end

data/test/html/test_element_description.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 module Nokogiri
   module HTML
@@ -66,7 +66,6 @@ module Nokogiri
       def test_optional_attributes
         attrs = ElementDescription['table'].optional_attributes
         assert attrs
-        assert_equal 22, attrs.length
       end
       def test_deprecated_attributes

data/test/html/test_named_characters.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 module Nokogiri
   module HTML

data/test/html/test_node.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 require 'nkf'
@@ -17,6 +17,43 @@ module Nokogiri
         eohtml
       end
+      def test_get_attribute
+        element = @html.at('div')
+        assert_equal 'baz', element.get_attribute('class')
+        assert_equal 'baz', element['class']
+        element['href'] = "javascript:alert(\"AGGA-KA-BOO!\")"
+        assert_match(/%22AGGA-KA-BOO!%22/, element.to_html)
+      end
+      def test_css_path_round_trip
+        doc = Nokogiri::HTML(File.read(HTML_FILE))
+        %w{ #header small div[2] div.post body }.each do |css_sel|
+          ele = doc.at css_sel
+          assert_equal ele, doc.at(ele.css_path), ele.css_path
+        end
+      end
+      def test_path_round_trip
+        doc = Nokogiri::HTML(File.read(HTML_FILE))
+        %w{ #header small div[2] div.post body }.each do |css_sel|
+          ele = doc.at css_sel
+          assert_equal ele, doc.at(ele.path), ele.path
+        end
+      end
+      def test_append_with_document
+        assert_raises(ArgumentError) do
+          @html.root << Nokogiri::HTML::Document.new
+        end
+      end
+      ###
+      # Make sure a document that doesn't declare a meta encoding returns
+      # nil.
+      def test_meta_encoding
+        assert_nil @html.meta_encoding
+      end
       def test_description
         assert desc = @html.at('a.bar').description
         assert_equal 'a', desc.name
@@ -51,6 +88,19 @@ module Nokogiri
         assert node.matches?('//a')
       end
+      def test_unlink_then_swap
+        node = @html.at('a')
+        node.unlink
+        another_node = @html.at('div')
+        assert another_node, 'should have a node'
+        # This used to segv
+        assert_nothing_raised do
+          node.add_previous_sibling another_node
+        end
+      end
       def test_swap
         @html.at('div').swap('<a href="foo">bar</a>')
         a_tag = @html.css('a').first
@@ -79,6 +129,11 @@ module Nokogiri
         assert_equal 'some text', @html.at('//body').children[0].content.strip
       end
+      def test_before
+        @html.at('//div').before('<a href="awesome">town</a>')
+        assert_equal 'awesome', @html.at('//div').previous['href']
+      end
       def test_fragment_handler_does_not_regurge_on_invalid_attributes
         iframe = %Q{<iframe style="width: 0%; height: 0px" src="http://someurl" allowtransparency></iframe>}
         assert_nothing_raised { @html.at('div').before(iframe) }
@@ -128,6 +183,11 @@ module Nokogiri
         assert_equal 'some text', node.next.text.strip
       end
+      def test_after
+        @html.at('//div').after('<a href="awesome">town</a>')
+        assert_equal 'awesome', @html.at('//div').next['href']
+      end
       def test_replace
         doc = Nokogiri::HTML(<<-eohtml)
           <html>

data/test/html/test_node_encoding.rb ADDED

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+require "helper"
+module Nokogiri
+  module HTML
+    if RUBY_VERSION =~ /^1\.9/
+      class TestNodeEncoding < Nokogiri::TestCase
+        def test_inner_html
+          doc = Nokogiri::HTML File.open(SHIFT_JIS_HTML, 'rb')
+          hello = "こんにちは"
+          contents = doc.at('h2').inner_html
+          assert_equal doc.encoding, contents.encoding.name
+          assert_match hello.encode('Shift_JIS'), contents
+          contents = doc.at('h2').inner_html(:encoding => 'UTF-8')
+          assert_match hello, contents
+          doc.encoding = 'UTF-8'
+          contents = doc.at('h2').inner_html
+          assert_match hello, contents
+        end
+      end
+    end
+  end
+end

data/test/test_convert_xpath.rb CHANGED

@@ -1,6 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
-require 'rubygems'
+require "helper"
 class TestConvertXPath < Nokogiri::TestCase

data/test/test_css_cache.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+require "helper"
 class TestCssCache < Nokogiri::TestCase

data/test/test_gc.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+require "helper"
 class TestGc < Nokogiri::TestCase

data/test/test_memory_leak.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+require "helper"
 class TestMemoryLeak < Nokogiri::TestCase

data/test/test_nokogiri.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+require "helper"
 class TestNokogiri < Nokogiri::TestCase
   def test_versions
@@ -69,7 +69,7 @@ class TestNokogiri < Nokogiri::TestCase
     doc = Nokogiri.make { b "bold tag" }
     assert_equal('<b>bold tag</b>', doc.to_html.chomp)
   end
   SLOP_HTML = <<-END
   <html>
     <body>
@@ -119,7 +119,7 @@ class TestNokogiri < Nokogiri::TestCase
     assert_raise(NoMethodError) { doc.nonexistent }
   end
   def test_slop_decorator
     doc = Nokogiri(SLOP_HTML)
     assert !doc.decorators(Nokogiri::XML::Node).include?(Nokogiri::Decorators::Slop)

data/test/test_reader.rb CHANGED

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+require "helper"
 class TestReader < Nokogiri::TestCase
   def test_from_io_sets_io_as_source
@@ -260,6 +260,34 @@ class TestReader < Nokogiri::TestCase
       reader.map { |n| n.prefix }
   end
+  def test_node_type
+    reader = Nokogiri::XML::Reader.from_memory(<<-eoxml)
+    <x>
+      <y>hello</y>
+    </x>
+    eoxml
+    assert_equal 0, reader.node_type
+    assert_equal [1, 14, 1, 3, 15, 14, 15], reader.map { |n| n.node_type }
+  end
+  def test_inner_xml
+    str = "<x><y>hello</y></x>"
+    reader = Nokogiri::XML::Reader.from_memory(str)
+    reader.read
+    assert_equal "<y>hello</y>", reader.inner_xml
+  end
+  def test_outer_xml
+    str = "<x><y>hello</y></x>"
+    reader = Nokogiri::XML::Reader.from_memory(str)
+    reader.read
+    assert_equal str, reader.outer_xml
+  end
   def test_state
     reader = Nokogiri::XML::Reader.from_memory('<foo>bar</bar>')
     assert reader.state

data/test/test_xslt_transforms.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+require "helper"
 class TestXsltTransforms < Nokogiri::TestCase

data/test/xml/node/test_save_options.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..',"helper"))
+require "helper"
 module Nokogiri
   module XML

data/test/xml/node/test_subclass.rb CHANGED

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..',"helper"))
+require "helper"
 module Nokogiri
   module XML

data/test/xml/sax/test_parser.rb CHANGED

@@ -1,4 +1,6 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', "helper"))
+# -*- coding: utf-8 -*-
+require "helper"
 module Nokogiri
   module XML
@@ -9,6 +11,61 @@ module Nokogiri
           @parser = XML::SAX::Parser.new(Doc.new)
         end
+        def test_parser_context_yielded_io
+          doc = Doc.new
+          parser = XML::SAX::Parser.new doc
+          xml = "<foo a='&amp;b'/>"
+          block_called = false
+          parser.parse(StringIO.new(xml)) { |ctx|
+            block_called = true
+            ctx.replace_entities = true
+          }
+          assert block_called
+          assert_equal ['a', '&b'], doc.start_elements.first.last
+        end
+        def test_parser_context_yielded_in_memory
+          doc = Doc.new
+          parser = XML::SAX::Parser.new doc
+          xml = "<foo a='&amp;b'/>"
+          block_called = false
+          parser.parse(xml) { |ctx|
+            block_called = true
+            ctx.replace_entities = true
+          }
+          assert block_called
+          assert_equal ['a', '&b'], doc.start_elements.first.last
+        end
+        def test_xml_decl
+          {
+            ''          => nil,
+            '<?xml version="1.0" ?>'                  => ['1.0'],
+            '<?xml version="1.0" encoding="UTF-8" ?>' => ['1.0', 'UTF-8'],
+            '<?xml version="1.0" standalone="yes"?>'  => ['1.0', 'yes'],
+            '<?xml version="1.0" standalone="no"?>'   => ['1.0', 'no'],
+          }.each do |decl,value|
+            parser = XML::SAX::Parser.new(Doc.new)
+            xml = "#{decl}\n<root />"
+            parser.parse xml
+            assert parser.document.start_document_called, xml
+            assert_equal value, parser.document.xmldecls, xml
+          end
+        end
+        def test_parse_empty
+          assert_raises RuntimeError do
+            @parser.parse('')
+          end
+        end
         def test_namespace_declaration_order_is_saved
           @parser.parse <<-eoxml
 <root xmlns:foo='http://foo.example.com/' xmlns='http://example.com/'>
@@ -114,11 +171,15 @@ module Nokogiri
           assert_equal doc.errors.length, @parser.document.errors.length
         end
-        def test_parse
+        def test_parse_with_memory_argument
+          @parser.parse(File.read(XML_FILE))
+          assert(@parser.document.cdata_blocks.length > 0)
+        end
+        def test_parse_with_io_argument
           File.open(XML_FILE, 'rb') { |f|
             @parser.parse(f)
           }
-          @parser.parse(File.read(XML_FILE))
           assert(@parser.document.cdata_blocks.length > 0)
         end

data/test/xml/sax/test_parser_context.rb ADDED

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+require "helper"
+module Nokogiri
+  module XML
+    module SAX
+      class TestParserContext < Nokogiri::SAX::TestCase
+        def test_replace_entities
+          pc = ParserContext.new StringIO.new('<root />'), 'UTF-8'
+          pc.replace_entities = false
+          assert_equal false, pc.replace_entities
+          pc.replace_entities = true
+          assert_equal true, pc.replace_entities
+        end
+        def test_from_io
+          assert_nothing_raised do
+            ParserContext.new StringIO.new('fo'), 'UTF-8'
+          end
+        end
+        def test_from_string
+          assert_nothing_raised do
+            ParserContext.new 'blah blah'
+          end
+        end
+        def test_parse_with
+          ctx = ParserContext.new 'blah'
+          assert_raises ArgumentError do
+            ctx.parse_with nil
+          end
+        end
+        def test_parse_with_sax_parser
+          assert_nothing_raised do
+            xml = "<root />"
+            ctx = ParserContext.new xml
+            parser = Parser.new Doc.new
+            ctx.parse_with parser
+          end
+        end
+        def test_from_file
+          assert_nothing_raised do
+            ctx = ParserContext.file XML_FILE
+            parser = Parser.new Doc.new
+            ctx.parse_with parser
+          end
+        end
+      end
+    end
+  end
+end