Skip to content
Browse files

Object.subclasses_of includes anonymous subclasses.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7590 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 2d02199 commit ea456801182195b113e695ec9019757ce523be0f @jeremy jeremy committed Sep 23, 2007
View
2 activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Object.subclasses_of includes anonymous subclasses. [Jeremy Kemper]
+
* Fixed that pluralizing an empty string should return the same empty string, not "s" #7720 [josh]
* Added call to inspect on non-string classes for the logger #8533 [codahale]
View
18 activesupport/lib/active_support/core_ext/object/extending.rb
@@ -5,17 +5,21 @@ def remove_subclasses_of(*superclasses) #:nodoc:
def subclasses_of(*superclasses) #:nodoc:
subclasses = []
+
+ # Exclude this class unless it's a subclass of our supers and is defined.
+ # We check defined? in case we find a removed class that has yet to be
+ # garbage collected. This also fails for anonymous classes -- please
+ # submit a patch if you have a workaround.
ObjectSpace.each_object(Class) do |k|
- next unless # Exclude this class unless
- superclasses.any? { |superclass| k < superclass } && # It *is* a subclass of our supers
- eval("defined?(::#{k}) && ::#{k}.object_id == k.object_id") # It *is* defined
- # Note that we check defined? in case we find a removed class that has
- # yet to be garbage collected.
- subclasses << k
+ if superclasses.any? { |superclass| k < superclass } &&
+ (k.name.blank? || eval("defined?(::#{k}) && ::#{k}.object_id == k.object_id"))
+ subclasses << k
+ end
end
+
subclasses
end
-
+
def extended_by #:nodoc:
ancestors = class << self; ancestors end
ancestors.select { |mod| mod.class == Module } - [ Object, Kernel ]
View
1 activesupport/test/abstract_unit.rb
@@ -6,6 +6,7 @@
# Wrap tests that use Mocha and skip if unavailable.
def uses_mocha(test_name)
require 'rubygems'
+ gem 'mocha', '>= 0.5.5'
require 'mocha'
yield
rescue LoadError
View
9 activesupport/test/core_ext/object_and_class_ext_test.rb
@@ -97,7 +97,14 @@ def test_subclasses_of_with_multiple_roots
classes = Object.subclasses_of(ClassI, ClassK)
assert_equal %w(ClassJ Nested::ClassL), classes.collect(&:to_s).sort
end
-
+
+ def test_subclasses_of_doesnt_find_anonymous_classes
+ assert_equal [], Object.subclasses_of(Foo)
+ bar = Class.new(Foo)
+ assert_nothing_raised do
+ assert_equal [bar], Object.subclasses_of(Foo)
+ end
+ end
end
class ObjectTests < Test::Unit::TestCase

0 comments on commit ea45680

Please sign in to comment.
Something went wrong with that request. Please try again.