kou	2009-05-16 19:39:06 +0900 (Sat, 16 May 2009)

  New Revision: 23459

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

  Log:
    merge r23446.
    * lib/rss/maker/feed.rb, test/test_maker_atom_entry.rb,
      test/test_maker_atom_feed.rb: fix duplicated dc:date.
      Reported by Kazuhiro NISHIYAMA. Thanks!!! [ruby-list:46014]

  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_entry.rb
    branches/ruby_1_8/test/rss/test_maker_atom_feed.rb

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 23458)
+++ ruby_1_8/ChangeLog	(revision 23459)
@@ -1,3 +1,9 @@
+Sat May 16 19:38:05 2009  Kouhei Sutou  <kou@c...>
+
+	* lib/rss/maker/feed.rb, test/test_maker_atom_entry.rb,
+	test/test_maker_atom_feed.rb: fix duplicated dc:date.
+	Reported by Kazuhiro NISHIYAMA. Thanks!!! [ruby-list:46014]
+
 Sat May 16 19:36:52 2009  Kouhei Sutou  <kou@c...>
 
 	* lib/rss/maker/base.rb, lib/rss/maker/1.0.rb, lib/rss/maker/feed.rb,
Index: ruby_1_8/lib/rss/maker/feed.rb
===================================================================
--- ruby_1_8/lib/rss/maker/feed.rb	(revision 23458)
+++ ruby_1_8/lib/rss/maker/feed.rb	(revision 23459)
@@ -184,6 +184,7 @@
               set_default_values do
                 entry = feed.class::Entry.new
                 set = setup_values(entry)
+                entry.dc_dates.clear
                 setup_other_elements(feed, entry)
                 if set
                   feed.entries << entry
Index: ruby_1_8/test/rss/test_maker_atom_entry.rb
===================================================================
--- ruby_1_8/test/rss/test_maker_atom_entry.rb	(revision 23458)
+++ ruby_1_8/test/rss/test_maker_atom_entry.rb	(revision 23459)
@@ -368,5 +368,20 @@
         setup_dummy_item_atom(maker)
       end
     end
+
+    def test_date
+      date = Time.parse("2004/11/1 10:10")
+      feed = Maker.make("atom:entry") do |maker|
+        setup_dummy_channel_atom(maker)
+        maker.channel.date = nil
+        maker.items.new_item do |item|
+          item.link = "http://example.com/article.html"
+          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
   end
 end
Index: ruby_1_8/test/rss/test_maker_atom_feed.rb
===================================================================
--- ruby_1_8/test/rss/test_maker_atom_feed.rb	(revision 23458)
+++ ruby_1_8/test/rss/test_maker_atom_feed.rb	(revision 23459)
@@ -401,5 +401,19 @@
       end
       assert_equal(language, feed.dc_language)
     end
+
+    def test_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.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/