@@ -485,24 +485,28 @@ module ActiveSupport #:nodoc: # Build the watch frames. Each frame is a tuple of # [module_name_as_string, constants_defined_elsewhere] watch_frames = descs.collect do |desc| - if desc.is_a? Module - mod_name = desc.name - initial_constants = desc.local_constant_names - elsif desc.is_a?(String) || desc.is_a?(Symbol) - mod_name = desc.to_s - - # Handle the case where the module has yet to be defined. - initial_constants = if qualified_const_defined?(mod_name) - mod_name.constantize.local_constant_names + begin + if desc.is_a? Module + mod_name = desc.name + initial_constants = desc.local_constant_names + elsif desc.is_a?(String) || desc.is_a?(Symbol) + mod_name = desc.to_s + + # Handle the case where the module has yet to be defined. + initial_constants = if qualified_const_defined?(mod_name) + mod_name.constantize.local_constant_names + else + [] + end else - [] + raise Argument, "#{desc.inspect} does not describe a module!" end - else - raise Argument, "#{desc.inspect} does not describe a module!" + [mod_name, initial_constants] + rescue NameError + # mod_name isn't a valid constant name + nil end - - [mod_name, initial_constants] - end + end.compact constant_watch_stack.concat watch_frames activesupport/lib/active_support/dependencies.rb @@ -901,6 +901,7 @@ Run `rake gems:install` to install the missing gems. components config lib + vendor ).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) } paths.concat builtin_directories railties/lib/initializer.rb 12118963acacc9c869bdd41ef8480a1a4e06d358 Matt Jones al2o3cr@gmail.com http://github.com/rails/rails/commit/45ba4ec626b79dda8534f13b3eb01524e0734781 45ba4ec626b79dda8534f13b3eb01524e0734781 2008-11-18T05:32:46-08:00 2008-11-17T11:03:46-08:00 add vendor/ back to load paths; catch errors in constant loading Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> 84bccc98fa97cb7bfb5244bbd1c0890315b99d32 David Heinemeier Hansson david@loudthinking.com