nokogiri 1.2.1 → 1.2.2

data/lib/nokogiri/xml/node_set.rb

@@ -1,10 +1,16 @@
 module Nokogiri
   module XML
+    ####
+    # A NodeSet contains a list of Nokogiri::XML::Node objects.  Typically
+    # a NodeSet is return as a result of searching a Document via
+    # Nokogiri::XML::Node#css or Nokogiri::XML::Node#xpath
     class NodeSet
       include Enumerable
 
+      # The Document this NodeSet is associated with
       attr_accessor :document
 
+      # Create a NodeSet with +document+ defaulting to +list+
       def initialize document, list = []
         @document = document
         list.each { |x| self << x }
@@ -42,23 +48,19 @@ module Nokogiri
       end
 
       alias :<< :push
-
-      ###
-      # Unlink this NodeSet and all Node objects it contains from their
-      # current context.
-      def unlink
-        each { |node| node.unlink }
-        self
-      end
       alias :remove :unlink
 
       ###
       # Search this document for +paths+
+      #
+      # For more information see Nokogiri::XML::Node#css and
+      # Nokogiri::XML::Node#xpath
       def search *paths
+        ns = paths.last.is_a?(Hash) ? paths.pop : document.root.namespaces
         sub_set = NodeSet.new(document)
         document.decorate(sub_set)
         each do |node|
-          node.search(*paths).each do |sub_node|
+          node.search(*(paths + [ns])).each do |sub_node|
             sub_set << sub_node
           end
         end
@@ -71,7 +73,7 @@ module Nokogiri
       ###
       # If path is a string, search this document for +path+ returning the
       # first Node.  Otherwise, index in to the array with +path+.
-      def at path, ns = {}
+      def at path, ns = document.root ? document.root.namespaces : {}
         return self[path] if path.is_a?(Numeric)
         search(path, ns).first
       end

data/lib/nokogiri/xml/sax/parser.rb

@@ -28,9 +28,9 @@ module Nokogiri
           'ASCII'       => 22, # pure ASCII
         }
 
-        attr_accessor :document
-        def initialize(doc = XML::SAX::Document.new)
-          @encoding = 'ASCII'
+        attr_accessor :document, :encoding
+        def initialize(doc = XML::SAX::Document.new, encoding = 'ASCII')
+          @encoding = encoding
           @document = doc
         end
 

data/lib/xsd/xmlparser/nokogiri.rb

@@ -0,0 +1,53 @@
+require 'nokogiri'
+
+module XSD
+  module XMLParser
+    ###
+    # Nokogiri XML parser for soap4r.
+    #
+    # Nokogiri may be used as the XML parser in soap4r.  Simply require
+    # 'xsd/xmlparser/nokogiri' in your soap4r applications, and soap4r
+    # will use Nokogiri as it's XML parser.  No other changes should be
+    # required to use Nokogiri as the XML parser.
+    #
+    # Example (using UW ITS Web Services):
+    #
+    #   require 'rubygems'
+    #   gem 'soap4r'
+    #   require 'xsd/xmlparser/nokogiri'
+    #   require 'defaultDriver'
+    #
+    #   obj = AvlPortType.new
+    #   obj.getLatestByRout(obj.getAgencies, 8).each do |event|
+    #     ...
+    #   end
+    class Nokogiri < XSD::XMLParser::Parser
+      def initialize host, opt = {}
+        super
+        @parser = ::Nokogiri::XML::SAX::Parser.new(self, @charset || 'UTF-8')
+      end
+
+      def do_parse string_or_readable
+        @parser.parse(string_or_readable)
+      end
+
+      def start_element name, attrs = []
+        super(name, Hash[*attrs])
+      end
+
+      def error msg
+        raise ParseError.new(msg)
+      end
+      alias :warning :error
+
+      def cdata_block string
+        characters string
+      end
+
+      %w{ start_document end_document comment }.each do |name|
+        class_eval %{ def #{name}(*args); end }
+      end
+      add_factory(self)
+    end
+  end
+end

data/tasks/test.rb

@@ -11,7 +11,7 @@ class NokogiriTestTask < Rake::TestTask
     end
     self.test_files = FileList['test/**/test_*.rb'] +
       FileList['test/**/*_test.rb']
-    self.verbose = true
+    self.verbose = "verbose"
     self.warning = true
   end
 end
@@ -19,7 +19,7 @@ end
 desc "run test suite under valgrind with basic ruby options"
 NokogiriTestTask.new('test:valgrind').extend(Module.new {
   def ruby *args
-    cmd = "valgrind #{VALGRIND_BASIC_OPTS} #{RUBY} #{args.join(' ')}"
+    cmd = "valgrind #{VALGRIND_BASIC_OPTS} #{RUBY} #{args.join(' ')} test/test_nokogiri.rb --verbose=verbose"
     puts cmd
     system cmd
   end
@@ -28,7 +28,7 @@ NokogiriTestTask.new('test:valgrind').extend(Module.new {
 desc "run test suite under valgrind with memory-fill ruby options"
 NokogiriTestTask.new('test:valgrind_mem').extend(Module.new {
   def ruby *args
-    cmd = "valgrind #{VALGRIND_BASIC_OPTS} --freelist-vol=100000000 --malloc-fill=6D --free-fill=66 #{RUBY} #{args.join(' ')}"
+    cmd = "valgrind #{VALGRIND_BASIC_OPTS} --freelist-vol=100000000 --malloc-fill=6D --free-fill=66 #{RUBY} #{args.join(' ')} test/test_nokogiri.rb --verbose=verbose"
     puts cmd
     system cmd
   end
@@ -37,7 +37,7 @@ NokogiriTestTask.new('test:valgrind_mem').extend(Module.new {
 desc "run test suite under valgrind with memory-zero ruby options"
 NokogiriTestTask.new('test:valgrind_mem0').extend(Module.new {
   def ruby *args
-    cmd = "valgrind #{VALGRIND_BASIC_OPTS} --freelist-vol=100000000 --malloc-fill=00 --free-fill=00 #{RUBY} #{args.join(' ')}"
+    cmd = "valgrind #{VALGRIND_BASIC_OPTS} --freelist-vol=100000000 --malloc-fill=00 --free-fill=00 #{RUBY} #{args.join(' ')} test/test_nokogiri.rb --verbose=verbose"
     puts cmd
     system cmd
   end
@@ -116,8 +116,10 @@ namespace :test do
     end
 
     test_results = {}
+    libxslt = Dir[File.join(MULTI_XML, 'install', 'libxslt*')].first
     Dir[File.join(MULTI_XML, 'install', '*')].each do |xml2_version|
-      extopts = "--with-xml2-include=#{xml2_version}/include/libxml2 --with-xml2-lib=#{xml2_version}/lib --with-xslt-dir=/usr/local"
+      next unless xml2_version =~ /libxml2/
+      extopts = "--with-xml2-include=#{xml2_version}/include/libxml2 --with-xml2-lib=#{xml2_version}/lib --with-xslt-dir=#{libxslt}"
       cmd = "#{$0} clean test EXTOPTS='#{extopts}'"
 
       version = File.basename(xml2_version)

data/test/css/test_nthiness.rb

@@ -4,6 +4,7 @@ module Nokogiri
   module CSS
     class TestNthiness < Nokogiri::TestCase
       def setup
+        super
         doc = <<EOF
 <html>
 <table>

data/test/css/test_parser.rb

@@ -4,6 +4,7 @@ module Nokogiri
   module CSS
     class TestParser < Nokogiri::TestCase
       def setup
+        super
         @parser = Nokogiri::CSS::Parser.new
       end
 

data/test/css/test_tokenizer.rb

@@ -4,6 +4,7 @@ module Nokogiri
   module CSS
     class TestTokenizer < Nokogiri::TestCase
       def setup
+        super
         @scanner = Nokogiri::CSS::Tokenizer.new
       end
 

data/test/css/test_xpath_visitor.rb

@@ -4,6 +4,7 @@ module Nokogiri
   module CSS
     class TestXPathVisitor < Nokogiri::TestCase
       def setup
+        super
         @parser = Nokogiri::CSS::Parser.new
       end
 

data/test/helper.rb

@@ -20,6 +20,10 @@ module Nokogiri
       undef :default_test
     end
 
+    def setup
+      warn "#{name}" if ENV['TESTOPTS'] == '-v'
+    end
+
     def teardown
       if ENV['NOKOGIRI_GC']
         STDOUT.putc '!'

data/test/hpricot/test_alter.rb

@@ -5,6 +5,7 @@ class TestAlter < Nokogiri::TestCase
   include Nokogiri
 
   def setup
+    super
     @basic = Hpricot.parse(TestFiles::BASIC)
   end
   

data/test/html/sax/test_parser.rb

@@ -5,6 +5,7 @@ module Nokogiri
     module SAX
       class TestParser < Nokogiri::SAX::TestCase
         def setup
+          super
           @parser = HTML::SAX::Parser.new(Doc.new)
         end
 
@@ -13,6 +14,18 @@ module Nokogiri
           assert_equal 1110, @parser.document.end_elements.length
         end
 
+        def test_parse_file_non_existant
+          assert_raise Errno::ENOENT do
+            @parser.parse_file('foo')
+          end
+        end
+
+        def test_parse_file_with_dir
+          assert_raise Errno::EISDIR do
+            @parser.parse_file(File.dirname(__FILE__))
+          end
+        end
+
         def test_parse_document
           @parser.parse_memory(<<-eoxml)
             <p>Paragraph 1</p>

data/test/html/test_builder.rb

@@ -3,6 +3,15 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
 module Nokogiri
   module HTML
     class TestBuilder < Nokogiri::TestCase
+      def test_hash_as_attributes_for_attribute_method
+        html = Nokogiri::HTML::Builder.new {
+          div.slide(:class => 'another_class') {
+            span 'Slide 1'
+          }
+        }.to_html
+        assert_match 'class="slide another_class"', html
+      end
+
       def test_hash_as_attributes
         builder = Nokogiri::HTML::Builder.new do
           div(:id => 'awesome') {
@@ -13,6 +22,18 @@ module Nokogiri
                      builder.doc.root.to_html.gsub(/\n/, '').gsub(/>\s*</, '><'))
       end
 
+      def test_tag_nesting
+        builder = Nokogiri::HTML::Builder.new do
+          span.left ''
+          span.middle {
+            div.icon ''
+          }
+          span.right ''
+        end
+        assert node = builder.doc.css('span.right').first
+        assert_equal 'middle', node.previous_sibling['class']
+      end
+
       def test_has_ampersand
         builder = Nokogiri::HTML::Builder.new do
           div.rad.thing! {

data/test/html/test_document.rb

@@ -4,9 +4,35 @@ module Nokogiri
   module HTML
     class TestDocument < Nokogiri::TestCase
       def setup
+        super
         @html = Nokogiri::HTML.parse(File.read(HTML_FILE))
       end
 
+      def test_swap_should_not_exist
+        assert_raises(NoMethodError) {
+          @html.swap
+        }
+      end
+
+      def test_namespace_should_not_exist
+        assert_raises(NoMethodError) {
+          @html.namespace
+        }
+      end
+
+      def test_root_node_parent_is_document
+        parent = @html.root.parent
+        assert_equal @html, parent
+        assert_instance_of Nokogiri::HTML::Document, parent
+      end
+
+      def test_parse_empty_document
+        doc = Nokogiri::HTML("\n")
+        assert_equal 0, doc.css('a').length
+        assert_equal 0, doc.xpath('//a').length
+        assert_equal 0, doc.search('//a').length
+      end
+
       def test_HTML_function
         html = Nokogiri::HTML(File.read(HTML_FILE))
         assert html.html?
@@ -136,6 +162,10 @@ module Nokogiri
       def test_dup_document
         assert dup = @html.dup
         assert_not_equal dup, @html
+        assert @html.html?
+        assert_instance_of Nokogiri::HTML::Document, dup
+        assert dup.html?, 'duplicate should be html'
+        assert_equal @html.to_s, dup.to_s
       end
 
       def test_dup_document_shallow
@@ -167,6 +197,12 @@ module Nokogiri
         assert_equal('<p>Helloworld!</p>', node.inner_html.gsub(/\s/, ''))
       end
 
+      def test_fragment_contains_text_node
+        fragment = Nokogiri::HTML.fragment('fooo')
+        assert_equal 1, fragment.children.length
+        assert_equal 'fooo', fragment.inner_text
+      end
+
       def test_fragment_includes_two_tags
         assert_equal 2, Nokogiri::HTML.fragment("<br/><hr/>").children.length
       end

data/test/html/test_document_encoding.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+
+module Nokogiri
+  module HTML
+    if RUBY_VERSION =~ /^1\.9/
+      class TestDocumentEncoding < Nokogiri::TestCase
+        def test_default_to_encoding_from_string
+          bad_charset = <<-eohtml
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=charset=UTF-8">
+</head>
+<body>
+  <a href="http://tenderlovemaking.com/">blah!</a>
+</body>
+</html>
+          eohtml
+          doc = Nokogiri::HTML(bad_charset)
+          assert_equal bad_charset.encoding.name, doc.encoding
+
+          doc = Nokogiri.parse(bad_charset)
+          assert_equal bad_charset.encoding.name, doc.encoding
+        end
+
+        def test_encoding_with_a_bad_name
+          bad_charset = <<-eohtml
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=charset=UTF-8">
+</head>
+<body>
+  <a href="http://tenderlovemaking.com/">blah!</a>
+</body>
+</html>
+          eohtml
+          doc = Nokogiri::HTML(bad_charset, nil, 'askldjfhalsdfjhlkasdfjh')
+          assert_equal ['http://tenderlovemaking.com/'],
+            doc.css('a').map { |a| a['href'] }
+        end
+      end
+    end
+  end
+end

data/test/html/test_named_characters.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+
+module Nokogiri
+  module HTML
+    class TestNamedCharacters < Nokogiri::TestCase
+      def test_named_character
+        copy = NamedCharacters.get('copy')
+        assert_equal 169, NamedCharacters['copy']
+        assert_equal copy.value, NamedCharacters['copy']
+        assert copy.description
+      end
+    end
+  end
+end

data/test/html/test_node.rb

@@ -5,6 +5,86 @@ require 'nkf'
 module Nokogiri
   module HTML
     class TestNode < Nokogiri::TestCase
+      def setup
+        super
+        @html = Nokogiri::HTML(<<-eohtml)
+        <html>
+          <head></head>
+          <body>
+            <div>first</div>
+          </body>
+        </html>
+        eohtml
+      end
+
+      def test_swap
+        @html.at('div').swap('<a href="foo">bar</a>')
+        a_tag = @html.css('a').first
+        assert_equal 'body', a_tag.parent.name
+        assert_equal 0, @html.css('div').length
+      end
+
+      def test_attribute_decodes_entities
+        node = @html.at('div')
+        node['href'] = 'foo&bar'
+        assert_equal 'foo&bar', node['href']
+        node['href'] += '&baz'
+        assert_equal 'foo&bar&baz', node['href']
+      end
+
+
+      def test_before_will_prepend_text_nodes
+        assert node = @html.at('//body').children.first
+        node.before "some text"
+        assert_equal 'some text', @html.at('//body').children[0].content.strip
+      end
+
+      def test_inner_html=
+        assert div = @html.at('//div')
+        div.inner_html = '<span>testing</span>'
+        assert_equal 'span', div.children.first.name
+
+        div.inner_html = 'testing'
+        assert_equal 'testing', div.content
+      end
+
+      def test_fragment
+        fragment = @html.fragment(<<-eohtml)
+          hello
+          <div class="foo">
+            <p>bar</p>
+          </div>
+          world
+        eohtml
+        assert_match(/^hello/, fragment.inner_html.strip)
+        assert_equal 3, fragment.children.length
+        assert p_tag = fragment.css('p').first
+        assert_equal 'div', p_tag.parent.name
+        assert_equal 'foo', p_tag.parent['class']
+      end
+
+      def test_after_will_append_text_nodes
+        assert node = @html.at('//body/div')
+        node.after "some text"
+        assert_equal 'some text', node.next.text.strip
+      end
+
+      def test_replace
+        doc = Nokogiri::HTML(<<-eohtml)
+          <html>
+            <head></head>
+            <body>
+              <center><img src='logo.gif' /></center>
+            </body>
+          </html>
+        eohtml
+        center = doc.at("//center")
+        img = center.search("//img")
+        assert_raises ArgumentError do
+          center.replace img
+        end
+      end
+
       def test_to_html_does_not_contain_entities
         html = NKF.nkf("-e --msdos", <<-EOH)
         <html><body>