diff --git a/lib/active_model_serializers.rb b/lib/active_model_serializers.rb index cb4a5c7a..0084d1ad 100644 --- a/lib/active_model_serializers.rb +++ b/lib/active_model_serializers.rb @@ -25,8 +25,12 @@ end begin require 'action_controller' - require 'rails' - require 'railtie' + require 'action_controller/serialization' + + ActiveSupport.on_load(:action_controller) do + include ::ActionController::Serialization + end rescue LoadError => ex + puts ex # rails on installed, continuing end diff --git a/lib/railtie.rb b/lib/railtie.rb deleted file mode 100644 index 8dbb7fbb..00000000 --- a/lib/railtie.rb +++ /dev/null @@ -1,14 +0,0 @@ -require 'active_model_serializers' -require 'action_controller/serialization' - -module ActiveModel - module Serialization - class Railtie < ::Rails::Railtie - initializer "active_model.serialization.action_controller" do - ActiveSupport.on_load(:action_controller) do - include ::ActionController::Serilization - end - end - end - end -end diff --git a/test/serialization_test.rb b/test/serialization_test.rb index e4e53d1e..05abd862 100644 --- a/test/serialization_test.rb +++ b/test/serialization_test.rb @@ -39,8 +39,6 @@ class RenderJsonTest < ActionController::TestCase end class TestController < ActionController::Base - include ActionController::Serialization - protect_from_forgery serialization_scope :current_user diff --git a/test/test_helper.rb b/test/test_helper.rb index 82ca563a..2942aa58 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -7,6 +7,8 @@ require "active_model_serializers" require "active_support/json" require "test/unit" +require 'rails' + module TestHelper Routes = ActionDispatch::Routing::RouteSet.new Routes.draw do