aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/core_ext/class/subclasses.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2010-02-11 23:41:16 +0100
committerXavier Noria <fxn@hashref.com>2010-02-11 23:41:16 +0100
commitaa82bdf92953824fd35db4a734bf6effa8de3329 (patch)
tree257c4719fb2b37a21cdb5a5eeba62f1a5023d2b1 /activesupport/lib/active_support/core_ext/class/subclasses.rb
parentb8bb54af7ff6652327d99f6a7cf5c96a3f3f876d (diff)
downloadrails-aa82bdf92953824fd35db4a734bf6effa8de3329.tar.gz
rails-aa82bdf92953824fd35db4a734bf6effa8de3329.tar.bz2
rails-aa82bdf92953824fd35db4a734bf6effa8de3329.zip
moves Class#reachable? to Module#reachable?, bases implementation on anonymous? and constantize, and adds test coverage
Diffstat (limited to 'activesupport/lib/active_support/core_ext/class/subclasses.rb')
-rw-r--r--activesupport/lib/active_support/core_ext/class/subclasses.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/subclasses.rb b/activesupport/lib/active_support/core_ext/class/subclasses.rb
index c166ce8079..bbd8f5aef6 100644
--- a/activesupport/lib/active_support/core_ext/class/subclasses.rb
+++ b/activesupport/lib/active_support/core_ext/class/subclasses.rb
@@ -1,4 +1,5 @@
-require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/module/anonymous'
+require 'active_support/core_ext/module/reachable'
class Class #:nodoc:
# Returns an array with the names of the subclasses of +self+ as strings.
@@ -8,10 +9,6 @@ class Class #:nodoc:
Class.subclasses_of(self).map { |o| o.to_s }
end
- def reachable? #:nodoc:
- eval("defined?(::#{self}) && ::#{self}.equal?(self)")
- end
-
# Rubinius
if defined?(Class.__subclasses__)
def descendents
@@ -51,7 +48,7 @@ class Class #:nodoc:
def self.subclasses_of(*superclasses) #:nodoc:
subclasses = []
superclasses.each do |klass|
- subclasses.concat klass.descendents.select {|k| k.name.blank? || k.reachable?}
+ subclasses.concat klass.descendents.select {|k| k.anonymous? || k.reachable?}
end
subclasses
end