Use safe_constantize where possible.

rails · Sep 23, 2011 · e8987c3 · e8987c3
1 parent b2f34d1
commit e8987c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb
@@ -141,19 +141,16 @@ def inherited(klass)
       # try to find Foo::Bar::User, Foo::User and finally User.
       def _default_wrap_model #:nodoc:
         return nil if self.anonymous?
-
         model_name = self.name.sub(/Controller$/, '').singularize
 
         begin
-          model_klass = model_name.constantize
+          if model_klass = model_name.safe_constantize
-        rescue NameError, ArgumentError => e
+            model_klass
-          if e.message =~ /is not missing constant|uninitialized constant #{model_name}/
+          else
             namespaces = model_name.split("::")
             namespaces.delete_at(-2)
             break if namespaces.last == model_name
             model_name = namespaces.join("::")
-          else
-            raise
           end
         end until model_klass
 

diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
@@ -54,10 +54,8 @@ def tests(helper_class)
         end
 
         def determine_default_helper_class(name)
-          mod = name.sub(/Test$/, '').constantize
+          mod = name.sub(/Test$/, '').safe_constantize
           mod.is_a?(Class) ? nil : mod
-        rescue NameError
-          nil
         end
 
         def helper_method(*methods)

diff --git a/activesupport/lib/active_support/core_ext/module/reachable.rb b/activesupport/lib/active_support/core_ext/module/reachable.rb
@@ -3,8 +3,6 @@
 
 class Module
   def reachable? #:nodoc:
-    !anonymous? && name.constantize.equal?(self)
+    !anonymous? && name.safe_constantize.equal?(self)
-  rescue NameError
-    false
   end
 end