RubyGems - nokogiri - Versions diffs - 1.4.3.1-java → 1.5.0-java - Mend

nokogiri 1.4.3.1-java → 1.5.0-java

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.

Files changed (231) hide show

data/.gemtest +0 -0
data/CHANGELOG.ja.rdoc +113 -0
data/CHANGELOG.rdoc +113 -1
data/Manifest.txt +72 -68
data/README.ja.rdoc +4 -4
data/README.rdoc +31 -7
data/Rakefile +110 -132
data/bin/nokogiri +7 -3
data/ext/java/nokogiri/EncodingHandler.java +124 -0
data/ext/java/nokogiri/HtmlDocument.java +119 -0
data/ext/java/nokogiri/HtmlElementDescription.java +145 -0
data/ext/java/nokogiri/HtmlEntityLookup.java +79 -0
data/ext/java/nokogiri/HtmlSaxParserContext.java +259 -0
data/ext/java/nokogiri/NokogiriService.java +590 -0
data/ext/java/nokogiri/XmlAttr.java +180 -0
data/ext/java/nokogiri/XmlAttributeDecl.java +130 -0
data/ext/java/nokogiri/XmlCdata.java +84 -0
data/ext/java/nokogiri/XmlComment.java +86 -0
data/ext/java/nokogiri/XmlDocument.java +519 -0
data/ext/java/nokogiri/XmlDocumentFragment.java +223 -0
data/ext/java/nokogiri/XmlDtd.java +469 -0
data/ext/java/nokogiri/XmlElement.java +195 -0
data/ext/java/nokogiri/XmlElementContent.java +382 -0
data/ext/java/nokogiri/XmlElementDecl.java +152 -0
data/ext/java/nokogiri/XmlEntityDecl.java +162 -0
data/ext/java/nokogiri/XmlEntityReference.java +97 -0
data/ext/java/nokogiri/XmlNamespace.java +183 -0
data/ext/java/nokogiri/XmlNode.java +1378 -0
data/ext/java/nokogiri/XmlNodeSet.java +267 -0
data/ext/java/nokogiri/XmlProcessingInstruction.java +99 -0
data/ext/java/nokogiri/XmlReader.java +408 -0
data/ext/java/nokogiri/XmlRelaxng.java +144 -0
data/ext/java/nokogiri/XmlSaxParserContext.java +367 -0
data/ext/java/nokogiri/XmlSaxPushParser.java +184 -0
data/ext/java/nokogiri/XmlSchema.java +324 -0
data/ext/java/nokogiri/XmlSyntaxError.java +119 -0
data/ext/java/nokogiri/XmlText.java +119 -0
data/ext/java/nokogiri/XmlXpathContext.java +199 -0
data/ext/java/nokogiri/XsltStylesheet.java +197 -0
data/ext/java/nokogiri/internals/HtmlDomParserContext.java +204 -0
data/ext/java/nokogiri/internals/NokogiriDocumentCache.java +73 -0
data/ext/java/nokogiri/internals/NokogiriErrorHandler.java +86 -0
data/ext/java/nokogiri/internals/NokogiriHandler.java +327 -0
data/ext/java/nokogiri/internals/NokogiriHelpers.java +639 -0
data/ext/java/nokogiri/internals/NokogiriNamespaceCache.java +167 -0
data/ext/java/nokogiri/internals/NokogiriNamespaceContext.java +130 -0
data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler.java +74 -0
data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler4NekoHtml.java +121 -0
data/ext/java/nokogiri/internals/NokogiriStrictErrorHandler.java +79 -0
data/ext/java/nokogiri/internals/NokogiriXPathFunction.java +141 -0
data/ext/java/nokogiri/internals/NokogiriXPathFunctionResolver.java +73 -0
data/ext/java/nokogiri/internals/NokogiriXPathVariableResolver.java +67 -0
data/ext/java/nokogiri/internals/NokogiriXsltErrorListener.java +86 -0
data/ext/java/nokogiri/internals/ParserContext.java +276 -0
data/ext/java/nokogiri/internals/PushInputStream.java +411 -0
data/ext/java/nokogiri/internals/ReaderNode.java +531 -0
data/ext/java/nokogiri/internals/SaveContextVisitor.java +567 -0
data/ext/java/nokogiri/internals/SchemaErrorHandler.java +76 -0
data/ext/java/nokogiri/internals/XmlDeclHandler.java +42 -0
data/ext/java/nokogiri/internals/XmlDomParser.java +76 -0
data/ext/java/nokogiri/internals/XmlDomParserContext.java +244 -0
data/ext/java/nokogiri/internals/XmlSaxParser.java +65 -0
data/ext/java/nokogiri/internals/XsltExtensionFunction.java +72 -0
data/ext/nokogiri/depend +358 -32
data/ext/nokogiri/extconf.rb +10 -6
data/ext/nokogiri/nokogiri.c +23 -3
data/ext/nokogiri/nokogiri.h +7 -2
data/ext/nokogiri/xml_document.c +9 -0
data/ext/nokogiri/xml_dtd.c +2 -2
data/ext/nokogiri/xml_io.c +32 -7
data/ext/nokogiri/xml_node.c +45 -25
data/ext/nokogiri/xml_node_set.c +1 -1
data/ext/nokogiri/xml_relax_ng.c +0 -7
data/ext/nokogiri/xml_sax_parser.c +14 -7
data/ext/nokogiri/xml_sax_parser_context.c +40 -0
data/ext/nokogiri/xml_xpath_context.c +33 -2
data/ext/nokogiri/xslt_stylesheet.c +128 -6
data/lib/isorelax.jar +0 -0
data/lib/jing.jar +0 -0
data/lib/nekodtd.jar +0 -0
data/lib/nekohtml.jar +0 -0
data/lib/nokogiri/css/parser.rb +665 -70
data/lib/nokogiri/css/parser.y +3 -1
data/lib/nokogiri/css/parser_extras.rb +91 -0
data/lib/nokogiri/css/tokenizer.rb +148 -3
data/lib/nokogiri/css/tokenizer.rex +1 -1
data/lib/nokogiri/css/xpath_visitor.rb +15 -7
data/lib/nokogiri/css.rb +5 -3
data/lib/nokogiri/decorators/slop.rb +5 -3
data/lib/nokogiri/html/document.rb +142 -19
data/lib/nokogiri/html/document_fragment.rb +19 -17
data/lib/nokogiri/html/element_description_defaults.rb +671 -0
data/lib/nokogiri/html/sax/parser.rb +6 -2
data/lib/nokogiri/html.rb +1 -0
data/lib/nokogiri/nokogiri.jar +0 -0
data/lib/nokogiri/version.rb +76 -26
data/lib/nokogiri/xml/attribute_decl.rb +1 -1
data/lib/nokogiri/xml/builder.rb +7 -0
data/lib/nokogiri/xml/document.rb +43 -2
data/lib/nokogiri/xml/document_fragment.rb +16 -2
data/lib/nokogiri/xml/dtd.rb +12 -1
data/lib/nokogiri/xml/element_decl.rb +1 -1
data/lib/nokogiri/xml/entity_decl.rb +1 -1
data/lib/nokogiri/xml/node/save_options.rb +20 -1
data/lib/nokogiri/xml/node.rb +198 -78
data/lib/nokogiri/xml/node_set.rb +10 -3
data/lib/nokogiri/xml/parse_options.rb +8 -0
data/lib/nokogiri/xml/reader.rb +42 -6
data/lib/nokogiri/xml/sax/document.rb +4 -2
data/lib/nokogiri/xml/schema.rb +7 -1
data/lib/nokogiri/xslt/stylesheet.rb +1 -1
data/lib/nokogiri/xslt.rb +9 -5
data/lib/nokogiri.rb +19 -25
data/lib/xercesImpl.jar +0 -0
data/nokogiri_help_responses.md +40 -0
data/tasks/cross_compile.rb +130 -136
data/tasks/nokogiri.org.rb +18 -0
data/tasks/test.rb +2 -2
data/test/css/test_parser.rb +29 -18
data/test/css/test_tokenizer.rb +8 -0
data/test/decorators/test_slop.rb +16 -0
data/test/files/encoding.html +82 -0
data/test/files/encoding.xhtml +84 -0
data/test/files/metacharset.html +10 -0
data/test/files/noencoding.html +47 -0
data/test/helper.rb +5 -1
data/test/html/sax/test_parser.rb +65 -3
data/test/html/test_document.rb +75 -1
data/test/html/test_document_encoding.rb +61 -0
data/test/html/test_document_fragment.rb +50 -5
data/test/html/test_element_description.rb +4 -2
data/test/html/test_node.rb +9 -0
data/test/test_memory_leak.rb +20 -35
data/test/test_nokogiri.rb +14 -20
data/test/test_reader.rb +23 -6
data/test/test_xslt_transforms.rb +6 -2
data/test/xml/node/test_save_options.rb +10 -2
data/test/xml/sax/test_parser.rb +39 -8
data/test/xml/sax/test_parser_context.rb +50 -0
data/test/xml/sax/test_push_parser.rb +18 -1
data/test/xml/test_attribute_decl.rb +7 -3
data/test/xml/test_builder.rb +17 -0
data/test/xml/test_document.rb +34 -5
data/test/xml/test_document_fragment.rb +14 -2
data/test/xml/test_dtd.rb +28 -3
data/test/xml/test_element_content.rb +1 -1
data/test/xml/test_element_decl.rb +1 -1
data/test/xml/test_entity_decl.rb +12 -10
data/test/xml/test_namespace.rb +7 -5
data/test/xml/test_node.rb +65 -13
data/test/xml/test_node_reparenting.rb +72 -31
data/test/xml/test_node_set.rb +57 -0
data/test/xml/test_schema.rb +5 -0
data/test/xml/test_xpath.rb +32 -0
data/test/xslt/test_custom_functions.rb +94 -0
data/test/xslt/test_exception_handling.rb +37 -0
metadata +512 -517
data/deps.rip +0 -5
data/ext/nokogiri/libcharset-1.dll +0 -0
data/ext/nokogiri/libexslt.dll +0 -0
data/ext/nokogiri/libiconv-2.dll +0 -0
data/ext/nokogiri/libxml2.dll +0 -0
data/ext/nokogiri/libxslt.dll +0 -0
data/ext/nokogiri/zlib1.dll +0 -0
data/lib/nokogiri/css/generated_parser.rb +0 -676
data/lib/nokogiri/css/generated_tokenizer.rb +0 -146
data/lib/nokogiri/ffi/encoding_handler.rb +0 -42
data/lib/nokogiri/ffi/html/document.rb +0 -28
data/lib/nokogiri/ffi/html/element_description.rb +0 -81
data/lib/nokogiri/ffi/html/entity_lookup.rb +0 -16
data/lib/nokogiri/ffi/html/sax/parser_context.rb +0 -38
data/lib/nokogiri/ffi/io_callbacks.rb +0 -42
data/lib/nokogiri/ffi/libxml.rb +0 -411
data/lib/nokogiri/ffi/structs/common_node.rb +0 -38
data/lib/nokogiri/ffi/structs/html_elem_desc.rb +0 -24
data/lib/nokogiri/ffi/structs/html_entity_desc.rb +0 -13
data/lib/nokogiri/ffi/structs/xml_alloc.rb +0 -16
data/lib/nokogiri/ffi/structs/xml_attr.rb +0 -19
data/lib/nokogiri/ffi/structs/xml_attribute.rb +0 -27
data/lib/nokogiri/ffi/structs/xml_buffer.rb +0 -16
data/lib/nokogiri/ffi/structs/xml_char_encoding_handler.rb +0 -11
data/lib/nokogiri/ffi/structs/xml_document.rb +0 -117
data/lib/nokogiri/ffi/structs/xml_dtd.rb +0 -28
data/lib/nokogiri/ffi/structs/xml_element.rb +0 -26
data/lib/nokogiri/ffi/structs/xml_element_content.rb +0 -17
data/lib/nokogiri/ffi/structs/xml_entity.rb +0 -32
data/lib/nokogiri/ffi/structs/xml_enumeration.rb +0 -12
data/lib/nokogiri/ffi/structs/xml_node.rb +0 -28
data/lib/nokogiri/ffi/structs/xml_node_set.rb +0 -53
data/lib/nokogiri/ffi/structs/xml_notation.rb +0 -11
data/lib/nokogiri/ffi/structs/xml_ns.rb +0 -15
data/lib/nokogiri/ffi/structs/xml_parser_context.rb +0 -19
data/lib/nokogiri/ffi/structs/xml_relax_ng.rb +0 -14
data/lib/nokogiri/ffi/structs/xml_sax_handler.rb +0 -51
data/lib/nokogiri/ffi/structs/xml_sax_push_parser_context.rb +0 -124
data/lib/nokogiri/ffi/structs/xml_schema.rb +0 -13
data/lib/nokogiri/ffi/structs/xml_syntax_error.rb +0 -31
data/lib/nokogiri/ffi/structs/xml_text_reader.rb +0 -12
data/lib/nokogiri/ffi/structs/xml_xpath_context.rb +0 -38
data/lib/nokogiri/ffi/structs/xml_xpath_object.rb +0 -35
data/lib/nokogiri/ffi/structs/xml_xpath_parser_context.rb +0 -20
data/lib/nokogiri/ffi/structs/xslt_stylesheet.rb +0 -13
data/lib/nokogiri/ffi/weak_bucket.rb +0 -40
data/lib/nokogiri/ffi/xml/attr.rb +0 -41
data/lib/nokogiri/ffi/xml/attribute_decl.rb +0 -27
data/lib/nokogiri/ffi/xml/cdata.rb +0 -19
data/lib/nokogiri/ffi/xml/comment.rb +0 -18
data/lib/nokogiri/ffi/xml/document.rb +0 -166
data/lib/nokogiri/ffi/xml/document_fragment.rb +0 -21
data/lib/nokogiri/ffi/xml/dtd.rb +0 -67
data/lib/nokogiri/ffi/xml/element_content.rb +0 -43
data/lib/nokogiri/ffi/xml/element_decl.rb +0 -19
data/lib/nokogiri/ffi/xml/entity_decl.rb +0 -36
data/lib/nokogiri/ffi/xml/entity_reference.rb +0 -19
data/lib/nokogiri/ffi/xml/namespace.rb +0 -44
data/lib/nokogiri/ffi/xml/node.rb +0 -554
data/lib/nokogiri/ffi/xml/node_set.rb +0 -149
data/lib/nokogiri/ffi/xml/processing_instruction.rb +0 -20
data/lib/nokogiri/ffi/xml/reader.rb +0 -236
data/lib/nokogiri/ffi/xml/relax_ng.rb +0 -85
data/lib/nokogiri/ffi/xml/sax/parser.rb +0 -135
data/lib/nokogiri/ffi/xml/sax/parser_context.rb +0 -67
data/lib/nokogiri/ffi/xml/sax/push_parser.rb +0 -51
data/lib/nokogiri/ffi/xml/schema.rb +0 -109
data/lib/nokogiri/ffi/xml/syntax_error.rb +0 -98
data/lib/nokogiri/ffi/xml/text.rb +0 -18
data/lib/nokogiri/ffi/xml/xpath.rb +0 -9
data/lib/nokogiri/ffi/xml/xpath_context.rb +0 -148
data/lib/nokogiri/ffi/xslt/stylesheet.rb +0 -53
data/lib/nokogiri/version_warning.rb +0 -14
data/test/ffi/test_document.rb +0 -35

data/test/html/test_document_fragment.rb CHANGED Viewed

@@ -74,6 +74,16 @@ module Nokogiri
         assert Nokogiri::HTML::DocumentFragment.new(@html)
       end
+      def test_body_fragment_should_contain_body
+        fragment = Nokogiri::HTML::DocumentFragment.parse("  <body><div>foo</div></body>")
+        assert_match(/^<body>/, fragment.to_s)
+      end
+      def test_nonbody_fragment_should_not_contain_body
+        fragment = Nokogiri::HTML::DocumentFragment.parse("<div>foo</div>")
+        assert_match(/^<div>/, fragment.to_s)
+      end
       def test_fragment_should_have_document
         fragment = Nokogiri::HTML::DocumentFragment.new(@html)
         assert_equal @html, fragment.document
@@ -123,7 +133,8 @@ module Nokogiri
       def test_html_fragment_has_outer_text
         doc = "a<div>b</div>c"
         fragment = Nokogiri::HTML::Document.new.fragment(doc)
-        if Nokogiri::VERSION_INFO['libxml']['loaded'] <= "2.6.16"
+        if Nokogiri.uses_libxml? &&
+            Nokogiri::VERSION_INFO['libxml']['loaded'] <= "2.6.16"
           assert_equal "a<div>b</div><p>c</p>", fragment.to_s
         else
           assert_equal "a<div>b</div>c", fragment.to_s
@@ -139,13 +150,13 @@ module Nokogiri
       def test_html_fragment_with_leading_whitespace
         doc = "     <div>b</div>  "
         fragment = Nokogiri::HTML::Document.new.fragment(doc)
-        assert_equal "<div>b</div>", fragment.to_s
+        assert_match %r%     <div>b</div> *%, fragment.to_s
       end
       def test_html_fragment_with_leading_whitespace_and_newline
         doc = "     \n<div>b</div>  "
         fragment = Nokogiri::HTML::Document.new.fragment(doc)
-        assert_equal "<div>b</div>", fragment.to_s
+        assert_match %r%     \n<div>b</div> *%, fragment.to_s
       end
       def test_html_fragment_with_leading_text_and_newline
@@ -155,7 +166,7 @@ module Nokogiri
       def test_html_fragment_with_leading_whitespace_and_text_and_newline
         fragment = HTML::Document.new.fragment("  First line\nSecond line<br>Broken line")
-        assert_equal "First line\nSecond line<br>Broken line", fragment.to_s
+        assert_equal "  First line\nSecond line<br>Broken line", fragment.to_s
       end
       def test_html_fragment_with_leading_entity
@@ -179,7 +190,8 @@ module Nokogiri
       def test_to_xhtml
         doc = "<span>foo<br></span><span>bar</span>"
         fragment = Nokogiri::HTML::Document.new.fragment(doc)
-        if Nokogiri::VERSION_INFO['libxml']['loaded'] >= "2.7.0"
+        if !Nokogiri.uses_libxml? ||
+            Nokogiri::VERSION_INFO['libxml']['loaded'] >= "2.7.0"
           assert_equal "<span>foo<br /></span><span>bar</span>", fragment.to_xhtml
         else
           assert_equal "<span>foo<br></span><span>bar</span>", fragment.to_xhtml
@@ -205,6 +217,39 @@ module Nokogiri
         assert_equal("<p>hello<!-- your ad here --></p>",
           fragment.to_s)
       end
+      def test_malformed_fragment_is_corrected
+        fragment = HTML::DocumentFragment.parse("<div </div>")
+        assert_equal "<div></div>", fragment.to_s
+      end
+      def test_unclosed_script_tag
+        # see GH#315
+        fragment = HTML::DocumentFragment.parse("foo <script>bar")
+        assert_equal "foo <script>bar</script>", fragment.to_html
+      end
+      def test_error_propagation_on_fragment_parse
+        frag = Nokogiri::HTML::DocumentFragment.parse "<hello>oh, hello there.</hello>"
+        assert frag.errors.any?{|err| err.to_s =~ /Tag hello invalid/}, "errors should be copied to the fragment"
+      end
+      def test_error_propagation_on_fragment_parse_in_node_context
+        doc = Nokogiri::HTML::Document.parse "<html><body><div></div></body></html>"
+        context_node = doc.at_css "div"
+        frag = Nokogiri::HTML::DocumentFragment.new doc, "<hello>oh, hello there.</hello>", context_node
+        assert frag.errors.any?{|err| err.to_s =~ /Tag hello invalid/}, "errors should be on the context node's document"
+      end
+      def test_error_propagation_on_fragment_parse_in_node_context_should_not_include_preexisting_errors
+        doc = Nokogiri::HTML::Document.parse "<html><body><div></div><jimmy></jimmy></body></html>"
+        assert doc.errors.any?{|err| err.to_s =~ /jimmy/}, "assert on setup"
+        context_node = doc.at_css "div"
+        frag = Nokogiri::HTML::DocumentFragment.new doc, "<hello>oh, hello there.</hello>", context_node
+        assert frag.errors.any?{|err| err.to_s =~ /Tag hello invalid/}, "errors should be on the context node's document"
+        assert frag.errors.none?{|err| err.to_s =~ /jimmy/}, "errors should not include pre-existing document errors"
+      end
     end
   end
 end

data/test/html/test_element_description.rb CHANGED Viewed

@@ -56,10 +56,12 @@ module Nokogiri
       def test_subelements
         sub_elements = ElementDescription['body'].sub_elements
-        if Nokogiri::LIBXML_VERSION == '2.7.7'
+        if Nokogiri.uses_libxml? && Nokogiri::LIBXML_VERSION >= '2.7.7'
           assert_equal 65, sub_elements.length
-        else
+        elsif Nokogiri.uses_libxml?
           assert_equal 61, sub_elements.length
+        else
+          assert sub_elements.length > 0
         end
       end

data/test/html/test_node.rb CHANGED Viewed

@@ -127,6 +127,15 @@ module Nokogiri
         assert_equal 'foo&bar&baz', node['href']
       end
+      def test_parse_config_option
+        node = @html.at('div')
+        options = nil
+        node.parse("<div></div>") do |config|
+          options = config
+        end
+        assert_equal Nokogiri::XML::ParseOptions::DEFAULT_HTML, options.to_i
+      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').fragment(iframe) }

data/test/test_memory_leak.rb CHANGED Viewed

@@ -1,9 +1,7 @@
 require "helper"
 class TestMemoryLeak < Nokogiri::TestCase
   if ENV['NOKOGIRI_GC'] # turning these off by default for now
     def test_dont_hurt_em_why
       content = File.open("#{File.dirname(__FILE__)}/files/dont_hurt_em_why.xml").read
       ndoc = Nokogiri::XML(content)
@@ -14,6 +12,26 @@ class TestMemoryLeak < Nokogiri::TestCase
       end
     end
+    class BadIO
+      def read(*args)
+        raise 'hell'
+      end
+      def write(*args)
+        raise 'chickens'
+      end
+    end
+    def test_for_mem_leak_on_io_callbacks
+      io = File.open SNUGGLES_FILE
+      Nokogiri::XML.parse(io)
+      (10**10).times do
+        Nokogiri::XML.parse(BadIO.new) rescue nil
+        doc.write BadIO.new rescue nil
+      end
+    end
     def test_for_memory_leak
       begin
         #  we don't use Dike in any tests, but requiring it has side effects
@@ -42,39 +60,6 @@ class TestMemoryLeak < Nokogiri::TestCase
         puts "\ndike is not installed, skipping memory leak test"
       end
     end
-    if Nokogiri.ffi?
-      [ ['Node', 'p', nil],
-        ['CDATA', nil, 'content'],
-        ['Comment', nil, 'content'],
-        ['DocumentFragment', nil],
-        ['EntityReference', nil, 'p'],
-        ['ProcessingInstruction', nil, 'p', 'content'] ].each do |klass, *args|
-        define_method "test_for_leaked_#{klass}_nodes" do
-          Nokogiri::LibXML.expects(:xmlAddChild).at_least(1) # more than once shows we're GCing properly
-          10.times {
-            xml = Nokogiri::XML("<root></root>")
-            2.times { Nokogiri::XML.const_get(klass).new(*(args.collect{|arg| arg || xml})) }
-            GC.start
-          }
-          GC.start
-        end
-      end
-      def test_for_leaked_attr_nodes
-        Nokogiri::LibXML.expects(:xmlFreePropList).at_least(1) # more than once shows we're GCing properly
-        10.times {
-          xml = Nokogiri::XML("<root></root>")
-          2.times { Nokogiri::XML::Attr.new(xml, "p") }
-          GC.start
-        }
-        GC.start
-      end
-    end # if ffi
   end # if NOKOGIRI_GC
   private

data/test/test_nokogiri.rb CHANGED Viewed

@@ -4,34 +4,28 @@ class TestNokogiri < Nokogiri::TestCase
   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 Nokogiri::VERSION_INFO['ruby']['version'], ::RUBY_VERSION
+    assert_equal Nokogiri::VERSION_INFO['ruby']['platform'], ::RUBY_PLATFORM
+    if Nokogiri.uses_libxml?
+      assert_match version_match, Nokogiri::LIBXML_VERSION
       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::VERSION_INFO['libxml']['loaded']
+      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::VERSION_INFO['libxml']['loaded']
+    end
   end
   def test_libxml_iconv
-    assert Nokogiri.const_defined?(:LIBXML_ICONV_ENABLED)
+    assert Nokogiri.const_defined?(:LIBXML_ICONV_ENABLED) if Nokogiri.uses_libxml?
   end
   def test_parse_with_io

data/test/test_reader.rb CHANGED Viewed

@@ -81,6 +81,28 @@ class TestReader < Nokogiri::TestCase
     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
+  class ReallyBadIO4Java
+    def read(size=1)
+      'a' * size ** 10
+    end
+  end
+  def test_io_that_reads_too_much
+    if Nokogiri.jruby?
+      io = ReallyBadIO4Java.new
+      Nokogiri::XML::Reader(io)
+    else
+      io = ReallyBadIO.new
+      Nokogiri::XML::Reader(io)
+    end
+  end
   def test_in_memory
     assert Nokogiri::XML::Reader(<<-eoxml)
@@ -97,12 +119,7 @@ class TestReader < Nokogiri::TestCase
     </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
+    assert_equal xml, reader.source
   end
   def test_default?

data/test/test_xslt_transforms.rb CHANGED Viewed

@@ -1,7 +1,6 @@
 require "helper"
 class TestXsltTransforms < Nokogiri::TestCase
   def setup
     @doc = Nokogiri::XML(File.open(XML_FILE))
   end
@@ -179,11 +178,16 @@ encoding="iso-8859-1" indent="yes"/>
       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

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

@@ -5,14 +5,22 @@ module Nokogiri
     class Node
       class TestSaveOptions < Nokogiri::TestCase
         SaveOptions.constants.each do |constant|
-          class_eval %{
+          class_eval <<-EOEVAL
             def test_predicate_#{constant.downcase}
               options = SaveOptions.new(SaveOptions::#{constant})
               assert options.#{constant.downcase}?
               assert SaveOptions.new.#{constant.downcase}.#{constant.downcase}?
             end
-          }
+          EOEVAL
+        end
+        def test_default_xml_save_options
+          if Nokogiri.jruby?
+            assert_equal 0, (SaveOptions::DEFAULT_XML & SaveOptions::FORMAT)
+          else
+            assert_equal SaveOptions::FORMAT, (SaveOptions::DEFAULT_XML & SaveOptions::FORMAT)
+          end
         end
       end
     end

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

@@ -24,7 +24,7 @@ module Nokogiri
           assert block_called
-          assert_equal ['a', '&b'], doc.start_elements.first.last
+          assert_equal [['foo', [['a', '&b']]]], doc.start_elements
         end
         def test_parser_context_yielded_in_memory
@@ -40,7 +40,7 @@ module Nokogiri
           assert block_called
-          assert_equal ['a', '&b'], doc.start_elements.first.last
+          assert_equal [['foo', [['a', '&b']]]], doc.start_elements
         end
         def test_xml_decl
@@ -95,6 +95,7 @@ module Nokogiri
   <foo:bar>hello world</foo:bar>
 </root>
           eoxml
           assert @parser.document.start_elements_namespace.length > 0
           el = @parser.document.start_elements_namespace[1]
           assert_equal 'a', el.first
@@ -144,8 +145,12 @@ module Nokogiri
         end
         def test_start_is_called_without_namespace
-          @parser.parse('<foo:f><bar></foo:f>')
-          assert_equal ['foo:f', 'bar'],
+          @parser.parse(<<-eoxml)
+<root xmlns:foo='http://foo.example.com/' xmlns='http://example.com/'>
+<foo:f><bar></foo:f>
+</root>
+          eoxml
+          assert_equal ['root', 'foo:f', 'bar'],
             @parser.document.start_elements.map { |x| x.first }
         end
@@ -291,15 +296,41 @@ module Nokogiri
           @parser.parse_memory(<<-eoxml)
             <p id="asdfasdf">Paragraph 1</p>
           eoxml
-          assert_equal [["p", ["id", "asdfasdf"]]],
+          assert_equal [["p", [["id", "asdfasdf"]]]],
                        @parser.document.start_elements
         end
-        def test_parse_document
+        def test_start_element_attrs_include_namespaces
           @parser.parse_memory(<<-eoxml)
-            <p>Paragraph 1</p>
-            <p>Paragraph 2</p>
+            <p xmlns:foo='http://foo.example.com/'>Paragraph 1</p>
           eoxml
+          assert_equal [["p", [['xmlns:foo', 'http://foo.example.com/']]]],
+                       @parser.document.start_elements
+        end
+        if Nokogiri.uses_libxml? # JRuby SAXParser only parses well-formed XML documents
+          def test_parse_document
+            @parser.parse_memory(<<-eoxml)
+              <p>Paragraph 1</p>
+              <p>Paragraph 2</p>
+            eoxml
+          end
+        end
+        def test_parser_attributes
+          xml = <<-eoxml
+<?xml version="1.0" ?><root><foo a="&amp;b" c="&gt;d" /></root>
+          eoxml
+          block_called = false
+          @parser.parse(xml) { |ctx|
+            block_called = true
+            ctx.replace_entities = true
+          }
+          assert block_called
+          assert_equal [['root', []], ['foo', [['a', '&b'], ['c', '>d']]]], @parser.document.start_elements
         end
       end
     end

data/test/xml/sax/test_parser_context.rb CHANGED Viewed

@@ -6,6 +6,56 @@ module Nokogiri
   module XML
     module SAX
       class TestParserContext < Nokogiri::SAX::TestCase
+        def setup
+          @xml = '<hello>
+world
+<inter>
+    <net>
+    </net>
+</inter>
+</hello>'
+        end
+        class Counter < Nokogiri::XML::SAX::Document
+          attr_accessor :context, :lines, :columns
+          def initialize
+            @context = nil
+            @lines   = []
+            @columns = []
+          end
+          def start_element name, attrs = []
+            @lines << [name, context.line]
+            @columns << [name, context.column]
+          end
+        end
+        def test_line_numbers
+          sax_handler = Counter.new
+          parser = Nokogiri::XML::SAX::Parser.new(sax_handler)
+          parser.parse(@xml) do |ctx|
+            sax_handler.context = ctx
+          end
+          assert_equal [["hello", 1], ["inter", 4], ["net", 5]],
+            sax_handler.lines
+        end
+        def test_column_numbers
+          sax_handler = Counter.new
+          parser = Nokogiri::XML::SAX::Parser.new(sax_handler)
+          parser.parse(@xml) do |ctx|
+            sax_handler.context = ctx
+          end
+          assert_equal [["hello", 7], ["inter", 7], ["net", 9]],
+            sax_handler.columns
+        end
         def test_replace_entities
           pc = ParserContext.new StringIO.new('<root />'), 'UTF-8'
           pc.replace_entities = false

data/test/xml/sax/test_push_parser.rb CHANGED Viewed

@@ -38,7 +38,24 @@ module Nokogiri
             <p id="asdfasdf">
           eoxml
-          assert_equal [["p", ["id", "asdfasdf"]]],
+          assert_equal [["p", [["id", "asdfasdf"]]]],
+            @parser.document.start_elements
+          @parser.<<(<<-eoxml)
+              <!-- This is a comment -->
+              Paragraph 1
+            </p>
+          eoxml
+          assert_equal [' This is a comment '], @parser.document.comments
+          @parser.finish
+        end
+        def test_start_element_with_namespaces
+          @parser.<<(<<-eoxml)
+            <p xmlns:foo="http://foo.example.com/">
+          eoxml
+          assert_equal [["p", [["xmlns:foo", "http://foo.example.com/"]]]],
             @parser.document.start_elements
           @parser.<<(<<-eoxml)

data/test/xml/test_attribute_decl.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Nokogiri
 <?xml version="1.0"?><?TEST-STYLE PIDATA?>
 <!DOCTYPE staff SYSTEM "staff.dtd" [
    <!ATTLIST br width CDATA "0">
-   <!ATTLIST a width CDATA >
+   <!ATTLIST a width CDATA "0">
    <!ATTLIST payment type (check|cash) "cash">
 ]>
 <root />
@@ -64,12 +64,16 @@ module Nokogiri
       end
       def test_attribute_type
-        assert_equal 1, @attr_decl.attribute_type
+        if Nokogiri.uses_libxml?
+          assert_equal 1, @attr_decl.attribute_type
+        else
+          assert_equal 'CDATA', @attr_decl.attribute_type
+        end
       end
       def test_default
         assert_equal '0', @attr_decl.default
-        assert_nil @attrs[1].default
+        assert_equal '0', @attrs[1].default
       end
       def test_enumeration

data/test/xml/test_builder.rb CHANGED Viewed

@@ -3,6 +3,23 @@ require "helper"
 module Nokogiri
   module XML
     class TestBuilder < Nokogiri::TestCase
+      def test_attribute_sensitivity
+        xml = Nokogiri::XML::Builder.new { |x|
+          x.tag "hello", "abcDef" => "world"
+        }.to_xml
+        doc = Nokogiri.XML xml
+        assert_equal 'world', doc.root['abcDef']
+      end
+      def test_builder_escape
+        xml = Nokogiri::XML::Builder.new { |x|
+          x.condition "value < 1", :attr => "value < 1"
+        }.to_xml
+        doc = Nokogiri.XML xml
+        assert_equal 'value < 1', doc.root['attr']
+        assert_equal 'value < 1', doc.root.content
+      end
       def test_builder_namespace
         doc = Nokogiri::XML::Builder.new { |xml|
           xml.a("xmlns:a" => "x") do

data/test/xml/test_document.rb CHANGED Viewed

@@ -217,7 +217,12 @@ module Nokogiri
       end
       def test_validate
-        assert_equal 44, @xml.validate.length
+        if Nokogiri.uses_libxml?
+          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
+        end
       end
       def test_validate_no_internal_subset
@@ -329,12 +334,12 @@ module Nokogiri
       end
       def test_non_existant_function
-        # WTF.  I don't know why this is different between MRI and ffi.
+        # WTF.  I don't know why this is different between MRI and Jruby
         # They should be the same...  Either way, raising an exception
         # is the correct thing to do.
         exception = RuntimeError
-        if Nokogiri::VERSION_INFO['libxml']['platform'] == 'jruby'
+        if !Nokogiri.uses_libxml? || (Nokogiri.uses_libxml? && Nokogiri::VERSION_INFO['libxml']['platform'] == 'jruby')
           exception = Nokogiri::XML::XPath::SyntaxError
         end
@@ -406,7 +411,7 @@ module Nokogiri
       end
       # wtf...  osx's libxml sucks.
-      unless Nokogiri::LIBXML_VERSION =~ /^2\.6\./
+      unless !Nokogiri.uses_libxml? || Nokogiri::LIBXML_VERSION =~ /^2\.6\./
         def test_encoding
           xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE, 'UTF-8')
           assert_equal 'UTF-8', xml.encoding
@@ -606,7 +611,7 @@ module Nokogiri
             <a:foo>hello from a</a:foo>
             <b:foo>hello from b</b:foo>
             <container xmlns:c="http://c.flavorjon.es/">
-              <c:foo>hello from c</c:foo>
+              <c:foo c:attr='attr-value'>hello from c</c:foo>
             </container>
           </root>
         EOX
@@ -620,6 +625,7 @@ module Nokogiri
         assert_equal 1, doc.xpath("//a:foo").length
         assert_equal 1, doc.xpath("//a:foo").length
         assert_equal 1, doc.xpath("//x:foo", "x" => "http://c.flavorjon.es/").length
+        assert_match %r{foo c:attr}, doc.to_xml
         doc.remove_namespaces!
@@ -629,6 +635,7 @@ module Nokogiri
         assert_equal 0, doc.xpath("//a:foo", namespaces).length
         assert_equal 0, doc.xpath("//a:foo", namespaces).length
         assert_equal 0, doc.xpath("//x:foo", "x" => "http://c.flavorjon.es/").length
+        assert_match %r{foo attr}, doc.to_xml
       end
       def test_subset_is_decorated
@@ -663,6 +670,28 @@ module Nokogiri
         assert @xml.root.respond_to?(:awesome!)
         assert @xml.children.respond_to?(:awesome!)
       end
+      def test_java_integration
+        if Nokogiri.jruby?
+          require 'java'
+          factory = javax.xml.parsers.DocumentBuilderFactory.newInstance
+          builder = factory.newDocumentBuilder
+          document = builder.newDocument
+          root = document.createElement("foo")
+          document.appendChild(root)
+          noko_doc = Nokogiri::XML::Document.wrap(document)
+          assert_equal 'foo', noko_doc.root.name
+          noko_doc = Nokogiri::XML(<<eoxml)
+<foo xmlns='hello'>
+  <bar xmlns:foo='world' />
+</foo>
+eoxml
+          dom = noko_doc.to_java
+          assert dom.kind_of? org.w3c.dom.Document
+          assert_equal 'foo', dom.getDocumentElement().getTagName()
+        end
+      end
     end
   end
 end