From 38634627034de63a4b1cdec50ffcef29228e8fc4 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rss/image.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'lib/rss/image.rb') diff --git a/lib/rss/image.rb b/lib/rss/image.rb index f499a75a0..035df680c 100644 --- a/lib/rss/image.rb +++ b/lib/rss/image.rb @@ -17,9 +17,11 @@ module RSS end module ImageModelUtils - def validate_one_tag_name(name, tags) - invalid = tags.find {|tag| tag != name} - raise UnknownTagError.new(invalid, IMAGE_URI) if invalid + def validate_one_tag_name(ignore_unknown_element, name, tags) + if !ignore_unknown_element + invalid = tags.find {|tag| tag != name} + raise UnknownTagError.new(invalid, IMAGE_URI) if invalid + end raise TooMuchTagError.new(name, tag_name) if tags.size > 1 end end @@ -34,8 +36,8 @@ module RSS klass.install_have_child_element("#{IMAGE_PREFIX}_item") end - def image_validate(tags) - validate_one_tag_name("item", tags) + def image_validate(ignore_unknown_element, tags, uri) + validate_one_tag_name(ignore_unknown_element, "item", tags) end class ImageItem < Element @@ -133,8 +135,8 @@ module RSS end end - def image_validate(tags) - validate_one_tag_name("favicon", tags) + def image_validate(ignore_unknown_element, tags, uri) + validate_one_tag_name(ignore_unknown_element, "favicon", tags) end class ImageFavicon < Element -- cgit