merge r23449, r23453.

* lib/rss/content/*, lib/rss/dublincore/*: fix circular require.
* test/test_maker_atom_feed.rb,
  test/test_maker_atom_entry.rb: suppress warnings.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

8 files changed, 10 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 05ae5428b8..6fe541dce3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat May 16 19:44:09 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/content/*, lib/rss/dublincore/*: fix circular require.
+	* test/test_maker_atom_feed.rb,
+	test/test_maker_atom_entry.rb: suppress warnings.
+
 Sat May 16 19:41:48 2009  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/maker/feed.rb, test/test_maker_atom_feed.rb:
diff --git a/lib/rss/content/1.0.rb b/lib/rss/content/1.0.rb
index e7c0c19685..e5dc857930 100644
--- a/lib/rss/content/1.0.rb
+++ b/lib/rss/content/1.0.rb
@@ -1,5 +1,4 @@
 require 'rss/1.0'
-require 'rss/content'
 
 module RSS
   RDF.install_ns(CONTENT_PREFIX, CONTENT_URI)
diff --git a/lib/rss/content/2.0.rb b/lib/rss/content/2.0.rb
index 8671b5b1a6..8491a99937 100644
--- a/lib/rss/content/2.0.rb
+++ b/lib/rss/content/2.0.rb
@@ -1,5 +1,4 @@
 require "rss/2.0"
-require "rss/content"
 
 module RSS
   Rss.install_ns(CONTENT_PREFIX, CONTENT_URI)
diff --git a/lib/rss/dublincore/1.0.rb b/lib/rss/dublincore/1.0.rb
index e193c6d2c2..efe2f5dad4 100644
--- a/lib/rss/dublincore/1.0.rb
+++ b/lib/rss/dublincore/1.0.rb
@@ -1,5 +1,4 @@
 require "rss/1.0"
-require "rss/dublincore"
 
 module RSS
   RDF.install_ns(DC_PREFIX, DC_URI)
diff --git a/lib/rss/dublincore/2.0.rb b/lib/rss/dublincore/2.0.rb
index 82ed1888c5..a79c1e84a4 100644
--- a/lib/rss/dublincore/2.0.rb
+++ b/lib/rss/dublincore/2.0.rb
@@ -1,5 +1,4 @@
 require "rss/2.0"
-require "rss/dublincore"
 
 module RSS
   Rss.install_ns(DC_PREFIX, DC_URI)
diff --git a/lib/rss/dublincore/atom.rb b/lib/rss/dublincore/atom.rb
index e78df4821b..8db9066bb8 100644
--- a/lib/rss/dublincore/atom.rb
+++ b/lib/rss/dublincore/atom.rb
@@ -1,5 +1,4 @@
 require "rss/atom"
-require "rss/dublincore"
 
 module RSS
   module Atom
diff --git a/test/rss/test_maker_atom_entry.rb b/test/rss/test_maker_atom_entry.rb
index c9b9f89537..94e4255e9e 100644
--- a/test/rss/test_maker_atom_entry.rb
+++ b/test/rss/test_maker_atom_entry.rb
@@ -381,7 +381,7 @@ module RSS
         end
       end
       assert_equal(date, feed.items[0].updated.content)
-      assert_equal([date], feed.items[0].dc_dates.collect {|date| date.value})
+      assert_equal([date], feed.items[0].dc_dates.collect {|_date| _date.value})
     end
   end
 end
diff --git a/test/rss/test_maker_atom_feed.rb b/test/rss/test_maker_atom_feed.rb
index 2ca67e719a..6ffd47c396 100644
--- a/test/rss/test_maker_atom_feed.rb
+++ b/test/rss/test_maker_atom_feed.rb
@@ -413,7 +413,7 @@ module RSS
         end
       end
       assert_equal(date, feed.items[0].updated.content)
-      assert_equal([date], feed.items[0].dc_dates.collect {|date| date.value})
+      assert_equal([date], feed.items[0].dc_dates.collect {|_date| _date.value})
     end
 
     def test_channel_dc_date
@@ -425,7 +425,7 @@ module RSS
         setup_dummy_item_atom(maker)
       end
       assert_equal(date, feed.updated.content)
-      assert_equal([date], feed.dc_dates.collect {|date| date.value})
+      assert_equal([date], feed.dc_dates.collect {|_date| _date.value})
     end
 
     def test_item_dc_date
@@ -439,7 +439,7 @@ module RSS
         end
       end
       assert_equal(date, feed.items[0].updated.content)
-      assert_equal([date], feed.items[0].dc_dates.collect {|date| date.value})
+      assert_equal([date], feed.items[0].dc_dates.collect {|_date| _date.value})
     end
   end
 end