diff options
| author | José Valim <jose.valim@gmail.com> | 2010-06-19 16:58:12 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-06-19 16:58:15 +0200 |
| commit | a2b7fcb07ca47ca2285dee2afe97050532e94d07 (patch) | |
| tree | 238b4e7c1e8a247495d34bc147a9cfb9e702996e /activesupport/lib/active_support/core_ext/class/subclasses.rb | |
| parent | 8db8c6f4ce3e8dd7f90553ab7866bf9991773b98 (diff) | |
| download | rails-a2b7fcb07ca47ca2285dee2afe97050532e94d07.tar.gz rails-a2b7fcb07ca47ca2285dee2afe97050532e94d07.tar.bz2 rails-a2b7fcb07ca47ca2285dee2afe97050532e94d07.zip | |
Change callbacks to automatically include DescendantsTracker and rename descendents to descendants.
Diffstat (limited to 'activesupport/lib/active_support/core_ext/class/subclasses.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/class/subclasses.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/subclasses.rb b/activesupport/lib/active_support/core_ext/class/subclasses.rb index bbd8f5aef6..7d58a8b56a 100644 --- a/activesupport/lib/active_support/core_ext/class/subclasses.rb +++ b/activesupport/lib/active_support/core_ext/class/subclasses.rb @@ -11,9 +11,9 @@ class Class #:nodoc: # Rubinius if defined?(Class.__subclasses__) - def descendents + def descendants subclasses = [] - __subclasses__.each {|k| subclasses << k; subclasses.concat k.descendents } + __subclasses__.each {|k| subclasses << k; subclasses.concat k.descendants } subclasses end else @@ -21,7 +21,7 @@ class Class #:nodoc: begin ObjectSpace.each_object(Class.new) {} - def descendents + def descendants subclasses = [] ObjectSpace.each_object(class << self; self; end) do |k| subclasses << k unless k == self @@ -30,7 +30,7 @@ class Class #:nodoc: end # JRuby rescue StandardError - def descendents + def descendants subclasses = [] ObjectSpace.each_object(Class) do |k| subclasses << k if k < self @@ -48,7 +48,7 @@ class Class #:nodoc: def self.subclasses_of(*superclasses) #:nodoc: subclasses = [] superclasses.each do |klass| - subclasses.concat klass.descendents.select {|k| k.anonymous? || k.reachable?} + subclasses.concat klass.descendants.select {|k| k.anonymous? || k.reachable?} end subclasses end |