From c849d2692ba964baabf536024a24b164ca622510 Mon Sep 17 00:00:00 2001 From: kou Date: Sun, 18 Jun 2006 09:22:12 +0000 Subject: * lib/rss/rss.rb: improved ignore_unknown_element handling. RSS::NotExpectedTagError provides tag URI. * lib/rss/parser.rb: ditto. * lib/rss/0.9.rb: ditto. * lib/rss/1.0.rb: ditto. * lib/rss/content.rb: ditto. * lib/rss/dublincore.rb: ditto. * lib/rss/image.rb: ditto. * lib/rss/syndication.rb: ditto. * lib/rss/taxonomy.rb: ditto. * lib/rss/trackback.rb: ditto. * test/rss/rss-assertions.rb: checked URI of not expected tag too. * test/rss/test_parser.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rss/content.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/rss/content.rb') diff --git a/lib/rss/content.rb b/lib/rss/content.rb index a732cec973..db96074a38 100644 --- a/lib/rss/content.rb +++ b/lib/rss/content.rb @@ -23,7 +23,7 @@ module RSS EOC end - def content_validate(tags) + def content_validate(ignore_unknown_element, tags, uri) counter = {} ELEMENTS.each do |name| counter[name] = 0 @@ -31,7 +31,9 @@ module RSS tags.each do |tag| key = "#{CONTENT_PREFIX}_#{tag}" - raise UnknownTagError.new(tag, CONTENT_URI) unless counter.has_key?(key) + if !ignore_unknown_element and !counter.has_key?(key) + raise UnknownTagError.new(tag, CONTENT_URI) + end counter[key] += 1 raise TooMuchTagError.new(tag, tag_name) if counter[key] > 1 end -- cgit v1.2.3