From 0095fc091a9e84e7fe348cf97faad7fbb668def5 Mon Sep 17 00:00:00 2001
From: kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 17 Jun 2006 00:54:19 +0000
Subject: * lib/rss, test/rss: backported from trunk. (2005-11-16 - now)

* lib/rss/image.rb: added Image prefix.
* lib/rss/maker/image.rb: ditto.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10297 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog              |  3 +++
 lib/rss/image.rb       | 16 ++++++++++++++--
 lib/rss/maker/image.rb |  4 ++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 691d31fa3..2a9e02ad1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,9 @@ Sat Jun 17 09:03:47 2006  Kouhei Sutou  <kou@cozmixng.org>
 	* lib/rss/0.9.rb: added initialize method.
 	* test/rss/test_1.0.rb: cleanup.
 
+	* lib/rss/image.rb: added Image prefix.
+	* lib/rss/maker/image.rb: ditto.
+
 Sat Jun 17 02:01:00 2006  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
diff --git a/lib/rss/image.rb b/lib/rss/image.rb
index 966a056d6..818edd4f2 100644
--- a/lib/rss/image.rb
+++ b/lib/rss/image.rb
@@ -8,6 +8,14 @@ module RSS
 
   RDF.install_ns(IMAGE_PREFIX, IMAGE_URI)
 
+  IMAGE_ELEMENTS = []
+
+  %w(item favicon).each do |name|
+    class_name = Utils.to_class_name(name)
+    BaseListener.install_class_name(IMAGE_URI, name, "Image#{class_name}")
+    IMAGE_ELEMENTS << "#{IMAGE_PREFIX}_#{name}"
+  end
+  
   module ImageModelUtils
     def validate_one_tag_name(name, tags)
       invalid = tags.find {|tag| tag != name}
@@ -30,10 +38,12 @@ module RSS
       validate_one_tag_name("item", tags)
     end
     
-    class Item < Element
+    class ImageItem < Element
       include RSS10
       include DublinCoreModel
 
+      @tag_name = "item"
+      
       class << self
         def required_prefix
           IMAGE_PREFIX
@@ -144,10 +154,12 @@ module RSS
       validate_one_tag_name("favicon", tags)
     end
     
-    class Favicon < Element
+    class ImageFavicon < Element
       include RSS10
       include DublinCoreModel
 
+      @tag_name = "favicon"
+      
       class << self
         def required_prefix
           IMAGE_PREFIX
diff --git a/lib/rss/maker/image.rb b/lib/rss/maker/image.rb
index 85d9d9c95..ed51c8ecb 100644
--- a/lib/rss/maker/image.rb
+++ b/lib/rss/maker/image.rb
@@ -95,7 +95,7 @@ EOC
             DublinCoreModel.install_dublin_core(self)
             def to_rss(rss, current)
               if @about
-                item = ::RSS::ImageItemModel::Item.new(@about, @resource)
+                item = ::RSS::ImageItemModel::ImageItem.new(@about, @resource)
                 setup_values(item)
                 setup_other_elements(item)
                 current.image_item = item
@@ -111,7 +111,7 @@ EOC
           def to_rss(rss, current)
             if @about and @image_size
               args = [@about, @image_size]
-              favicon = ::RSS::ImageFaviconModel::Favicon.new(*args)
+              favicon = ::RSS::ImageFaviconModel::ImageFavicon.new(*args)
               setup_values(favicon)
               setup_other_elements(favicon)
               current.image_favicon = favicon
-- 
cgit