@@ -33,6 +33,10 @@ * Fixed SEGV when adding an XML::Document to NodeSet * XML::SyntaxError can be duplicated. GH #148 +* Deprecations + + * Hpricot compatibility layer removed + === 1.3.3 / 2009/07/26 * New Features CHANGELOG.rdoc @@ -82,11 +82,6 @@ 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.rb -lib/nokogiri/decorators/hpricot.rb -lib/nokogiri/decorators/hpricot/node.rb -lib/nokogiri/decorators/hpricot/node_set.rb -lib/nokogiri/decorators/hpricot/xpath_visitor.rb lib/nokogiri/decorators/slop.rb lib/nokogiri/ffi/html/document.rb lib/nokogiri/ffi/html/element_description.rb @@ -148,7 +143,6 @@ 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/hpricot.rb lib/nokogiri/html.rb lib/nokogiri/html/builder.rb lib/nokogiri/html/document.rb @@ -223,20 +217,6 @@ test/files/staff.xslt test/files/tlm.html test/files/valid_bar.xml test/helper.rb -test/hpricot/files/basic.xhtml -test/hpricot/files/boingboing.html -test/hpricot/files/cy0.html -test/hpricot/files/immob.html -test/hpricot/files/pace_application.html -test/hpricot/files/tenderlove.html -test/hpricot/files/uswebgen.html -test/hpricot/files/utf8.html -test/hpricot/files/week9.html -test/hpricot/files/why.xml -test/hpricot/load_files.rb -test/hpricot/test_parser.rb -test/hpricot/test_preserved.rb -test/hpricot/test_xml.rb test/html/sax/test_parser.rb test/html/sax/test_parser_context.rb test/html/test_builder.rb Manifest.txt @@ -26,8 +26,6 @@ XML/HTMLの高速な解析と探索検索、ならびにCSS3セレクタとXPath * http://gist.github.com/24605 -また、NokogiriはHpricot互換の特徴を持ち、CSSやXPathも簡単に取り扱うことが出来ます。 - == SUPPORT: Nokogiriのメーリングリスト: README.ja.rdoc @@ -19,7 +19,6 @@ enough of it. * XPath support for document searching * CSS3 selector support for document searching * XML/HTML builder -* Drop in replacement for Hpricot (though not bug for bug) Nokogiri parses and searches XML/HTML very quickly, and also has correctly implemented CSS3 selector support as well as XPath support. @@ -28,9 +27,6 @@ Here is a speed test: * http://gist.github.com/24605 -Nokogiri also features an Hpricot compatibility layer to help ease the change -to using correct CSS and XPath. - == SUPPORT: The Nokogiri {mailing list}[http://groups.google.com/group/nokogiri-talk] README.rdoc @@ -20,7 +20,7 @@ require 'nokogiri/syntax_error' require 'nokogiri/xml' require 'nokogiri/xslt' require 'nokogiri/html' -require 'nokogiri/decorators' +require 'nokogiri/decorators/slop' require 'nokogiri/css' require 'nokogiri/html/builder' require 'nokogiri/hpricot' lib/nokogiri.rb @@ -312,6 +312,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 test/html/test_document.rb @@ -17,6 +17,14 @@ module Nokogiri eohtml end + def test_get_attribute + element = @html.at('div') + assert_equal 'baz', element.get_attribute('class') + assert_equal 'baz', element['class'] + element['href'] = "javascript:alert(\"AGGA-KA-BOO!\")" + assert_match(/%22AGGA-KA-BOO!%22/, element.to_html) + end + def test_css_path_round_trip doc = Nokogiri::HTML File.read HTML_FILE %w{ #header small div[2] div.post body }.each do |css_sel| test/html/test_node.rb @@ -13,6 +13,12 @@ module Nokogiri assert_equal('<!--hello world-->', comment.to_s) end + def test_comment? + comment = Nokogiri::XML::Comment.new(@xml, 'hello world') + assert(comment.comment?) + assert(!@xml.root.comment?) + end + def test_many_comments 100.times { Nokogiri::XML::Comment.new(@xml, 'hello world') test/xml/test_comment.rb @@ -10,6 +10,14 @@ module Nokogiri @xml = Nokogiri::XML(File.read(XML_FILE), XML_FILE) end + def test_element? + assert @xml.root.element?, 'is an element' + end + + def test_slash_search + assert_equal 'EMP0001', (@xml/:staff/:employee/:employeeId).first.text + end + def test_append_with_document assert_raises(ArgumentError) do @xml.root << Nokogiri::XML::Document.new test/xml/test_node.rb lib/nokogiri/decorators.rb lib/nokogiri/decorators/hpricot.rb lib/nokogiri/decorators/hpricot/node.rb lib/nokogiri/decorators/hpricot/node_set.rb lib/nokogiri/decorators/hpricot/xpath_visitor.rb lib/nokogiri/hpricot.rb test/hpricot/files/basic.xhtml test/hpricot/files/boingboing.html test/hpricot/files/cy0.html test/hpricot/files/immob.html test/hpricot/files/pace_application.html test/hpricot/files/tenderlove.html test/hpricot/files/uswebgen.html test/hpricot/files/utf8.html test/hpricot/files/week9.html test/hpricot/files/why.xml test/hpricot/load_files.rb test/hpricot/test_parser.rb test/hpricot/test_preserved.rb test/hpricot/test_xml.rb ceb00ef93387ce32d89e30d397bafbaa374a7228 Aaron Patterson aaron.patterson@gmail.com http://github.com/tenderlove/nokogiri/commit/888b667ce46ad451d9eb8668965d900fef956b08 888b667ce46ad451d9eb8668965d900fef956b08 2009-10-14T18:47:34-07:00 2009-10-14T18:47:34-07:00 Squashed commit of the following: commit 94339991388f50355f840ec1654ef38ff2ee23c7 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Oct 14 18:47:03 2009 -0700 updating changelog commit f69ed6ae46138961f1b50ddbcd2b80496cfd4a05 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Oct 14 18:46:23 2009 -0700 updating readme commit c92bf4ec0197d8bef0c9ed0ff2dd10f5ae9f38b8 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Oct 14 18:44:30 2009 -0700 cleaning up manifest commit 33b7ff52e478fec95e4562fd112b67672775d3dd Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Oct 14 18:42:38 2009 -0700 removing hpricot compat layer commit d7a62bcc4adbb53aac7499e1d6d5bda07d32a059 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Oct 14 18:15:55 2009 -0700 cleaning up tests commit d58ddb222cb49884823dce4798ef67425c06d8f4 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Oct 14 17:57:08 2009 -0700 removing test commit 336eb89e17369b740de976b44fcbe4bc5b025869 Author: Aaron Patterson <aaron.patterson@gmail.com> Date: Wed Oct 14 17:54:47 2009 -0700 removing unused test c0622a88fa4bdde0e659a768564efe3e6aa24884 Aaron Patterson aaron.patterson@gmail.com