diff --git a/lib/active_model/array_serializer.rb b/lib/active_model/array_serializer.rb index 78455537..2c6a4738 100644 --- a/lib/active_model/array_serializer.rb +++ b/lib/active_model/array_serializer.rb @@ -64,10 +64,5 @@ module ActiveModel end end - private - - def instrumentation_keys - [:object, :scope, :root, :meta_key, :meta, :each_serializer, :resource_name, :key_format, :context] - end end end diff --git a/lib/active_model/default_serializer.rb b/lib/active_model/default_serializer.rb index c2db6b1d..8c755cc2 100644 --- a/lib/active_model/default_serializer.rb +++ b/lib/active_model/default_serializer.rb @@ -21,12 +21,8 @@ module ActiveModel @wrap_in_array ? [hash] : hash end end + alias serializable_hash as_json alias serializable_object as_json - - private - def instrumentation_keys - [:object, :wrap_in_array] - end end end diff --git a/lib/active_model/serializable.rb b/lib/active_model/serializable.rb index d23aae7d..3b412d17 100644 --- a/lib/active_model/serializable.rb +++ b/lib/active_model/serializable.rb @@ -52,15 +52,8 @@ module ActiveModel end def instrument(action, &block) - payload = instrumentation_keys.inject({ serializer: self.class.name }) do |payload, key| - payload[:payload] = self.instance_variable_get(:"@#{key}") - payload - end + payload = { serializer: self.class.name } ActiveSupport::Notifications.instrument("#{action}.active_model_serializers", payload, &block) end - - def instrumentation_keys - [:object, :scope, :root, :meta_key, :meta, :wrap_in_array, :only, :except, :key_format] - end end end