ruby-changes:6160
From: kou <ko1@a...>
Date: Sun, 29 Jun 2008 17:38:28 +0900 (JST)
Subject: [ruby-changes:6160] Ruby:r17672 (trunk): * lib/rss/maker/base.rb (RSS::Maker::RSSBase#make): require block.
kou 2008-06-29 17:38:11 +0900 (Sun, 29 Jun 2008) New Revision: 17672 Modified files: trunk/ChangeLog trunk/lib/rss/maker/base.rb trunk/test/rss/test_maker_0.9.rb trunk/test/rss/test_maker_1.0.rb trunk/test/rss/test_maker_2.0.rb Log: * lib/rss/maker/base.rb (RSS::Maker::RSSBase#make): require block. * test/rss/test_maker_{0.9,1.0,2.0}.rb: follow the above change. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/rss/test_maker_2.0.rb?r1=17672&r2=17671&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/rss/test_maker_0.9.rb?r1=17672&r2=17671&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/rss/test_maker_1.0.rb?r1=17672&r2=17671&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17672&r2=17671&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rss/maker/base.rb?r1=17672&r2=17671&diff_format=u Index: ChangeLog =================================================================== --- ChangeLog (revision 17671) +++ ChangeLog (revision 17672) @@ -1,3 +1,8 @@ +Sun Jun 29 17:37:23 2008 Kouhei Sutou <kou@c...> + + * lib/rss/maker/base.rb (RSS::Maker::RSSBase#make): require block. + * test/rss/test_maker_{0.9,1.0,2.0}.rb: follow the above change. + Sun Jun 29 17:33:34 2008 Kouhei Sutou <kou@c...> * lib/rss/maker/base.rb, lib/rss/maker/itunes.rb: don't use Index: lib/rss/maker/base.rb =================================================================== --- lib/rss/maker/base.rb (revision 17671) +++ lib/rss/maker/base.rb (revision 17672) @@ -411,12 +411,8 @@ end def make - if block_given? - yield(self) - to_feed - else - nil - end + yield(self) + to_feed end def to_feed Index: test/rss/test_maker_2.0.rb =================================================================== --- test/rss/test_maker_2.0.rb (revision 17671) +++ test/rss/test_maker_2.0.rb (revision 17672) @@ -6,8 +6,9 @@ class TestMaker20 < TestCase def test_rss - rss = RSS::Maker.make("2.0") - assert_nil(rss) + assert_raise(LocalJumpError) do + RSS::Maker.make("2.0") + end rss = RSS::Maker.make("2.0") do |maker| setup_dummy_channel(maker) Index: test/rss/test_maker_1.0.rb =================================================================== --- test/rss/test_maker_1.0.rb (revision 17671) +++ test/rss/test_maker_1.0.rb (revision 17672) @@ -6,6 +6,10 @@ class TestMaker10 < TestCase def test_rdf + assert_raise(LocalJumpError) do + RSS::Maker.make("1.0") + end + rss = RSS::Maker.make("1.0") do |maker| setup_dummy_channel(maker) setup_dummy_item(maker) @@ -48,9 +52,6 @@ link = "http://hoge.com" description = "fugafugafugafuga" - rss = RSS::Maker.make("1.0") - assert_nil(rss) - rss = RSS::Maker.make("1.0") do |maker| maker.channel.about = about maker.channel.title = title Index: test/rss/test_maker_0.9.rb =================================================================== --- test/rss/test_maker_0.9.rb (revision 17671) +++ test/rss/test_maker_0.9.rb (revision 17672) @@ -6,8 +6,9 @@ class TestMaker09 < TestCase def test_rss - rss = RSS::Maker.make("0.91") - assert_nil(rss) + assert_raise(LocalJumpError) do + RSS::Maker.make("0.91") + end rss = RSS::Maker.make("0.9") do |maker| setup_dummy_channel(maker) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/