safe_constantize instead of rescue

This commit is contained in:
Tema Bolshakov and Dmitry Myaskovskiy 2014-08-29 19:47:29 +04:00 committed by Tema Bolshakov
parent ff37b6260d
commit 45a47a1c4d

View File

@ -66,13 +66,8 @@ module ActiveModel
if resource.respond_to?(:to_ary) if resource.respond_to?(:to_ary)
config.array_serializer config.array_serializer
else else
serializer_name = "#{resource.class.name}Serializer" serializer_class = "#{resource.class.name}Serializer"
serializer_class.safe_constantize
begin
serializer_name.constantize
rescue NameError
nil
end
end end
end end
@ -80,11 +75,7 @@ module ActiveModel
adapter_class = case config.adapter adapter_class = case config.adapter
when Symbol when Symbol
class_name = "ActiveModel::Serializer::Adapter::#{config.adapter.to_s.classify}" class_name = "ActiveModel::Serializer::Adapter::#{config.adapter.to_s.classify}"
begin class_name.safe_constantize
class_name.constantize
rescue NameError
nil
end
when Class when Class
config.adapter config.adapter
end end