console-adapter-rails 0.3.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abd9adec2e1cfc1d328702870234107d437f1fe66e13346440565a318ac83580
-  data.tar.gz: 577e164ed9f4c9838b028e2e95def5893c31e8bd22af48077d9c7ec57e081d2c
+  metadata.gz: a4e48e85afc72be9449b0da7dcc6ea25c3333daaafe092062429ea8944fcca98
+  data.tar.gz: 3c325105475e32b6099d9eb35c7fe6ec2ec6990ef920c2b07cb03e4c4d211206
 SHA512:
-  metadata.gz: 7327c9cc36a454ec0e8feec77154b74fc3b5e6750475a8c8a59cbfcc03d065e89085c82cb2dda280388c6cfada526525dad79c6fa104b0254f85903d1c9be49d
-  data.tar.gz: 233cd6789316c80808e78c5daa76128e97bfea17a8f5c94ecbcc80728e11b4b6805f6aff09197c4f415fc296ae3a92b54038de8e649368207a29fc2d3b90c600
+  metadata.gz: d0265cf56ce46b5fac25cc1c3efccc071951b84d57e46d8e572ea5f16a8a70cacc2ea2645d9696acf4ccf5bfcaa1233d7dbd360da9b6738d483c534ca85eb785
+  data.tar.gz: 3f7377560820af3bd579778be6d85f15a0a83846eff9c1eca3e25a0957df0996010d8fcdfbb31f7a6f156d585cb42223c1bb1094d1b1e2c0ef8ad5591f6cd3fa

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

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023, by Samuel Williams.
+# Copyright, 2023-2024, by Samuel Williams.
 
 require 'console'
 
+require 'active_support/log_subscriber'
 require 'action_controller/log_subscriber'
 
 module Console

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

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023, by Samuel Williams.
+# Copyright, 2023-2024, by Samuel Williams.
 
 require 'console'
 
+require 'active_support/log_subscriber'
 require 'active_record/log_subscriber'
 
 module Console
@@ -67,4 +68,4 @@ module Console
 			end
 		end
 	end
-end
+end

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

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023, by Samuel Williams.
+# Copyright, 2023-2024, by Samuel Williams.
+# Copyright, 2024, by Michael Adams.
 
 require 'console/compatible/logger'
 
@@ -12,9 +13,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 +33,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 +67,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,41 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2024, by Michael Adams.
+# Copyright, 2024, 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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023, by Samuel Williams.
+# Copyright, 2023-2024, by Samuel Williams.
 
 module Console
 	module Adapter
 		module Rails
-			VERSION = "0.3.4"
+			VERSION = "0.4.1"
 		end
 	end
 end

data/lib/console/adapter/rails.rb

@@ -1,33 +1,10 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2023, by Samuel Williams.
+# Copyright, 2023-2024, by Samuel Williams.
+# Copyright, 2024, by Michael Adams.
 
 require_relative 'rails/logger'
 require_relative 'rails/action_controller'
 require_relative 'rails/active_record'
-
-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
-			end
-		end
-	end
-end
+require_relative "rails/railtie" if defined?(Rails::Railtie)

data/license.md

@@ -1,6 +1,8 @@
 # MIT License
 
-Copyright, 2023, by Samuel Williams.  
+Copyright, 2023-2024, by Samuel Williams.  
+Copyright, 2023, by Joshua Young.  
+Copyright, 2024, by Michael Adams.  
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/readme.md

@@ -2,15 +2,13 @@
 
 Adapt Rails event logs for `console`.
 
-[![Development
-Status](https://github.com/socketry/console-adapter-rails/workflows/Test/badge.svg)](https://github.com/socketry/console-adapter-rails/actions?workflow=Test)
+[![Development Status](https://github.com/socketry/console-adapter-rails/workflows/Test/badge.svg)](https://github.com/socketry/console-adapter-rails/actions?workflow=Test)
 
 ## 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
 
@@ -24,10 +22,8 @@ We welcome contributions to this project.
 
 ### Developer Certificate of Origin
 
-This project uses the [Developer Certificate of Origin](https://developercertificate.org/). All contributors to this
-project must agree to this document to have their contributions accepted.
+In order to protect users of this project, we require all contributors to comply with the [Developer Certificate of Origin](https://developercertificate.org/). This ensures that all contributions are properly licensed and attributed.
 
-### Contributor Covenant
+### Community Guidelines
 
-This project is governed by [Contributor Covenant](https://www.contributor-covenant.org/). All contributors and
-participants agree to abide by its terms.
+This project is best served by a collaborative and respectful environment. Treat each other professionally, respect differing viewpoints, and engage constructively. Harassment, discrimination, or harmful behavior is not tolerated. Communicate clearly, listen actively, and support one another. If any issues arise, please inform the project maintainers.

metadata

@@ -1,10 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: console-adapter-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.1
 platform: ruby
 authors:
 - Samuel Williams
+- Joshua Young
+- Michael Adams
 autorequire:
 bindir: bin
 cert_chain:
@@ -37,7 +39,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2024-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: console
@@ -54,33 +56,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.21'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: fiber-storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: fiber-storage
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '6.1'
 description:
 email:
 executables: []
@@ -91,13 +93,16 @@ 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/
+  source_code_uri: https://github.com/socketry/console-adapter-rails.git
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -106,14 +111,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Adapt Rails logs and events to the console gem.