From fa51c5f574d240d0d24add87ae75c7221d29de5d Mon Sep 17 00:00:00 2001 From: Nicholas Mulder Date: Thu, 28 Feb 2013 10:01:40 -0500 Subject: [PATCH] Add ActiveSupport::DescendantsTracker to Serializer and ArraySerializer --- lib/active_model/array_serializer.rb | 4 ++++ lib/active_model/serializer.rb | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/lib/active_model/array_serializer.rb b/lib/active_model/array_serializer.rb index f0a2ab02..15f24523 100644 --- a/lib/active_model/array_serializer.rb +++ b/lib/active_model/array_serializer.rb @@ -1,4 +1,6 @@ require "active_support/core_ext/class/attribute" +require 'active_support/dependencies' +require 'active_support/descendants_tracker' module ActiveModel # Active Model Array Serializer @@ -11,6 +13,8 @@ module ActiveModel # ActiveModel::ArraySerializer.root = false # class ArraySerializer + extend ActiveSupport::DescendantsTracker + attr_reader :object, :options class_attribute :root diff --git a/lib/active_model/serializer.rb b/lib/active_model/serializer.rb index b070664c..9d772a1d 100644 --- a/lib/active_model/serializer.rb +++ b/lib/active_model/serializer.rb @@ -1,5 +1,7 @@ require "active_support/core_ext/class/attribute" require "active_support/core_ext/module/anonymous" +require 'active_support/dependencies' +require 'active_support/descendants_tracker' module ActiveModel # Active Model Serializer @@ -36,6 +38,8 @@ module ActiveModel # end # class Serializer + extend ActiveSupport::DescendantsTracker + INCLUDE_METHODS = {} INSTRUMENT = { :serialize => :"serialize.serializer", :associations => :"associations.serializer" }