RubyGems - nokogiri - Versions diffs - 1.2.3-x86-mswin32-60 → 1.4.5-x86-mswin32-60 - Mend

nokogiri 1.2.3-x86-mswin32-60 → 1.4.5-x86-mswin32-60

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 (319) hide show

data/.autotest +18 -7
data/.gemtest +0 -0
data/CHANGELOG.ja.rdoc +297 -3
data/CHANGELOG.rdoc +289 -0
data/Manifest.txt +148 -37
data/README.ja.rdoc +20 -20
data/README.rdoc +53 -22
data/Rakefile +127 -211
data/bin/nokogiri +54 -0
data/ext/nokogiri/depend +358 -0
data/ext/nokogiri/extconf.rb +89 -54
data/ext/nokogiri/html_document.c +34 -27
data/ext/nokogiri/html_document.h +1 -1
data/ext/nokogiri/html_element_description.c +276 -0
data/ext/nokogiri/html_element_description.h +10 -0
data/ext/nokogiri/html_entity_lookup.c +7 -5
data/ext/nokogiri/html_entity_lookup.h +1 -1
data/ext/nokogiri/html_sax_parser_context.c +94 -0
data/ext/nokogiri/html_sax_parser_context.h +11 -0
data/ext/nokogiri/{native.c → nokogiri.c} +31 -7
data/ext/nokogiri/{native.h → nokogiri.h} +68 -41
data/ext/nokogiri/xml_attr.c +20 -9
data/ext/nokogiri/xml_attr.h +1 -1
data/ext/nokogiri/xml_attribute_decl.c +70 -0
data/ext/nokogiri/xml_attribute_decl.h +9 -0
data/ext/nokogiri/xml_cdata.c +21 -9
data/ext/nokogiri/xml_cdata.h +1 -1
data/ext/nokogiri/xml_comment.c +18 -6
data/ext/nokogiri/xml_comment.h +1 -1
data/ext/nokogiri/xml_document.c +247 -68
data/ext/nokogiri/xml_document.h +5 -3
data/ext/nokogiri/xml_document_fragment.c +15 -7
data/ext/nokogiri/xml_document_fragment.h +1 -1
data/ext/nokogiri/xml_dtd.c +110 -10
data/ext/nokogiri/xml_dtd.h +3 -1
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_encoding_handler.c +79 -0
data/ext/nokogiri/xml_encoding_handler.h +8 -0
data/ext/nokogiri/xml_entity_decl.c +110 -0
data/ext/nokogiri/xml_entity_decl.h +10 -0
data/ext/nokogiri/xml_entity_reference.c +16 -5
data/ext/nokogiri/xml_entity_reference.h +1 -1
data/ext/nokogiri/xml_io.c +40 -8
data/ext/nokogiri/xml_io.h +2 -1
data/ext/nokogiri/xml_libxml2_hacks.c +112 -0
data/ext/nokogiri/xml_libxml2_hacks.h +12 -0
data/ext/nokogiri/xml_namespace.c +84 -0
data/ext/nokogiri/xml_namespace.h +13 -0
data/ext/nokogiri/xml_node.c +782 -225
data/ext/nokogiri/xml_node.h +2 -4
data/ext/nokogiri/xml_node_set.c +253 -34
data/ext/nokogiri/xml_node_set.h +2 -2
data/ext/nokogiri/xml_processing_instruction.c +17 -5
data/ext/nokogiri/xml_processing_instruction.h +1 -1
data/ext/nokogiri/xml_reader.c +277 -85
data/ext/nokogiri/xml_reader.h +1 -1
data/ext/nokogiri/xml_relax_ng.c +168 -0
data/ext/nokogiri/xml_relax_ng.h +9 -0
data/ext/nokogiri/xml_sax_parser.c +183 -111
data/ext/nokogiri/xml_sax_parser.h +30 -1
data/ext/nokogiri/xml_sax_parser_context.c +199 -0
data/ext/nokogiri/xml_sax_parser_context.h +10 -0
data/ext/nokogiri/xml_sax_push_parser.c +42 -12
data/ext/nokogiri/xml_sax_push_parser.h +1 -1
data/ext/nokogiri/xml_schema.c +205 -0
data/ext/nokogiri/xml_schema.h +9 -0
data/ext/nokogiri/xml_syntax_error.c +28 -173
data/ext/nokogiri/xml_syntax_error.h +2 -1
data/ext/nokogiri/xml_text.c +16 -6
data/ext/nokogiri/xml_text.h +1 -1
data/ext/nokogiri/xml_xpath_context.c +104 -47
data/ext/nokogiri/xml_xpath_context.h +1 -1
data/ext/nokogiri/xslt_stylesheet.c +161 -19
data/ext/nokogiri/xslt_stylesheet.h +1 -1
data/lib/nokogiri.rb +47 -8
data/lib/nokogiri/1.8/nokogiri.so +0 -0
data/lib/nokogiri/1.9/nokogiri.so +0 -0
data/lib/nokogiri/css.rb +6 -3
data/lib/nokogiri/css/node.rb +14 -12
data/lib/nokogiri/css/parser.rb +665 -62
data/lib/nokogiri/css/parser.y +20 -10
data/lib/nokogiri/css/parser_extras.rb +91 -0
data/lib/nokogiri/css/tokenizer.rb +148 -5
data/lib/nokogiri/css/tokenizer.rex +10 -9
data/lib/nokogiri/css/xpath_visitor.rb +47 -44
data/lib/nokogiri/decorators/slop.rb +8 -4
data/lib/nokogiri/ffi/encoding_handler.rb +42 -0
data/lib/nokogiri/ffi/html/document.rb +28 -0
data/lib/nokogiri/ffi/html/element_description.rb +81 -0
data/lib/nokogiri/ffi/html/entity_lookup.rb +16 -0
data/lib/nokogiri/ffi/html/sax/parser_context.rb +38 -0
data/lib/nokogiri/ffi/io_callbacks.rb +42 -0
data/lib/nokogiri/ffi/libxml.rb +420 -0
data/lib/nokogiri/ffi/structs/common_node.rb +38 -0
data/lib/nokogiri/ffi/structs/html_elem_desc.rb +24 -0
data/lib/nokogiri/ffi/structs/html_entity_desc.rb +13 -0
data/lib/nokogiri/ffi/structs/xml_alloc.rb +16 -0
data/lib/nokogiri/ffi/structs/xml_attr.rb +20 -0
data/lib/nokogiri/ffi/structs/xml_attribute.rb +27 -0
data/lib/nokogiri/ffi/structs/xml_buffer.rb +16 -0
data/lib/nokogiri/ffi/structs/xml_char_encoding_handler.rb +11 -0
data/lib/nokogiri/ffi/structs/xml_document.rb +117 -0
data/lib/nokogiri/ffi/structs/xml_dtd.rb +28 -0
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_node.rb +28 -0
data/lib/nokogiri/ffi/structs/xml_node_set.rb +53 -0
data/lib/nokogiri/ffi/structs/xml_notation.rb +11 -0
data/lib/nokogiri/ffi/structs/xml_ns.rb +15 -0
data/lib/nokogiri/ffi/structs/xml_parser_context.rb +20 -0
data/lib/nokogiri/ffi/structs/xml_parser_input.rb +19 -0
data/lib/nokogiri/ffi/structs/xml_relax_ng.rb +14 -0
data/lib/nokogiri/ffi/structs/xml_sax_handler.rb +51 -0
data/lib/nokogiri/ffi/structs/xml_sax_push_parser_context.rb +124 -0
data/lib/nokogiri/ffi/structs/xml_schema.rb +13 -0
data/lib/nokogiri/ffi/structs/xml_syntax_error.rb +31 -0
data/lib/nokogiri/ffi/structs/xml_text_reader.rb +12 -0
data/lib/nokogiri/ffi/structs/xml_xpath_context.rb +38 -0
data/lib/nokogiri/ffi/structs/xml_xpath_object.rb +35 -0
data/lib/nokogiri/ffi/structs/xml_xpath_parser_context.rb +20 -0
data/lib/nokogiri/ffi/structs/xslt_stylesheet.rb +13 -0
data/lib/nokogiri/ffi/weak_bucket.rb +40 -0
data/lib/nokogiri/ffi/xml/attr.rb +41 -0
data/lib/nokogiri/ffi/xml/attribute_decl.rb +27 -0
data/lib/nokogiri/ffi/xml/cdata.rb +19 -0
data/lib/nokogiri/ffi/xml/comment.rb +18 -0
data/lib/nokogiri/ffi/xml/document.rb +174 -0
data/lib/nokogiri/ffi/xml/document_fragment.rb +21 -0
data/lib/nokogiri/ffi/xml/dtd.rb +67 -0
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 +36 -0
data/lib/nokogiri/ffi/xml/entity_reference.rb +19 -0
data/lib/nokogiri/ffi/xml/namespace.rb +44 -0
data/lib/nokogiri/ffi/xml/node.rb +559 -0
data/lib/nokogiri/ffi/xml/node_set.rb +150 -0
data/lib/nokogiri/ffi/xml/processing_instruction.rb +20 -0
data/lib/nokogiri/ffi/xml/reader.rb +236 -0
data/lib/nokogiri/ffi/xml/relax_ng.rb +85 -0
data/lib/nokogiri/ffi/xml/sax/parser.rb +143 -0
data/lib/nokogiri/ffi/xml/sax/parser_context.rb +79 -0
data/lib/nokogiri/ffi/xml/sax/push_parser.rb +51 -0
data/lib/nokogiri/ffi/xml/schema.rb +109 -0
data/lib/nokogiri/ffi/xml/syntax_error.rb +98 -0
data/lib/nokogiri/ffi/xml/text.rb +18 -0
data/lib/nokogiri/ffi/xml/xpath.rb +9 -0
data/lib/nokogiri/ffi/xml/xpath_context.rb +153 -0
data/lib/nokogiri/ffi/xslt/stylesheet.rb +77 -0
data/lib/nokogiri/html.rb +13 -47
data/lib/nokogiri/html/builder.rb +27 -1
data/lib/nokogiri/html/document.rb +201 -7
data/lib/nokogiri/html/document_fragment.rb +41 -0
data/lib/nokogiri/html/element_description.rb +23 -0
data/lib/nokogiri/html/entity_lookup.rb +2 -0
data/lib/nokogiri/html/sax/parser.rb +34 -3
data/lib/nokogiri/html/sax/parser_context.rb +16 -0
data/lib/nokogiri/nokogiri.rb +1 -0
data/lib/nokogiri/version.rb +40 -1
data/lib/nokogiri/version_warning.rb +14 -0
data/lib/nokogiri/xml.rb +32 -53
data/lib/nokogiri/xml/attr.rb +5 -0
data/lib/nokogiri/xml/attribute_decl.rb +18 -0
data/lib/nokogiri/xml/builder.rb +349 -29
data/lib/nokogiri/xml/cdata.rb +3 -1
data/lib/nokogiri/xml/character_data.rb +7 -0
data/lib/nokogiri/xml/document.rb +166 -14
data/lib/nokogiri/xml/document_fragment.rb +76 -1
data/lib/nokogiri/xml/dtd.rb +16 -3
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 +19 -0
data/lib/nokogiri/xml/namespace.rb +13 -0
data/lib/nokogiri/xml/node.rb +561 -166
data/lib/nokogiri/xml/node/save_options.rb +22 -2
data/lib/nokogiri/xml/node_set.rb +202 -40
data/lib/nokogiri/xml/parse_options.rb +93 -0
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/processing_instruction.rb +2 -0
data/lib/nokogiri/xml/reader.rb +93 -8
data/lib/nokogiri/xml/relax_ng.rb +32 -0
data/lib/nokogiri/xml/sax.rb +1 -7
data/lib/nokogiri/xml/sax/document.rb +107 -2
data/lib/nokogiri/xml/sax/parser.rb +57 -7
data/lib/nokogiri/xml/sax/parser_context.rb +16 -0
data/lib/nokogiri/xml/sax/push_parser.rb +13 -1
data/lib/nokogiri/xml/schema.rb +63 -0
data/lib/nokogiri/xml/syntax_error.rb +25 -1
data/lib/nokogiri/xml/text.rb +4 -1
data/lib/nokogiri/xml/xpath.rb +1 -1
data/lib/nokogiri/xml/xpath/syntax_error.rb +3 -0
data/lib/nokogiri/xml/xpath_context.rb +2 -0
data/lib/nokogiri/xslt.rb +26 -2
data/lib/nokogiri/xslt/stylesheet.rb +19 -0
data/lib/xsd/xmlparser/nokogiri.rb +45 -9
data/tasks/cross_compile.rb +173 -0
data/tasks/test.rb +25 -69
data/test/css/test_nthiness.rb +3 -4
data/test/css/test_parser.rb +75 -20
data/test/css/test_tokenizer.rb +23 -1
data/test/css/test_xpath_visitor.rb +10 -1
data/test/decorators/test_slop.rb +16 -0
data/test/ffi/test_document.rb +35 -0
data/test/files/2ch.html +108 -0
data/test/files/address_book.rlx +12 -0
data/test/files/address_book.xml +10 -0
data/test/files/bar/bar.xsd +4 -0
data/test/files/encoding.html +82 -0
data/test/files/encoding.xhtml +84 -0
data/test/files/foo/foo.xsd +4 -0
data/test/files/po.xml +32 -0
data/test/files/po.xsd +66 -0
data/test/files/shift_jis.html +10 -0
data/test/files/shift_jis.xml +5 -0
data/test/files/snuggles.xml +3 -0
data/test/files/staff.dtd +10 -0
data/test/files/valid_bar.xml +2 -0
data/test/helper.rb +101 -23
data/test/html/sax/test_parser.rb +81 -2
data/test/html/sax/test_parser_context.rb +48 -0
data/test/html/test_builder.rb +39 -8
data/test/html/test_document.rb +186 -23
data/test/html/test_document_encoding.rb +78 -1
data/test/html/test_document_fragment.rb +253 -0
data/test/html/test_element_description.rb +98 -0
data/test/html/test_named_characters.rb +1 -1
data/test/html/test_node.rb +124 -36
data/test/html/test_node_encoding.rb +27 -0
data/test/test_convert_xpath.rb +1 -52
data/test/test_css_cache.rb +2 -13
data/test/test_encoding_handler.rb +46 -0
data/test/test_memory_leak.rb +88 -19
data/test/test_nokogiri.rb +38 -5
data/test/test_reader.rb +188 -6
data/test/test_soap4r_sax.rb +52 -0
data/test/test_xslt_transforms.rb +183 -83
data/test/xml/node/test_save_options.rb +1 -1
data/test/xml/node/test_subclass.rb +44 -0
data/test/xml/sax/test_parser.rb +175 -4
data/test/xml/sax/test_parser_context.rb +113 -0
data/test/xml/sax/test_push_parser.rb +90 -2
data/test/xml/test_attr.rb +35 -1
data/test/xml/test_attribute_decl.rb +82 -0
data/test/xml/test_builder.rb +186 -1
data/test/xml/test_cdata.rb +32 -1
data/test/xml/test_comment.rb +13 -1
data/test/xml/test_document.rb +415 -43
data/test/xml/test_document_encoding.rb +1 -1
data/test/xml/test_document_fragment.rb +173 -5
data/test/xml/test_dtd.rb +61 -6
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 +120 -0
data/test/xml/test_entity_reference.rb +5 -1
data/test/xml/test_namespace.rb +68 -0
data/test/xml/test_node.rb +546 -201
data/test/xml/test_node_attributes.rb +34 -0
data/test/xml/test_node_encoding.rb +33 -3
data/test/xml/test_node_reparenting.rb +321 -0
data/test/xml/test_node_set.rb +538 -2
data/test/xml/test_parse_options.rb +52 -0
data/test/xml/test_processing_instruction.rb +6 -1
data/test/xml/test_reader_encoding.rb +1 -1
data/test/xml/test_relax_ng.rb +60 -0
data/test/xml/test_schema.rb +94 -0
data/test/xml/test_syntax_error.rb +12 -0
data/test/xml/test_text.rb +35 -1
data/test/xml/test_unparented_node.rb +5 -5
data/test/xml/test_xpath.rb +142 -11
data/test/xslt/test_custom_functions.rb +94 -0
metadata +328 -92
data/ext/nokogiri/html_sax_parser.c +0 -57
data/ext/nokogiri/html_sax_parser.h +0 -11
data/ext/nokogiri/iconv.dll +0 -0
data/ext/nokogiri/libexslt.dll +0 -0
data/ext/nokogiri/libxml2.dll +0 -0
data/ext/nokogiri/libxslt.dll +0 -0
data/ext/nokogiri/native.so +0 -0
data/ext/nokogiri/xml_xpath.c +0 -53
data/ext/nokogiri/xml_xpath.h +0 -11
data/ext/nokogiri/zlib1.dll +0 -0
data/lib/action-nokogiri.rb +0 -30
data/lib/nokogiri/css/generated_parser.rb +0 -713
data/lib/nokogiri/css/generated_tokenizer.rb +0 -144
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 -28
data/lib/nokogiri/hpricot.rb +0 -51
data/lib/nokogiri/xml/comment.rb +0 -6
data/lib/nokogiri/xml/element.rb +0 -6
data/lib/nokogiri/xml/entity_declaration.rb +0 -9
data/lib/nokogiri/xml/fragment_handler.rb +0 -34
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 -426
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/test_gc.rb +0 -15

data/test/test_nokogiri.rb CHANGED Viewed

@@ -1,12 +1,44 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+require "helper"
 class TestNokogiri < Nokogiri::TestCase
-  def test_version
+  def test_versions
+    version_match = /\d+\.\d+\.\d+/
+    assert_match version_match, Nokogiri::VERSION
+    assert_match version_match, Nokogiri::LIBXML_VERSION
+    if defined?(FFI) && defined?(Nokogiri::LibXML)
+      assert_equal 'ffi', Nokogiri::VERSION_INFO['libxml']['binding']
+      if RUBY_PLATFORM =~ /java/
+        assert_equal 'jruby', Nokogiri::VERSION_INFO['libxml']['platform']
+      else
+        assert_equal 'ruby', Nokogiri::VERSION_INFO['libxml']['platform']
+      end
+      assert Nokogiri.ffi?
+    else
+      assert_equal 'extension', Nokogiri::VERSION_INFO['libxml']['binding']
+      assert_match version_match, Nokogiri::VERSION_INFO['libxml']['compiled']
+      assert_equal Nokogiri::LIBXML_VERSION, Nokogiri::VERSION_INFO['libxml']['compiled']
+      assert ! Nokogiri.ffi?
+    end
+    assert_match version_match, Nokogiri::VERSION_INFO['libxml']['loaded']
     Nokogiri::LIBXML_PARSER_VERSION =~ /(\d)(\d{2})(\d{2})/
     major = $1.to_i
     minor = $2.to_i
     bug   = $3.to_i
-    assert_equal "#{major}.#{minor}.#{bug}", Nokogiri::LIBXML_VERSION
+    assert_equal "#{major}.#{minor}.#{bug}", Nokogiri::VERSION_INFO['libxml']['loaded']
+  end
+  def test_libxml_iconv
+    assert Nokogiri.const_defined?(:LIBXML_ICONV_ENABLED)
+  end
+  def test_parse_with_io
+    doc = Nokogiri.parse(
+      StringIO.new("<html><head><title></title><body></body></html>")
+    )
+    assert_instance_of Nokogiri::HTML::Document, doc
   end
   def test_xml?
@@ -41,7 +73,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>
@@ -91,7 +123,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)
@@ -102,4 +134,5 @@ class TestNokogiri < Nokogiri::TestCase
     doc.slop!
     assert_equal 1, doc.decorators(Nokogiri::XML::Node).select { |d| d == Nokogiri::Decorators::Slop }.size
   end
 end

data/test/test_reader.rb CHANGED Viewed

@@ -1,7 +1,123 @@
 # -*- 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
+    io = File.open SNUGGLES_FILE
+    reader = Nokogiri::XML::Reader.from_io(io)
+    assert_equal io, reader.source
+  end
+  def test_empty_element?
+    reader = Nokogiri::XML::Reader.from_memory(<<-eoxml)
+<xml><city>Paris</city><state/></xml>
+    eoxml
+    results = reader.map do |node|
+      if node.node_type == Nokogiri::XML::Node::ELEMENT_NODE
+        node.empty_element?
+      end
+    end
+    assert_equal [false, false, nil, nil, true, nil], results
+  end
+  def test_self_closing?
+    reader = Nokogiri::XML::Reader.from_memory(<<-eoxml)
+<xml><city>Paris</city><state/></xml>
+    eoxml
+    results = reader.map do |node|
+      if node.node_type == Nokogiri::XML::Node::ELEMENT_NODE
+        node.self_closing?
+      end
+    end
+    assert_equal [false, false, nil, nil, true, nil], results
+  end
+  def test_reader_takes_block
+    options = nil
+    Nokogiri::XML::Reader(File.read(XML_FILE), XML_FILE) do |cfg|
+      options = cfg
+      options.nonet.nowarning.dtdattr
+    end
+    assert options.nonet?
+    assert options.nowarning?
+    assert options.dtdattr?
+  end
+  def test_nil_raises
+    assert_raises(ArgumentError) {
+      Nokogiri::XML::Reader.from_memory(nil)
+    }
+    assert_raises(ArgumentError) {
+      Nokogiri::XML::Reader.from_io(nil)
+    }
+  end
+  def test_from_io
+    io = File.open SNUGGLES_FILE
+    reader = Nokogiri::XML::Reader.from_io(io)
+    assert_equal false, reader.default?
+    assert_equal [false, false, false, false, false, false, false],
+      reader.map { |x| x.default? }
+  end
+  def test_io
+    io = File.open SNUGGLES_FILE
+    reader = Nokogiri::XML::Reader(io)
+    assert_equal false, reader.default?
+    assert_equal [false, false, false, false, false, false, false],
+      reader.map { |x| x.default? }
+  end
+  def test_string_io
+    io = StringIO.new(<<-eoxml)
+    <x xmlns:tenderlove='http://tenderlovemaking.com/'>
+      <tenderlove:foo awesome='true'>snuggles!</tenderlove:foo>
+    </x>
+    eoxml
+    reader = Nokogiri::XML::Reader(io)
+    assert_equal false, reader.default?
+    assert_equal [false, false, false, false, false, false, false],
+      reader.map { |x| x.default? }
+  end
+  class ReallyBadIO
+    def read(size)
+      'a' * size ** 10
+    end
+  end
+  unless Nokogiri.ffi?
+    def test_io_that_reads_too_much
+      io = ReallyBadIO.new
+      Nokogiri::XML::Reader(io)
+    end
+  end
+  def test_in_memory
+    assert Nokogiri::XML::Reader(<<-eoxml)
+    <x xmlns:tenderlove='http://tenderlovemaking.com/'>
+      <tenderlove:foo awesome='true'>snuggles!</tenderlove:foo>
+    </x>
+    eoxml
+  end
+  def test_reader_holds_on_to_string
+    xml = <<-eoxml
+    <x xmlns:tenderlove='http://tenderlovemaking.com/'>
+      <tenderlove:foo awesome='true'>snuggles!</tenderlove:foo>
+    </x>
+    eoxml
+    reader = Nokogiri::XML::Reader(xml)
+    if Nokogiri.ffi?
+      assert_not_nil reader.source
+      assert reader.source.is_a?(FFI::MemoryPointer)
+    else
+      assert_equal xml, reader.source
+    end
+  end
   def test_default?
     reader = Nokogiri::XML::Reader.from_memory(<<-eoxml)
     <x xmlns:tenderlove='http://tenderlovemaking.com/'>
@@ -31,13 +147,9 @@ class TestReader < Nokogiri::TestCase
       <foo>
     </x>
     eoxml
-    error_happened = false
-    begin
+    assert_raises(Nokogiri::XML::SyntaxError) do
       reader.each { |node| }
-    rescue Nokogiri::XML::SyntaxError => ex
-      error_happened = true
     end
-    assert error_happened
     assert 1, reader.errors.length
   end
@@ -183,6 +295,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
@@ -227,6 +367,34 @@ class TestReader < Nokogiri::TestCase
                  reader.map { |n| n.name })
   end
+  def test_base_uri
+    reader = Nokogiri::XML::Reader.from_memory(<<-eoxml)
+      <x xml:base="http://base.example.org/base/">
+        <link href="link"/>
+        <other xml:base="http://other.example.org/"/>
+        <relative xml:base="relative">
+          <link href="stuff" />
+        </relative>
+      </x>
+    eoxml
+    assert_nil reader.base_uri
+    assert_equal(["http://base.example.org/base/",
+                  "http://base.example.org/base/",
+                  "http://base.example.org/base/",
+                  "http://base.example.org/base/",
+                  "http://other.example.org/",
+                  "http://base.example.org/base/",
+                  "http://base.example.org/base/relative",
+                  "http://base.example.org/base/relative",
+                  "http://base.example.org/base/relative",
+                  "http://base.example.org/base/relative",
+                  "http://base.example.org/base/relative",
+                  "http://base.example.org/base/",
+                  "http://base.example.org/base/"],
+                  reader.map {|n| n.base_uri })
+  end
   def test_read_from_memory
     called = false
     reader = Nokogiri::XML::Reader.from_memory('<foo>bar</foo>')
@@ -236,4 +404,18 @@ class TestReader < Nokogiri::TestCase
     end
     assert called
   end
+  def test_large_document_smoke_test
+    #  simply run on a large document to verify that there no GC issues
+    xml = []
+    xml << "<elements>"
+    10000.times { |j| xml << "<element id=\"#{j}\"/>" }
+    xml << "</elements>"
+    xml = xml.join("\n")
+    Nokogiri::XML::Reader.from_memory(xml).each do |e|
+      e.attributes
+    end
+  end
 end

data/test/test_soap4r_sax.rb ADDED Viewed

@@ -0,0 +1,52 @@
+require "helper"
+module XSD
+  module XMLParser
+    class Parser
+      @factory_added = nil
+      class << self; attr_reader :factory_added; end
+      def self.add_factory o
+        @factory_added = o
+      end
+      def initialize *args
+        @charset = nil
+      end
+      def characters foo
+      end
+      def start_element *args
+      end
+      def end_element *args
+      end
+    end
+  end
+end
+require 'xsd/xmlparser/nokogiri'
+class TestSoap4rSax < Nokogiri::TestCase
+  def test_factory_added
+    assert_equal XSD::XMLParser::Nokogiri, XSD::XMLParser::Nokogiri.factory_added
+  end
+  def test_parse
+    o = Class.new(::XSD::XMLParser::Nokogiri) do
+      attr_accessor :element_started
+      def initialize *args
+        super
+        @element_started = false
+      end
+      def start_element *args
+        @element_started = true
+      end
+    end.new 'foo'
+    o.do_parse '<?xml version="1.0" ?><root xmlns="http://example.com/"/>'
+    assert o.element_started, 'element started'
+  end
+end

data/test/test_xslt_transforms.rb CHANGED Viewed

@@ -1,93 +1,193 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "helper"))
+require "helper"
 class TestXsltTransforms < Nokogiri::TestCase
-  def test_transform
-    assert doc = Nokogiri::XML.parse(File.read(XML_FILE))
-    assert doc.xml?
-    assert style = Nokogiri::XSLT.parse(File.read(XSLT_FILE))
-    assert result = style.apply_to(doc, ['title', '"Booyah"'])
-    assert_match %r{<h1>Booyah</h1>}, result
-    assert_match %r{<th.*Employee ID</th>}, result
-    assert_match %r{<th.*Name</th>}, result
-    assert_match %r{<th.*Position</th>}, result
-    assert_match %r{<th.*Salary</th>}, result
-    assert_match %r{<td>EMP0003</td>}, result
-    assert_match %r{<td>Margaret Martin</td>}, result
-    assert_match %r{<td>Computer Specialist</td>}, result
-    assert_match %r{<td>100,000</td>}, result
-    assert_no_match %r{Dallas|Texas}, result
-    assert_no_match %r{Female}, result
-    assert result = style.apply_to(doc, ['title', '"Grandma"'])
-    assert_match %r{<h1>Grandma</h1>}, result
-    assert result = style.apply_to(doc)
-    assert_match %r{<h1></h1>}, result
+  def setup
+    @doc = Nokogiri::XML(File.open(XML_FILE))
   end
-  def test_transform2
-    assert doc = Nokogiri::XML.parse(File.read(XML_FILE))
-    assert doc.xml?
-    assert style = Nokogiri::XSLT.parse(File.read(XSLT_FILE))
-    assert result_doc = style.transform(doc, ['title', '"Booyah"'])
-    assert doc.xml?
+  if Nokogiri.uses_libxml?
+    def test_class_methods
+      style = Nokogiri::XSLT(File.read(XSLT_FILE))
-    assert result_string = style.apply_to(doc, ['title', '"Booyah"'])
-    assert_equal result_string, style.serialize(result_doc)
-  end
-  def test_quote_params
-    h = {
-      :sym   => %{xxx},
-      'str'  => %{"xxx"},
-      :sym2  => %{'xxx'},
-      'str2' => %{x'x'x},
-      :sym3  => %{x"x"x},
-    }
-    hh=h.dup
-    result_hash = Nokogiri::XSLT.quote_params(h)
-    assert_equal hh, h # non-destructive
-    a=h.to_a.flatten
-    result_array = Nokogiri::XSLT.quote_params(a)
-    assert_equal h.to_a.flatten, a #non-destructive
-    assert_equal  result_array, result_hash
-  end
+      assert result = style.apply_to(@doc, ['title', '"Grandma"'])
+      assert_match %r{<h1>Grandma</h1>}, result
+    end
+    def test_transform
+      assert style = Nokogiri::XSLT.parse(File.read(XSLT_FILE))
+      assert result = style.apply_to(@doc, ['title', '"Booyah"'])
+      assert_match %r{<h1>Booyah</h1>}, result
+      assert_match %r{<th.*Employee ID</th>}, result
+      assert_match %r{<th.*Name</th>}, result
+      assert_match %r{<th.*Position</th>}, result
+      assert_match %r{<th.*Salary</th>}, result
+      assert_match %r{<td>EMP0003</td>}, result
+      assert_match %r{<td>Margaret Martin</td>}, result
+      assert_match %r{<td>Computer Specialist</td>}, result
+      assert_match %r{<td>100,000</td>}, result
+      assert_no_match %r{Dallas|Texas}, result
+      assert_no_match %r{Female}, result
-  def test_exslt
-    assert doc = Nokogiri::XML.parse(File.read(EXML_FILE))
-    assert doc.xml?
-    assert style = Nokogiri::XSLT.parse(File.read(EXSLT_FILE))
-    params = {
-      :p1 => 'xxx',
-      :p2 => "x'x'x",
-      :p3 => 'x"x"x',
-      :p4 => '"xxx"'
-    }
-    result_doc = Nokogiri::XML.parse(style.apply_to(doc,
-        Nokogiri::XSLT.quote_params(params)))
-    assert_equal 'func-result', result_doc.at('/root/function').content
-    assert_equal 3, result_doc.at('/root/max').content.to_i
-    assert_match(
-      /\d{4}-\d\d-\d\d[-|+]\d\d:\d\d/,
-      result_doc.at('/root/date').content
-      )
-    result_doc.xpath('/root/params/*').each do  |p|
-      assert_equal p.content, params[p.name.intern]
+      assert result = style.apply_to(@doc, ['title', '"Grandma"'])
+      assert_match %r{<h1>Grandma</h1>}, result
+      assert result = style.apply_to(@doc)
+      assert_match %r{<h1></h1>}, result
     end
-    check_params result_doc, params
-    result_doc = Nokogiri::XML.parse(style.apply_to(doc,
-        Nokogiri::XSLT.quote_params(params.to_a.flatten)))
-    check_params result_doc, params
-  end
-  def check_params result_doc, params
-    result_doc.xpath('/root/params/*').each do  |p|
-      assert_equal p.content, params[p.name.intern]
+    def test_transform_with_output_style
+      xslt = Nokogiri::XSLT(<<-eoxslt)
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<xsl:stylesheet version="1.0"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<xsl:output method="text" version="1.0"
+encoding="iso-8859-1" indent="yes"/>
+<xsl:param name="title"/>
+<xsl:template match="/">
+  <html>
+  <body>
+    <xsl:for-each select="staff/employee">
+    <tr>
+      <td><xsl:value-of select="employeeId"/></td>
+      <td><xsl:value-of select="name"/></td>
+      <td><xsl:value-of select="position"/></td>
+      <td><xsl:value-of select="salary"/></td>
+    </tr>
+    </xsl:for-each>
+    </table>
+  </body>
+  </html>
+</xsl:template>
+</xsl:stylesheet>
+      eoxslt
+      assert_no_match(/<td>/, xslt.apply_to(@doc, ['title', 'foo']))
+    end
+    def test_transform_arg_error
+      assert style = Nokogiri::XSLT(File.read(XSLT_FILE))
+      assert_raises(TypeError) do
+        style.transform(@doc, :foo)
+      end
+    end
+    def test_transform_with_hash
+      assert style = Nokogiri::XSLT(File.read(XSLT_FILE))
+      result = style.transform(@doc, {'title' => '"Booyah"'})
+      assert result.html?
+      assert_equal "Booyah", result.at_css("h1").content
+    end
+    def test_transform2
+      assert style = Nokogiri::XSLT(File.open(XSLT_FILE))
+      assert result_doc = style.transform(@doc)
+      assert result_doc.html?
+      assert_equal "", result_doc.at_css("h1").content
+      assert style = Nokogiri::XSLT(File.read(XSLT_FILE))
+      assert result_doc = style.transform(@doc, ['title', '"Booyah"'])
+      assert result_doc.html?
+      assert_equal "Booyah", result_doc.at_css("h1").content
+      assert result_string = style.apply_to(@doc, ['title', '"Booyah"'])
+      assert_equal result_string, style.serialize(result_doc)
+    end
+    def test_transform_with_quote_params
+      assert style = Nokogiri::XSLT(File.open(XSLT_FILE))
+      assert result_doc = style.transform(@doc, Nokogiri::XSLT.quote_params(['title', 'Booyah']))
+      assert result_doc.html?
+      assert_equal "Booyah", result_doc.at_css("h1").content
+      assert style = Nokogiri::XSLT.parse(File.read(XSLT_FILE))
+      assert result_doc = style.transform(@doc, Nokogiri::XSLT.quote_params({'title' => 'Booyah'}))
+      assert result_doc.html?
+      assert_equal "Booyah", result_doc.at_css("h1").content
+    end
+    def test_quote_params
+      h = {
+        :sym   => %{xxx},
+        'str'  => %{"xxx"},
+        :sym2  => %{'xxx'},
+        'str2' => %{x'x'x},
+        :sym3  => %{x"x"x},
+      }
+      hh=h.dup
+      result_hash = Nokogiri::XSLT.quote_params(h)
+      assert_equal hh, h # non-destructive
+      a=h.to_a.flatten
+      result_array = Nokogiri::XSLT.quote_params(a)
+      assert_equal h.to_a.flatten, a #non-destructive
+      assert_equal  result_array, result_hash
+    end
+    if Nokogiri.uses_libxml? # By now, cannot get it working on JRuby.
+      def test_exslt
+        assert doc = Nokogiri::XML.parse(File.read(EXML_FILE))
+        assert doc.xml?
+        assert style = Nokogiri::XSLT.parse(File.read(EXSLT_FILE))
+        params = {
+          :p1 => 'xxx',
+          :p2 => "x'x'x",
+          :p3 => 'x"x"x',
+          :p4 => '"xxx"'
+        }
+        result_doc = Nokogiri::XML.parse(style.apply_to(doc,
+            Nokogiri::XSLT.quote_params(params)))
+        assert_equal 'func-result', result_doc.at('/root/function').content
+        assert_equal 3, result_doc.at('/root/max').content.to_i
+        assert_match(
+          /\d{4}-\d\d-\d\d([-|+]\d\d:\d\d)?/,
+          result_doc.at('/root/date').content
+          )
+        result_doc.xpath('/root/params/*').each do  |p|
+          assert_equal p.content, params[p.name.intern]
+        end
+        check_params result_doc, params
+        result_doc = Nokogiri::XML.parse(style.apply_to(doc,
+            Nokogiri::XSLT.quote_params(params.to_a.flatten)))
+        check_params result_doc, params
+      end
+    end
+    def test_xslt_parse_error
+      xslt_str = <<-EOX
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <!-- Not well-formed: -->
+  <xsl:template match="/"/>
+    <values>
+      <xsl:for-each select="//*">
+        <value>
+          <xsl:value-of select="@id"/>
+        </value>
+      </xsl:for-each>
+    </values>
+  </xsl:template>
+</xsl:stylesheet>}
+      EOX
+      assert_raises(RuntimeError) { Nokogiri::XSLT.parse(xslt_str) }
+    end
+    def test_passing_a_non_document_to_transform
+      xsl = Nokogiri::XSLT('<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"></xsl:stylesheet>')
+      assert_raises(ArgumentError) { xsl.transform("<div></div>") }
+      assert_raises(ArgumentError) { xsl.transform(Nokogiri::HTML("").css("body")) }
+    end
+    def check_params result_doc, params
+      result_doc.xpath('/root/params/*').each do  |p|
+        assert_equal p.content, params[p.name.intern]
+      end
     end
   end
 end