Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

add vendor/ back to load paths; catch errors in constant loading

Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
  • Loading branch information...
commit 45ba4ec626b79dda8534f13b3eb01524e0734781 1 parent 1211896
@al2o3cr al2o3cr authored dhh committed
View
34 activesupport/lib/active_support/dependencies.rb
@@ -485,24 +485,28 @@ def new_constants_in(*descs)
# 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
View
1  railties/lib/initializer.rb
@@ -901,6 +901,7 @@ def default_load_paths
components
config
lib
+ vendor
).map { |dir| "#{root_path}/#{dir}" }.select { |dir| File.directory?(dir) }
paths.concat builtin_directories
Please sign in to comment.
Something went wrong with that request. Please try again.