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
rails-api · Sep 9, 2015 · 6e886c0 · 6e886c0
1 parent 819137e
commit 6e886c0
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/lib/active_model/serializer/adapter.rb b/lib/active_model/serializer/adapter.rb
@@ -60,11 +60,7 @@ def lookup(adapter)
             register(adapter_name, adapter_class)
             adapter_class
           }
-        rescue ArgumentError => e
-          failure_message =
-            "Unknown adapter: #{adapter.inspect}. Valid adapters are: #{adapters}"
-          raise UnknownAdapterError, failure_message, e.backtrace
-        rescue NameError => e
+        rescue NameError, ArgumentError => e
           failure_message =
             "NameError: #{e.message}. Unknown adapter: #{adapter.inspect}. Valid adapters are: #{adapters}"
           raise UnknownAdapterError, failure_message, e.backtrace
@@ -73,7 +69,7 @@ def lookup(adapter)
         # @api private
         def find_by_name(adapter_name)
           adapter_name = adapter_name.to_s.classify.tr('API', 'Api')
-          "ActiveModel::Serializer::Adapter::#{adapter_name}".safe_constantize or # rubocop:disable Style/AndOr
+          ActiveModel::Serializer::Adapter.const_get(adapter_name.to_sym) or # rubocop:disable Style/AndOr
             fail UnknownAdapterError
         end
         private :find_by_name