1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* lib/rss/maker/0.9.rb (RSS::Maker::RSS09::Image#have_required_values):

changed /rss/channel/image to be optional. [ruby-Bugs:1047]

* test/rss/test_maker_0.9.rb: added tests for the above.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kou 2004-11-19 08:49:05 +00:00
parent 9be1ed43c8
commit b37319295d
3 changed files with 11 additions and 39 deletions

View file

@ -1,3 +1,10 @@
Fri Nov 19 17:46:56 2004 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/maker/0.9.rb (RSS::Maker::RSS09::Image#have_required_values):
changed /rss/channel/image to be optional. [ruby-Bugs:1047]
* test/rss/test_maker_0.9.rb: added tests for the above.
Fri Nov 19 17:18:17 2004 Kouhei Sutou <kou@cozmixng.org> Fri Nov 19 17:18:17 2004 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/rss.rb (RSS::VERSION): 0.1.0 -> 0.1.1. * lib/rss/rss.rb (RSS::VERSION): 0.1.0 -> 0.1.1.

View file

@ -48,8 +48,7 @@ module RSS
end end
def have_required_values? def have_required_values?
@title and @link and @description and @language and @title and @link and @description and @language
@maker.image.have_required_values?
end end
private private

View file

@ -11,13 +11,11 @@ module RSS
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_channel(maker) setup_dummy_channel(maker)
setup_dummy_image(maker)
end end
assert_equal("0.91", rss.rss_version) assert_equal("0.91", rss.rss_version)
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_channel(maker) setup_dummy_channel(maker)
setup_dummy_image(maker)
maker.encoding = "EUC-JP" maker.encoding = "EUC-JP"
end end
@ -26,7 +24,6 @@ module RSS
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_channel(maker) setup_dummy_channel(maker)
setup_dummy_image(maker)
maker.standalone = "yes" maker.standalone = "yes"
end end
@ -35,7 +32,6 @@ module RSS
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_channel(maker) setup_dummy_channel(maker)
setup_dummy_image(maker)
maker.encoding = "EUC-JP" maker.encoding = "EUC-JP"
maker.standalone = "yes" maker.standalone = "yes"
@ -87,8 +83,6 @@ module RSS
new_hour = maker.channel.skipHours.new_hour new_hour = maker.channel.skipHours.new_hour
new_hour.content = hour new_hour.content = hour
end end
setup_dummy_image(maker)
end end
channel = rss.channel channel = rss.channel
@ -112,7 +106,7 @@ module RSS
end end
assert(channel.items.empty?) assert(channel.items.empty?)
assert_not_nil(channel.image) assert_nil(channel.image)
assert_nil(channel.textInput) assert_nil(channel.textInput)
end end
@ -123,18 +117,6 @@ module RSS
language = "ja" language = "ja"
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
# setup_dummy_image(maker)
maker.channel.title = title
maker.channel.link = link
maker.channel.description = description
maker.channel.language = language
end
assert_nil(rss)
rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_image(maker)
# maker.channel.title = title # maker.channel.title = title
maker.channel.link = link maker.channel.link = link
maker.channel.description = description maker.channel.description = description
@ -143,8 +125,6 @@ module RSS
assert_nil(rss) assert_nil(rss)
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_image(maker)
maker.channel.title = title maker.channel.title = title
# maker.channel.link = link # maker.channel.link = link
maker.channel.link = nil maker.channel.link = nil
@ -154,8 +134,6 @@ module RSS
assert_nil(rss) assert_nil(rss)
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_image(maker)
maker.channel.title = title maker.channel.title = title
maker.channel.link = link maker.channel.link = link
# maker.channel.description = description # maker.channel.description = description
@ -164,8 +142,6 @@ module RSS
assert_nil(rss) assert_nil(rss)
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_image(maker)
maker.channel.title = title maker.channel.title = title
maker.channel.link = link maker.channel.link = link
maker.channel.description = description maker.channel.description = description
@ -231,7 +207,7 @@ module RSS
maker.image.height = height maker.image.height = height
maker.image.description = description maker.image.description = description
end end
assert_nil(rss) assert_nil(rss.channel.image)
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_channel(maker) setup_dummy_channel(maker)
@ -256,7 +232,7 @@ module RSS
maker.image.height = height maker.image.height = height
maker.image.description = description maker.image.description = description
end end
assert_nil(rss) assert_nil(rss.channel.image)
end end
def test_items def test_items
@ -266,13 +242,11 @@ module RSS
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_channel(maker) setup_dummy_channel(maker)
setup_dummy_image(maker)
end end
assert(rss.channel.items.empty?) assert(rss.channel.items.empty?)
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_channel(maker) setup_dummy_channel(maker)
setup_dummy_image(maker)
item = maker.items.new_item item = maker.items.new_item
item.title = title item.title = title
@ -289,7 +263,6 @@ module RSS
item_size = 5 item_size = 5
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_channel(maker) setup_dummy_channel(maker)
setup_dummy_image(maker)
item_size.times do |i| item_size.times do |i|
item = maker.items.new_item item = maker.items.new_item
@ -308,7 +281,6 @@ module RSS
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_channel(maker) setup_dummy_channel(maker)
setup_dummy_image(maker)
item_size.times do |i| item_size.times do |i|
item = maker.items.new_item item = maker.items.new_item
@ -336,7 +308,6 @@ module RSS
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_channel(maker) setup_dummy_channel(maker)
setup_dummy_image(maker)
maker.textinput.title = title maker.textinput.title = title
maker.textinput.description = description maker.textinput.description = description
@ -351,7 +322,6 @@ module RSS
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
# setup_dummy_channel(maker) # setup_dummy_channel(maker)
setup_dummy_image(maker)
maker.textinput.title = title maker.textinput.title = title
maker.textinput.description = description maker.textinput.description = description
@ -369,7 +339,6 @@ module RSS
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_channel(maker) setup_dummy_channel(maker)
setup_dummy_image(maker)
# maker.textinput.title = title # maker.textinput.title = title
maker.textinput.description = description maker.textinput.description = description
@ -380,7 +349,6 @@ module RSS
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_channel(maker) setup_dummy_channel(maker)
setup_dummy_image(maker)
maker.textinput.title = title maker.textinput.title = title
# maker.textinput.description = description # maker.textinput.description = description
@ -391,7 +359,6 @@ module RSS
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_channel(maker) setup_dummy_channel(maker)
setup_dummy_image(maker)
maker.textinput.title = title maker.textinput.title = title
maker.textinput.description = description maker.textinput.description = description
@ -402,7 +369,6 @@ module RSS
rss = RSS::Maker.make("0.9") do |maker| rss = RSS::Maker.make("0.9") do |maker|
setup_dummy_channel(maker) setup_dummy_channel(maker)
setup_dummy_image(maker)
maker.textinput.title = title maker.textinput.title = title
maker.textinput.description = description maker.textinput.description = description