1 files changed, 26 insertions, 91 deletions

diff --git a/lib/rss/maker/taxonomy.rb b/lib/rss/maker/taxonomy.rb
index f272996581..798b239df9 100644
--- a/lib/rss/maker/taxonomy.rb
+++ b/lib/rss/maker/taxonomy.rb
@@ -8,24 +8,14 @@ module RSS
       def self.append_features(klass)
         super
 
-        klass.add_need_initialize_variable("taxo_topics", "make_taxo_topics")
-        klass.add_other_element("taxo_topics")
-        klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          attr_reader :taxo_topics
-          def make_taxo_topics
-            self.class::TaxonomyTopics.new(@maker)
-          end
-            
-          def setup_taxo_topics(rss, current)
-            @taxo_topics.to_rss(rss, current)
-          end
-EOC
+        klass.def_classed_element("#{RSS::TAXO_PREFIX}_topics",
+                                  "TaxonomyTopics")
       end
 
       def self.install_taxo_topics(klass)
-        klass.module_eval(<<-EOC, *Utils.get_file_and_line_from_caller(1))
+        klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
           class TaxonomyTopics < TaxonomyTopicsBase
-            def to_rss(rss, current)
+            def to_feed(feed, current)
               if current.respond_to?(:taxo_topics)
                 topics = current.class::TaxonomyTopics.new
                 bag = topics.Bag
@@ -39,11 +29,10 @@ EOC
 EOC
       end
 
-      class TaxonomyTopicsBase
-        include Base
-
+      class TaxonomyTopicsBase < Base
         attr_reader :resources
-        def_array_element("resources")
+        def_array_element("resource")
+        remove_method :new_resource
       end
     end
 
@@ -51,77 +40,35 @@ EOC
       def self.append_features(klass)
         super
 
-        klass.add_need_initialize_variable("taxo_topics", "make_taxo_topics")
-        klass.add_other_element("taxo_topics")
-        klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
-          attr_reader :taxo_topics
-          def make_taxo_topics
-            self.class::TaxonomyTopics.new(@maker)
-          end
-            
-          def setup_taxo_topics(rss, current)
-            @taxo_topics.to_rss(rss, current)
-          end
-
-          def taxo_topic
-            @taxo_topics[0] and @taxo_topics[0].value
-          end
-            
-          def taxo_topic=(new_value)
-            @taxo_topic[0] = self.class::TaxonomyTopic.new(self)
-            @taxo_topic[0].value = new_value
-          end
-EOC
+        class_name = "TaxonomyTopics"
+        klass.def_classed_elements("#{TAXO_PREFIX}_topic", "value", class_name)
       end
-    
+
       def self.install_taxo_topic(klass)
-        klass.module_eval(<<-EOC, *Utils.get_file_and_line_from_caller(1))
+        klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
           class TaxonomyTopics < TaxonomyTopicsBase
             class TaxonomyTopic < TaxonomyTopicBase
               DublinCoreModel.install_dublin_core(self)
               TaxonomyTopicsModel.install_taxo_topics(self)
 
-              def to_rss(rss, current)
+              def to_feed(feed, current)
                 if current.respond_to?(:taxo_topics)
                   topic = current.class::TaxonomyTopic.new(value)
                   topic.taxo_link = value
-                  taxo_topics.to_rss(rss, topic) if taxo_topics
+                  taxo_topics.to_feed(feed, topic) if taxo_topics
                   current.taxo_topics << topic
-                  setup_other_elements(rss)
+                  setup_other_elements(feed, topic)
                 end
               end
-
-              def current_element(rss)
-                super.taxo_topics.last
-              end
             end
           end
 EOC
       end
 
-      class TaxonomyTopicsBase
-        include Base
-        
-        def_array_element("taxo_topics")
-                            
-        def new_taxo_topic
-          taxo_topic = self.class::TaxonomyTopic.new(self)
-          @taxo_topics << taxo_topic
-          if block_given?
-            yield taxo_topic
-          else
-            taxo_topic
-          end
-        end
+      class TaxonomyTopicsBase < Base
+        def_array_element("taxo_topic", nil, "TaxonomyTopic")
 
-        def to_rss(rss, current)
-          @taxo_topics.each do |taxo_topic|
-            taxo_topic.to_rss(rss, current)
-          end
-        end
-        
-        class TaxonomyTopicBase
-          include Base
+        class TaxonomyTopicBase < Base
           include DublinCoreModel
           include TaxonomyTopicsModel
           
@@ -151,32 +98,20 @@ EOC
       end
     end
 
-    class RSS10
-      TaxonomyTopicModel.install_taxo_topic(self)
-      
-      class Channel
-        TaxonomyTopicsModel.install_taxo_topics(self)
-      end
+    makers.each do |maker|
+      maker.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+        TaxonomyTopicModel.install_taxo_topic(self)
 
-      class Items
-        class Item
+        class Channel
           TaxonomyTopicsModel.install_taxo_topics(self)
         end
-      end
-    end
-    
-    class RSS09
-      TaxonomyTopicModel.install_taxo_topic(self)
-      
-      class Channel
-        TaxonomyTopicsModel.install_taxo_topics(self)
-      end
 
-      class Items
-        class Item
-          TaxonomyTopicsModel.install_taxo_topics(self)
+        class Items
+          class Item
+            TaxonomyTopicsModel.install_taxo_topics(self)
+          end
         end
-      end
+      EOC
     end
   end
 end