diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2015-10-21 16:34:50 +0100 |
|---|---|---|
| committer | Andrew White <pixeltrix@users.noreply.github.com> | 2015-10-21 16:34:50 +0100 |
| commit | 1d16d8102a2b53d3ddced10050d700fe16ca0ef7 (patch) | |
| tree | c794b8303a486432e8ddf057c82259f0e904369f /activesupport/lib | |
| parent | 173fc1f7beed616adc840e02fef4e7f93e877c69 (diff) | |
| parent | 94ca3e0a571dba0fe41ca18d61634c5f3aa11209 (diff) | |
| download | rails-1d16d8102a2b53d3ddced10050d700fe16ca0ef7.tar.gz rails-1d16d8102a2b53d3ddced10050d700fe16ca0ef7.tar.bz2 rails-1d16d8102a2b53d3ddced10050d700fe16ca0ef7.zip | |
Merge pull request #20026 from rails/remove-possible-singleton-method
Fix warnings in multiple application tests
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/class/attribute.rb | 11 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/module/remove_method.rb | 7 |
2 files changed, 17 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/attribute.rb b/activesupport/lib/active_support/core_ext/class/attribute.rb index f2b7bb3ef1..802d988af2 100644 --- a/activesupport/lib/active_support/core_ext/class/attribute.rb +++ b/activesupport/lib/active_support/core_ext/class/attribute.rb @@ -75,11 +75,15 @@ class Class instance_predicate = options.fetch(:instance_predicate, true) attrs.each do |name| + remove_possible_singleton_method(name) define_singleton_method(name) { nil } + + remove_possible_singleton_method("#{name}?") define_singleton_method("#{name}?") { !!public_send(name) } if instance_predicate ivar = "@#{name}" + remove_possible_singleton_method("#{name}=") define_singleton_method("#{name}=") do |val| singleton_class.class_eval do remove_possible_method(name) @@ -110,10 +114,15 @@ class Class self.class.public_send name end end + + remove_possible_method "#{name}?" define_method("#{name}?") { !!public_send(name) } if instance_predicate end - attr_writer name if instance_writer + if instance_writer + remove_possible_method "#{name}=" + attr_writer name + end end end end 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 52632d2c6b..287ec477a0 100644 --- a/activesupport/lib/active_support/core_ext/module/remove_method.rb +++ b/activesupport/lib/active_support/core_ext/module/remove_method.rb @@ -6,6 +6,13 @@ class Module end end + # Removes the named singleton method, if it exists. + def remove_possible_singleton_method(method) + singleton_class.instance_eval do + remove_possible_method(method) + end + end + # Replaces the existing method definition, if there is one, with the passed # block as its body. def redefine_method(method, &block) |