1 files changed, 41 insertions, 75 deletions
diff --git a/lib/rss/maker/image.rb b/lib/rss/maker/image.rb
index ed51c8ecba..b95cf4c714 100644
--- a/lib/rss/maker/image.rb
+++ b/lib/rss/maker/image.rb
@@ -9,24 +9,18 @@ module RSS
         super
 
         name = "#{RSS::IMAGE_PREFIX}_item"
-        klass.add_need_initialize_variable(name, "make_#{name}")
-        klass.add_other_element(name)
-        klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
-          attr_reader :#{name}
-          def setup_#{name}(rss, current)
-            if @#{name}
-              @#{name}.to_rss(rss, current)
-            end
-          end
+        klass.def_classed_element(name)
+      end
 
-          def make_#{name}
-            self.class::#{Utils.to_class_name(name)}.new(@maker)
+      def self.install_image_item(klass)
+	klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+          class ImageItem < ImageItemBase
+            DublinCoreModel.install_dublin_core(self)
           end
 EOC
       end
 
-      class ImageItemBase
-        include Base
+      class ImageItemBase < Base
         include Maker::DublinCoreModel
 
         attr_accessor :about, :resource, :image_width, :image_height
@@ -42,6 +36,15 @@ EOC
         def have_required_values?
           @about
         end
+
+        def to_feed(feed, current)
+          if current.respond_to?(:image_item=) and have_required_values?
+            item = current.class::ImageItem.new
+            setup_values(item)
+            setup_other_elements(item)
+            current.image_item = item
+          end
+        end
       end
     end
 
@@ -50,24 +53,18 @@ EOC
         super
 
         name = "#{RSS::IMAGE_PREFIX}_favicon"
-        klass.add_need_initialize_variable(name, "make_#{name}")
-        klass.add_other_element(name)
-        klass.module_eval(<<-EOC, __FILE__, __LINE__+1)
-          attr_reader :#{name}
-          def setup_#{name}(rss, current)
-            if @#{name}
-              @#{name}.to_rss(rss, current)
-            end
-          end
+        klass.def_classed_element(name)
+      end
 
-          def make_#{name}
-            self.class::#{Utils.to_class_name(name)}.new(@maker)
+      def self.install_image_favicon(klass)
+	klass.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+          class ImageFavicon < ImageFaviconBase
+            DublinCoreModel.install_dublin_core(self)
           end
-EOC
+        EOC
       end
 
-      class ImageFaviconBase
-        include Base
+      class ImageFaviconBase < Base
         include Maker::DublinCoreModel
 
         attr_accessor :about, :image_size
@@ -79,6 +76,15 @@ EOC
         def have_required_values?
           @about and @image_size
         end
+
+        def to_feed(feed, current)
+          if current.respond_to?(:image_favicon=) and have_required_values?
+            favicon = current.class::ImageFavicon.new
+            setup_values(favicon)
+            setup_other_elements(favicon)
+            current.image_favicon = favicon
+          end
+        end
       end
     end
 
@@ -88,58 +94,18 @@ EOC
       class ItemBase; include Maker::ImageItemModel; end
     end
 
-    class RSS10
-      class Items
-        class Item
-          class ImageItem < ImageItemBase
-            DublinCoreModel.install_dublin_core(self)
-            def to_rss(rss, current)
-              if @about
-                item = ::RSS::ImageItemModel::ImageItem.new(@about, @resource)
-                setup_values(item)
-                setup_other_elements(item)
-                current.image_item = item
-              end
-            end
-          end
+    makers.each do |maker|
+      maker.module_eval(<<-EOC, __FILE__, __LINE__ + 1)
+        class Channel
+          ImageFaviconModel.install_image_favicon(self)
         end
-      end
-      
-      class Channel
-        class ImageFavicon < ImageFaviconBase
-          DublinCoreModel.install_dublin_core(self)
-          def to_rss(rss, current)
-            if @about and @image_size
-              args = [@about, @image_size]
-              favicon = ::RSS::ImageFaviconModel::ImageFavicon.new(*args)
-              setup_values(favicon)
-              setup_other_elements(favicon)
-              current.image_favicon = favicon
-            end
-          end
-        end
-      end
-    end
 
-    class RSS09
-      class Items
-        class Item
-          class ImageItem < ImageItemBase
-            DublinCoreModel.install_dublin_core(self)
-            def to_rss(*args)
-            end
+        class Items
+          class Item
+            ImageItemModel.install_image_item(self)
           end
         end
-      end
-      
-      class Channel
-        class ImageFavicon < ImageFaviconBase
-          DublinCoreModel.install_dublin_core(self)
-          def to_rss(*args)
-          end
-        end
-      end
+      EOC
     end
-
   end
 end