We can't just piggyback on serialization because it may already be included at this point.

This commit is contained in:
Yehuda Katz 2011-12-07 12:25:11 -08:00
parent ca7786c2e0
commit 7dd3bdaca9
2 changed files with 6 additions and 2 deletions

View File

@ -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'

View File

@ -16,7 +16,7 @@ class SerializerTest < ActiveModel::TestCase
end
class User
include ActiveModel::Serialization
include ActiveModel::SerializerSupport
attr_accessor :superuser