From c965de396f1bd7457159306f1fc10342840fdf86 Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Mon, 16 Jun 2014 18:25:09 -0400
Subject: Dont swallow errors when bad alias_method

---
 activerecord/lib/active_record/inheritance.rb | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'activerecord/lib/active_record/inheritance.rb')

diff --git a/activerecord/lib/active_record/inheritance.rb b/activerecord/lib/active_record/inheritance.rb
index 08fc91c9df..17cec08628 100644
--- a/activerecord/lib/active_record/inheritance.rb
+++ b/activerecord/lib/active_record/inheritance.rb
@@ -120,14 +120,8 @@ module ActiveRecord
           candidates << type_name
 
           candidates.each do |candidate|
-            begin
-              constant = ActiveSupport::Dependencies.constantize(candidate)
-              return constant if candidate == constant.to_s
-            # We don't want to swallow NoMethodError < NameError errors
-            rescue NoMethodError
-              raise
-            rescue NameError
-            end
+            constant = ActiveSupport::Dependencies.safe_constantize(candidate)
+            return constant if candidate == constant.to_s
           end
 
           raise NameError.new("uninitialized constant #{candidates.first}", candidates.first)
-- 
cgit v1.2.3