From 805d87a01644931aed9c5eaf870e5f6a5085cc83 Mon Sep 17 00:00:00 2001
From: kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 16 May 2009 09:01:18 +0000
Subject: * lib/rss/maker/base.rb, lib/rss/maker/1.0.rb, lib/rss/maker/feed.rb,
   test/rss/test_maker_1.0.rb, test/rss/test_maker_atom_feed.rb:   RSS 1.0 and
 Atom feed maker treat maker.channel.language as   maker.channel.dc_language.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rss/maker/1.0.rb  |  1 +
 lib/rss/maker/base.rb | 19 +++++++++++++++++++
 lib/rss/maker/feed.rb |  2 ++
 3 files changed, 22 insertions(+)

(limited to 'lib/rss')

diff --git a/lib/rss/maker/1.0.rb b/lib/rss/maker/1.0.rb
index 676f66291..0d8075f83 100644
--- a/lib/rss/maker/1.0.rb
+++ b/lib/rss/maker/1.0.rb
@@ -25,6 +25,7 @@ module RSS
       end
 
       class Channel < ChannelBase
+        include SetupDefaultLanguage
 
         def to_feed(rss)
           set_default_values do
diff --git a/lib/rss/maker/base.rb b/lib/rss/maker/base.rb
index 615088f8f..6b42f11fc 100644
--- a/lib/rss/maker/base.rb
+++ b/lib/rss/maker/base.rb
@@ -372,6 +372,25 @@ module RSS
       end
     end
 
+    module SetupDefaultLanguage
+      private
+      def _set_default_values(&block)
+        keep = {
+          :dc_languages => dc_languages.to_a.dup,
+        }
+        _language = language
+        if _language and
+            !dc_languages.any? {|dc_language| dc_language.value == _language}
+          dc_language = self.class::DublinCoreLanguages::DublinCoreLanguage.new(self)
+          dc_language.value = _language.dup
+          dc_languages.unshift(dc_language)
+        end
+        super(&block)
+      ensure
+        dc_languages.replace(keep[:dc_languages])
+      end
+    end
+
     class RSSBase < Base
       class << self
         def make(*args, &block)
diff --git a/lib/rss/maker/feed.rb b/lib/rss/maker/feed.rb
index 3a30ad428..fa3a17716 100644
--- a/lib/rss/maker/feed.rb
+++ b/lib/rss/maker/feed.rb
@@ -22,6 +22,8 @@ module RSS
         end
 
         class Channel < ChannelBase
+          include SetupDefaultLanguage
+
           def to_feed(feed)
             set_default_values do
               setup_values(feed)
-- 
cgit