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#convert): added.

Browse source 
* lib/rss/rss.rb: convert -> need_convert.
* lib/rss/1.0.rb: ditto.
* lib/rss/0.9.rb: ditto.
* lib/rss/2.0.rb: ditto.
* lib/rss/trackback.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7865 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kou 2005-02-02 13:04:32 +00:00
parent 296f79bef5
commit 4af65e86a8
6 changed files with 88 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
Wed Feb 2 21:56:01 2005 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/rss.rb (RSS::Element#convert): added.
* lib/rss/rss.rb: convert -> need_convert.
* lib/rss/1.0.rb: ditto.
* lib/rss/0.9.rb: ditto.
* lib/rss/2.0.rb: ditto.
* lib/rss/trackback.rb: ditto.
Tue Feb 1 22:48:48 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> Tue Feb 1 22:48:48 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
* lib/drb/drb.rb (DRb::DRbObject#respond_to?): check marshal_dump and * lib/drb/drb.rb (DRb::DRbObject#respond_to?): check marshal_dump and

44
lib/rss/0.9.rb
View file

@ -59,14 +59,14 @@ module RSS
end end
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_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),
other_element(false, next_indent), other_element(false, next_indent),
] ]
end end
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
@ -142,7 +142,7 @@ module RSS
super() super()
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
title_element(false, next_indent), title_element(false, next_indent),
@ -165,7 +165,7 @@ module RSS
other_element(false, next_indent), other_element(false, next_indent),
] ]
end end
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
@ -233,13 +233,13 @@ module RSS
install_model(x, occurs) install_model(x, occurs)
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
day_elements(false, next_indent) day_elements(false, next_indent)
] ]
end end
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
@ -278,13 +278,13 @@ module RSS
install_model(x, occurs) install_model(x, occurs)
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
hour_elements(false, next_indent) hour_elements(false, next_indent)
] ]
end end
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
@ -331,7 +331,7 @@ module RSS
install_model(x, "?") install_model(x, "?")
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
url_element(false, next_indent), url_element(false, next_indent),
@ -343,8 +343,8 @@ module RSS
other_element(false, next_indent), other_element(false, next_indent),
] ]
end end
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
private private
@ -384,10 +384,10 @@ module RSS
@protocol = protocol @protocol = protocol
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) rv = tag(indent)
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
private private
@ -428,7 +428,7 @@ module RSS
install_model(tag, occurs) install_model(tag, occurs)
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
title_element(false, next_indent), title_element(false, next_indent),
@ -440,8 +440,8 @@ module RSS
other_element(false, next_indent), other_element(false, next_indent),
] ]
end end
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
private private
@ -533,9 +533,9 @@ module RSS
@type = type @type = type
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) rv = tag(indent)
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
@ -606,7 +606,7 @@ module RSS
install_model(x, nil) install_model(x, nil)
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
title_element(false, next_indent), title_element(false, next_indent),
@ -616,8 +616,8 @@ module RSS
other_element(false, next_indent), other_element(false, next_indent),
] ]
end end
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
private private

48
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(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_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),
@ -70,7 +70,7 @@ module RSS
other_element(false, next_indent), other_element(false, next_indent),
] ]
end end
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
@ -118,11 +118,11 @@ module RSS
@li = li @li = li
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
tag(indent) do |next_indent| tag(indent) do |next_indent|
[ [
li_elements(convert, next_indent), li_elements(need_convert, next_indent),
other_element(convert, next_indent), other_element(need_convert, next_indent),
] ]
end end
end end
@ -177,9 +177,9 @@ module RSS
tag_name_with_prefix(PREFIX) tag_name_with_prefix(PREFIX)
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) rv = tag(indent)
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
@ -204,7 +204,7 @@ module RSS
end end
[ [
["about", URI, true] ["about", URI, true]
].each do |name, uri, required| ].each do |name, uri, required|
install_get_attribute(name, uri, required) install_get_attribute(name, uri, required)
@ -234,7 +234,7 @@ module RSS
@about = about @about = about
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
title_element(false, next_indent), title_element(false, next_indent),
@ -246,8 +246,8 @@ module RSS
other_element(false, next_indent), other_element(false, next_indent),
] ]
end end
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
private private
@ -305,9 +305,9 @@ module RSS
@resource = resource @resource = resource
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) rv = tag(indent)
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
@ -342,9 +342,9 @@ module RSS
@resource = resource @resource = resource
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) rv = tag(indent)
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
@ -384,11 +384,11 @@ module RSS
@Seq = seq @Seq = seq
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
Seq_element(convert, next_indent), Seq_element(need_convert, next_indent),
other_element(convert, next_indent), other_element(need_convert, next_indent),
] ]
end end
end end
@ -448,7 +448,7 @@ module RSS
@about = about @about = about
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
title_element(false, next_indent), title_element(false, next_indent),
@ -457,7 +457,7 @@ module RSS
other_element(false, next_indent), other_element(false, next_indent),
] ]
end end
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
@ -518,7 +518,7 @@ module RSS
@about = about @about = about
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
title_element(false, next_indent), title_element(false, next_indent),
@ -527,7 +527,7 @@ module RSS
other_element(false, next_indent), other_element(false, next_indent),
] ]
end end
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
@ -589,7 +589,7 @@ module RSS
@about = about @about = about
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
[ [
title_element(false, next_indent), title_element(false, next_indent),
@ -599,7 +599,7 @@ module RSS
other_element(false, next_indent), other_element(false, next_indent),
] ]
end end
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end

10
lib/rss/2.0.rb
View file

@ -30,11 +30,11 @@ module RSS
install_model(x, occurs) install_model(x, occurs)
end end
def other_element(convert, indent) def other_element(need_convert, indent)
rv = <<-EOT rv = <<-EOT
#{category_elements(convert, indent)} #{category_elements(need_convert, indent)}
#{generator_element(convert, indent)} #{generator_element(need_convert, indent)}
#{ttl_element(convert, indent)} #{ttl_element(need_convert, indent)}
EOT EOT
rv << super rv << super
end end
@ -86,7 +86,7 @@ EOT
install_model(x, occurs) install_model(x, occurs)
end end
def other_element(convert, indent) def other_element(need_convert, indent)
rv = [ rv = [
super, super,
*%w(author comments pubDate guid).collect do |name| *%w(author comments pubDate guid).collect do |name|

30
lib/rss/rss.rb
View file

@ -164,7 +164,7 @@ module RSS
install_element(name) do |n, elem_name| install_element(name) do |n, elem_name|
<<-EOC <<-EOC
if @#{n} if @#{n}
"\#{@#{n}.to_s(convert, indent)}" "\#{@#{n}.to_s(need_convert, indent)}"
else else
'' ''
end end
@ -183,7 +183,7 @@ EOC
<<-EOC <<-EOC
rv = [] rv = []
@#{n}.each do |x| @#{n}.each do |x|
value = "\#{x.to_s(convert, indent)}" value = "\#{x.to_s(need_convert, indent)}"
rv << value if /\\A\\s*\\z/ !~ value rv << value if /\\A\\s*\\z/ !~ value
end end
rv.join("\n") rv.join("\n")
@ -202,8 +202,8 @@ EOC
if @#{n} if @#{n}
rv = "\#{indent}<#{elem_name}>" rv = "\#{indent}<#{elem_name}>"
value = html_escape(@#{n}) value = html_escape(@#{n})
if convert and @converter if need_convert
rv << @converter.convert(value) rv << convert(value)
else else
rv << value rv << value
end end
@ -260,8 +260,8 @@ EOC
if @#{n} if @#{n}
rv = "\#{indent}<#{elem_name}>" rv = "\#{indent}<#{elem_name}>"
value = html_escape(@#{n}.#{type}) value = html_escape(@#{n}.#{type})
if convert and @converter if need_convert
rv << @converter.convert(value) rv << convert(value)
else else
rv << value rv << value
end end
@ -279,7 +279,7 @@ EOC
def install_element(name, postfix="") def install_element(name, postfix="")
elem_name = name.sub('_', ':') elem_name = name.sub('_', ':')
module_eval(<<-EOC, *get_file_and_line_from_caller(2)) module_eval(<<-EOC, *get_file_and_line_from_caller(2))
def #{name}_element#{postfix}(convert=true, indent='') def #{name}_element#{postfix}(need_convert=true, indent='')
#{yield(name, elem_name)} #{yield(name, elem_name)}
end end
private :#{name}_element#{postfix} private :#{name}_element#{postfix}
@ -332,12 +332,12 @@ 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(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
if @content if @content
rv = tag(indent) do |next_indent| rv = tag(indent) do |next_indent|
h(@content) h(@content)
end end
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
else else
"" ""
@ -515,6 +515,14 @@ EOC
child.converter = converter unless child.nil? child.converter = converter unless child.nil?
end end
end end
def convert(value)
if @converter
@converter.convert(value)
else
value
end
end
def validate def validate
validate_attribute validate_attribute
@ -692,12 +700,12 @@ EOC
end end
end end
def other_element(convert, indent='') def other_element(need_convert, indent='')
rv = [] rv = []
private_methods.each do |meth| private_methods.each do |meth|
if /\A([^_]+)_[^_]+_elements?\z/ =~ meth and if /\A([^_]+)_[^_]+_elements?\z/ =~ meth and
self.class::NSPOOL.has_key?($1) self.class::NSPOOL.has_key?($1)
res = __send__(meth, convert) res = __send__(meth, need_convert)
rv << "#{indent}#{res}" if /\A\s*\z/ !~ res rv << "#{indent}#{res}" if /\A\s*\z/ !~ res
end end
end end

8
lib/rss/trackback.rb
View file

@ -146,9 +146,9 @@ module RSS
tag_name_with_prefix(TRACKBACK_PREFIX) tag_name_with_prefix(TRACKBACK_PREFIX)
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) rv = tag(indent)
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end
@ -194,9 +194,9 @@ module RSS
tag_name_with_prefix(TRACKBACK_PREFIX) tag_name_with_prefix(TRACKBACK_PREFIX)
end end
def to_s(convert=true, indent=calc_indent) def to_s(need_convert=true, indent=calc_indent)
rv = tag(indent) rv = tag(indent)
rv = @converter.convert(rv) if convert and @converter rv = convert(rv) if need_convert
rv rv
end end