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

* lib/rss/rss.rb: RSS::Element#calc_indent became to be deprecated.

Browse source 
* lib/rss/0.9.rb: ditto.
* lib/rss/1.0.rb: ditto.
* lib/rss/image.rb: ditto.
* lib/rss/taxonomy.rb: ditto.
* lib/rss/trackback.rb: ditto.

* test/rss/test_1.0.rb: removed RSS::Element.indent_size tests.
* test/rss/test_2.0.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kou 2006-06-18 08:58:18 +00:00
parent b79b5815f0
commit eb8598146d
9 changed files with 42 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
Sun Jun 18 17:52:39 2006 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/rss.rb: RSS::Element#calc_indent became to be deprecated.
* lib/rss/0.9.rb: ditto.
* lib/rss/1.0.rb: ditto.
* lib/rss/image.rb: ditto.
* lib/rss/taxonomy.rb: ditto.
* lib/rss/trackback.rb: ditto.
* test/rss/test_1.0.rb: removed RSS::Element.indent_size tests.
* test/rss/test_2.0.rb: ditto.
Sun Jun 18 00:49:11 2006 Tanaka Akira <akr@m17n.org> Sun Jun 18 00:49:11 2006 Tanaka Akira <akr@m17n.org>
* ext/socket/socket.c (bsock_recv_nonblock): new method * ext/socket/socket.c (bsock_recv_nonblock): new method

18
lib/rss/0.9.rb
View file

@ -59,7 +59,7 @@ module RSS
end end
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent, ns_declarations) do |next_indent| rv = tag(indent, ns_declarations) do |next_indent|
[ [
channel_element(false, next_indent), channel_element(false, next_indent),
@ -153,7 +153,7 @@ module RSS
super() super()
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
title_element(false, next_indent), title_element(false, next_indent),
@ -248,7 +248,7 @@ module RSS
install_model(name, occurs) install_model(name, occurs)
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
day_elements(false, next_indent) day_elements(false, next_indent)
@ -293,7 +293,7 @@ module RSS
install_model(name, occurs) install_model(name, occurs)
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
hour_elements(false, next_indent) hour_elements(false, next_indent)
@ -355,7 +355,7 @@ module RSS
self.description = description self.description = description
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
url_element(false, next_indent), url_element(false, next_indent),
@ -408,7 +408,7 @@ module RSS
self.protocol = protocol self.protocol = protocol
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) rv = tag(indent)
rv = convert(rv) if need_convert rv = convert(rv) if need_convert
rv rv
@ -452,7 +452,7 @@ module RSS
install_model(tag, occurs) install_model(tag, occurs)
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
title_element(false, next_indent), title_element(false, next_indent),
@ -561,7 +561,7 @@ module RSS
self.type = type self.type = type
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) rv = tag(indent)
rv = convert(rv) if need_convert rv = convert(rv) if need_convert
rv rv
@ -642,7 +642,7 @@ module RSS
self.link = link self.link = link
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
title_element(false, next_indent), title_element(false, next_indent),

22
lib/rss/1.0.rb
View file

@ -60,7 +60,7 @@ module RSS
tag_name_with_prefix(PREFIX) tag_name_with_prefix(PREFIX)
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent, ns_declarations) do |next_indent| rv = tag(indent, ns_declarations) do |next_indent|
[ [
channel_element(false, next_indent), channel_element(false, next_indent),
@ -120,7 +120,7 @@ module RSS
tag_name_with_prefix(PREFIX) tag_name_with_prefix(PREFIX)
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) rv = tag(indent)
rv = convert(rv) if need_convert rv = convert(rv) if need_convert
rv rv
@ -157,7 +157,7 @@ module RSS
@li = li @li = li
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
tag(indent) do |next_indent| tag(indent) do |next_indent|
[ [
li_elements(need_convert, next_indent), li_elements(need_convert, next_indent),
@ -217,7 +217,7 @@ module RSS
@li = li @li = li
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
tag(indent) do |next_indent| tag(indent) do |next_indent|
[ [
li_elements(need_convert, next_indent), li_elements(need_convert, next_indent),
@ -296,7 +296,7 @@ module RSS
self.about = about self.about = about
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
title_element(false, next_indent), title_element(false, next_indent),
@ -367,7 +367,7 @@ module RSS
self.resource = resource self.resource = resource
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) rv = tag(indent)
rv = convert(rv) if need_convert rv = convert(rv) if need_convert
rv rv
@ -404,7 +404,7 @@ module RSS
self.resource = resource self.resource = resource
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) rv = tag(indent)
rv = convert(rv) if need_convert rv = convert(rv) if need_convert
rv rv
@ -441,7 +441,7 @@ module RSS
@Seq = seq @Seq = seq
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
Seq_element(need_convert, next_indent), Seq_element(need_convert, next_indent),
@ -512,7 +512,7 @@ module RSS
self.about = about self.about = about
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
title_element(false, next_indent), title_element(false, next_indent),
@ -582,7 +582,7 @@ module RSS
self.about = about self.about = about
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
title_element(false, next_indent), title_element(false, next_indent),
@ -657,7 +657,7 @@ module RSS
self.about = about self.about = about
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
title_element(false, next_indent), title_element(false, next_indent),

4
lib/rss/image.rb
View file

@ -83,7 +83,7 @@ module RSS
tag_name_with_prefix(IMAGE_PREFIX) tag_name_with_prefix(IMAGE_PREFIX)
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
other_element(false, next_indent), other_element(false, next_indent),
@ -187,7 +187,7 @@ module RSS
tag_name_with_prefix(IMAGE_PREFIX) tag_name_with_prefix(IMAGE_PREFIX)
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
other_element(false, next_indent), other_element(false, next_indent),

15
lib/rss/rss.rb
View file

@ -380,7 +380,7 @@ EOC
def def_content_only_to_s def def_content_only_to_s
module_eval(<<-EOC, *get_file_and_line_from_caller(2)) module_eval(<<-EOC, *get_file_and_line_from_caller(2))
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
if @content if @content
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
h(@content) h(@content)
@ -445,7 +445,6 @@ EOC
@tag_name = name.split(/::/).last @tag_name = name.split(/::/).last
@tag_name[0,1] = @tag_name[0,1].downcase @tag_name[0,1] = @tag_name[0,1].downcase
@indent_size = name.split(/::/).size - 2
@have_content = false @have_content = false
def self.must_call_validators def self.must_call_validators
@ -547,11 +546,6 @@ EOC
def tag_name def tag_name
@tag_name @tag_name
end end
def indent_size
@indent_size
end
end end
attr_accessor :do_validate attr_accessor :do_validate
@ -570,10 +564,6 @@ EOC
tag_name tag_name
end end
def indent_size
self.class.indent_size
end
def converter=(converter) def converter=(converter)
@converter = converter @converter = converter
targets = children.dup targets = children.dup
@ -683,8 +673,9 @@ EOC
"#{prefix}:#{tag_name}" "#{prefix}:#{tag_name}"
end end
# For backward compatibility
def calc_indent def calc_indent
INDENT * (self.class.indent_size) ''
end end
def maker_target(maker) def maker_target(maker)

4
lib/rss/taxonomy.rb
View file

@ -81,7 +81,7 @@ module RSS
target.taxo_topics target.taxo_topics
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
Bag_element(need_convert, next_indent), Bag_element(need_convert, next_indent),
@ -164,7 +164,7 @@ module RSS
tag_name_with_prefix(TAXO_PREFIX) tag_name_with_prefix(TAXO_PREFIX)
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
other_element(need_convert, next_indent), other_element(need_convert, next_indent),

4
lib/rss/trackback.rb
View file

@ -143,7 +143,7 @@ module RSS
tag_name_with_prefix(TRACKBACK_PREFIX) tag_name_with_prefix(TRACKBACK_PREFIX)
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) rv = tag(indent)
rv = convert(rv) if need_convert rv = convert(rv) if need_convert
rv rv
@ -193,7 +193,7 @@ module RSS
tag_name_with_prefix(TRACKBACK_PREFIX) tag_name_with_prefix(TRACKBACK_PREFIX)
end end
def to_s(need_convert=true, indent=calc_indent) def to_s(need_convert=true, indent='')
rv = tag(indent) rv = tag(indent)
rv = convert(rv) if need_convert rv = convert(rv) if need_convert
rv rv

11
test/rss/test_1.0.rb
View file

@ -245,16 +245,5 @@ module RSS
rss20 = RSS::Parser.parse(rss.to_xml("2.0")) rss20 = RSS::Parser.parse(rss.to_xml("2.0"))
assert_equal("2.0", rss20.rss_version) assert_equal("2.0", rss20.rss_version)
end end
def test_indent_size
assert_equal(0, RDF.indent_size)
assert_equal(1, RDF::Channel.indent_size)
assert_equal(2, RDF::Channel::Image.indent_size)
assert_equal(2, RDF::Channel::Textinput.indent_size)
assert_equal(2, RDF::Channel::Items.indent_size)
assert_equal(1, RDF::Image.indent_size)
assert_equal(1, RDF::Item.indent_size)
assert_equal(1, RDF::Textinput.indent_size)
end
end end
end end

17
test/rss/test_2.0.rb
View file

@ -386,22 +386,5 @@ module RSS
rss10 = RSS::Parser.parse(rss10) rss10 = RSS::Parser.parse(rss10)
assert_equal("1.0", rss10.rss_version) assert_equal("1.0", rss10.rss_version)
end end
def test_indent_size
assert_equal(0, Rss.indent_size)
assert_equal(1, Rss::Channel.indent_size)
assert_equal(2, Rss::Channel::SkipDays.indent_size)
assert_equal(3, Rss::Channel::SkipDays::Day.indent_size)
assert_equal(2, Rss::Channel::SkipHours.indent_size)
assert_equal(3, Rss::Channel::SkipHours::Hour.indent_size)
assert_equal(2, Rss::Channel::Image.indent_size)
assert_equal(2, Rss::Channel::Cloud.indent_size)
assert_equal(2, Rss::Channel::Item.indent_size)
assert_equal(3, Rss::Channel::Item::Source.indent_size)
assert_equal(3, Rss::Channel::Item::Enclosure.indent_size)
assert_equal(3, Rss::Channel::Item::Category.indent_size)
assert_equal(3, Rss::Channel::Item::Guid.indent_size)
assert_equal(2, Rss::Channel::TextInput.indent_size)
end
end end
end end