diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb index de54646f..bc96fbfa 100644 --- a/lib/active_model/serializer.rb +++ b/lib/active_model/serializer.rb @@ -522,17 +522,4 @@ module ActiveModel ActiveSupport::Notifications.instrument("#{name}.serializer", payload, &block) end end -end - -module ActiveModel::ArraySerializerSupport - def active_model_serializer - ActiveModel::ArraySerializer - end -end - -Array.send(:include, ActiveModel::ArraySerializerSupport) - -ActiveSupport.on_load(:active_record) do - ActiveRecord::Relation.send(:include, ActiveModel::ArraySerializerSupport) -end - +end \ No newline at end of file diff --git a/lib/active_model_serializers.rb b/lib/active_model_serializers.rb index da4c1780..18679652 100644 --- a/lib/active_model_serializers.rb +++ b/lib/active_model_serializers.rb @@ -56,6 +56,18 @@ ActiveSupport.on_load(:active_record) do include ActiveModel::SerializerSupport end +module ActiveModel::ArraySerializerSupport + def active_model_serializer + ActiveModel::ArraySerializer + end +end + +Array.send(:include, ActiveModel::ArraySerializerSupport) + +ActiveSupport.on_load(:active_record) do + ActiveRecord::Relation.send(:include, ActiveModel::ArraySerializerSupport) +end + begin require 'action_controller' require 'action_controller/serialization'