Skip to content

Commit 289d14d

Browse files
committed
Add option to prevent JSONAPI::Rails::Controller to be mixed in.
1 parent a904687 commit 289d14d

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

lib/generators/jsonapi/initializer/templates/initializer.rb

+1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
# config.register_mime_type = true
33
# config.register_param_parser = true
44
# config.register_renderers = true
5+
# config.extend_action_controller = true
56
end

lib/jsonapi/rails/configuration.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ class Configuration < ActiveSupport::InheritableOptions; end
55
DEFAULT_CONFIG = {
66
register_parameter_parser: true,
77
register_mime_type: true,
8-
register_renderers: true
8+
register_renderers: true,
9+
extend_action_controller: true
910
}.freeze
1011

1112
def self.configure

lib/jsonapi/rails/railtie.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ class Railtie < ::Rails::Railtie
1818

1919
initializer 'jsonapi-rails.action_controller' do
2020
ActiveSupport.on_load(:action_controller) do
21-
include ::JSONAPI::Rails::Controller
21+
if JSONAPI::Rails.config.extend_action_controller
22+
include ::JSONAPI::Rails::Controller
23+
end
2224

2325
if JSONAPI::Rails.config.register_mime_type
2426
Mime::Type.register MEDIA_TYPE, :jsonapi

0 commit comments

Comments
 (0)