diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/rss/maker/feed.rb | 1 | ||||
| -rw-r--r-- | test/rss/test_maker_atom_entry.rb | 15 | ||||
| -rw-r--r-- | test/rss/test_maker_atom_feed.rb | 14 | ||||
| -rw-r--r-- | version.h | 2 |
5 files changed, 37 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat May 16 18:02:57 2009 Kouhei Sutou <kou@cozmixng.org> + + * 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@ruby-lang.org> * ext/dl/lib/dl/callback.rb (DL#remove_callback_internal): ignore diff --git a/lib/rss/maker/feed.rb b/lib/rss/maker/feed.rb index 3a30ad428..303959aba 100644 --- a/lib/rss/maker/feed.rb +++ b/lib/rss/maker/feed.rb @@ -182,6 +182,7 @@ module RSS 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 diff --git a/test/rss/test_maker_atom_entry.rb b/test/rss/test_maker_atom_entry.rb index ae0ab2d09..564c582be 100644 --- a/test/rss/test_maker_atom_entry.rb +++ b/test/rss/test_maker_atom_entry.rb @@ -363,5 +363,20 @@ module RSS 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 diff --git a/test/rss/test_maker_atom_feed.rb b/test/rss/test_maker_atom_feed.rb index e5bf0e23b..94a03662b 100644 --- a/test/rss/test_maker_atom_feed.rb +++ b/test/rss/test_maker_atom_feed.rb @@ -385,5 +385,19 @@ module RSS 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 @@ -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 |