From 45a47a1c4dee14734f0677ec79d29c4415dbeaa9 Mon Sep 17 00:00:00 2001 From: Tema Bolshakov and Dmitry Myaskovskiy Date: Fri, 29 Aug 2014 19:47:29 +0400 Subject: [PATCH] safe_constantize instead of rescue --- lib/active_model/serializer.rb | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb index e21d99df..ff0b4b1a 100644 --- a/lib/active_model/serializer.rb +++ b/lib/active_model/serializer.rb @@ -66,13 +66,8 @@ module ActiveModel if resource.respond_to?(:to_ary) config.array_serializer else - serializer_name = "#{resource.class.name}Serializer" - - begin - serializer_name.constantize - rescue NameError - nil - end + serializer_class = "#{resource.class.name}Serializer" + serializer_class.safe_constantize end end @@ -80,11 +75,7 @@ module ActiveModel adapter_class = case config.adapter when Symbol class_name = "ActiveModel::Serializer::Adapter::#{config.adapter.to_s.classify}" - begin - class_name.constantize - rescue NameError - nil - end + class_name.safe_constantize when Class config.adapter end