File tree Expand file tree Collapse file tree 3 files changed +42
-14
lines changed Expand file tree Collapse file tree 3 files changed +42
-14
lines changed Original file line number Diff line number Diff line change 1
1
require 'rails/railtie'
2
2
module ActiveModel
3
3
class Railtie < Rails ::Railtie
4
+ initializer 'active_model_serializers.logger' do
5
+ ActiveSupport . on_load ( :action_controller ) do
6
+ ActiveModelSerializers . logger = ActionController ::Base . logger
7
+ end
8
+ end
9
+
4
10
initializer 'generators' do |app |
5
11
app . load_generators
6
12
require 'generators/serializer/resource_override'
Original file line number Diff line number Diff line change
1
+ require 'logger'
2
+ require 'active_model'
3
+ require "active_support/railtie"
4
+ require 'action_controller'
5
+ require "action_controller/railtie"
1
6
module ActiveModelSerializers
7
+ mattr_accessor :logger
8
+ self . logger = Rails . logger || Logger . new ( IO ::NULL )
9
+
2
10
module_function
3
11
4
12
def silence_warnings
@@ -10,22 +18,17 @@ def silence_warnings
10
18
end
11
19
12
20
end
13
- require 'active_model'
14
- require 'active_model/serializer/version'
21
+
15
22
require 'active_model/serializer'
16
23
require 'active_model/serializable_resource'
24
+ require 'active_model/serializer/version'
17
25
18
- begin
19
- require 'active_model/serializer/railtie'
20
- require 'action_controller'
21
- require 'action_controller/serialization'
22
-
23
- ActiveSupport . on_load ( :action_controller ) do
24
- include ::ActionController ::Serialization
25
- ActionDispatch ::Reloader . to_prepare do
26
- ActiveModel ::Serializer . serializers_cache . clear
27
- end
26
+ require 'action_controller/serialization'
27
+ ActiveSupport . on_load ( :action_controller ) do
28
+ include ::ActionController ::Serialization
29
+ ActionDispatch ::Reloader . to_prepare do
30
+ ActiveModel ::Serializer . serializers_cache . clear
28
31
end
29
- rescue LoadError
30
- # rails not installed, continuing
31
32
end
33
+
34
+ require 'active_model/serializer/railtie'
Original file line number Diff line number Diff line change
1
+ require 'test_helper'
2
+
3
+ class ActiveModelSerializers ::LoggerTest < Minitest ::Test
4
+
5
+ def test_logger_is_set_to_action_controller_logger_when_initializer_runs
6
+ assert_equal ActiveModelSerializers . logger , ActionController ::Base . logger
7
+ end
8
+
9
+ def test_logger_can_be_set
10
+ original_logger = ActiveModelSerializers . logger
11
+ logger = Logger . new ( STDOUT )
12
+
13
+ ActiveModelSerializers . logger = logger
14
+
15
+ assert_equal ActiveModelSerializers . logger , logger
16
+ ensure
17
+ ActiveModelSerializers . logger = original_logger
18
+ end
19
+ end
You can’t perform that action at this time.
0 commit comments