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

data/test/xml/test_parse_options.rb

@@ -0,0 +1,52 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestParseOptions < Nokogiri::TestCase
+      def test_new
+        options = Nokogiri::XML::ParseOptions.new
+        assert_equal 0, options.options
+      end
+
+      def test_to_i
+        options = Nokogiri::XML::ParseOptions.new
+        assert_equal 0, options.to_i
+      end
+
+      ParseOptions.constants.each do |constant|
+        next if constant == 'STRICT'
+        class_eval %{
+          def test_predicate_#{constant.downcase}
+            options = ParseOptions.new(ParseOptions::#{constant})
+            assert options.#{constant.downcase}?
+
+            assert ParseOptions.new.#{constant.downcase}.#{constant.downcase}?
+          end
+        }
+      end
+
+      def test_strict_noent
+        options = ParseOptions.new.recover.noent
+        assert !options.strict?
+      end
+
+      def test_new_with_argument
+        options = Nokogiri::XML::ParseOptions.new 1 << 1
+        assert_equal 1 << 1, options.options
+      end
+
+      def test_chaining
+        options = Nokogiri::XML::ParseOptions.new.recover.noent
+        assert options.recover?
+        assert options.noent?
+      end
+
+      def test_inspect
+        options = Nokogiri::XML::ParseOptions.new.recover.noent
+        ins = options.inspect
+        assert_match(/recover/, ins)
+        assert_match(/noent/, ins)
+      end
+    end
+  end
+end

data/test/xml/test_processing_instruction.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML
@@ -20,6 +20,11 @@ module Nokogiri
         assert ref = ProcessingInstruction.new(@xml, 'name', 'content')
         assert_instance_of ProcessingInstruction, ref
       end
+
+      def test_many_new
+        100.times { ProcessingInstruction.new(@xml, 'foo', 'bar') }
+        @xml.root << ProcessingInstruction.new(@xml, 'foo', 'bar')
+      end
     end
   end
 end

data/test/xml/test_reader_encoding.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML

data/test/xml/test_relax_ng.rb

@@ -0,0 +1,60 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestRelaxNG < Nokogiri::TestCase
+      def setup
+        assert @schema = Nokogiri::XML::RelaxNG(File.read(ADDRESS_SCHEMA_FILE))
+      end
+
+      def test_parse_with_memory
+        assert_instance_of Nokogiri::XML::RelaxNG, @schema
+        assert_equal 0, @schema.errors.length
+      end
+
+      def test_new
+        assert schema = Nokogiri::XML::RelaxNG.new(
+          File.read(ADDRESS_SCHEMA_FILE))
+        assert_instance_of Nokogiri::XML::RelaxNG, schema
+      end
+
+      def test_parse_with_io
+        xsd = nil
+        File.open(ADDRESS_SCHEMA_FILE, 'rb') { |f|
+          assert xsd = Nokogiri::XML::RelaxNG(f)
+        }
+        assert_equal 0, xsd.errors.length
+      end
+
+      def test_parse_with_errors
+        xml = File.read(ADDRESS_SCHEMA_FILE).sub(/name="/, 'name=')
+        assert_raises(Nokogiri::XML::SyntaxError) {
+          Nokogiri::XML::RelaxNG(xml)
+        }
+      end
+
+      def test_validate_document
+        doc = Nokogiri::XML(File.read(ADDRESS_XML_FILE))
+        assert errors = @schema.validate(doc)
+        assert_equal 0, errors.length
+      end
+
+      def test_validate_invalid_document
+        # Empty address book is not allowed
+        read_doc = '<addressBook></addressBook>'
+
+        assert errors = @schema.validate(Nokogiri::XML(read_doc))
+        assert_equal 1, errors.length
+      end
+
+      def test_valid?
+        valid_doc = Nokogiri::XML(File.read(ADDRESS_XML_FILE))
+
+        invalid_doc = Nokogiri::XML('<addressBook></addressBook>')
+
+        assert(@schema.valid?(valid_doc))
+        assert(!@schema.valid?(invalid_doc))
+      end
+    end
+  end
+end

data/test/xml/test_schema.rb

@@ -0,0 +1,94 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestSchema < Nokogiri::TestCase
+      def setup
+        assert @xsd = Nokogiri::XML::Schema(File.read(PO_SCHEMA_FILE))
+      end
+
+      def test_schema_from_document
+        doc = Nokogiri::XML(File.open(PO_SCHEMA_FILE))
+        assert doc
+        xsd = Nokogiri::XML::Schema.from_document doc
+        assert_instance_of Nokogiri::XML::Schema, xsd
+      end
+
+      def test_schema_from_document_node
+        doc = Nokogiri::XML(File.open(PO_SCHEMA_FILE))
+        assert doc
+        xsd = Nokogiri::XML::Schema.from_document doc.root
+        assert_instance_of Nokogiri::XML::Schema, xsd
+      end
+
+      def test_schema_validates_with_relative_paths
+        xsd = File.join(ASSETS_DIR, 'foo', 'foo.xsd')
+        xml = File.join(ASSETS_DIR, 'valid_bar.xml')
+        doc = Nokogiri::XML(File.open(xsd))
+        xsd = Nokogiri::XML::Schema.from_document doc
+
+        doc = Nokogiri::XML(File.open(xml))
+        assert xsd.valid?(doc)
+      end
+
+      def test_parse_with_memory
+        assert_instance_of Nokogiri::XML::Schema, @xsd
+        assert_equal 0, @xsd.errors.length
+      end
+
+      def test_new
+        assert xsd = Nokogiri::XML::Schema.new(File.read(PO_SCHEMA_FILE))
+        assert_instance_of Nokogiri::XML::Schema, xsd
+      end
+
+      def test_parse_with_io
+        xsd = nil
+        File.open(PO_SCHEMA_FILE, 'rb') { |f|
+          assert xsd = Nokogiri::XML::Schema(f)
+        }
+        assert_equal 0, xsd.errors.length
+      end
+
+      def test_parse_with_errors
+        xml = File.read(PO_SCHEMA_FILE).sub(/name="/, 'name=')
+        assert_raises(Nokogiri::XML::SyntaxError) {
+          Nokogiri::XML::Schema(xml)
+        }
+      end
+
+      def test_validate_document
+        doc = Nokogiri::XML(File.read(PO_XML_FILE))
+        assert errors = @xsd.validate(doc)
+        assert_equal 0, errors.length
+      end
+
+      def test_validate_file
+        assert errors = @xsd.validate(PO_XML_FILE)
+        assert_equal 0, errors.length
+      end
+
+      def test_validate_invalid_document
+        read_doc = File.read(PO_XML_FILE).gsub(/<city>[^<]*<\/city>/, '')
+
+        assert errors = @xsd.validate(Nokogiri::XML(read_doc))
+        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))
+
+        invalid_doc = Nokogiri::XML(
+          File.read(PO_XML_FILE).gsub(/<city>[^<]*<\/city>/, '')
+        )
+
+        assert(@xsd.valid?(valid_doc))
+        assert(!@xsd.valid?(invalid_doc))
+      end
+    end
+  end
+end

data/test/xml/test_syntax_error.rb

@@ -0,0 +1,12 @@
+require "helper"
+
+module Nokogiri
+  module XML
+    class TestSyntaxError < Nokogiri::TestCase
+      def test_new
+        error = Nokogiri::XML::SyntaxError.new 'hello'
+        assert_equal 'hello', error.message
+      end
+    end
+  end
+end

data/test/xml/test_text.rb

@@ -1,12 +1,46 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML
     class TestText < Nokogiri::TestCase
+      def test_css_path
+        doc  = Nokogiri.XML "<root> foo <a>something</a> bar bazz </root>"
+        node = doc.root.children[2]
+        assert_instance_of Nokogiri::XML::Text, node
+        assert_equal node, doc.at_css(node.css_path)
+      end
+
+      def test_inspect
+        node = Text.new('hello world', Document.new)
+        assert_equal "#<#{node.class.name}:#{sprintf("0x%x",node.object_id)} #{node.text.inspect}>", node.inspect
+      end
+
       def test_new
         node = Text.new('hello world', Document.new)
         assert node
         assert_equal('hello world', node.content)
+        assert_instance_of Nokogiri::XML::Text, node
+      end
+
+      def test_lots_of_text
+        100.times { Text.new('hello world', Document.new) }
+      end
+
+      def test_new_without_document
+        doc = Document.new
+        node = Nokogiri::XML::Element.new('foo', doc)
+
+        assert_nothing_raised do
+          Text.new('hello world', node)
+        end
+      end
+
+      def test_content=
+        node = Text.new('foo', Document.new)
+        assert_equal('foo', node.content)
+        node.content = '& <foo> &amp;'
+        assert_equal('& <foo> &amp;', node.content)
+        assert_equal('&amp; &lt;foo&gt; &amp;amp;', node.to_xml)
       end
     end
   end

data/test/xml/test_unparented_node.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 require 'stringio'
 
@@ -47,7 +47,7 @@ module Nokogiri
         end
         io.rewind
         assert called
-        assert_equal @node.serialize(nil, conf.options), io.read
+        assert_equal @node.serialize(:save_with => conf.options), io.read
       end
 
       %w{ xml html xhtml }.each do |type|
@@ -100,8 +100,8 @@ module Nokogiri
 
       def test_ancestors
         assert(address = @node.xpath('.//address').first)
-        assert_equal 3, address.ancestors.length
-        assert_equal ['employee', 'staff', nil],
+        assert_equal 2, address.ancestors.length
+        assert_equal ['employee', 'staff'],
           address.ancestors.map { |x| x ? x.name : x }
       end
 
@@ -129,7 +129,7 @@ module Nokogiri
       def test_add_child_in_same_document
         child = @node.css('employee').first
 
-        assert previous_last_child = child.children.last
+        assert child.children.last
         assert new_child = child.children.first
 
         last = child.children.last

data/test/xml/test_xpath.rb

@@ -1,12 +1,39 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 
 module Nokogiri
   module XML
     class TestXPath < Nokogiri::TestCase
+
+      # ** WHY ALL THOSE _if Nokogiri.uses_libxml?_ **
+      # Hi, my dear readers,
+      #
+      # After reading these tests you may be wondering why all those ugly
+      # if Nokogiri.uses_libxml? sparsed over the whole document. Well, let
+      # me explain it. While using XPath in Java, you need the extension
+      # functions to be in a namespace. This is not required by XPath, afaik,
+      # but it is an usual convention though.
+      #
+      # Furthermore, CSS does not support extension functions but it does in
+      # Nokogiri. Result: you cannot use them in JRuby impl. At least, until
+      # the CSS to XPath parser is patched, and let me say that there are more
+      # important features to add before that happens. I hope you will forgive
+      # me.
+      #
+      # Yours truly,
+      #
+      # The guy whose headaches belong to Nokogiri JRuby impl.
+
+
       def setup
         super
+
         @xml = Nokogiri::XML.parse(File.read(XML_FILE), XML_FILE)
 
+        @ns = @xml.root.namespaces
+
+        # TODO: Maybe I should move this to the original code.
+        @ns["nokogiri"] = "http://www.nokogiri.org/default_ns/ruby/extensions_functions"
+
         @handler = Class.new {
           attr_reader :things
 
@@ -27,11 +54,40 @@ module Nokogiri
           def my_filter set, attribute, value
             set.find_all { |x| x[attribute] == value }
           end
+
+          def saves_node_set node_set
+            @things = node_set
+          end
         }.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]
+      end
+
+      def test_boolean
+        assert_equal false, @xml.xpath('1 = 2')
+      end
+
+      def test_number
+        assert_equal 2, @xml.xpath('1 + 1')
+      end
+
+      def test_string
+        assert_equal 'foo', @xml.xpath('concat("fo", "o")')
+      end
+
       def test_css_search_uses_custom_selectors_with_arguments
-        set = @xml.css('employee > address:my_filter("domestic", "Yes")', @handler)
+        set = if Nokogiri.uses_libxml?
+                @xml.css('employee > address:my_filter("domestic", "Yes")', @handler)
+              else
+                @xml.xpath("//employee/address[nokogiri:my_filter(., \"domestic\", \"Yes\")]", @ns, @handler)
+               end
         assert set.length > 0
         set.each do |node|
           assert_equal 'Yes', node['domestic']
@@ -40,13 +96,23 @@ module Nokogiri
 
       def test_css_search_uses_custom_selectors
         set = @xml.xpath('//employee')
-        css_set = @xml.css('employee:thing()', @handler)
+        assert_nothing_raised do
+          if Nokogiri.uses_libxml?
+            @xml.css('employee:thing()', @handler)
+          else
+            @xml.xpath("//employee[nokogiri:thing(.)]", @ns, @handler)
+          end
+        end
         assert_equal(set.length, @handler.things.length)
         assert_equal(set.to_a, @handler.things.flatten)
       end
 
       def test_pass_self_to_function
-        set = @xml.xpath('//employee/address[my_filter(., "domestic", "Yes")]', @handler)
+        set = if Nokogiri.uses_libxml?
+                @xml.xpath('//employee/address[my_filter(., "domestic", "Yes")]', @handler)
+              else
+                @xml.xpath('//employee/address[nokogiri:my_filter(., "domestic", "Yes")]', @ns, @handler)
+              end
         assert set.length > 0
         set.each do |node|
           assert_equal 'Yes', node['domestic']
@@ -55,51 +121,116 @@ module Nokogiri
 
       def test_custom_xpath_function_gets_strings
         set = @xml.xpath('//employee')
-        @xml.xpath('//employee[thing("asdf")]', @handler)
+        if Nokogiri.uses_libxml?
+          @xml.xpath('//employee[thing("asdf")]', @handler)
+        else
+          @xml.xpath('//employee[nokogiri:thing("asdf")]', @ns, @handler)
+        end
         assert_equal(set.length, @handler.things.length)
         assert_equal(['asdf'] * set.length, @handler.things)
       end
 
       def test_custom_xpath_gets_true_booleans
         set = @xml.xpath('//employee')
-        @xml.xpath('//employee[thing(true())]', @handler)
+        if Nokogiri.uses_libxml?
+          @xml.xpath('//employee[thing(true())]', @handler)
+        else
+          @xml.xpath("//employee[nokogiri:thing(true())]", @ns, @handler)
+        end
         assert_equal(set.length, @handler.things.length)
         assert_equal([true] * set.length, @handler.things)
       end
 
       def test_custom_xpath_gets_false_booleans
         set = @xml.xpath('//employee')
-        @xml.xpath('//employee[thing(false())]', @handler)
+        if Nokogiri.uses_libxml?
+          @xml.xpath('//employee[thing(false())]', @handler)
+        else
+          @xml.xpath("//employee[nokogiri:thing(false())]", @ns, @handler)
+        end
         assert_equal(set.length, @handler.things.length)
         assert_equal([false] * set.length, @handler.things)
       end
 
       def test_custom_xpath_gets_numbers
         set = @xml.xpath('//employee')
-        @xml.xpath('//employee[thing(10)]', @handler)
+        if Nokogiri.uses_libxml?
+          @xml.xpath('//employee[thing(10)]', @handler)
+        else
+          @xml.xpath('//employee[nokogiri:thing(10)]', @ns, @handler)
+        end
         assert_equal(set.length, @handler.things.length)
         assert_equal([10] * set.length, @handler.things)
       end
 
       def test_custom_xpath_gets_node_sets
         set = @xml.xpath('//employee/name')
-        @xml.xpath('//employee[thing(name)]', @handler)
+        if Nokogiri.uses_libxml?
+          @xml.xpath('//employee[thing(name)]', @handler)
+        else
+          @xml.xpath('//employee[nokogiri:thing(name)]', @ns, @handler)
+        end
         assert_equal(set.length, @handler.things.length)
         assert_equal(set.to_a, @handler.things.flatten)
       end
 
       def test_custom_xpath_gets_node_sets_and_returns_array
         set = @xml.xpath('//employee/name')
-        @xml.xpath('//employee[returns_array(name)]', @handler)
+        if Nokogiri.uses_libxml?
+          @xml.xpath('//employee[returns_array(name)]', @handler)
+        else
+          @xml.xpath('//employee[nokogiri:returns_array(name)]', @ns, @handler)
+        end
         assert_equal(set.length, @handler.things.length)
         assert_equal(set.to_a, @handler.things.flatten)
       end
 
+      def test_custom_xpath_handler_is_passed_a_decorated_node_set
+        x = Module.new do
+          def awesome! ; end
+        end
+        util_decorate(@xml, x)
+
+        assert @xml.xpath('//employee/name')
+
+        @xml.xpath('//employee[saves_node_set(name)]', @handler)
+        assert_equal @xml, @handler.things.document
+        assert @handler.things.respond_to?(:awesome!)
+      end
+
       def test_code_that_invokes_OP_RESET_inside_libxml2
         doc = "<html><body id='foo'><foo>hi</foo></body></html>"
         xpath = 'id("foo")//foo'
         nokogiri = Nokogiri::HTML.parse(doc)
-        tree = nokogiri.xpath(xpath)
+        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