yugui	2009-05-22 18:48:40 +0900 (Fri, 22 May 2009)

  New Revision: 23530

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

  Log:
    merges r23446 from trunk into ruby_1_9_1.
    --
    * 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_9_1/ChangeLog
    branches/ruby_1_9_1/lib/rss/maker/feed.rb
    branches/ruby_1_9_1/test/rss/test_maker_atom_entry.rb
    branches/ruby_1_9_1/test/rss/test_maker_atom_feed.rb
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 23529)
+++ ruby_1_9_1/ChangeLog	(revision 23530)
@@ -1,3 +1,9 @@
+Sat May 16 18:02:57 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 17:57:39 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/dl/lib/dl/callback.rb (DL#remove_callback_internal): ignore
Index: ruby_1_9_1/lib/rss/maker/feed.rb
===================================================================
--- ruby_1_9_1/lib/rss/maker/feed.rb	(revision 23529)
+++ ruby_1_9_1/lib/rss/maker/feed.rb	(revision 23530)
@@ -182,6 +182,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_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 23529)
+++ ruby_1_9_1/version.h	(revision 23530)
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-12"
-#define RUBY_PATCHLEVEL 144
+#define RUBY_PATCHLEVEL 145
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
Index: ruby_1_9_1/test/rss/test_maker_atom_entry.rb
===================================================================
--- ruby_1_9_1/test/rss/test_maker_atom_entry.rb	(revision 23529)
+++ ruby_1_9_1/test/rss/test_maker_atom_entry.rb	(revision 23530)
@@ -363,5 +363,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_9_1/test/rss/test_maker_atom_feed.rb
===================================================================
--- ruby_1_9_1/test/rss/test_maker_atom_feed.rb	(revision 23529)
+++ ruby_1_9_1/test/rss/test_maker_atom_feed.rb	(revision 23530)
@@ -385,5 +385,19 @@
         setup_dummy_item_atom(maker)
       end
     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/