From e515ba9ecd43101d31ae9afea8de766e886192dd Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Tue, 18 Oct 2005 00:50:52 +0000 Subject: [PATCH] Fix the html-scanner to count children correctly, playing nicely with :only, fixes #2181 [patrick@lenz.sh] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2670 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- .../vendor/html-scanner/html/node.rb | 6 +++++- actionpack/test/controller/test_test.rb | 21 +++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb index 6bc62fdf33..f3e8eb1a22 100644 --- a/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb +++ b/actionpack/lib/action_controller/vendor/html-scanner/html/node.rb @@ -435,7 +435,11 @@ def match(conditions) # count children if opts = conditions[:children] - matches = children.select { |c| c.match(/./) } + matches = children.select do |c| + c.match(/./) or + (c.kind_of?(HTML::Tag) and (c.closing == :self or ! c.childless?)) + end + matches = matches.select { |c| c.match(opts[:only]) } if opts[:only] opts.each do |key, value| next if key == :only diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb index 20fa9d60b2..04baff6ed6 100644 --- a/actionpack/test/controller/test_test.rb +++ b/actionpack/test/controller/test_test.rb @@ -20,6 +20,7 @@ def test_html_output render :text => < +