github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-30 00:38:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Check for nil name also. Closes #6561.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5814 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2006-12-31 23:53:05 +00:00
parent 7ed7930769
commit cbe0c3c54f
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
activesupport/lib/active_support/dependencies.rb
View File

@@ -278,7 +278,8 @@ module Dependencies #:nodoc:
# Determine if the given constant has been automatically loaded.
def autoloaded?(desc)
return false if desc.is_a?(Module) && desc.name.empty? # Empty name => anonymous module.
# No name => anonymous module.
return false if desc.is_a?(Module) && desc.name.blank?
name = to_constant_name desc
return false unless qualified_const_defined? name
return autoloaded_constants.include?(name)

7
activesupport/test/dependencies_test.rb
View File

@@ -305,7 +305,12 @@ class DependenciesTest < Test::Unit::TestCase
assert Dependencies.autoloaded?("::ModuleFolder")
assert Dependencies.autoloaded?(:ModuleFolder)
assert ! Dependencies.autoloaded?(Module.new)
# Anonymous modules aren't autoloaded.
assert !Dependencies.autoloaded?(Module.new)
nil_name = Module.new
def nil_name.name() nil end
assert !Dependencies.autoloaded?(nil_name)
Object.send :remove_const, :ModuleFolder
end