diff options
author | Brad Ediger <brad.ediger@madriska.com> | 2011-07-31 07:38:38 -0500 |
---|---|---|
committer | Brad Ediger <brad.ediger@madriska.com> | 2011-07-31 08:51:48 -0500 |
commit | 7f885390876a3acdfa962e42b2bf2c73241e8702 (patch) | |
tree | 6c8186b9991cc3c024d09aa91c36130b7d5f8258 /activesupport/lib/active_support | |
parent | 4c85c4ed95cb323e749d200d238a3f4898a688dd (diff) | |
download | rails-7f885390876a3acdfa962e42b2bf2c73241e8702.tar.gz rails-7f885390876a3acdfa962e42b2bf2c73241e8702.tar.bz2 rails-7f885390876a3acdfa962e42b2bf2c73241e8702.zip |
remove_possible_method: test if method exists
This speeds up remove_possible_method substantially since it doesn't
have to rescue a NameError in the common case.
Closes #2346.
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r-- | activesupport/lib/active_support/core_ext/module/remove_method.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/module/remove_method.rb b/activesupport/lib/active_support/core_ext/module/remove_method.rb index 07d7c9b018..b76bc16ee1 100644 --- a/activesupport/lib/active_support/core_ext/module/remove_method.rb +++ b/activesupport/lib/active_support/core_ext/module/remove_method.rb @@ -1,11 +1,16 @@ class Module def remove_possible_method(method) - remove_method(method) + if method_defined?(method) || private_method_defined?(method) + remove_method(method) + end rescue NameError + # If the requested method is defined on a superclass or included module, + # method_defined? returns true but remove_method throws a NameError. + # Ignore this. end def redefine_method(method, &block) remove_possible_method(method) define_method(method, &block) end -end
\ No newline at end of file +end |