Permalink
Browse files

Merge pull request #2279 from jdelStrother/load_missing_constant

Constantize a regexp in Dependencies#load_missing_constant
  • Loading branch information...
2 parents b4efff4 + f17ea60 commit 6089ecf93187fbd47c7b3f11b58c88f0de09940a @spastorino spastorino committed Jul 26, 2011
Showing with 2 additions and 1 deletion.
  1. +2 −1 activesupport/lib/active_support/dependencies.rb
@@ -466,6 +466,7 @@ def qualified_name_for(mod, name)
# Load the constant named +const_name+ which is missing from +from_mod+. If
# it is not possible to load the constant into from_mod, try its parent module
# using const_missing.
+ THIS_FILE = %r{#{Regexp.escape(__FILE__)}}
def load_missing_constant(from_mod, const_name)
log_call from_mod, const_name
@@ -478,7 +479,7 @@ def load_missing_constant(from_mod, const_name)
qualified_name = qualified_name_for from_mod, const_name
path_suffix = qualified_name.underscore
- trace = caller.reject {|l| l =~ %r{#{Regexp.escape(__FILE__)}}}
+ trace = caller.reject {|l| l =~ THIS_FILE}
name_error = NameError.new("uninitialized constant #{qualified_name}")
name_error.set_backtrace(trace)

0 comments on commit 6089ecf

Please sign in to comment.