nokogiri 1.4.2 → 1.4.3

data/test/xml/test_text.rb

@@ -3,6 +3,13 @@ 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
@@ -19,11 +26,13 @@ module Nokogiri
         100.times { Text.new('hello world', Document.new) }
       end
 
-      # No assertion because this was a segv
       def test_new_without_document
         doc = Document.new
         node = Nokogiri::XML::Element.new('foo', doc)
-        text = Text.new('hello world', node)
+
+        assert_nothing_raised do
+          Text.new('hello world', node)
+        end
       end
 
       def test_content=

data/test/xml/test_unparented_node.rb

@@ -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

@@ -3,10 +3,37 @@ 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
 
@@ -52,7 +79,11 @@ module Nokogiri
       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']
@@ -61,13 +92,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']
@@ -76,42 +117,66 @@ 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
@@ -121,7 +186,9 @@ module Nokogiri
           def awesome! ; end
         end
         util_decorate(@xml, x)
-        set = @xml.xpath('//employee/name')
+
+        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!)
@@ -131,7 +198,7 @@ module Nokogiri
         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
     end
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 4
-  - 2
-  version: 1.4.2
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-22 00:00:00 -04:00
+date: 2010-07-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 0
@@ -36,9 +39,11 @@ dependencies:
   name: racc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -48,9 +53,11 @@ dependencies:
   name: rexical
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -60,9 +67,11 @@ dependencies:
   name: rake-compiler
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -72,9 +81,11 @@ dependencies:
   name: minitest
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 6
@@ -86,9 +97,11 @@ dependencies:
   name: hoe
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 2
         - 6
@@ -131,6 +144,7 @@ extra_rdoc_files:
 - ext/nokogiri/xml_entity_decl.c
 - ext/nokogiri/xml_entity_reference.c
 - ext/nokogiri/xml_io.c
+- ext/nokogiri/xml_libxml2_hacks.c
 - ext/nokogiri/xml_namespace.c
 - ext/nokogiri/xml_node.c
 - ext/nokogiri/xml_node_set.c
@@ -192,6 +206,8 @@ files:
 - ext/nokogiri/xml_entity_reference.h
 - ext/nokogiri/xml_io.c
 - ext/nokogiri/xml_io.h
+- ext/nokogiri/xml_libxml2_hacks.c
+- ext/nokogiri/xml_libxml2_hacks.h
 - ext/nokogiri/xml_namespace.c
 - ext/nokogiri/xml_namespace.h
 - ext/nokogiri/xml_node.c
@@ -305,7 +321,6 @@ files:
 - lib/nokogiri/html/sax/parser_context.rb
 - lib/nokogiri/syntax_error.rb
 - lib/nokogiri/version.rb
-- lib/nokogiri/version_warning.rb
 - lib/nokogiri/xml.rb
 - lib/nokogiri/xml/attr.rb
 - lib/nokogiri/xml/attribute_decl.rb
@@ -433,23 +448,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: nokogiri
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser"

data/lib/nokogiri/version_warning.rb

@@ -1,14 +0,0 @@
-module Nokogiri
-  if self.is_2_6_16?
-    VERSION_INFO['warnings'] << "libxml 2.6.16 is old and buggy."
-    if !defined?(I_KNOW_I_AM_USING_AN_OLD_AND_BUGGY_VERSION_OF_LIBXML2)
-      warn <<-eom
-HI.  You're using libxml2 version 2.6.16 which is over 4 years old and has
-plenty of bugs.  We suggest that for maximum HTML/XML parsing pleasure, you
-upgrade your version of libxml2 and re-install nokogiri.  If you like using
-libxml2 version 2.6.16, but don't like this warning, please define the constant
-I_KNOW_I_AM_USING_AN_OLD_AND_BUGGY_VERSION_OF_LIBXML2 before requring nokogiri.
-      eom
-    end
-  end
-end