1 files changed, 36 insertions, 64 deletions

diff --git a/lib/rss/maker/dublincore.rb b/lib/rss/maker/dublincore.rb
index b208d5fcb2..088ae60942 100644
--- a/lib/rss/maker/dublincore.rb
+++ b/lib/rss/maker/dublincore.rb
@@ -24,8 +24,8 @@ module RSS
               #{full_plural_klass_name}.new(@maker)
             end
             
-            def setup_#{full_plural_name}(rss, current)
-              @#{full_plural_name}.to_rss(rss, current)
+            def setup_#{full_plural_name}(feed, current)
+              @#{full_plural_name}.to_feed(feed, current)
             end
 
             def #{full_name}
@@ -36,6 +36,17 @@ module RSS
               @#{full_plural_name}[0] = #{full_klass_name}.new(self)
               @#{full_plural_name}[0].value = new_value
             end
+
+            def new_#{full_name}(value=nil)
+              #{full_name} = #{full_klass_name}.new(self)
+              #{full_name}.value = value
+              @#{full_plural_name} << #{full_name}
+              if block_given?
+                yield #{full_name}
+              else
+                #{full_name}
+              end
+            end
 EOC
         end
 
@@ -48,25 +59,14 @@ EOC
       ::RSS::DublinCoreModel::ELEMENT_NAME_INFOS.each do |name, plural_name|
         plural_name ||= "#{name}s"
         klass_name = Utils.to_class_name(name)
+        full_klass_name = "DublinCore#{klass_name}"
         plural_klass_name = "DublinCore#{Utils.to_class_name(plural_name)}"
         module_eval(<<-EOC, __FILE__, __LINE__)
         class #{plural_klass_name}Base
           include Base
 
-          def_array_element(#{plural_name.dump})
-                            
-          def new_#{name}
-            #{name} = self.class::#{klass_name}.new(self)
-            @#{plural_name} << #{name}
-            #{name}
-          end
+          def_array_element(#{name.dump}, #{plural_name.dump})
 
-          def to_rss(rss, current)
-            @#{plural_name}.each do |#{name}|
-              #{name}.to_rss(rss, current)
-            end
-          end
-        
           class #{klass_name}Base
             include Base
 
@@ -78,6 +78,13 @@ EOC
             def have_required_values?
               @value
             end
+
+            def to_feed(feed, current)
+              if value and current.respond_to?(:dc_#{name})
+                new_item = current.class::#{full_klass_name}.new(value)
+                current.dc_#{plural_name} << new_item
+              end
+            end
           end
         end
         EOC
@@ -88,16 +95,9 @@ EOC
           plural_name ||= "#{name}s"
           klass_name = Utils.to_class_name(name)
           plural_klass_name = "DublinCore#{Utils.to_class_name(plural_name)}"
-          full_klass_name = "DublinCore#{klass_name}"
-          klass.module_eval(<<-EOC, *Utils.get_file_and_line_from_caller(1))
+          klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
           class #{plural_klass_name} < #{plural_klass_name}Base
             class #{klass_name} < #{klass_name}Base
-              def to_rss(rss, current)
-                if value and current.respond_to?(:dc_#{name})
-                  new_item = current.class::#{full_klass_name}.new(value)
-                  current.dc_#{plural_name} << new_item
-                end
-              end
             end
           end
 EOC
@@ -107,64 +107,36 @@ EOC
 
     class ChannelBase
       include DublinCoreModel
-      
-      remove_method(:date)
-      remove_method(:date=)
-      alias_method(:date, :dc_date)
-      alias_method(:date=, :dc_date=)
     end
     
     class ImageBase; include DublinCoreModel; end
     class ItemsBase
       class ItemBase
         include DublinCoreModel
-        
-        remove_method(:date)
-        remove_method(:date=)
-        alias_method(:date, :dc_date)
-        alias_method(:date=, :dc_date=)
       end
     end
     class TextinputBase; include DublinCoreModel; end
 
-    class RSS10
-      class Channel
-        DublinCoreModel.install_dublin_core(self)
-      end
-
-      class Image
-        DublinCoreModel.install_dublin_core(self)
-      end
-
-      class Items
-        class Item
+    makers.each do |maker|
+      maker.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+        class Channel
           DublinCoreModel.install_dublin_core(self)
         end
-      end
 
-      class Textinput
-        DublinCoreModel.install_dublin_core(self)
-      end
-    end
-    
-    class RSS09
-      class Channel
-        DublinCoreModel.install_dublin_core(self)
-      end
+        class Image
+          DublinCoreModel.install_dublin_core(self)
+        end
 
-      class Image
-        DublinCoreModel.install_dublin_core(self)
-      end
+        class Items
+          class Item
+            DublinCoreModel.install_dublin_core(self)
+          end
+        end
 
-      class Items
-        class Item
+        class Textinput
           DublinCoreModel.install_dublin_core(self)
         end
-      end
-
-      class Textinput
-        DublinCoreModel.install_dublin_core(self)
-      end
+      EOC
     end
   end
 end