Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 5814

Show
Ignore:
Timestamp:
12/31/06 23:53:05 (2 years ago)
Author:
bitsweat
Message:

Check for nil name also. Closes #6561.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/activesupport/lib/active_support/dependencies.rb

    r5811 r5814  
    279279  # Determine if the given constant has been automatically loaded. 
    280280  def autoloaded?(desc) 
    281     return false if desc.is_a?(Module) && desc.name.empty? # Empty name => anonymous module. 
     281    # No name => anonymous module. 
     282    return false if desc.is_a?(Module) && desc.name.blank? 
    282283    name = to_constant_name desc 
    283284    return false unless qualified_const_defined? name 

  • trunk/activesupport/test/dependencies_test.rb

    r5811 r5814  
    306306      assert Dependencies.autoloaded?(:ModuleFolder) 
    307307 
    308       assert ! Dependencies.autoloaded?(Module.new) 
     308      # Anonymous modules aren't autoloaded. 
     309      assert !Dependencies.autoloaded?(Module.new) 
     310 
     311      nil_name = Module.new 
     312      def nil_name.name() nil end 
     313      assert !Dependencies.autoloaded?(nil_name) 
    309314 
    310315      Object.send :remove_const, :ModuleFolder