diff options
author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-16 09:25:59 +0000 |
---|---|---|
committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-16 09:25:59 +0000 |
commit | 86f2dc74256ea3223b715e6b2311fa0cf3d60c86 (patch) | |
tree | 34ba0af53c16300919bf0a39ca13423c045df3cb /lib/rss/parser.rb | |
parent | a687b15ff8df120be282d939bc1ff21b1a4861fd (diff) | |
download | ruby-86f2dc74256ea3223b715e6b2311fa0cf3d60c86.tar.gz |
* lib/rss/parser.rb, test/test_parser_1.0.rb: fix foaf:Image
element causes parse error even if ignore_unknown_element mode.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rss/parser.rb')
-rw-r--r-- | lib/rss/parser.rb | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb index 225e07d504..b78683ca3e 100644 --- a/lib/rss/parser.rb +++ b/lib/rss/parser.rb @@ -392,7 +392,7 @@ module RSS start_have_something_element(local, prefix, attrs, ns, next_class) else if !@do_validate or @ignore_unknown_element - @proc_stack.push(nil) + @proc_stack.push(setup_next_element_in_unknown_element) else parent = "ROOT ELEMENT???" if current_class.tag_name @@ -423,13 +423,22 @@ module RSS [$1 || '', $2] end - def check_ns(tag_name, prefix, ns, require_uri) - unless _ns(ns, prefix) == require_uri - if @do_validate + def check_ns(tag_name, prefix, ns, require_uri, ignore_unknown_element=nil) + if _ns(ns, prefix) == require_uri + true + else + if ignore_unknown_element.nil? + ignore_unknown_element = @ignore_unknown_element + end + + if ignore_unknown_element + false + elsif @do_validate raise NSError.new(tag_name, prefix, require_uri) else # Force bind required URI with prefix @ns_stack.last[prefix] = require_uri + true end end end @@ -456,9 +465,12 @@ module RSS end def start_have_something_element(tag_name, prefix, attrs, ns, klass) - check_ns(tag_name, prefix, ns, klass.required_uri) - attributes = collect_attributes(tag_name, prefix, attrs, ns, klass) - @proc_stack.push(setup_next_element(tag_name, klass, attributes)) + if check_ns(tag_name, prefix, ns, klass.required_uri) + attributes = collect_attributes(tag_name, prefix, attrs, ns, klass) + @proc_stack.push(setup_next_element(tag_name, klass, attributes)) + else + @proc_stack.push(setup_next_element_in_unknown_element) + end end def collect_attributes(tag_name, prefix, attrs, ns, klass) @@ -525,6 +537,11 @@ module RSS @last_element = previous end end + + def setup_next_element_in_unknown_element + current_element, @last_element = @last_element, nil + Proc.new {@last_element = current_element} + end end unless const_defined? :AVAILABLE_PARSER_LIBRARIES |