console-adapter-rails 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abd9adec2e1cfc1d328702870234107d437f1fe66e13346440565a318ac83580
-  data.tar.gz: 577e164ed9f4c9838b028e2e95def5893c31e8bd22af48077d9c7ec57e081d2c
+  metadata.gz: 5cc4bca3597337b67f0d19a87e57e5bd5e989f3e99052e6a07968db52e4e77a1
+  data.tar.gz: 2a2cd5896bf6966db23d612a05f481c41b44735ee8a36e4ea7bd1c0d6e6b7a70
 SHA512:
-  metadata.gz: 7327c9cc36a454ec0e8feec77154b74fc3b5e6750475a8c8a59cbfcc03d065e89085c82cb2dda280388c6cfada526525dad79c6fa104b0254f85903d1c9be49d
-  data.tar.gz: 233cd6789316c80808e78c5daa76128e97bfea17a8f5c94ecbcc80728e11b4b6805f6aff09197c4f415fc296ae3a92b54038de8e649368207a29fc2d3b90c600
+  metadata.gz: 02a6978fad7e5c8d645af5e5994b610e1b71b3c618858de3a4d621c5387cb3964102e4306f0941b6c117b710ccc1d46e2a52b45a738bbb288d663da1949426bf
+  data.tar.gz: ec8cffd46a7cd02fe812713fd87123af1ffbd880f19d79b45b8ad731def893148d2069084211ee6125ea0893971a8c83decaecc996781e8aca89be083e9aecde

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-�;������!��;��7�
�oIo0�k�܂��ֹ�e�џk˂�ڇ����t�ԕ��J���MCuߧi]�w똾X��fa�C�
F�����$����t�����-�jX�X=!�b��(}0�ϱ,���-�W���G�L����l���������NNK�./0%���T��x��?'�F
?�n3Eч�.&�o���d�^��O��]<$�m�Rx� uî������@_��Tb�)���S�Ǜ���p���-Y/$A���^qbC���b�PF�Q���;�K&b�
 �X�Z��
- [���&�j��pewo��BJ����ۯ���8�oi�d����
+�h�;���;ad�	��6�D��U�|�����ޥ�����RO	%cY�蠂&��2�J�1��+d_~���DŤ��u�Y>��%�g_OICI�#�a�
+�{ӦUw�

data/lib/console/adapter/rails/logger.rb

@@ -12,9 +12,11 @@ require 'active_support/logger_silence'
 
 if ActiveSupport::Logger.respond_to?(:logger_outputs_to?)
 	# https://github.com/rails/rails/issues/44800
-	class ActiveSupport::Logger
-		def self.logger_outputs_to?(*)
-			true
+	module ActiveSupport
+		class Logger
+			def self.logger_outputs_to?(*)
+				true
+			end
 		end
 	end
 end
@@ -30,6 +32,14 @@ module Console
 					@silence_key = :"#{self.class}.silence.#{object_id}"
 				end
 				
+				def local_level= severity
+					Fiber[@silence_key] = severity
+				end
+				
+				def local_level
+					Fiber[@silence_key]
+				end
+				
 				# Silences the logger for the duration of the block.
 				def silence(severity = Logger::ERROR)
 					current = Fiber[@silence_key]
@@ -56,9 +66,6 @@ module Console
 					configuration.logger = ActiveSupport::TaggedLogging.new(
 						Logger.new(::Rails)
 					)
-					
-					# Delete `Rails::Rack::Logger` as it also doubles up on request logs:
-					configuration.middleware.delete ::Rails::Rack::Logger
 				end
 			end
 		end

data/lib/console/adapter/rails/railtie.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2023, by Samuel Williams.
+
+require 'action_controller/log_subscriber'
+require 'action_view/log_subscriber'
+
+module Console
+	module Adapter
+		module Rails
+			# Hook into Rails startup process and replace Rails.logger with our custom hooks
+			class Railtie < ::Rails::Railtie
+				initializer 'console.adapter.rails', before: :initialize_logger do |app|
+					# 1. Set up Console to be used as the Rails logger
+					Logger.apply!(configuration: app.config)
+
+					# 2. Remove the Rails::Rack::Logger middleware as it also doubles up on request logs
+					app.middleware.delete ::Rails::Rack::Logger
+				end
+
+				# 3. Remove existing log subscribers for ActionController and ActionView
+				config.after_initialize do
+					::ActionController::LogSubscriber.detach_from :action_controller
+
+					# Silence the default action view logs, e.g. "Rendering text template" etc
+					::ActionView::LogSubscriber.detach_from :action_view
+				end
+
+				config.after_initialize do
+					# 4. Add a new log subscriber for ActionController
+					ActionController.apply!
+
+					# 5. (optionally) Add a new log subscriber for ActiveRecord
+					# ActiveRecord.apply!
+				end
+			end
+		end
+	end
+end

data/lib/console/adapter/rails/version.rb

@@ -6,7 +6,7 @@
 module Console
 	module Adapter
 		module Rails
-			VERSION = "0.3.4"
+			VERSION = "0.4.0"
 		end
 	end
 end

data/lib/console/adapter/rails.rb

@@ -6,27 +6,14 @@
 require_relative 'rails/logger'
 require_relative 'rails/action_controller'
 require_relative 'rails/active_record'
+require_relative 'rails/railtie'
 
 module Console
 	module Adapter
 		# A Rails adapter for the console logger.
 		module Rails
-			# Apply the Rails adapter to the current process and Rails application.
-			# @parameter notifications [ActiveSupport::Notifications] The notifications object to use.
-			# @parameter configuration [Rails::Configuration] The configuration object to use.
-			def self.apply!(notifications: ActiveSupport::Notifications, configuration: ::Rails.configuration)
-				if configuration
-					Logger.apply!(configuration: configuration)
-				end
-				
-				if notifications
-					# Clear out all the existing subscribers otherwise you'll get double the logs:
-					notifications.notifier = ActiveSupport::Notifications::Fanout.new
-					
-					# Add our own subscribers:
-					Rails::ActionController.apply!(notifications: notifications)
-					# Rails::ActiveRecord.apply!(notifications: notifications)
-				end
+			# Placeholder to remain compatible with older clients
+			def self.apply!
 			end
 		end
 	end

data/readme.md

@@ -7,10 +7,9 @@ Status](https://github.com/socketry/console-adapter-rails/workflows/Test/badge.s
 
 ## Usage
 
-Please see the [project documentation](https://socketry.github.io/console-adapter-rails) for more details.
+Please see the [project documentation](https://socketry.github.io/console-adapter-rails/) for more details.
 
-  - [Getting Started](https://github.com/socketry/console-adapter-railsguides/getting-started/index) - This guide
-    explains how to integrate the `console-adapter-rails` gem into your Rails application.
+  - [Getting Started](https://socketry.github.io/console-adapter-rails/guides/getting-started/index) - This guide explains how to integrate the `console-adapter-rails` gem into your Rails application.
 
 ## Contributing
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console-adapter-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2024-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -91,13 +91,15 @@ files:
 - lib/console/adapter/rails/action_controller.rb
 - lib/console/adapter/rails/active_record.rb
 - lib/console/adapter/rails/logger.rb
+- lib/console/adapter/rails/railtie.rb
 - lib/console/adapter/rails/version.rb
 - license.md
 - readme.md
 homepage: https://github.com/socketry/console-adapter-rails
 licenses:
 - MIT
-metadata: {}
+metadata:
+  documentation_uri: https://socketry.github.io/console-adapter-rails/
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -113,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Adapt Rails logs and events to the console gem.