nokogiri 1.4.7 → 1.5.0.beta.1

data/test/xml/test_node_reparenting.rb

@@ -50,22 +50,21 @@ module Nokogiri
         # end
 
         {
-          :add_child            => {:target => "/root/a1",        :returns_self => false, :children_tags => %w[text b1 b2]},
-          :<<                   => {:target => "/root/a1",        :returns_self => false, :children_tags => %w[text b1 b2]},
+          :add_child            => {:target => "/root/a1",        :returns => :reparented, :children_tags => %w[text b1 b2]},
+          :<<                   => {:target => "/root/a1",        :returns => :reparented, :children_tags => %w[text 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]},
+          :replace              => {:target => "/root/a1/node()", :returns => :reparented, :children_tags => %w[b1 b2]},
+          :swap                 => {:target => "/root/a1/node()", :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]},
+          :inner_html=          => {:target => "/root/a1",        :returns => :self,       :children_tags => %w[b1 b2]},
 
-          :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_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_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]}
+          :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]}
         }.each do |method, params|
 
           before do
@@ -96,12 +95,11 @@ module Nokogiri
                   end
 
                   it "returns the expected value" do
-                    sendee = @doc.at_xpath(params[:target])
-                    result = sendee.send(method, @other_node)
-                    if params[:returns_self]
-                      result.must_equal sendee
+                    if params[:returns] == :self
+                      sendee = @doc.at_xpath(params[:target])
+                      sendee.send(method, @other_node).must_equal sendee
                     else
-                      result.must_equal @other_node
+                      @doc.at_xpath(params[:target]).send(method, @other_node).must_equal @other_node
                     end
                   end
                 end
@@ -112,17 +110,6 @@ 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
@@ -147,25 +134,37 @@ module Nokogiri
               end
             end
           end
-        end
 
-        describe "text node merging" do
-          describe "#add_child" do
-            it "merges the Text node with adjacent Text nodes" do
-              @doc.at_xpath("/root/a1").add_child Nokogiri::XML::Text.new('hello', @doc)
-              @doc.at_xpath("/root/a1/text()").content.must_equal "First nodehello"
+          describe "text node merging" do
+            describe "#add_child" do
+              it "merges the Text node with adjacent Text nodes" do
+                @doc.at_xpath("/root/a1").add_child Nokogiri::XML::Text.new('hello', @doc)
+                @doc.at_xpath("/root/a1/text()").content.must_equal "First nodehello"
+              end
             end
-          end
-          describe "#replace" do
-            it "merges the Text node with adjacent Text nodes" do
-              @doc.at_xpath("/root/a3/bx").replace Nokogiri::XML::Text.new('hello', @doc)
-              @doc.at_xpath("/root/a3/text()").content.must_equal "Third hellonode"
+            describe "#replace" do
+              it "merges the Text node with adjacent Text nodes" do
+                @doc.at_xpath("/root/a3/bx").replace Nokogiri::XML::Text.new('hello', @doc)
+                @doc.at_xpath("/root/a3/text()").content.must_equal "Third hellonode"
+              end
             end
           end
         end
       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
+        end
+
         describe "#add_child" do
           describe "given a new node with a namespace" do
             it "keeps the namespace" do
@@ -224,34 +223,7 @@ 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)
@@ -288,10 +260,10 @@ module Nokogiri
                   </root>
                 EOHTML
 
-                assert root = doc.at("root")
-                assert a = root.at("a")
-                assert b = a.at("b")
-                assert c = a.at("c")
+                root = doc.at("root")
+                a = root.at("a")
+                b = a.at("b")
+                c = a.at("c")
                 a.add_next_sibling(b.unlink)
                 c.unlink
               end
@@ -300,21 +272,6 @@ module Nokogiri
           end
         end
 
-        describe "replace-merging text nodes" do
-          [
-            ['<root>a<br/></root>',  'afoo'],
-            ['<root>a<br/>b</root>', 'afoob'],
-            ['<root><br/>b</root>',  'foob']
-          ].each do |xml, result|
-            it "doesn't blow up on #{xml}" do
-              doc = Nokogiri::XML.parse(xml)
-              saved_nodes = doc.root.children
-              doc.at_xpath("/root/br").replace(Nokogiri::XML::Text.new('foo', doc))
-              saved_nodes.each { |child| child.inspect } # try to cause a crash
-              assert_equal result, doc.at_xpath("/root/text()").inner_text
-            end
-          end
-        end
       end
     end
   end

data/test/xml/test_node_set.rb

@@ -3,27 +3,6 @@ require "helper"
 module Nokogiri
   module XML
     class TestNodeSet < Nokogiri::TestCase
-      class TestNodeSetNamespaces < Nokogiri::TestCase
-        def setup
-          super
-          @xml = Nokogiri.XML('<foo xmlns:n0="http://example.com" />')
-          @list = @xml.xpath('//namespace::*')
-        end
-
-        def test_include?
-          assert @list.include?(@list.first), 'list should have item'
-        end
-
-        def test_push
-          @list.push @list.first
-        end
-
-        def test_delete
-          @list.push @list.first
-          @list.delete @list.first
-        end
-      end
-
       def setup
         super
         @xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE)
@@ -158,16 +137,6 @@ 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')
@@ -286,26 +255,11 @@ module Nokogiri
         assert_match '<a>', html
       end
 
-      def test_gt_string_arg
-        assert node_set = @xml.search('//employee')
-        assert_equal node_set.xpath('./employeeId'), (node_set > 'employeeId')
-      end
-
       def test_at
         assert node_set = @xml.search('//employee')
         assert_equal node_set.first, node_set.at(0)
       end
 
-      def test_at_xpath
-        assert node_set = @xml.search('//employee')
-        assert_equal node_set.first.first_element_child, node_set.at_xpath('./employeeId')
-      end
-
-      def test_at_css
-        assert node_set = @xml.search('//employee')
-        assert_equal node_set.first.first_element_child, node_set.at_css('employeeId')
-      end
-
       def test_percent
         assert node_set = @xml.search('//employee')
         assert_equal node_set.first, node_set % 0
@@ -441,19 +395,6 @@ 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
@@ -469,7 +410,7 @@ module Nokogiri
         names_len = names.length
         positions_len = positions.length
 
-        assert_raises(ArgumentError) { names + positions.first }
+        assert_raises(ArgumentError) { result = names + positions.first }
 
         result = names + positions
         assert_equal names_len,                         names.length
@@ -493,7 +434,7 @@ module Nokogiri
         employees_len = employees.length
         females_len = females.length
 
-        assert_raises(ArgumentError) { employees - females.first }
+        assert_raises(ArgumentError) { result = employees - females.first }
 
         result = employees - females
         assert_equal employees_len,                     employees.length

data/test/xml/test_schema.rb

@@ -74,11 +74,6 @@ 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_text.rb

@@ -3,13 +3,6 @@ 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
@@ -26,13 +19,11 @@ 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)
-
-        assert_nothing_raised do
-          Text.new('hello world', node)
-        end
+        text = Text.new('hello world', node)
       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 child.children.last
+        assert previous_last_child = child.children.last
         assert new_child = child.children.first
 
         last = child.children.last

data/test/xml/test_xpath.rb

@@ -61,10 +61,6 @@ 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]
@@ -96,13 +92,11 @@ module Nokogiri
 
       def test_css_search_uses_custom_selectors
         set = @xml.xpath('//employee')
-        assert_nothing_raised do
-          if Nokogiri.uses_libxml?
-            @xml.css('employee:thing()', @handler)
-          else
-            @xml.xpath("//employee[nokogiri:thing(.)]", @ns, @handler)
-          end
-        end
+        css_set = if Nokogiri.uses_libxml?
+                    @xml.css('employee:thing()', @handler)
+                  else
+                    @xml.xpath("//employee[nokogiri:thing(.)]", @ns, @handler)
+                  end
         assert_equal(set.length, @handler.things.length)
         assert_equal(set.to_a, @handler.things.flatten)
       end
@@ -190,9 +184,7 @@ module Nokogiri
           def awesome! ; end
         end
         util_decorate(@xml, x)
-
-        assert @xml.xpath('//employee/name')
-
+        set = @xml.xpath('//employee/name')
         @xml.xpath('//employee[saves_node_set(name)]', @handler)
         assert_equal @xml, @handler.things.document
         assert @handler.things.respond_to?(:awesome!)
@@ -202,35 +194,7 @@ module Nokogiri
         doc = "<html><body id='foo'><foo>hi</foo></body></html>"
         xpath = 'id("foo")//foo'
         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)
+        tree = nokogiri.xpath(xpath)
       end
     end
   end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.4.7
+  hash: 62196433
+  prerelease: true
+  segments: 
+  - 1
+  - 5
+  - 0
+  - beta
+  - 1
+  version: 1.5.0.beta.1
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -11,64 +18,99 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 -04:00
+date: 2010-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: racc
+  name: rubyforge
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rexical
+  name: racc
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake-compiler
+  name: rexical
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: rake-compiler
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.6.0
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: minitest
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.9.4
+        hash: 15
+        segments: 
+        - 1
+        - 6
+        - 0
+        version: 1.6.0
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  type: :development
+  version_requirements: *id006
 description: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser.  Among Nokogiri's\n\
   many features is the ability to search documents via XPath or CSS3 selectors.\n\n\
   XML is like violence - if it doesn\xE2\x80\x99t solve your problems, you are not using\n\
@@ -82,46 +124,44 @@ extensions:
 - ext/nokogiri/extconf.rb
 extra_rdoc_files: 
 - Manifest.txt
-- README.ja.rdoc
-- CHANGELOG.rdoc
 - CHANGELOG.ja.rdoc
+- CHANGELOG.rdoc
+- README.ja.rdoc
 - README.rdoc
-- ext/nokogiri/xml_sax_push_parser.c
-- ext/nokogiri/xml_relax_ng.c
-- ext/nokogiri/html_sax_parser_context.c
+- ext/nokogiri/html_document.c
+- ext/nokogiri/html_element_description.c
 - ext/nokogiri/html_entity_lookup.c
-- ext/nokogiri/xml_text.c
+- ext/nokogiri/html_sax_parser_context.c
 - ext/nokogiri/nokogiri.c
-- ext/nokogiri/xml_element_decl.c
-- ext/nokogiri/xml_encoding_handler.c
-- ext/nokogiri/html_document.c
-- ext/nokogiri/xslt_stylesheet.c
+- ext/nokogiri/xml_attr.c
 - ext/nokogiri/xml_attribute_decl.c
-- ext/nokogiri/xml_io.c
-- ext/nokogiri/xml_document_fragment.c
-- ext/nokogiri/xml_namespace.c
-- ext/nokogiri/xml_libxml2_hacks.c
-- ext/nokogiri/xml_sax_parser_context.c
+- ext/nokogiri/xml_cdata.c
 - ext/nokogiri/xml_comment.c
-- ext/nokogiri/xml_sax_parser.c
-- ext/nokogiri/html_element_description.c
-- ext/nokogiri/xml_xpath_context.c
-- ext/nokogiri/xml_syntax_error.c
 - ext/nokogiri/xml_document.c
+- ext/nokogiri/xml_document_fragment.c
+- ext/nokogiri/xml_dtd.c
+- ext/nokogiri/xml_element_content.c
+- ext/nokogiri/xml_element_decl.c
+- ext/nokogiri/xml_encoding_handler.c
 - ext/nokogiri/xml_entity_decl.c
+- ext/nokogiri/xml_entity_reference.c
+- ext/nokogiri/xml_io.c
+- ext/nokogiri/xml_namespace.c
 - ext/nokogiri/xml_node.c
 - ext/nokogiri/xml_node_set.c
-- ext/nokogiri/xml_reader.c
 - ext/nokogiri/xml_processing_instruction.c
-- ext/nokogiri/xml_element_content.c
-- ext/nokogiri/xml_dtd.c
-- ext/nokogiri/xml_attr.c
+- ext/nokogiri/xml_reader.c
+- ext/nokogiri/xml_relax_ng.c
+- ext/nokogiri/xml_sax_parser.c
+- ext/nokogiri/xml_sax_parser_context.c
+- ext/nokogiri/xml_sax_push_parser.c
 - ext/nokogiri/xml_schema.c
-- ext/nokogiri/xml_cdata.c
-- ext/nokogiri/xml_entity_reference.c
+- ext/nokogiri/xml_syntax_error.c
+- ext/nokogiri/xml_text.c
+- ext/nokogiri/xml_xpath_context.c
+- ext/nokogiri/xslt_stylesheet.c
 files: 
 - .autotest
-- .gemtest
 - CHANGELOG.ja.rdoc
 - CHANGELOG.rdoc
 - Manifest.txt
@@ -129,7 +169,7 @@ files:
 - README.rdoc
 - Rakefile
 - bin/nokogiri
-- ext/nokogiri/depend
+- deps.rip
 - ext/nokogiri/extconf.rb
 - ext/nokogiri/html_document.c
 - ext/nokogiri/html_document.h
@@ -167,8 +207,6 @@ 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
@@ -199,84 +237,22 @@ files:
 - ext/nokogiri/xslt_stylesheet.h
 - lib/nokogiri.rb
 - lib/nokogiri/css.rb
+- lib/nokogiri/css/generated_parser.rb
+- lib/nokogiri/css/generated_tokenizer.rb
 - lib/nokogiri/css/node.rb
 - lib/nokogiri/css/parser.rb
 - lib/nokogiri/css/parser.y
-- lib/nokogiri/css/parser_extras.rb
 - lib/nokogiri/css/syntax_error.rb
 - lib/nokogiri/css/tokenizer.rb
 - lib/nokogiri/css/tokenizer.rex
 - lib/nokogiri/css/xpath_visitor.rb
 - lib/nokogiri/decorators/slop.rb
-- lib/nokogiri/ffi/encoding_handler.rb
-- lib/nokogiri/ffi/html/document.rb
-- lib/nokogiri/ffi/html/element_description.rb
-- lib/nokogiri/ffi/html/entity_lookup.rb
-- lib/nokogiri/ffi/html/sax/parser_context.rb
-- lib/nokogiri/ffi/io_callbacks.rb
-- lib/nokogiri/ffi/libxml.rb
-- lib/nokogiri/ffi/structs/common_node.rb
-- lib/nokogiri/ffi/structs/html_elem_desc.rb
-- lib/nokogiri/ffi/structs/html_entity_desc.rb
-- lib/nokogiri/ffi/structs/xml_alloc.rb
-- lib/nokogiri/ffi/structs/xml_attr.rb
-- lib/nokogiri/ffi/structs/xml_attribute.rb
-- lib/nokogiri/ffi/structs/xml_buffer.rb
-- lib/nokogiri/ffi/structs/xml_char_encoding_handler.rb
-- lib/nokogiri/ffi/structs/xml_document.rb
-- lib/nokogiri/ffi/structs/xml_dtd.rb
-- lib/nokogiri/ffi/structs/xml_element.rb
-- lib/nokogiri/ffi/structs/xml_element_content.rb
-- lib/nokogiri/ffi/structs/xml_entity.rb
-- lib/nokogiri/ffi/structs/xml_enumeration.rb
-- lib/nokogiri/ffi/structs/xml_node.rb
-- lib/nokogiri/ffi/structs/xml_node_set.rb
-- lib/nokogiri/ffi/structs/xml_notation.rb
-- lib/nokogiri/ffi/structs/xml_ns.rb
-- lib/nokogiri/ffi/structs/xml_parser_context.rb
-- lib/nokogiri/ffi/structs/xml_parser_input.rb
-- lib/nokogiri/ffi/structs/xml_relax_ng.rb
-- lib/nokogiri/ffi/structs/xml_sax_handler.rb
-- lib/nokogiri/ffi/structs/xml_sax_push_parser_context.rb
-- lib/nokogiri/ffi/structs/xml_schema.rb
-- lib/nokogiri/ffi/structs/xml_syntax_error.rb
-- lib/nokogiri/ffi/structs/xml_text_reader.rb
-- lib/nokogiri/ffi/structs/xml_xpath_context.rb
-- lib/nokogiri/ffi/structs/xml_xpath_object.rb
-- lib/nokogiri/ffi/structs/xml_xpath_parser_context.rb
-- lib/nokogiri/ffi/structs/xslt_stylesheet.rb
-- lib/nokogiri/ffi/weak_bucket.rb
-- lib/nokogiri/ffi/xml/attr.rb
-- lib/nokogiri/ffi/xml/attribute_decl.rb
-- lib/nokogiri/ffi/xml/cdata.rb
-- lib/nokogiri/ffi/xml/comment.rb
-- lib/nokogiri/ffi/xml/document.rb
-- lib/nokogiri/ffi/xml/document_fragment.rb
-- lib/nokogiri/ffi/xml/dtd.rb
-- lib/nokogiri/ffi/xml/element_content.rb
-- lib/nokogiri/ffi/xml/element_decl.rb
-- lib/nokogiri/ffi/xml/entity_decl.rb
-- lib/nokogiri/ffi/xml/entity_reference.rb
-- lib/nokogiri/ffi/xml/namespace.rb
-- lib/nokogiri/ffi/xml/node.rb
-- lib/nokogiri/ffi/xml/node_set.rb
-- lib/nokogiri/ffi/xml/processing_instruction.rb
-- lib/nokogiri/ffi/xml/reader.rb
-- lib/nokogiri/ffi/xml/relax_ng.rb
-- lib/nokogiri/ffi/xml/sax/parser.rb
-- lib/nokogiri/ffi/xml/sax/parser_context.rb
-- lib/nokogiri/ffi/xml/sax/push_parser.rb
-- lib/nokogiri/ffi/xml/schema.rb
-- lib/nokogiri/ffi/xml/syntax_error.rb
-- lib/nokogiri/ffi/xml/text.rb
-- lib/nokogiri/ffi/xml/xpath.rb
-- lib/nokogiri/ffi/xml/xpath_context.rb
-- lib/nokogiri/ffi/xslt/stylesheet.rb
 - lib/nokogiri/html.rb
 - lib/nokogiri/html/builder.rb
 - lib/nokogiri/html/document.rb
 - lib/nokogiri/html/document_fragment.rb
 - lib/nokogiri/html/element_description.rb
+- lib/nokogiri/html/element_description_defaults.rb
 - lib/nokogiri/html/entity_lookup.rb
 - lib/nokogiri/html/sax/parser.rb
 - lib/nokogiri/html/sax/parser_context.rb
@@ -327,15 +303,11 @@ files:
 - test/css/test_parser.rb
 - test/css/test_tokenizer.rb
 - test/css/test_xpath_visitor.rb
-- test/decorators/test_slop.rb
-- test/ffi/test_document.rb
 - test/files/2ch.html
 - test/files/address_book.rlx
 - test/files/address_book.xml
 - test/files/bar/bar.xsd
 - test/files/dont_hurt_em_why.xml
-- test/files/encoding.html
-- test/files/encoding.xhtml
 - test/files/exslt.xml
 - test/files/exslt.xslt
 - test/files/foo/foo.xsd
@@ -402,7 +374,6 @@ files:
 - test/xml/test_text.rb
 - test/xml/test_unparented_node.rb
 - test/xml/test_xpath.rb
-- test/xslt/test_custom_functions.rb
 has_rdoc: true
 homepage: http://nokogiri.org
 licenses: []
@@ -418,77 +389,82 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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 
-      version: "0"
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: nokogiri
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "Nokogiri (\xE9\x8B\xB8) is an HTML, XML, SAX, and Reader parser"
 test_files: 
-- test/test_convert_xpath.rb
-- test/test_soap4r_sax.rb
-- test/test_memory_leak.rb
-- test/test_nokogiri.rb
-- test/test_css_cache.rb
 - test/css/test_nthiness.rb
-- test/css/test_xpath_visitor.rb
 - test/css/test_parser.rb
 - test/css/test_tokenizer.rb
-- test/decorators/test_slop.rb
+- test/css/test_xpath_visitor.rb
+- test/html/sax/test_parser.rb
+- test/html/sax/test_parser_context.rb
+- test/html/test_builder.rb
 - test/html/test_document.rb
 - test/html/test_document_encoding.rb
-- test/html/test_named_characters.rb
 - test/html/test_document_fragment.rb
+- test/html/test_element_description.rb
+- test/html/test_named_characters.rb
 - test/html/test_node.rb
-- test/html/test_builder.rb
-- test/html/sax/test_parser_context.rb
-- test/html/sax/test_parser.rb
 - test/html/test_node_encoding.rb
-- test/html/test_element_description.rb
-- test/ffi/test_document.rb
+- test/test_convert_xpath.rb
+- test/test_css_cache.rb
+- test/test_encoding_handler.rb
+- test/test_memory_leak.rb
+- test/test_nokogiri.rb
 - test/test_reader.rb
-- test/xml/test_parse_options.rb
-- test/xml/test_unparented_node.rb
-- test/xml/test_element_decl.rb
-- test/xml/test_document.rb
-- test/xml/test_dtd.rb
-- test/xml/test_document_encoding.rb
-- test/xml/test_entity_decl.rb
-- test/xml/test_dtd_encoding.rb
+- test/test_soap4r_sax.rb
+- test/test_xslt_transforms.rb
 - test/xml/node/test_save_options.rb
 - test/xml/node/test_subclass.rb
-- test/xml/test_document_fragment.rb
-- test/xml/test_cdata.rb
-- test/xml/test_text.rb
-- test/xml/test_reader_encoding.rb
-- test/xml/test_xpath.rb
-- test/xml/test_element_content.rb
-- test/xml/test_node.rb
-- test/xml/test_builder.rb
-- test/xml/sax/test_push_parser.rb
-- test/xml/sax/test_parser_context.rb
 - test/xml/sax/test_parser.rb
-- test/xml/test_schema.rb
-- test/xml/test_node_set.rb
+- test/xml/sax/test_parser_context.rb
+- test/xml/sax/test_push_parser.rb
 - test/xml/test_attr.rb
-- test/xml/test_processing_instruction.rb
-- test/xml/test_node_encoding.rb
-- test/xml/test_syntax_error.rb
+- test/xml/test_attribute_decl.rb
+- test/xml/test_builder.rb
+- test/xml/test_cdata.rb
 - test/xml/test_comment.rb
+- test/xml/test_document.rb
+- test/xml/test_document_encoding.rb
+- test/xml/test_document_fragment.rb
+- test/xml/test_dtd.rb
+- test/xml/test_dtd_encoding.rb
+- test/xml/test_element_content.rb
+- test/xml/test_element_decl.rb
+- test/xml/test_entity_decl.rb
 - test/xml/test_entity_reference.rb
-- test/xml/test_node_reparenting.rb
-- test/xml/test_attribute_decl.rb
-- test/xml/test_relax_ng.rb
 - test/xml/test_namespace.rb
+- test/xml/test_node.rb
 - test/xml/test_node_attributes.rb
-- test/test_xslt_transforms.rb
-- test/xslt/test_custom_functions.rb
-- test/test_encoding_handler.rb
+- test/xml/test_node_encoding.rb
+- test/xml/test_node_reparenting.rb
+- test/xml/test_node_set.rb
+- test/xml/test_parse_options.rb
+- test/xml/test_processing_instruction.rb
+- test/xml/test_reader_encoding.rb
+- test/xml/test_relax_ng.rb
+- test/xml/test_schema.rb
+- test/xml/test_syntax_error.rb
+- test/xml/test_text.rb
+- test/xml/test_unparented_node.rb
+- test/xml/test_xpath.rb