@@ -18,6 +18,8 @@ module Nokogiri class << self attr_accessor :error_handler + ### + # Parse an HTML or XML document. +string+ contains the document. def parse string, url = nil, encoding = nil, options = nil doc = if string =~ /^\s*<[^Hh>]*html/i # Probably html @@ -37,6 +39,21 @@ module Nokogiri end end + ### + # Parse a document and add the Slop decorator. The Slop decorator + # implements method_missing such that methods may be used instead of CSS + # or XPath. For example: + # + # doc = Nokogiri::Slop(<<-eohtml) + # <html> + # <body> + # <p>first</p> + # <p>second</p> + # </body> + # </html> + # eohtml + # assert_equal('second', doc.html.body.p[1].text) + # def Slop(*args, &block) Nokogiri(*args, &block).slop! end lib/nokogiri.rb @@ -12,21 +12,32 @@ module Nokogiri def set_cache setting @cache_on = setting ? true : false end + def cache_on? @cache ||= {} instance_variable_defined?('@cache_on') ? @cache_on : true end + def check_cache string return unless cache_on? @cache[string] end + def add_cache string, value return value unless cache_on? @cache[string] = value end + def clear_cache @cache = {} end + + def without_cache &block + tmp = @cache_on + @cache_on = false + block.call + @cache_on = tmp + end end alias :parse :scan_str lib/nokogiri/css/parser.rb @@ -1,5 +1,8 @@ module Nokogiri module Decorators + ### + # The Slop decorator implements method missing such that a methods may be + # used instead of XPath or CSS. See Nokogiri.Slop module Slop def method_missing name, *args, &block if args.empty? @@ -13,7 +16,11 @@ module Nokogiri list = xpath("./#{name}#{conds}") end else - list = css("#{name}#{args.first}") + CSS::Parser.without_cache do + list = xpath( + *CSS.xpath_for("#{name}#{args.first}", :prefix => "./") + ) + end end super if list.empty? lib/nokogiri/decorators/slop.rb @@ -49,6 +49,25 @@ class TestNokogiri < Nokogiri::TestCase </html> END + def test_slop_css + doc = Nokogiri::Slop(<<-eohtml) + <html> + <body> + <div> + one + <div class='foo'> + div two + <div class='foo'> + div three + </div> + </div> + </div> + </body> + </html> + eohtml + assert_equal "div", doc.html.body.div.div('.foo').name + end + def test_slop doc = Nokogiri::Slop(SLOP_HTML) test/test_nokogiri.rb ffac3c78ef98588d9ffe3e6e46339dd73d92ce8b Aaron Patterson aaron.patterson@gmail.com http://github.com/tenderlove/nokogiri/commit/8b9daefbcc1635414ddb991b328755c3783615cb 8b9daefbcc1635414ddb991b328755c3783615cb

2008-11-30T22:19:58-08:00

making sure that sloppy css selectors do not descend too far a3091bd5ea7fa8038a0eb023f7cedf22dbdfe20b Aaron Patterson aaron.patterson@gmail.com