diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2012-12-15 13:59:17 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2012-12-15 13:59:17 -0800 |
| commit | 2d6abcce55c9024e2ef8753ab710b8a053e96eec (patch) | |
| tree | 50734e92e8c2f93d2a2f92eecc5d44467eb9b00e /activesupport/lib/active_support | |
| parent | d72a07f1d1478db9daed847eadb35bfd840674f6 (diff) | |
| parent | bb1d3c1f8eae54abae0f97440d6986e25b528b86 (diff) | |
| download | rails-2d6abcce55c9024e2ef8753ab710b8a053e96eec.tar.gz rails-2d6abcce55c9024e2ef8753ab710b8a053e96eec.tar.bz2 rails-2d6abcce55c9024e2ef8753ab710b8a053e96eec.zip | |
Merge pull request #8518 from rwz/inheritable-basic-object
Properly deprecate AS::BasicObject without breaking subclasses of it
Diffstat (limited to 'activesupport/lib/active_support')
| -rw-r--r-- | activesupport/lib/active_support/basic_object.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/basic_object.rb b/activesupport/lib/active_support/basic_object.rb index 242b766b58..d4d06b2aa4 100644 --- a/activesupport/lib/active_support/basic_object.rb +++ b/activesupport/lib/active_support/basic_object.rb @@ -1,7 +1,12 @@ require 'active_support/deprecation' +require 'active_support/proxy_object' module ActiveSupport # :nodoc: - # Deprecated in favor of ActiveSupport::ProxyObject - BasicObject = Deprecation::DeprecatedConstantProxy.new('ActiveSupport::BasicObject', 'ActiveSupport::ProxyObject') + class BasicObject < ProxyObject + def self.inherited(*) + ::ActiveSupport::Deprecation.warn 'ActiveSupport::BasicObject is deprecated! Use ActiveSupport::ProxyObject instead.' + super + end + end end |