* lib/rss/rss.rb:

  - cleanup validation mechanism. Now, #XXX_validation is
    needless.
  - changed internal variable name RSS::Element::MODEL to
    RSS::Element::MODELS.
  - RSS::Element.install_model requires uri.

* lib/rss/0.9.rb: followed new validation API.
* lib/rss/1.0.rb: ditto.
* lib/rss/2.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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 21 deletions

diff --git a/lib/rss/content.rb b/lib/rss/content.rb
index db96074a38..545aecb4df 100644
--- a/lib/rss/content.rb
+++ b/lib/rss/content.rb
@@ -15,30 +15,13 @@ module RSS
 
     def self.append_features(klass)
       super
-      
-      klass.module_eval(<<-EOC, *get_file_and_line_from_caller(1))
-        %w(encoded).each do |name|
-          install_text_element("\#{CONTENT_PREFIX}_\#{name}")
-        end
-      EOC
-    end
-
-    def content_validate(ignore_unknown_element, tags, uri)
-      counter = {}
-      ELEMENTS.each do |name|
-        counter[name] = 0
-      end
 
-      tags.each do |tag|
-        key = "#{CONTENT_PREFIX}_#{tag}"
-        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
+      klass.install_must_call_validator(CONTENT_PREFIX, CONTENT_URI)
+      %w(encoded).each do |name|
+        klass.install_text_element("#{CONTENT_PREFIX}_#{name}")
+        klass.install_model(name, CONTENT_URI, "?")
       end
     end
-
   end
 
   class RDF