diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-07-31 07:55:39 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-31 07:55:39 +0900 |
| commit | e8dd2bf85716f4aaf3ea4223e748e539589937f6 (patch) | |
| tree | 8a31c61488cf73679ac507b5cef3d28277a82cdb /activesupport/lib | |
| parent | 6db5b6dc4322d043db4d6eff2cc49de86baf1595 (diff) | |
| parent | 015477ae9109d4105d5a5057d82338f198febb74 (diff) | |
| download | rails-e8dd2bf85716f4aaf3ea4223e748e539589937f6.tar.gz rails-e8dd2bf85716f4aaf3ea4223e748e539589937f6.tar.bz2 rails-e8dd2bf85716f4aaf3ea4223e748e539589937f6.zip | |
Merge pull request #33325 from Edouard-chin/ec-deprecate-class-method
A regression in `deprecate_methods` was introduced in a982a42:
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/deprecation/method_wrappers.rb | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/activesupport/lib/active_support/deprecation/method_wrappers.rb b/activesupport/lib/active_support/deprecation/method_wrappers.rb index 5be893d281..468978d610 100644 --- a/activesupport/lib/active_support/deprecation/method_wrappers.rb +++ b/activesupport/lib/active_support/deprecation/method_wrappers.rb @@ -54,23 +54,26 @@ module ActiveSupport deprecator = options.delete(:deprecator) || self method_names += options.keys - mod = Module.new do - method_names.each do |method_name| - define_method(method_name) do |*args, &block| - deprecator.deprecation_warning(method_name, options[method_name]) - super(*args, &block) - end + method_names.each do |method_name| + aliased_method, punctuation = method_name.to_s.sub(/([?!=])$/, ""), $1 + with_method = "#{aliased_method}_with_deprecation#{punctuation}" + without_method = "#{aliased_method}_without_deprecation#{punctuation}" - case - when target_module.protected_method_defined?(method_name) - protected method_name - when target_module.private_method_defined?(method_name) - private method_name - end + target_module.send(:define_method, with_method) do |*args, &block| + deprecator.deprecation_warning(method_name, options[method_name]) + send(without_method, *args, &block) end - end - target_module.prepend(mod) + target_module.send(:alias_method, without_method, method_name) + target_module.send(:alias_method, method_name, with_method) + + case + when target_module.protected_method_defined?(without_method) + target_module.send(:protected, method_name) + when target_module.private_method_defined?(without_method) + target_module.send(:private, method_name) + end + end end end end |