summaryrefslogtreecommitdiff
path: root/lib/rss/1.0.rb
diff options
context:
space:
mode:
authorkou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-18 09:22:12 +0000
committerkou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-18 09:22:12 +0000
commitc849d2692ba964baabf536024a24b164ca622510 (patch)
treeab54ab154fa8ec3327adc9dbbf17fe828e595539 /lib/rss/1.0.rb
parente49a4c952cfdf32abf3d6ba946f94d152dae988d (diff)
* 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
Diffstat (limited to 'lib/rss/1.0.rb')
-rw-r--r--lib/rss/1.0.rb18
1 files changed, 7 insertions, 11 deletions
diff --git a/lib/rss/1.0.rb b/lib/rss/1.0.rb
index 52cb2fb1ec..6e601d1a43 100644
--- a/lib/rss/1.0.rb
+++ b/lib/rss/1.0.rb
@@ -75,10 +75,6 @@ module RSS
end
private
- def rdf_validate(tags)
- _validate(tags, [])
- end
-
def children
[@channel, @image, @textinput, *@item]
end
@@ -181,8 +177,8 @@ module RSS
@li
end
- def rdf_validate(tags)
- _validate(tags, [["li", '*']])
+ def rdf_validate(ignore_unknown_element, tags, uri)
+ _validate(ignore_unknown_element, tags, uri, [["li", '*']])
end
def _tags
@@ -241,8 +237,8 @@ module RSS
@li
end
- def rdf_validate(tags)
- _validate(tags, [["li", '*']])
+ def rdf_validate(ignore_unknown_element, tags, uri)
+ _validate(ignore_unknown_element, tags, uri, [["li", '*']])
end
def _tags
@@ -471,8 +467,8 @@ module RSS
rv
end
- def rdf_validate(tags)
- _validate(tags, [["Seq", nil]])
+ def rdf_validate(ignore_unknown_element, tags, uri)
+ _validate(ignore_unknown_element, tags, uri, [["Seq", nil]])
end
end
end
@@ -710,7 +706,7 @@ module RSS
@rss.xml_stylesheets = @xml_stylesheets
@last_element = @rss
@proc_stack.push Proc.new { |text, tags|
- @rss.validate_for_stream(tags) if @do_validate
+ @rss.validate_for_stream(tags, @ignore_unknown_element) if @do_validate
}
end
end