Merge pull request #2279 from jdelStrother/load_missing_constant

Constantize a regexp in Dependencies#load_missing_constant
rails · Jul 26, 2011 · 6089ecf · 6089ecf
2 parents b4efff4 + f17ea60
commit 6089ecf
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/activesupport/lib/active_support/dependencies.rb b/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)