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/xml/test_document_fragment.rb CHANGED Viewed

@@ -100,13 +100,13 @@ module Nokogiri
       def test_xml_fragment_with_leading_whitespace
         doc = "     <div>b</div>  "
         fragment = Nokogiri::XML::Document.new.fragment(doc)
-        assert_equal "<div>b</div>", fragment.to_s
+        assert_equal "     <div>b</div>  ", fragment.to_s
       end
       def test_xml_fragment_with_leading_whitespace_and_newline
         doc = "     \n<div>b</div>  "
         fragment = Nokogiri::XML::Document.new.fragment(doc)
-        assert_equal "<div>b</div>", fragment.to_s
+        assert_equal "     \n<div>b</div>  ", fragment.to_s
       end
       def test_fragment_children_search
@@ -175,6 +175,18 @@ module Nokogiri
         end
         assert fragment.children.respond_to?(:awesome!), fragment.children.class
       end
+      def test_for_libxml_in_context_fragment_parsing_bug_workaround
+        10.times do
+          begin
+            fragment = Nokogiri::XML.fragment("<div></div>")
+            parent = fragment.children.first
+            child = parent.parse("<h1></h1>").first
+            parent.add_child child
+          end
+          GC.start
+        end
+      end
     end
   end
 end

data/test/xml/test_dtd.rb CHANGED Viewed

@@ -14,7 +14,11 @@ module Nokogiri
       end
       def test_external_id
-        xml = Nokogiri::XML('<!DOCTYPE foo PUBLIC "bar" ><foo />')
+        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
         assert_equal 'bar', dtd.external_id
       end
@@ -25,11 +29,26 @@ module Nokogiri
         end
       end
+      def test_empty_attributes
+        dtd = Nokogiri::HTML("<html></html>").internal_subset
+        assert_equal Hash.new, dtd.attributes
+      end
       def test_attributes
         assert_equal ['width'], @dtd.attributes.keys
         assert_equal '0', @dtd.attributes['width'].default
       end
+      def test_keys
+        assert_equal ['width'], @dtd.keys
+      end
+      def test_each
+        hash = {}
+        @dtd.each { |key, value| hash[key] = value }
+        assert_equal @dtd.attributes, hash
+      end
       def test_namespace
         assert_raise NoMethodError do
           @dtd.namespace
@@ -49,8 +68,14 @@ module Nokogiri
       end
       def test_validate
-        list = @xml.internal_subset.validate @xml
-        assert_equal 44, list.length
+        if Nokogiri.uses_libxml?
+          list = @xml.internal_subset.validate @xml
+          assert_equal 44, list.length
+        else
+          xml = Nokogiri::XML(File.open(XML_FILE)) {|cfg| cfg.dtdvalid}
+          list = xml.internal_subset.validate xml
+          assert_equal 37, list.length
+        end
       end
       def test_external_subsets

data/test/xml/test_element_content.rb CHANGED Viewed

@@ -12,7 +12,7 @@ module Nokogiri
    <!ELEMENT div1 (head, (p | list | note)*, div2*)>
    <!ELEMENT div2 (tender:love)>
 ]>
-</root>
+<root/>
         eoxml
         @elements = @xml.internal_subset.children.find_all { |x|
           x.type == 15

data/test/xml/test_element_decl.rb CHANGED Viewed

@@ -14,7 +14,7 @@ module Nokogiri
    <!ATTLIST br width CDATA "0">
    <!ATTLIST br height CDATA "0">
 ]>
-</root>
+<root/>
         eoxml
         @elements = @xml.internal_subset.children.find_all { |x|
           x.type == 15

data/test/xml/test_entity_decl.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Nokogiri
 <?xml version="1.0"?><?TEST-STYLE PIDATA?>
 <!DOCTYPE staff SYSTEM "staff.dtd" [
    <!ENTITY ent1 "es">
-   <!ENTITY nocontent >
+   <!ENTITY nocontent "">
 ]>
 <root />
         eoxml
@@ -18,19 +18,13 @@ module Nokogiri
         @entity_decl = @entities.first
       end
-      def test_constants # for libffi implementation. *sigh* sorry Mike. :-(
+      def test_constants
         assert_equal 1, EntityDecl::INTERNAL_GENERAL
         assert_equal 2, EntityDecl::EXTERNAL_GENERAL_PARSED
         assert_equal 3, EntityDecl::EXTERNAL_GENERAL_UNPARSED
         assert_equal 4, EntityDecl::INTERNAL_PARAMETER
         assert_equal 5, EntityDecl::EXTERNAL_PARAMETER
         assert_equal 6, EntityDecl::INTERNAL_PREDEFINED
-        # While I'm here, another problem with libffi comes to mind.  If someone
-        # upgrades their version of any particular C library, and the constants
-        # change values, the client using Ruby code is fucked.  That sucks.
-        # Basically anything to do with the preprocessor fucks someone using
-        # libffi.  :-(
       end
       def test_create_typed_entity
@@ -69,12 +63,20 @@ module Nokogiri
       def test_original_content
         assert_equal "es", @entity_decl.original_content
-        assert_nil @entities[1].original_content
+        if Nokogiri.jruby?
+          assert_nil @entities[1].original_content
+        else
+          assert_equal "", @entities[1].original_content
+        end
       end
       def test_content
         assert_equal "es", @entity_decl.content
-        assert_nil @entities[1].content
+        if Nokogiri.jruby?
+          assert_nil @entities[1].content
+        else
+          assert_equal "", @entities[1].content
+        end
       end
       def test_type

data/test/xml/test_namespace.rb CHANGED Viewed

@@ -12,6 +12,13 @@ module Nokogiri
         eoxml
       end
+      if Nokogiri.uses_libxml?
+        def test_namespace_is_in_node_cache
+          node = @xml.root.namespace
+          assert @xml.instance_variable_get(:@node_cache).include?(node)
+        end
+      end
       def test_built_nodes_keep_namespace_decls
         doc = Document.new
         e   = Node.new 'element', doc
@@ -31,11 +38,6 @@ module Nokogiri
         assert_equal "#<#{ns.class.name}:#{sprintf("0x%x", ns.object_id)} href=#{ns.href.inspect}>", ns.inspect
       end
-      def test_namespace_is_in_node_cache
-        node = @xml.root.namespace
-        assert @xml.instance_variable_get(:@node_cache).include?(node)
-      end
       def test_namespace_node_prefix
         namespaces = @xml.root.namespace_definitions
         assert_equal [nil, 'foo'], namespaces.map { |x| x.prefix }

data/test/xml/test_node.rb CHANGED Viewed

@@ -82,18 +82,47 @@ module Nokogiri
         assert_equal 0, list.length
       end
+      def test_parse_config_option
+        node = @xml.root
+        options = nil
+        node.parse("<item></item>") do |config|
+          options = config
+        end
+        assert_equal Nokogiri::XML::ParseOptions::DEFAULT_XML, options.to_i
+      end
       # descriptive, not prescriptive.
       def test_parse_invalid_html_markup_results_in_empty_nodeset
         doc = Nokogiri::HTML("<html></html>")
         nodeset = doc.root.parse "<div><div>a</div><snippet>b</snippet></div>"
         assert_equal 1, doc.errors.length # "Tag snippet invalid"
+        assert_equal 1, nodeset.length
+      end
+      def test_node_context_parsing_of_malformed_html_fragment_with_recover_is_corrected
+        doc = HTML.parse "<html><body><div></div></body></html>"
+        context_node = doc.at_css "div"
+        nodeset = context_node.parse("<div </div>") do |options|
+          options.recover
+        end
+        assert_equal "<div></div>", nodeset.to_s
+        assert_equal 1, doc.errors.length
+        assert_equal 1, nodeset.length
+      end
+      def test_node_context_parsing_of_malformed_html_fragment_without_recover_is_not_corrected
+        doc = HTML.parse "<html><body><div></div></body></html>"
+        context_node = doc.at_css "div"
+        nodeset = context_node.parse("<div </div>") do |options|
+          options.strict
+        end
+        assert_equal 1, doc.errors.length
         assert_equal 0, nodeset.length
       end
       def test_parse_error_list
         error_count = @xml.errors.length
-        list = @xml.root.parse('<hello>')
-        assert_equal 0, list.length
+        @xml.root.parse('<hello>')
         assert(error_count < @xml.errors.length, "errors should have increased")
       end
@@ -457,6 +486,11 @@ module Nokogiri
         assert_equal 'Yes', @xml.css('address').first[:domestic]
       end
+      def test_non_existent_attribute_should_return_nil
+        node = @xml.root.first_element_child
+        assert_nil node.attribute('type')
+      end
       def test_write_to_with_block
         called = false
         io = StringIO.new
@@ -468,7 +502,9 @@ module Nokogiri
         end
         io.rewind
         assert called
-        assert_equal @xml.serialize(nil, conf.options), io.read
+        string = io.read
+        assert_equal @xml.serialize(nil, conf.options), string
+        assert_equal @xml.serialize(nil, conf), string
       end
       %w{ xml html xhtml }.each do |type|
@@ -490,6 +526,7 @@ module Nokogiri
         end
         assert called
         assert_equal @xml.serialize(nil, conf.options), string
+        assert_equal @xml.serialize(nil, conf), string
       end
       def test_hold_refence_to_subnode
@@ -667,6 +704,15 @@ module Nokogiri
         assert_equal('/staff/employee[1]', node.path)
       end
+      def test_parent_xpath
+        assert set = @xml.search('//employee')
+        assert node = set.first
+        assert parent_set = node.search('..')
+        assert parent_node = parent_set.first
+        assert_equal '/staff', parent_node.path
+        assert_equal node.parent, parent_node
+      end
       def test_search_by_symbol
         assert set = @xml.search(:employee)
         assert 5, set.length
@@ -686,7 +732,7 @@ module Nokogiri
         assert_equal '&amp;', foo
       end
-      def test_content
+      def test_content_equals
         node = Nokogiri::XML::Node.new('form', @xml)
         assert_equal('', node.content)
@@ -696,6 +742,10 @@ module Nokogiri
         node.content = '& <foo> &amp;'
         assert_equal('& <foo> &amp;', node.content)
         assert_equal('<form>&amp; &lt;foo&gt; &amp;amp;</form>', node.to_xml)
+        node.content = "1234 <-> 1234"
+        assert_equal "1234 <-> 1234", node.content
+        assert_equal "<form>1234 &lt;-&gt; 1234</form>", node.to_xml
       end
       def test_set_content_should_unlink_existing_content
@@ -814,17 +864,19 @@ module Nokogiri
         assert_equal nil, set[3].namespace
       end
-      def test_namespace_without_an_href_on_html_node
-        # because microsoft word's HTML formatting does this. ick.
-        xml = Nokogiri::HTML.parse <<-EOF
-          <div><o:p>foo</o:p></div>
-        EOF
+      if Nokogiri.uses_libxml?
+        def test_namespace_without_an_href_on_html_node
+          # because microsoft word's HTML formatting does this. ick.
+          xml = Nokogiri::HTML.parse <<-EOF
+            <div><o:p>foo</o:p></div>
+          EOF
-        assert_not_nil(node = xml.at('p'))
+          assert_not_nil(node = xml.at('p'))
-        assert_equal 1, node.namespaces.keys.size
-        assert       node.namespaces.has_key?('xmlns:o')
-        assert_equal nil, node.namespaces['xmlns:o']
+          assert_equal 1, node.namespaces.keys.size
+          assert       node.namespaces.has_key?('xmlns:o')
+          assert_equal nil, node.namespaces['xmlns:o']
+        end
       end
       def test_line

data/test/xml/test_node_reparenting.rb CHANGED Viewed

@@ -50,21 +50,22 @@ module Nokogiri
         # end
         {
-          :add_child            => {:target => "/root/a1",        :returns => :reparented, :children_tags => %w[text b1 b2]},
-          :<<                   => {:target => "/root/a1",        :returns => :reparented, :children_tags => %w[text b1 b2]},
+          :add_child            => {:target => "/root/a1",        :returns_self => false, :children_tags => %w[text b1 b2]},
+          :<<                   => {:target => "/root/a1",        :returns_self => true, :children_tags => %w[text b1 b2]},
-          :replace              => {:target => "/root/a1/node()", :returns => :reparented, :children_tags => %w[b1 b2]},
-          :swap                 => {:target => "/root/a1/node()", :returns => :self,       :children_tags => %w[b1 b2]},
+          :replace              => {:target => "/root/a1/node()", :returns_self => false, :children_tags => %w[b1 b2]},
+          :swap                 => {:target => "/root/a1/node()", :returns_self => true,  :children_tags => %w[b1 b2]},
-          :inner_html=          => {:target => "/root/a1",        :returns => :self,       :children_tags => %w[b1 b2]},
+          :children=            => {:target => "/root/a1",        :returns_self => false, :children_tags => %w[b1 b2]},
+          :inner_html=          => {:target => "/root/a1",        :returns_self => true,  :children_tags => %w[b1 b2]},
-          :add_previous_sibling => {:target => "/root/a1/text()", :returns => :reparented, :children_tags => %w[b1 b2 text]},
-          :previous=            => {:target => "/root/a1/text()", :returns => :reparented, :children_tags => %w[b1 b2 text]},
-          :before               => {:target => "/root/a1/text()", :returns => :self,       :children_tags => %w[b1 b2 text]},
+          :add_previous_sibling => {:target => "/root/a1/text()", :returns_self => false, :children_tags => %w[b1 b2 text]},
+          :previous=            => {:target => "/root/a1/text()", :returns_self => false, :children_tags => %w[b1 b2 text]},
+          :before               => {:target => "/root/a1/text()", :returns_self => true,  :children_tags => %w[b1 b2 text]},
-          :add_next_sibling     => {:target => "/root/a1/text()", :returns => :reparented, :children_tags => %w[text b1 b2]},
-          :next=                => {:target => "/root/a1/text()", :returns => :reparented, :children_tags => %w[text b1 b2]},
-          :after                => {:target => "/root/a1/text()", :returns => :self,       :children_tags => %w[text b1 b2]}
+          :add_next_sibling     => {:target => "/root/a1/text()", :returns_self => false, :children_tags => %w[text b1 b2]},
+          :next=                => {:target => "/root/a1/text()", :returns_self => false, :children_tags => %w[text b1 b2]},
+          :after                => {:target => "/root/a1/text()", :returns_self => true,  :children_tags => %w[text b1 b2]}
         }.each do |method, params|
           before do
@@ -95,11 +96,12 @@ module Nokogiri
                   end
                   it "returns the expected value" do
-                    if params[:returns] == :self
-                      sendee = @doc.at_xpath(params[:target])
-                      sendee.send(method, @other_node).must_equal sendee
+                    sendee = @doc.at_xpath(params[:target])
+                    result = sendee.send(method, @other_node)
+                    if params[:returns_self]
+                      result.must_equal sendee
                     else
-                      @doc.at_xpath(params[:target]).send(method, @other_node).must_equal @other_node
+                      result.must_equal @other_node
                     end
                   end
                 end
@@ -110,6 +112,17 @@ module Nokogiri
                 @doc.at_xpath(params[:target]).send(method, @fragment_string)
                 @doc.xpath("/root/a1/node()").collect {|n| n.name}.must_equal params[:children_tags]
               end
+              it "returns the expected value" do
+                sendee = @doc.at_xpath(params[:target])
+                result = sendee.send(method, @fragment_string)
+                if params[:returns_self]
+                  result.must_equal sendee
+                else
+                  result.must_be_kind_of Nokogiri::XML::NodeSet
+                  result.to_html.must_equal @fragment_string
+                end
+              end
             end
             describe "passed a fragment" do
               it "inserts the fragment roots in the proper position" do
@@ -153,16 +166,19 @@ module Nokogiri
       end
       describe "ad hoc node reparenting behavior" do
-        before do
-          @xml = Nokogiri::XML "<root><a1>First node</a1><a2>Second node</a2><a3>Third node</a3></root>"
-          @html = Nokogiri::HTML(<<-eohtml)
-            <html>
-              <head></head>
-              <body>
-                <div class='baz'><a href="foo" class="bar">first</a></div>
-              </body>
-            </html>
-          eohtml
+        describe "#<<" do
+          it "allows chaining" do
+            doc   = Nokogiri::XML::Document.new
+            root  = Nokogiri::XML::Element.new('root', doc)
+            doc.root = root
+            child1 = Nokogiri::XML::Element.new('child1', doc)
+            child2 = Nokogiri::XML::Element.new('child2', doc)
+            doc.root << child1 << child2
+            assert_equal [child1, child2], doc.root.children.to_a
+          end
         end
         describe "#add_child" do
@@ -223,7 +239,34 @@ module Nokogiri
           end
         end
+        describe "#add_previous_sibling" do
+          it "should not merge text nodes during the operation" do
+            xml = Nokogiri::XML %Q(<root>text node</root>)
+            replacee = xml.root.children.first
+            replacee.add_previous_sibling "foo <p></p> bar"
+            assert_equal "foo <p></p> bartext node", xml.root.children.to_html
+          end
+        end
+        describe "#add_next_sibling" do
+          it "should not merge text nodes during the operation" do
+            xml = Nokogiri::XML %Q(<root>text node</root>)
+            replacee = xml.root.children.first
+            replacee.add_next_sibling "foo <p></p> bar"
+            assert_equal "text nodefoo <p></p> bar", xml.root.children.to_html
+          end
+        end
         describe "#replace" do
+          describe "a text node with a text node" do
+            it "should not merge text nodes during the operation" do
+              xml = Nokogiri::XML %Q(<root>text node</root>)
+              replacee = xml.root.children.first
+              replacee.replace "new text node"
+              assert_equal "new text node", xml.root.children.first.content
+            end
+          end
           describe "when a document has a default namespace" do
             before do
               @fruits = Nokogiri::XML(<<-eoxml)
@@ -248,8 +291,6 @@ module Nokogiri
           it "not blow up" do
             # see http://github.com/tenderlove/nokogiri/issues#issue/22
             10.times do
-              STDOUT.putc "."
-              STDOUT.flush
               begin
                 doc = Nokogiri::XML <<-EOHTML
                   <root>
@@ -260,10 +301,10 @@ module Nokogiri
                   </root>
                 EOHTML
-                root = doc.at("root")
-                a = root.at("a")
-                b = a.at("b")
-                c = a.at("c")
+                assert root = doc.at("root")
+                assert a = root.at("a")
+                assert b = a.at("b")
+                assert c = a.at("c")
                 a.add_next_sibling(b.unlink)
                 c.unlink
               end

data/test/xml/test_node_set.rb CHANGED Viewed

@@ -30,6 +30,10 @@ module Nokogiri
         @list = @xml.css('employee')
       end
+      def test_break_works
+        assert_equal 7, @xml.root.elements.each { |x| break 7 }
+      end
       def test_filter
         list = @xml.css('address').filter('*[domestic="Yes"]')
         assert_equal(%w{ Yes } * 4, list.map { |n| n['domestic'] })
@@ -158,6 +162,16 @@ module Nokogiri
         set = html.xpath("/html/body/div")
         assert_equal set.first, set.search(".a").first
       end
+      def test_css_search_with_namespace
+        fragment = Nokogiri::XML.fragment(<<-eoxml)
+          <html xmlns="http://www.w3.org/1999/xhtml">
+          <head></head>
+          <body></body>
+          </html>
+        eoxml
+        assert_nothing_raised{ fragment.children.search( 'body', { 'xmlns' => 'http://www.w3.org/1999/xhtml' }) }
+      end
       def test_double_equal
         assert node_set_one = @xml.xpath('//employee')
@@ -224,6 +238,11 @@ module Nokogiri
         end
       end
+      def test_dup_on_empty_set
+        empty_set = Nokogiri::XML::NodeSet.new @xml, []
+        assert_equal 0, empty_set.dup.length # this shouldn't raise null pointer exception
+      end
       def test_xmlns_is_automatically_registered
         doc = Nokogiri::XML(<<-eoxml)
           <root xmlns="http://tenderlovemaking.com/">
@@ -348,6 +367,12 @@ module Nokogiri
         assert length, employees.length
       end
+      def test_delete_on_empty_set
+        empty_set = Nokogiri::XML::NodeSet.new @xml, []
+        employee  = @xml.at_xpath("//employee")
+        assert_equal nil, empty_set.delete(employee)
+      end
       def test_unlink
         xml = Nokogiri::XML.parse(<<-eoxml)
         <root>
@@ -431,6 +456,19 @@ module Nokogiri
         assert_equal 'employee', @xml.search("//wrapper").first.children[0].name
       end
+      def test_wrap_a_fragment
+        frag = Nokogiri::XML::DocumentFragment.parse <<-EOXML
+          <employees>
+            <employee>hello</employee>
+            <employee>goodbye</employee>
+          </employees>
+        EOXML
+        employees = frag.xpath ".//employee"
+        employees.wrap("<wrapper/>")
+        assert_equal 'wrapper', employees[0].parent.name
+        assert_equal 'employee', frag.at(".//wrapper").children.first.name
+      end
       def test_wrap_preserves_document_structure
         assert_equal "employeeId",
                      @xml.at_xpath("//employee").children.detect{|j| ! j.text? }.name
@@ -495,6 +533,13 @@ module Nokogiri
         assert_equal employees.length, employees[0, employees.length].length
       end
+      def test_slice_on_empty_node_set
+        empty_set = Nokogiri::XML::NodeSet.new @xml, []
+        assert_equal nil, empty_set[99]
+        assert_equal nil, empty_set[99..101]
+        assert_equal nil, empty_set[99,2]
+      end
       def test_slice_waaaaaay_off_the_end
         xml = Nokogiri::XML::Builder.new {
           root { 100.times { div } }
@@ -549,6 +594,12 @@ module Nokogiri
         assert_equal [employees[2]], (first_set & second_set).to_a
       end
+      def test_intersection_on_empty_set
+        empty_set = Nokogiri::XML::NodeSet.new @xml
+        employees = @xml.search("//employee")
+        assert_equal 0, (empty_set & employees).length
+      end
       def test_include?
         employees = @xml.search("//employee")
         yes = employees.first
@@ -558,6 +609,12 @@ module Nokogiri
         assert ! employees.include?(no)
       end
+      def test_include_on_empty_node_set
+        empty_set = Nokogiri::XML::NodeSet.new @xml, []
+        employee  = @xml.at_xpath("//employee")
+        assert ! empty_set.include?(employee)
+      end
       def test_children
         employees = @xml.search("//employee")
         count = 0

data/test/xml/test_schema.rb CHANGED Viewed

@@ -74,6 +74,11 @@ module Nokogiri
         assert_equal 2, errors.length
       end
+      def test_validate_non_document
+        string = File.read(PO_XML_FILE)
+        assert_raise(ArgumentError) {@xsd.validate(string)}
+      end
       def test_valid?
         valid_doc = Nokogiri::XML(File.read(PO_XML_FILE))

data/test/xml/test_xpath.rb CHANGED Viewed

@@ -61,6 +61,10 @@ module Nokogiri
         }.new
       end
+      def test_variable_binding
+        assert_equal 4, @xml.xpath('//address[@domestic=$value]', nil, :value => 'Yes').length
+      end
       def test_unknown_attribute
         assert_equal 0, @xml.xpath('//employee[@id="asdfasdf"]/@fooo').length
         assert_nil @xml.xpath('//employee[@id="asdfasdf"]/@fooo')[0]
@@ -200,6 +204,34 @@ module Nokogiri
         nokogiri = Nokogiri::HTML.parse(doc)
         assert nokogiri.xpath(xpath)
       end
+      def test_custom_xpath_handler_with_args_under_gc_pressure
+        # see http://github.com/tenderlove/nokogiri/issues/#issue/345
+        tool_inspector = Class.new do
+          def name_equals(nodeset, name, *args)
+            nodeset.all? do |node|
+              args.each { |thing| thing.inspect }
+              node["name"] == name
+            end
+          end
+        end.new
+        xml = <<-EOXML
+          <toolbox>
+            #{"<tool name='hammer'/><tool name='wrench'/>" * 10}
+          </toolbox>
+        EOXML
+        doc = Nokogiri::XML xml
+        # long list of long arguments, to apply GC pressure during
+        # ruby_funcall argument marshalling
+        xpath = ["//tool[name_equals(.,'hammer'"]
+        1000.times { xpath << "'unused argument #{'x' * 1000}'" }
+        xpath << "'unused argument')]"
+        xpath = xpath.join(',')
+        assert_equal doc.xpath("//tool[@name='hammer']"), doc.xpath(xpath, tool_inspector)
+      end
     end
   end
 end