kou	2009-05-16 19:44:15 +0900 (Sat, 16 May 2009)

  New Revision: 23462

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23462

  Log:
    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.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/rss/content/1.0.rb
    branches/ruby_1_8/lib/rss/content/2.0.rb
    branches/ruby_1_8/lib/rss/dublincore/1.0.rb
    branches/ruby_1_8/lib/rss/dublincore/2.0.rb
    branches/ruby_1_8/lib/rss/dublincore/atom.rb
    branches/ruby_1_8/test/rss/test_maker_atom_entry.rb
    branches/ruby_1_8/test/rss/test_maker_atom_feed.rb

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 23461)
+++ ruby_1_8/ChangeLog	(revision 23462)
@@ -1,3 +1,9 @@
+Sat May 16 19:44:09 2009  Kouhei Sutou  <kou@c...>
+
+	* 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@c...>
 
 	* lib/rss/maker/feed.rb, test/test_maker_atom_feed.rb:
Index: ruby_1_8/lib/rss/dublincore/1.0.rb
===================================================================
--- ruby_1_8/lib/rss/dublincore/1.0.rb	(revision 23461)
+++ ruby_1_8/lib/rss/dublincore/1.0.rb	(revision 23462)
@@ -1,5 +1,4 @@
 require "rss/1.0"
-require "rss/dublincore"
 
 module RSS
   RDF.install_ns(DC_PREFIX, DC_URI)
Index: ruby_1_8/lib/rss/dublincore/2.0.rb
===================================================================
--- ruby_1_8/lib/rss/dublincore/2.0.rb	(revision 23461)
+++ ruby_1_8/lib/rss/dublincore/2.0.rb	(revision 23462)
@@ -1,5 +1,4 @@
 require "rss/2.0"
-require "rss/dublincore"
 
 module RSS
   Rss.install_ns(DC_PREFIX, DC_URI)
Index: ruby_1_8/lib/rss/dublincore/atom.rb
===================================================================
--- ruby_1_8/lib/rss/dublincore/atom.rb	(revision 23461)
+++ ruby_1_8/lib/rss/dublincore/atom.rb	(revision 23462)
@@ -1,5 +1,4 @@
 require "rss/atom"
-require "rss/dublincore"
 
 module RSS
   module Atom
Index: ruby_1_8/lib/rss/content/1.0.rb
===================================================================
--- ruby_1_8/lib/rss/content/1.0.rb	(revision 23461)
+++ ruby_1_8/lib/rss/content/1.0.rb	(revision 23462)
@@ -1,5 +1,4 @@
 require 'rss/1.0'
-require 'rss/content'
 
 module RSS
   RDF.install_ns(CONTENT_PREFIX, CONTENT_URI)
Index: ruby_1_8/lib/rss/content/2.0.rb
===================================================================
--- ruby_1_8/lib/rss/content/2.0.rb	(revision 23461)
+++ ruby_1_8/lib/rss/content/2.0.rb	(revision 23462)
@@ -1,5 +1,4 @@
 require "rss/2.0"
-require "rss/content"
 
 module RSS
   Rss.install_ns(CONTENT_PREFIX, CONTENT_URI)
Index: ruby_1_8/test/rss/test_maker_atom_entry.rb
===================================================================
--- ruby_1_8/test/rss/test_maker_atom_entry.rb	(revision 23461)
+++ ruby_1_8/test/rss/test_maker_atom_entry.rb	(revision 23462)
@@ -381,7 +381,7 @@
         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
Index: ruby_1_8/test/rss/test_maker_atom_feed.rb
===================================================================
--- ruby_1_8/test/rss/test_maker_atom_feed.rb	(revision 23461)
+++ ruby_1_8/test/rss/test_maker_atom_feed.rb	(revision 23462)
@@ -413,7 +413,7 @@
         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 @@
         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 @@
         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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/