From 7dd3bdaca994c4cbff4a13b6d0575d79e2db3218 Mon Sep 17 00:00:00 2001 From: Yehuda Katz Date: Wed, 7 Dec 2011 12:25:11 -0800 Subject: [PATCH] We can't just piggyback on serialization because it may already be included at this point. --- lib/active_model_serializers.rb | 6 +++++- test/serializer_test.rb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/active_model_serializers.rb b/lib/active_model_serializers.rb index adb444e3..3019cd99 100644 --- a/lib/active_model_serializers.rb +++ b/lib/active_model_serializers.rb @@ -1,7 +1,7 @@ require "active_model" require "active_model/serializer" -ActiveModel::Serialization.class_eval do +module ActiveModel::SerializerSupport extend ActiveSupport::Concern module ClassMethods #:nodoc: @@ -25,6 +25,10 @@ ActiveModel::Serialization.class_eval do alias :read_attribute_for_serialization :send end +ActiveSupport.on_load(:active_record) do + include ActiveModel::SerializerSupport +end + begin require 'action_controller' require 'action_controller/serialization' diff --git a/test/serializer_test.rb b/test/serializer_test.rb index 5fd71cdd..b790f23e 100644 --- a/test/serializer_test.rb +++ b/test/serializer_test.rb @@ -16,7 +16,7 @@ class SerializerTest < ActiveModel::TestCase end class User - include ActiveModel::Serialization + include ActiveModel::SerializerSupport attr_accessor :superuser