Skip to content

Commit a72b76a

Browse files
committed
Use Adapter.const_get instead of safe_constantize
(Thanks to sandstrom for the reference to ActiveJob::QueueAdapters https://github.com/rails/rails/blob/a11571cec3213753d63ac3e6b4bb3b97fe2594a6/activejob/lib/active_job/queue_adapters.rb#L123-L133
1 parent 3a03e36 commit a72b76a

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

lib/active_model/serializer/adapter.rb

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,7 @@ def lookup(adapter)
6060
register(adapter_name, adapter_class)
6161
adapter_class
6262
}
63-
rescue ArgumentError
64-
failure_message =
65-
"Unknown adapter: #{adapter.inspect}. Valid adapters are: #{adapters}"
66-
raise UnknownAdapterError, failure_message, $!.backtrace
67-
rescue NameError
63+
rescue NameError, ArgumentError
6864
failure_message =
6965
"NameError: #{$!.message}. Unknown adapter: #{adapter.inspect}. Valid adapters are: #{adapters}"
7066
raise UnknownAdapterError, failure_message, $!.backtrace
@@ -73,7 +69,7 @@ def lookup(adapter)
7369
# @api private
7470
def find_by_name(adapter_name)
7571
adapter_name = adapter_name.to_s.classify.tr('API', 'Api')
76-
"ActiveModel::Serializer::Adapter::#{adapter_name}".safe_constantize or # rubocop:disable Style/AndOr
72+
ActiveModel::Serializer::Adapter.const_get(adapter_name.to_sym) or # rubocop:disable Style/AndOr
7773
fail UnknownAdapterError
7874
end
7975
private :find_by_name

0 commit comments

Comments
 (0)