From 73cd292fcd50f301180c536461001df2f3f9c7e9 Mon Sep 17 00:00:00 2001 From: kou Date: Wed, 23 Nov 2005 09:49:02 +0000 Subject: * lib/rss/: use #__send__ instead of #send. * test/rss/: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rss/0.9.rb | 10 +++++----- lib/rss/1.0.rb | 10 +++++----- lib/rss/2.0.rb | 4 ++-- lib/rss/image.rb | 2 +- lib/rss/maker/base.rb | 2 +- lib/rss/parser.rb | 8 ++++---- lib/rss/rss.rb | 10 +++++----- lib/rss/trackback.rb | 4 ++-- lib/rss/xml-stylesheet.rb | 8 ++++---- 9 files changed, 29 insertions(+), 29 deletions(-) (limited to 'lib/rss') diff --git a/lib/rss/0.9.rb b/lib/rss/0.9.rb index 41b8fced73..56fdfb3618 100644 --- a/lib/rss/0.9.rb +++ b/lib/rss/0.9.rb @@ -79,7 +79,7 @@ module RSS [ [nil, 'channel'], ].delete_if do |uri, name| - send(name).nil? + __send__(name).nil? end end @@ -195,7 +195,7 @@ module RSS "textInput", "cloud", ].delete_if do |name| - send(name).nil? + __send__(name).nil? end.collect do |elem| [nil, elem] end @@ -358,7 +358,7 @@ module RSS private def _tags %w(url title link width height description).delete_if do |name| - send(name).nil? + __send__(name).nil? end.collect do |elem| [nil, elem] end @@ -460,7 +460,7 @@ module RSS def _tags rv = %w(title link description author comments source enclosure).delete_if do |name| - send(name).nil? + __send__(name).nil? end.collect do |name| [nil, name] end @@ -635,7 +635,7 @@ module RSS private def _tags %w(title description name link).each do |name| - send(name).nil? + __send__(name).nil? end.collect do |elem| [nil, elem] end diff --git a/lib/rss/1.0.rb b/lib/rss/1.0.rb index 00d8c3abdb..6603d525d3 100644 --- a/lib/rss/1.0.rb +++ b/lib/rss/1.0.rb @@ -87,7 +87,7 @@ module RSS rv = [ [::RSS::URI, "channel"], [::RSS::URI, "image"], - ].delete_if {|uri, name| send(name).nil?} + ].delete_if {|uri, name| __send__(name).nil?} @item.each do |item| rv << [::RSS::URI, "item"] end @@ -326,7 +326,7 @@ module RSS [::RSS::URI, 'items'], [::RSS::URI, 'textinput'], ].delete_if do |uri, name| - send(name).nil? + __send__(name).nil? end end @@ -532,7 +532,7 @@ module RSS [::RSS::URI, 'url'], [::RSS::URI, 'link'], ].delete_if do |uri, name| - send(name).nil? + __send__(name).nil? end end @@ -602,7 +602,7 @@ module RSS [::RSS::URI, 'link'], [::RSS::URI, 'description'], ].delete_if do |uri, name| - send(name).nil? + __send__(name).nil? end end @@ -679,7 +679,7 @@ module RSS [::RSS::URI, 'name'], [::RSS::URI, 'link'], ].delete_if do |uri, name| - send(name).nil? + __send__(name).nil? end end diff --git a/lib/rss/2.0.rb b/lib/rss/2.0.rb index af6ced9f7c..66474ff76d 100644 --- a/lib/rss/2.0.rb +++ b/lib/rss/2.0.rb @@ -48,7 +48,7 @@ EOT alias _tags09 _tags def _tags rv = %w(generator ttl).delete_if do |name| - send(name).nil? + __send__(name).nil? end.collect do |elem| [nil, elem] end + _tags09 @@ -109,7 +109,7 @@ EOT alias _tags09 _tags def _tags %w(comments author pubDate guid).delete_if do |name| - send(name).nil? + __send__(name).nil? end.collect do |elem| [nil, elem] end + _tags09 diff --git a/lib/rss/image.rb b/lib/rss/image.rb index 4dea91925b..966a056d62 100644 --- a/lib/rss/image.rb +++ b/lib/rss/image.rb @@ -106,7 +106,7 @@ module RSS [IMAGE_URI, 'width'], [IMAGE_URI, 'height'], ].delete_if do |uri, name| - send(name).nil? + __send__(name).nil? end end diff --git a/lib/rss/maker/base.rb b/lib/rss/maker/base.rb index dbd8bf9041..6d7dd557bf 100644 --- a/lib/rss/maker/base.rb +++ b/lib/rss/maker/base.rb @@ -91,7 +91,7 @@ module RSS variables.each do |var| setter = "#{var}=" if target.respond_to?(setter) - value = self.__send__(var) + value = __send__(var) if value target.__send__(setter, value) set = true diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb index cf4368dced..a328146c4a 100644 --- a/lib/rss/parser.rb +++ b/lib/rss/parser.rb @@ -226,7 +226,7 @@ module RSS end end EOT - send("private", "start_#{name}") + __send__("private", "start_#{name}") end end @@ -285,7 +285,7 @@ module RSS @tag_stack.last.push([ns[prefix], local]) @tag_stack.push([]) if respond_to?("start_#{local}", true) - send("start_#{local}", local, prefix, attrs, ns.dup) + __send__("start_#{local}", local, prefix, attrs, ns.dup) else start_else_element(local, prefix, attrs, ns.dup) end @@ -358,7 +358,7 @@ module RSS setter = self.class.setter(required_uri, tag_name) setter ||= "#{tag_name}=" if @last_element.respond_to?(setter) - @last_element.send(setter, text.to_s) + @last_element.__send__(setter, text.to_s) else if @do_validate and not @ignore_unknown_element raise NotExceptedTagError.new(tag_name, @last_element.tag_name) @@ -405,7 +405,7 @@ module RSS end previous = @last_element - next_element = klass.send(:new, *args) + next_element = klass.__send__(:new, *args) next_element.do_validate = @do_validate previous.funcall(:set_next_element, tag_name, next_element) @last_element = next_element diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb index 7acbef275d..17e56d5a7d 100644 --- a/lib/rss/rss.rb +++ b/lib/rss/rss.rb @@ -279,7 +279,7 @@ EOC else if @do_validate begin - @#{name} = Time.send('#{type}', new_value) + @#{name} = Time.__send__('#{type}', new_value) rescue ArgumentError raise NotAvailableValueError.new('#{disp_name}', new_value) end @@ -316,7 +316,7 @@ EOC if args.empty? @#{accessor_name}.first else - @#{accessor_name}.send("[]", *args) + @#{accessor_name}[*args] end end @@ -328,7 +328,7 @@ EOC if args.size == 1 @#{accessor_name}.push(args[0]) else - @#{accessor_name}.send("[]=", *args) + @#{accessor_name}.__send__("[]=", *args) end end alias_method(:set_#{accessor_name}, :#{accessor_name}=) @@ -703,11 +703,11 @@ EOC self.class::NSPOOL.each do |prefix, uri| if tags.has_key?(uri) and !must_call_validators.has_key?(uri) meth = "#{prefix}_validate" - send(meth, tags[uri]) if respond_to?(meth, true) + __send__(meth, tags[uri]) if respond_to?(meth, true) end end must_call_validators.each do |uri, prefix| - send("#{prefix}_validate", tags[uri]) + __send__("#{prefix}_validate", tags[uri]) end end diff --git a/lib/rss/trackback.rb b/lib/rss/trackback.rb index 3a5304a8f4..ad6954f3f5 100644 --- a/lib/rss/trackback.rb +++ b/lib/rss/trackback.rb @@ -70,7 +70,7 @@ module RSS if args.empty? @#{var_name}.first and @#{var_name}.first.value else - ret = @#{var_name}.send("[]", *args) + ret = @#{var_name}.__send__("[]", *args) if ret.is_a?(Array) ret.collect {|x| x.value} else @@ -94,7 +94,7 @@ module RSS else new_val = Utils.new_with_value_if_need(#{klass_name}, new_val) end - @#{var_name}.send("[]=", *(args[0..-2] + [new_val])) + @#{var_name}.__send__("[]=", *(args[0..-2] + [new_val])) end end alias set_#{var_name} #{var_name}= diff --git a/lib/rss/xml-stylesheet.rb b/lib/rss/xml-stylesheet.rb index 05602eee9b..66e3161dd0 100644 --- a/lib/rss/xml-stylesheet.rb +++ b/lib/rss/xml-stylesheet.rb @@ -37,13 +37,13 @@ module RSS def initialize(*attrs) @do_validate = true ATTRIBUTES.each do |attr| - self.send("#{attr}=", nil) + __send__("#{attr}=", nil) end vars = ATTRIBUTES.dup vars.unshift(:do_validate) attrs.each do |name, value| if vars.include?(name.to_s) - self.send("#{name}=", value) + __send__("#{name}=", value) end end end @@ -53,8 +53,8 @@ module RSS if @href rv << %Q[] -- cgit v1.2.3