RubyGems - nokogiri - Versions diffs - 1.2.3-x86-mswin32-60 → 1.4.5-x86-mswin32-60 - Mend

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

Potentially problematic release.

This version of nokogiri might be problematic. Click here for more details.

Files changed (319) hide show

data/.autotest +18 -7
data/.gemtest +0 -0
data/CHANGELOG.ja.rdoc +297 -3
data/CHANGELOG.rdoc +289 -0
data/Manifest.txt +148 -37
data/README.ja.rdoc +20 -20
data/README.rdoc +53 -22
data/Rakefile +127 -211
data/bin/nokogiri +54 -0
data/ext/nokogiri/depend +358 -0
data/ext/nokogiri/extconf.rb +89 -54
data/ext/nokogiri/html_document.c +34 -27
data/ext/nokogiri/html_document.h +1 -1
data/ext/nokogiri/html_element_description.c +276 -0
data/ext/nokogiri/html_element_description.h +10 -0
data/ext/nokogiri/html_entity_lookup.c +7 -5
data/ext/nokogiri/html_entity_lookup.h +1 -1
data/ext/nokogiri/html_sax_parser_context.c +94 -0
data/ext/nokogiri/html_sax_parser_context.h +11 -0
data/ext/nokogiri/{native.c → nokogiri.c} +31 -7
data/ext/nokogiri/{native.h → nokogiri.h} +68 -41
data/ext/nokogiri/xml_attr.c +20 -9
data/ext/nokogiri/xml_attr.h +1 -1
data/ext/nokogiri/xml_attribute_decl.c +70 -0
data/ext/nokogiri/xml_attribute_decl.h +9 -0
data/ext/nokogiri/xml_cdata.c +21 -9
data/ext/nokogiri/xml_cdata.h +1 -1
data/ext/nokogiri/xml_comment.c +18 -6
data/ext/nokogiri/xml_comment.h +1 -1
data/ext/nokogiri/xml_document.c +247 -68
data/ext/nokogiri/xml_document.h +5 -3
data/ext/nokogiri/xml_document_fragment.c +15 -7
data/ext/nokogiri/xml_document_fragment.h +1 -1
data/ext/nokogiri/xml_dtd.c +110 -10
data/ext/nokogiri/xml_dtd.h +3 -1
data/ext/nokogiri/xml_element_content.c +123 -0
data/ext/nokogiri/xml_element_content.h +10 -0
data/ext/nokogiri/xml_element_decl.c +69 -0
data/ext/nokogiri/xml_element_decl.h +9 -0
data/ext/nokogiri/xml_encoding_handler.c +79 -0
data/ext/nokogiri/xml_encoding_handler.h +8 -0
data/ext/nokogiri/xml_entity_decl.c +110 -0
data/ext/nokogiri/xml_entity_decl.h +10 -0
data/ext/nokogiri/xml_entity_reference.c +16 -5
data/ext/nokogiri/xml_entity_reference.h +1 -1
data/ext/nokogiri/xml_io.c +40 -8
data/ext/nokogiri/xml_io.h +2 -1
data/ext/nokogiri/xml_libxml2_hacks.c +112 -0
data/ext/nokogiri/xml_libxml2_hacks.h +12 -0
data/ext/nokogiri/xml_namespace.c +84 -0
data/ext/nokogiri/xml_namespace.h +13 -0
data/ext/nokogiri/xml_node.c +782 -225
data/ext/nokogiri/xml_node.h +2 -4
data/ext/nokogiri/xml_node_set.c +253 -34
data/ext/nokogiri/xml_node_set.h +2 -2
data/ext/nokogiri/xml_processing_instruction.c +17 -5
data/ext/nokogiri/xml_processing_instruction.h +1 -1
data/ext/nokogiri/xml_reader.c +277 -85
data/ext/nokogiri/xml_reader.h +1 -1
data/ext/nokogiri/xml_relax_ng.c +168 -0
data/ext/nokogiri/xml_relax_ng.h +9 -0
data/ext/nokogiri/xml_sax_parser.c +183 -111
data/ext/nokogiri/xml_sax_parser.h +30 -1
data/ext/nokogiri/xml_sax_parser_context.c +199 -0
data/ext/nokogiri/xml_sax_parser_context.h +10 -0
data/ext/nokogiri/xml_sax_push_parser.c +42 -12
data/ext/nokogiri/xml_sax_push_parser.h +1 -1
data/ext/nokogiri/xml_schema.c +205 -0
data/ext/nokogiri/xml_schema.h +9 -0
data/ext/nokogiri/xml_syntax_error.c +28 -173
data/ext/nokogiri/xml_syntax_error.h +2 -1
data/ext/nokogiri/xml_text.c +16 -6
data/ext/nokogiri/xml_text.h +1 -1
data/ext/nokogiri/xml_xpath_context.c +104 -47
data/ext/nokogiri/xml_xpath_context.h +1 -1
data/ext/nokogiri/xslt_stylesheet.c +161 -19
data/ext/nokogiri/xslt_stylesheet.h +1 -1
data/lib/nokogiri.rb +47 -8
data/lib/nokogiri/1.8/nokogiri.so +0 -0
data/lib/nokogiri/1.9/nokogiri.so +0 -0
data/lib/nokogiri/css.rb +6 -3
data/lib/nokogiri/css/node.rb +14 -12
data/lib/nokogiri/css/parser.rb +665 -62
data/lib/nokogiri/css/parser.y +20 -10
data/lib/nokogiri/css/parser_extras.rb +91 -0
data/lib/nokogiri/css/tokenizer.rb +148 -5
data/lib/nokogiri/css/tokenizer.rex +10 -9
data/lib/nokogiri/css/xpath_visitor.rb +47 -44
data/lib/nokogiri/decorators/slop.rb +8 -4
data/lib/nokogiri/ffi/encoding_handler.rb +42 -0
data/lib/nokogiri/ffi/html/document.rb +28 -0
data/lib/nokogiri/ffi/html/element_description.rb +81 -0
data/lib/nokogiri/ffi/html/entity_lookup.rb +16 -0
data/lib/nokogiri/ffi/html/sax/parser_context.rb +38 -0
data/lib/nokogiri/ffi/io_callbacks.rb +42 -0
data/lib/nokogiri/ffi/libxml.rb +420 -0
data/lib/nokogiri/ffi/structs/common_node.rb +38 -0
data/lib/nokogiri/ffi/structs/html_elem_desc.rb +24 -0
data/lib/nokogiri/ffi/structs/html_entity_desc.rb +13 -0
data/lib/nokogiri/ffi/structs/xml_alloc.rb +16 -0
data/lib/nokogiri/ffi/structs/xml_attr.rb +20 -0
data/lib/nokogiri/ffi/structs/xml_attribute.rb +27 -0
data/lib/nokogiri/ffi/structs/xml_buffer.rb +16 -0
data/lib/nokogiri/ffi/structs/xml_char_encoding_handler.rb +11 -0
data/lib/nokogiri/ffi/structs/xml_document.rb +117 -0
data/lib/nokogiri/ffi/structs/xml_dtd.rb +28 -0
data/lib/nokogiri/ffi/structs/xml_element.rb +26 -0
data/lib/nokogiri/ffi/structs/xml_element_content.rb +17 -0
data/lib/nokogiri/ffi/structs/xml_entity.rb +32 -0
data/lib/nokogiri/ffi/structs/xml_enumeration.rb +12 -0
data/lib/nokogiri/ffi/structs/xml_node.rb +28 -0
data/lib/nokogiri/ffi/structs/xml_node_set.rb +53 -0
data/lib/nokogiri/ffi/structs/xml_notation.rb +11 -0
data/lib/nokogiri/ffi/structs/xml_ns.rb +15 -0
data/lib/nokogiri/ffi/structs/xml_parser_context.rb +20 -0
data/lib/nokogiri/ffi/structs/xml_parser_input.rb +19 -0
data/lib/nokogiri/ffi/structs/xml_relax_ng.rb +14 -0
data/lib/nokogiri/ffi/structs/xml_sax_handler.rb +51 -0
data/lib/nokogiri/ffi/structs/xml_sax_push_parser_context.rb +124 -0
data/lib/nokogiri/ffi/structs/xml_schema.rb +13 -0
data/lib/nokogiri/ffi/structs/xml_syntax_error.rb +31 -0
data/lib/nokogiri/ffi/structs/xml_text_reader.rb +12 -0
data/lib/nokogiri/ffi/structs/xml_xpath_context.rb +38 -0
data/lib/nokogiri/ffi/structs/xml_xpath_object.rb +35 -0
data/lib/nokogiri/ffi/structs/xml_xpath_parser_context.rb +20 -0
data/lib/nokogiri/ffi/structs/xslt_stylesheet.rb +13 -0
data/lib/nokogiri/ffi/weak_bucket.rb +40 -0
data/lib/nokogiri/ffi/xml/attr.rb +41 -0
data/lib/nokogiri/ffi/xml/attribute_decl.rb +27 -0
data/lib/nokogiri/ffi/xml/cdata.rb +19 -0
data/lib/nokogiri/ffi/xml/comment.rb +18 -0
data/lib/nokogiri/ffi/xml/document.rb +174 -0
data/lib/nokogiri/ffi/xml/document_fragment.rb +21 -0
data/lib/nokogiri/ffi/xml/dtd.rb +67 -0
data/lib/nokogiri/ffi/xml/element_content.rb +43 -0
data/lib/nokogiri/ffi/xml/element_decl.rb +19 -0
data/lib/nokogiri/ffi/xml/entity_decl.rb +36 -0
data/lib/nokogiri/ffi/xml/entity_reference.rb +19 -0
data/lib/nokogiri/ffi/xml/namespace.rb +44 -0
data/lib/nokogiri/ffi/xml/node.rb +559 -0
data/lib/nokogiri/ffi/xml/node_set.rb +150 -0
data/lib/nokogiri/ffi/xml/processing_instruction.rb +20 -0
data/lib/nokogiri/ffi/xml/reader.rb +236 -0
data/lib/nokogiri/ffi/xml/relax_ng.rb +85 -0
data/lib/nokogiri/ffi/xml/sax/parser.rb +143 -0
data/lib/nokogiri/ffi/xml/sax/parser_context.rb +79 -0
data/lib/nokogiri/ffi/xml/sax/push_parser.rb +51 -0
data/lib/nokogiri/ffi/xml/schema.rb +109 -0
data/lib/nokogiri/ffi/xml/syntax_error.rb +98 -0
data/lib/nokogiri/ffi/xml/text.rb +18 -0
data/lib/nokogiri/ffi/xml/xpath.rb +9 -0
data/lib/nokogiri/ffi/xml/xpath_context.rb +153 -0
data/lib/nokogiri/ffi/xslt/stylesheet.rb +77 -0
data/lib/nokogiri/html.rb +13 -47
data/lib/nokogiri/html/builder.rb +27 -1
data/lib/nokogiri/html/document.rb +201 -7
data/lib/nokogiri/html/document_fragment.rb +41 -0
data/lib/nokogiri/html/element_description.rb +23 -0
data/lib/nokogiri/html/entity_lookup.rb +2 -0
data/lib/nokogiri/html/sax/parser.rb +34 -3
data/lib/nokogiri/html/sax/parser_context.rb +16 -0
data/lib/nokogiri/nokogiri.rb +1 -0
data/lib/nokogiri/version.rb +40 -1
data/lib/nokogiri/version_warning.rb +14 -0
data/lib/nokogiri/xml.rb +32 -53
data/lib/nokogiri/xml/attr.rb +5 -0
data/lib/nokogiri/xml/attribute_decl.rb +18 -0
data/lib/nokogiri/xml/builder.rb +349 -29
data/lib/nokogiri/xml/cdata.rb +3 -1
data/lib/nokogiri/xml/character_data.rb +7 -0
data/lib/nokogiri/xml/document.rb +166 -14
data/lib/nokogiri/xml/document_fragment.rb +76 -1
data/lib/nokogiri/xml/dtd.rb +16 -3
data/lib/nokogiri/xml/element_content.rb +36 -0
data/lib/nokogiri/xml/element_decl.rb +13 -0
data/lib/nokogiri/xml/entity_decl.rb +19 -0
data/lib/nokogiri/xml/namespace.rb +13 -0
data/lib/nokogiri/xml/node.rb +561 -166
data/lib/nokogiri/xml/node/save_options.rb +22 -2
data/lib/nokogiri/xml/node_set.rb +202 -40
data/lib/nokogiri/xml/parse_options.rb +93 -0
data/lib/nokogiri/xml/pp.rb +2 -0
data/lib/nokogiri/xml/pp/character_data.rb +18 -0
data/lib/nokogiri/xml/pp/node.rb +56 -0
data/lib/nokogiri/xml/processing_instruction.rb +2 -0
data/lib/nokogiri/xml/reader.rb +93 -8
data/lib/nokogiri/xml/relax_ng.rb +32 -0
data/lib/nokogiri/xml/sax.rb +1 -7
data/lib/nokogiri/xml/sax/document.rb +107 -2
data/lib/nokogiri/xml/sax/parser.rb +57 -7
data/lib/nokogiri/xml/sax/parser_context.rb +16 -0
data/lib/nokogiri/xml/sax/push_parser.rb +13 -1
data/lib/nokogiri/xml/schema.rb +63 -0
data/lib/nokogiri/xml/syntax_error.rb +25 -1
data/lib/nokogiri/xml/text.rb +4 -1
data/lib/nokogiri/xml/xpath.rb +1 -1
data/lib/nokogiri/xml/xpath/syntax_error.rb +3 -0
data/lib/nokogiri/xml/xpath_context.rb +2 -0
data/lib/nokogiri/xslt.rb +26 -2
data/lib/nokogiri/xslt/stylesheet.rb +19 -0
data/lib/xsd/xmlparser/nokogiri.rb +45 -9
data/tasks/cross_compile.rb +173 -0
data/tasks/test.rb +25 -69
data/test/css/test_nthiness.rb +3 -4
data/test/css/test_parser.rb +75 -20
data/test/css/test_tokenizer.rb +23 -1
data/test/css/test_xpath_visitor.rb +10 -1
data/test/decorators/test_slop.rb +16 -0
data/test/ffi/test_document.rb +35 -0
data/test/files/2ch.html +108 -0
data/test/files/address_book.rlx +12 -0
data/test/files/address_book.xml +10 -0
data/test/files/bar/bar.xsd +4 -0
data/test/files/encoding.html +82 -0
data/test/files/encoding.xhtml +84 -0
data/test/files/foo/foo.xsd +4 -0
data/test/files/po.xml +32 -0
data/test/files/po.xsd +66 -0
data/test/files/shift_jis.html +10 -0
data/test/files/shift_jis.xml +5 -0
data/test/files/snuggles.xml +3 -0
data/test/files/staff.dtd +10 -0
data/test/files/valid_bar.xml +2 -0
data/test/helper.rb +101 -23
data/test/html/sax/test_parser.rb +81 -2
data/test/html/sax/test_parser_context.rb +48 -0
data/test/html/test_builder.rb +39 -8
data/test/html/test_document.rb +186 -23
data/test/html/test_document_encoding.rb +78 -1
data/test/html/test_document_fragment.rb +253 -0
data/test/html/test_element_description.rb +98 -0
data/test/html/test_named_characters.rb +1 -1
data/test/html/test_node.rb +124 -36
data/test/html/test_node_encoding.rb +27 -0
data/test/test_convert_xpath.rb +1 -52
data/test/test_css_cache.rb +2 -13
data/test/test_encoding_handler.rb +46 -0
data/test/test_memory_leak.rb +88 -19
data/test/test_nokogiri.rb +38 -5
data/test/test_reader.rb +188 -6
data/test/test_soap4r_sax.rb +52 -0
data/test/test_xslt_transforms.rb +183 -83
data/test/xml/node/test_save_options.rb +1 -1
data/test/xml/node/test_subclass.rb +44 -0
data/test/xml/sax/test_parser.rb +175 -4
data/test/xml/sax/test_parser_context.rb +113 -0
data/test/xml/sax/test_push_parser.rb +90 -2
data/test/xml/test_attr.rb +35 -1
data/test/xml/test_attribute_decl.rb +82 -0
data/test/xml/test_builder.rb +186 -1
data/test/xml/test_cdata.rb +32 -1
data/test/xml/test_comment.rb +13 -1
data/test/xml/test_document.rb +415 -43
data/test/xml/test_document_encoding.rb +1 -1
data/test/xml/test_document_fragment.rb +173 -5
data/test/xml/test_dtd.rb +61 -6
data/test/xml/test_dtd_encoding.rb +3 -1
data/test/xml/test_element_content.rb +56 -0
data/test/xml/test_element_decl.rb +73 -0
data/test/xml/test_entity_decl.rb +120 -0
data/test/xml/test_entity_reference.rb +5 -1
data/test/xml/test_namespace.rb +68 -0
data/test/xml/test_node.rb +546 -201
data/test/xml/test_node_attributes.rb +34 -0
data/test/xml/test_node_encoding.rb +33 -3
data/test/xml/test_node_reparenting.rb +321 -0
data/test/xml/test_node_set.rb +538 -2
data/test/xml/test_parse_options.rb +52 -0
data/test/xml/test_processing_instruction.rb +6 -1
data/test/xml/test_reader_encoding.rb +1 -1
data/test/xml/test_relax_ng.rb +60 -0
data/test/xml/test_schema.rb +94 -0
data/test/xml/test_syntax_error.rb +12 -0
data/test/xml/test_text.rb +35 -1
data/test/xml/test_unparented_node.rb +5 -5
data/test/xml/test_xpath.rb +142 -11
data/test/xslt/test_custom_functions.rb +94 -0
metadata +328 -92
data/ext/nokogiri/html_sax_parser.c +0 -57
data/ext/nokogiri/html_sax_parser.h +0 -11
data/ext/nokogiri/iconv.dll +0 -0
data/ext/nokogiri/libexslt.dll +0 -0
data/ext/nokogiri/libxml2.dll +0 -0
data/ext/nokogiri/libxslt.dll +0 -0
data/ext/nokogiri/native.so +0 -0
data/ext/nokogiri/xml_xpath.c +0 -53
data/ext/nokogiri/xml_xpath.h +0 -11
data/ext/nokogiri/zlib1.dll +0 -0
data/lib/action-nokogiri.rb +0 -30
data/lib/nokogiri/css/generated_parser.rb +0 -713
data/lib/nokogiri/css/generated_tokenizer.rb +0 -144
data/lib/nokogiri/decorators.rb +0 -2
data/lib/nokogiri/decorators/hpricot.rb +0 -3
data/lib/nokogiri/decorators/hpricot/node.rb +0 -56
data/lib/nokogiri/decorators/hpricot/node_set.rb +0 -54
data/lib/nokogiri/decorators/hpricot/xpath_visitor.rb +0 -28
data/lib/nokogiri/hpricot.rb +0 -51
data/lib/nokogiri/xml/comment.rb +0 -6
data/lib/nokogiri/xml/element.rb +0 -6
data/lib/nokogiri/xml/entity_declaration.rb +0 -9
data/lib/nokogiri/xml/fragment_handler.rb +0 -34
data/test/hpricot/files/basic.xhtml +0 -17
data/test/hpricot/files/boingboing.html +0 -2266
data/test/hpricot/files/cy0.html +0 -3653
data/test/hpricot/files/immob.html +0 -400
data/test/hpricot/files/pace_application.html +0 -1320
data/test/hpricot/files/tenderlove.html +0 -16
data/test/hpricot/files/uswebgen.html +0 -220
data/test/hpricot/files/utf8.html +0 -1054
data/test/hpricot/files/week9.html +0 -1723
data/test/hpricot/files/why.xml +0 -19
data/test/hpricot/load_files.rb +0 -11
data/test/hpricot/test_alter.rb +0 -68
data/test/hpricot/test_builder.rb +0 -20
data/test/hpricot/test_parser.rb +0 -426
data/test/hpricot/test_paths.rb +0 -15
data/test/hpricot/test_preserved.rb +0 -77
data/test/hpricot/test_xml.rb +0 -30
data/test/test_gc.rb +0 -15

data/test/html/sax/test_parser.rb CHANGED Viewed

@@ -1,4 +1,5 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', "helper"))
+# -*- coding: utf-8 -*-
+require "helper"
 module Nokogiri
   module HTML
@@ -9,14 +10,32 @@ module Nokogiri
           @parser = HTML::SAX::Parser.new(Doc.new)
         end
+        def test_parse_empty_document
+          # This caused a segfault in libxml 2.6.x
+          assert_nothing_raised { @parser.parse '' }
+        end
+        def test_parse_empty_file
+          # Make sure empty files don't break stuff
+          empty_file_name =  File.join(Dir.tmpdir, 'bogus.xml')
+          FileUtils.touch empty_file_name
+          assert_nothing_raised { @parser.parse_file empty_file_name }
+        end
         def test_parse_file
           @parser.parse_file(HTML_FILE)
           assert_equal 1110, @parser.document.end_elements.length
         end
+        def test_parse_file_nil_argument
+          assert_raises(ArgumentError) {
+            @parser.parse_file(nil)
+          }
+        end
         def test_parse_file_non_existant
           assert_raise Errno::ENOENT do
-            @parser.parse_file('foo')
+            @parser.parse_file('there_is_no_reasonable_way_this_file_exists')
           end
         end
@@ -26,6 +45,21 @@ module Nokogiri
           end
         end
+        def test_parse_memory_nil
+          assert_raise ArgumentError do
+            @parser.parse_memory(nil)
+          end
+        end
+        def test_parse_force_encoding
+          @parser.parse_memory(<<-HTML, 'UTF-8')
+          <meta http-equiv="Content-Type" content="text/html; charset=windows-1251">
+          Информация
+          HTML
+          assert_equal("Информация",
+                       @parser.document.data.join.strip)
+        end
         def test_parse_document
           @parser.parse_memory(<<-eoxml)
             <p>Paragraph 1</p>
@@ -34,6 +68,51 @@ module Nokogiri
           assert_equal([["html", []], ["body", []], ["p", []], ["p", []]],
                        @parser.document.start_elements)
         end
+        def test_parser_attributes
+          html = <<-eohtml
+<html>
+  <head>
+    <title>hello</title>
+  </head>
+<body>
+  <img src="face.jpg" title="daddy &amp; me">
+  <hr noshade size="2">
+</body>
+</html>
+          eohtml
+          block_called = false
+          @parser.parse(html) { |ctx|
+            block_called = true
+            ctx.replace_entities = true
+          }
+          assert block_called
+          noshade_value = if Nokogiri.uses_libxml? && Nokogiri::VERSION_INFO['libxml']['loaded'] < '2.7.7'
+                            ['noshade', 'noshade']
+                          elsif Nokogiri.jruby?
+                            ['noshade', '']
+                          else
+                            ['noshade', nil]
+                          end
+          assert_equal [
+            ['html', []],
+            ['head', []],
+            ['title', []],
+            ['body', []],
+            ['img', [
+                ['src', 'face.jpg'],
+                ['title', 'daddy & me']
+              ]],
+            ['hr', [
+                noshade_value,
+                ['size', '2']
+              ]]
+          ], @parser.document.start_elements
+        end
       end
     end
   end

data/test/html/sax/test_parser_context.rb ADDED Viewed

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+require "helper"
+module Nokogiri
+  module HTML
+    module SAX
+      class TestParserContext < Nokogiri::SAX::TestCase
+        def test_from_io
+          assert_nothing_raised do
+            ParserContext.new StringIO.new('fo'), 'UTF-8'
+          end
+        end
+        def test_from_string
+          assert_nothing_raised do
+            ParserContext.new 'blah blah'
+          end
+        end
+        def test_parse_with
+          ctx = ParserContext.new 'blah'
+          assert_raises ArgumentError do
+            ctx.parse_with nil
+          end
+        end
+        def test_parse_with_sax_parser
+          assert_nothing_raised do
+            xml = "<root />"
+            ctx = ParserContext.new xml
+            parser = Parser.new Doc.new
+            ctx.parse_with parser
+          end
+        end
+        def test_from_file
+          assert_nothing_raised do
+            ctx = ParserContext.file HTML_FILE, 'UTF-8'
+            parser = Parser.new Doc.new
+            ctx.parse_with parser
+          end
+        end
+      end
+    end
+  end
+end

data/test/html/test_builder.rb CHANGED Viewed

@@ -1,8 +1,14 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 module Nokogiri
   module HTML
     class TestBuilder < Nokogiri::TestCase
+      def test_top_level_function_builds
+        foo = nil
+        Nokogiri() { |xml| foo = xml }
+        assert_instance_of Nokogiri::HTML::Builder, foo
+      end
       def test_builder_with_explicit_tags
         html_doc = Nokogiri::HTML::Builder.new {
           div.slide(:class => 'another_class') {
@@ -16,7 +22,7 @@ module Nokogiri
       end
       def test_hash_as_attributes_for_attribute_method
-        html = Nokogiri::HTML::Builder.new {
+        html = Nokogiri::HTML::Builder.new { ||
           div.slide(:class => 'another_class') {
             span 'Slide 1'
           }
@@ -36,7 +42,7 @@ module Nokogiri
       def test_href_with_attributes
         uri = 'http://tenderlovemaking.com/'
-        built = Nokogiri::XML::Builder.new { |x|
+        built = Nokogiri::XML::Builder.new {
           div {
             a('King Khan & The Shrines', :href => uri)
           }
@@ -47,11 +53,13 @@ module Nokogiri
       def test_tag_nesting
         builder = Nokogiri::HTML::Builder.new do
-          span.left ''
-          span.middle {
-            div.icon ''
+          body {
+            span.left ''
+            span.middle {
+              div.icon ''
+            }
+            span.right ''
           }
-          span.right ''
         end
         assert node = builder.doc.css('span.right').first
         assert_equal 'middle', node.previous_sibling['class']
@@ -117,7 +125,7 @@ module Nokogiri
         assert_equal('<html><body><b>bold tag</b></body></html>',
                      builder.doc.root.to_html.chomp.gsub(/>\s*</, '><'))
       end
       def test_instance_eval_with_delegation_to_block_context
         class << self
           def foo
@@ -128,6 +136,29 @@ module Nokogiri
         builder = Nokogiri::HTML::Builder.new { text foo }
         assert builder.to_html.include?("foo!")
       end
+      def test_builder_with_param
+        doc = Nokogiri::HTML::Builder.new { |html|
+          html.body {
+            html.p "hello world"
+          }
+        }.doc
+        assert node = doc.xpath('//body/p').first
+        assert_equal 'hello world', node.content
+      end
+      def test_builder_with_id
+        text = "hello world"
+        doc = Nokogiri::HTML::Builder.new { |html|
+          html.body {
+            html.id_ text
+          }
+        }.doc
+        assert node = doc.xpath('//body/id').first
+        assert_equal text, node.content
+      end
     end
   end
 end

data/test/html/test_document.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', "helper"))
+require "helper"
 module Nokogiri
   module HTML
@@ -8,8 +8,101 @@ module Nokogiri
         @html = Nokogiri::HTML.parse(File.read(HTML_FILE))
       end
-      def test_emtpy_string_returns_empty_doc
+      def test_exceptions_remove_newlines
+        errors = @html.errors
+        assert errors.length > 0, 'has errors'
+        errors.each do |error|
+          assert_equal(error.to_s.chomp, error.to_s)
+        end
+      end
+      def test_fragment
+        fragment = @html.fragment
+        assert_equal 0, fragment.children.length
+      end
+      def test_document_takes_config_block
+        options = nil
+        Nokogiri::HTML(File.read(HTML_FILE), HTML_FILE) do |cfg|
+          options = cfg
+          options.nonet.nowarning.dtdattr
+        end
+        assert options.nonet?
+        assert options.nowarning?
+        assert options.dtdattr?
+      end
+      def test_parse_takes_config_block
+        options = nil
+        Nokogiri::HTML.parse(File.read(HTML_FILE), HTML_FILE) do |cfg|
+          options = cfg
+          options.nonet.nowarning.dtdattr
+        end
+        assert options.nonet?
+        assert options.nowarning?
+        assert options.dtdattr?
+      end
+      def test_subclass
+        klass = Class.new(Nokogiri::HTML::Document)
+        doc = klass.new
+        assert_instance_of klass, doc
+      end
+      def test_subclass_initialize
+        klass = Class.new(Nokogiri::HTML::Document) do
+          attr_accessor :initialized_with
+          def initialize(*args)
+            @initialized_with = args
+          end
+        end
+        doc = klass.new("uri", "external_id", 1)
+        assert_equal ["uri", "external_id", 1], doc.initialized_with
+      end
+      def test_subclass_dup
+        klass = Class.new(Nokogiri::HTML::Document)
+        doc = klass.new.dup
+        assert_instance_of klass, doc
+      end
+      def test_subclass_parse
+        klass = Class.new(Nokogiri::HTML::Document)
+        doc = klass.parse(File.read(HTML_FILE))
+        assert_equal @html.to_s, doc.to_s
+        assert_instance_of klass, doc
+      end
+      def test_document_parse_method
+        html = Nokogiri::HTML::Document.parse(File.read(HTML_FILE))
+        assert_equal @html.to_s, html.to_s
+      end
+      ###
+      # Nokogiri::HTML returns an empty Document when given a blank string GH#11
+      def test_empty_string_returns_empty_doc
         doc = Nokogiri::HTML('')
+        assert_instance_of Nokogiri::HTML::Document, doc
+        assert_nil doc.root
+      end
+      unless %w[2 6] === LIBXML_VERSION.split('.')[0..1]
+        # FIXME: this is a hack around broken libxml versions
+        def test_to_xhtml_with_indent
+          doc = Nokogiri::HTML('<html><body><a>foo</a></body></html>')
+          doc = Nokogiri::HTML(doc.to_xhtml(:indent => 2))
+          assert_indent 2, doc
+        end
+        def test_write_to_xhtml_with_indent
+          io = StringIO.new
+          doc = Nokogiri::HTML('<html><body><a>foo</a></body></html>')
+          doc.write_xhtml_to io, :indent => 5
+          io.rewind
+          doc = Nokogiri::HTML(io.read)
+          assert_indent 5, doc
+        end
       end
       def test_swap_should_not_exist
@@ -24,12 +117,91 @@ module Nokogiri
         }
       end
+      def test_meta_encoding
+        assert_equal 'UTF-8', @html.meta_encoding
+        html = Nokogiri::HTML(<<-eohtml)
+<html>
+  <head>
+    <meta http-equiv="X-Content-Type" content="text/html; charset=Shift_JIS">
+  </head>
+  <body>
+    foo
+  </body>
+</html>
+        eohtml
+        assert_nil html.meta_encoding
+      end
+      def test_meta_encoding=
+        @html.meta_encoding = 'EUC-JP'
+        assert_equal 'EUC-JP', @html.meta_encoding
+      end
+      def test_title
+        assert_equal 'Tender Lovemaking  ', @html.title
+        doc = Nokogiri::HTML('<html><body>foo</body></html>')
+        assert_nil doc.title
+      end
+      def test_title=()
+        doc = Nokogiri::HTML(<<eohtml)
+<html>
+  <head>
+    <title>old</title>
+  </head>
+  <body>
+    foo
+  </body>
+</html>
+eohtml
+        doc.title = 'new'
+        assert_equal 'new', doc.title
+        doc = Nokogiri::HTML(<<eohtml)
+<html>
+  <head>
+  </head>
+  <body>
+    foo
+  </body>
+</html>
+eohtml
+        doc.title = 'new'
+        assert_equal 'new', doc.title
+        doc = Nokogiri::HTML(<<eohtml)
+<html>
+  <body>
+    foo
+  </body>
+</html>
+eohtml
+        doc.title = 'new'
+        assert_nil doc.title
+      end
+      def test_meta_encoding_without_head
+        html = Nokogiri::HTML('<html><body>foo</body></html>')
+        assert_nil html.meta_encoding
+        html.meta_encoding = 'EUC-JP'
+        assert_nil html.meta_encoding
+      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_handles_nil_gracefully
+        assert_nothing_raised do
+          @doc = Nokogiri::HTML::Document.parse(nil)
+        end
+        assert_instance_of Nokogiri::HTML::Document, @doc
+      end
       def test_parse_empty_document
         doc = Nokogiri::HTML("\n")
         assert_equal 0, doc.css('a').length
@@ -43,15 +215,17 @@ module Nokogiri
       end
       def test_parse_io
-        assert doc = File.open(HTML_FILE, 'rb') { |f|
-          Document.read_io(f, nil, 'UTF-8', PARSE_NOERROR | PARSE_NOWARNING)
+        assert File.open(HTML_FILE, 'rb') { |f|
+          Document.read_io(f, nil, 'UTF-8',
+                           XML::ParseOptions::NOERROR | XML::ParseOptions::NOWARNING
+                          )
         }
       end
       def test_to_xhtml
         assert_match 'XHTML', @html.to_xhtml
-        assert_match 'XHTML', @html.to_xhtml('UTF-8')
-        assert_match 'UTF-8', @html.to_xhtml('UTF-8')
+        assert_match 'XHTML', @html.to_xhtml(:encoding => 'UTF-8')
+        assert_match 'UTF-8', @html.to_xhtml(:encoding => 'UTF-8')
       end
       def test_no_xml_header
@@ -142,7 +316,7 @@ module Nokogiri
       end
       def test_find_with_function
-        found = @html.css("div:awesome() h1", Class.new {
+        assert @html.css("div:awesome() h1", Class.new {
           def awesome divs
             [divs.first]
           end
@@ -201,6 +375,11 @@ module Nokogiri
         assert_equal('<p>Helloworld!</p>', node.inner_html.gsub(/\s/, ''))
       end
+      def test_round_trip
+        doc = Nokogiri::HTML(@html.inner_html)
+        assert_equal @html.root.to_html, doc.root.to_html
+      end
       def test_fragment_contains_text_node
         fragment = Nokogiri::HTML.fragment('fooo')
         assert_equal 1, fragment.children.length
@@ -211,22 +390,6 @@ module Nokogiri
         assert_equal 2, Nokogiri::HTML.fragment("<br/><hr/>").children.length
       end
-      def test_fragment
-        fragment = Nokogiri::HTML.fragment(<<-eohtml)
-          <div>
-            <b>Hello World</b>
-          </div>
-        eohtml
-        assert_equal 1, fragment.children.length
-        assert_equal 'div', fragment.children.first.name
-        assert_match(/Hello World/, fragment.to_html)
-        # libxml2 is broken in 2.6.16 and 2.6.17
-        unless [16, 17].include?(Nokogiri::LIBXML_VERSION.split('.').last.to_i)
-          assert_equal 1, fragment.css('div').length
-        end
-      end
       def test_relative_css_finder
         doc = Nokogiri::HTML(<<-eohtml)
           <html>