kou	2009-05-16 19:41:54 +0900 (Sat, 16 May 2009)

  New Revision: 23461

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

  Log:
    merge r23448.
    * lib/rss/maker/feed.rb, test/test_maker_atom_feed.rb:
      remove needless codes.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/rss/maker/feed.rb
    branches/ruby_1_8/test/rss/test_maker_atom_feed.rb

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 23460)
+++ ruby_1_8/ChangeLog	(revision 23461)
@@ -1,3 +1,8 @@
+Sat May 16 19:41:48 2009  Kouhei Sutou  <kou@c...>
+
+	* lib/rss/maker/feed.rb, test/test_maker_atom_feed.rb:
+	remove needless codes.
+
 Sat May 16 19:40:45 2009  Kouhei Sutou  <kou@c...>
 
 	* lib/rss/maker/entry.rb: fix a typo.
Index: ruby_1_8/lib/rss/maker/feed.rb
===================================================================
--- ruby_1_8/lib/rss/maker/feed.rb	(revision 23460)
+++ ruby_1_8/lib/rss/maker/feed.rb	(revision 23461)
@@ -73,14 +73,11 @@
           def _set_default_values(&block)
             keep = {
               :id => id,
-              :updated => updated,
             }
             self.id ||= about
-            self.updated ||= dc_date
             super(&block)
           ensure
             self.id = keep[:id]
-            self.updated = keep[:updated]
           end
 
           class SkipDays < SkipDaysBase
@@ -219,14 +216,11 @@
             def _set_default_values(&block)
               keep = {
                 :id => id,
-                :updated => updated,
               }
               self.id ||= link
-              self.updated ||= dc_date
               super(&block)
             ensure
               self.id = keep[:id]
-              self.updated = keep[:updated]
             end
 
             class Guid < GuidBase
Index: ruby_1_8/test/rss/test_maker_atom_feed.rb
===================================================================
--- ruby_1_8/test/rss/test_maker_atom_feed.rb	(revision 23460)
+++ ruby_1_8/test/rss/test_maker_atom_feed.rb	(revision 23461)
@@ -408,12 +408,38 @@
         setup_dummy_channel_atom(maker)
         maker.items.new_item do |item|
           item.link = "http://example.com/article.html"
-          item.title = "Sample Article"
+          item.title = "sample article"
           item.date = date
         end
       end
       assert_equal(date, feed.items[0].updated.content)
       assert_equal([date], feed.items[0].dc_dates.collect {|date| date.value})
     end
+
+    def test_channel_dc_date
+      date = Time.parse("2004/11/1 10:10")
+      feed = Maker.make("atom") do |maker|
+        setup_dummy_channel_atom(maker)
+        maker.channel.updated = nil
+        maker.channel.dc_date = date
+        setup_dummy_item_atom(maker)
+      end
+      assert_equal(date, feed.updated.content)
+      assert_equal([date], feed.dc_dates.collect {|date| date.value})
+    end
+
+    def test_item_dc_date
+      date = Time.parse("2004/11/1 10:10")
+      feed = Maker.make("atom") do |maker|
+        setup_dummy_channel_atom(maker)
+        maker.items.new_item do |item|
+          item.link = "http://example.com/article.html"
+          item.title = "sample article"
+          item.dc_date = date
+        end
+      end
+      assert_equal(date, feed.items[0].updated.content)
+      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/