diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rss/maker/feed.rb | 6 | ||||
| -rw-r--r-- | test/rss/test_maker_atom_feed.rb | 28 |
3 files changed, 32 insertions, 7 deletions
@@ -1,3 +1,8 @@ +Sat May 16 18:07:17 2009 Kouhei Sutou <kou@cozmixng.org> + + * lib/rss/maker/feed.rb, test/test_maker_atom_feed.rb: + remove needless codes. + Sat May 16 18:05:07 2009 Kouhei Sutou <kou@cozmixng.org> * lib/rss/maker/entry.rb: fix a typo. diff --git a/lib/rss/maker/feed.rb b/lib/rss/maker/feed.rb index 90e2c1407a..0129218b0c 100644 --- a/lib/rss/maker/feed.rb +++ b/lib/rss/maker/feed.rb @@ -73,14 +73,11 @@ module RSS 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 @@ module RSS 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 diff --git a/test/rss/test_maker_atom_feed.rb b/test/rss/test_maker_atom_feed.rb index 7a2bb63b0a..2ca67e719a 100644 --- a/test/rss/test_maker_atom_feed.rb +++ b/test/rss/test_maker_atom_feed.rb @@ -408,12 +408,38 @@ module RSS 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 |