Support Rails 6.1

Author: maksymst

.gitignore

@@ -9,3 +9,4 @@
 
 /spec/rails_app/log/
 /spec/rails_app/db/test.sqlite
+/.idea

epilog.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'byebug', '~> 11.0'
   spec.add_development_dependency 'combustion', '~> 1.1.0'
   spec.add_development_dependency 'irb'
-  spec.add_development_dependency 'rails', '>= 4.2', '< 6'
+  spec.add_development_dependency 'rails', '>= 4.2', '< 7'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'redcarpet', '~> 3.5'
   spec.add_development_dependency 'rspec', '~> 3.4'

lib/epilog/rails/epilog_ext.rb

@@ -2,10 +2,10 @@
 
 module Epilog
   class Logger
-    include LoggerSilence
-
     def silencer
       false
     end
   end
 end
+
+Epilog::Logger.send(:include, defined?(ActiveSupport::LoggerSilence) ? ActiveSupport::LoggerSilence : ::LoggerSilence)

lib/epilog/rails/ext/action_controller.rb

@@ -47,7 +47,9 @@ def epilog_context
   end
 end
 
-ActionController::Base.prepend(Epilog::ActionControllerExt)
-if defined? ActionController::API
-  ActionController::API.prepend(Epilog::ActionControllerExt)
+ActiveSupport.on_load(:action_controller_base) do
+  ActionController::Base.prepend(Epilog::ActionControllerExt)
+  if defined? ActionController::API
+    ActionController::API.prepend(Epilog::ActionControllerExt)
+  end
 end

lib/epilog/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Epilog
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end