activesupport-logger 2.0.2 → 3.0.0

data/lib/active_support/logger.rb

@@ -1,4 +1,4 @@
-# This is a stub
-# It will prevent vanilla ActiveSupport from loading its own broken logger tooling.
-# Instead, we'll load the fixed replacement logging tooling from this library!
-require_relative "../activesupport-logger"
+# Prevent Active Support from loading its own logger implementation. Loading
+# the implementation through this feature path also keeps Ruby's require
+# tracking consistent when Rails is loaded before or after this gem.
+require_relative "../activesupport/logger"

data/lib/activesupport/isolated_execution_state.rb

@@ -13,7 +13,7 @@ module ActiveSupport
       def isolation_level=(level)
         return if level == @isolation_level
 
-        unless %i(thread fiber).include?(level)
+        unless %i[thread fiber].include?(level)
           raise ArgumentError, "isolation_level must be `:thread` or `:fiber`, got: `#{level.inspect}`"
         end
 
@@ -60,13 +60,29 @@ module ActiveSupport
         # Action Controller streaming spawns a new thread and copy thread locals.
         # We do the same here for backward compatibility, but this is very much a hack
         # and streaming should be rethought.
-        context.active_support_execution_state = other.active_support_execution_state.dup
+        set_state(context, state_for(other).dup)
       end
 
       private
 
       def state
-        context.active_support_execution_state ||= {}
+        state_for(context) || set_state(context, {})
+      end
+
+      def state_for(target)
+        if scope == Thread
+          target.thread_variable_get(:active_support_execution_state)
+        else
+          target.active_support_execution_state
+        end
+      end
+
+      def set_state(target, value)
+        if scope == Thread
+          target.thread_variable_set(:active_support_execution_state, value)
+        else
+          target.active_support_execution_state = value
+        end
       end
     end
 

data/lib/activesupport/logger/version.rb

@@ -1,12 +1,8 @@
 # frozen_string_literal: true
 
-# NOTE: This is a different namespace than the Rails one.
-# Lowercase "s" here, uppercase in Rails.
-#  This is to avoid a superclass mismatch for Logger.
-module Activesupport
-  module Logger
-    module Version
-      VERSION = "2.0.2"
-    end
+module ActiveSupport
+  module LoggerVersion
+    # Current gem version.
+    VERSION = "3.0.0"
   end
 end

data/lib/activesupport/logger.rb

@@ -3,6 +3,11 @@
 # Std Lib
 require "logger"
 
+# Active Support prerequisites used by the extracted implementation.
+require "active_support/concern"
+require "active_support/core_ext/module/attribute_accessors"
+require_relative "isolated_execution_state"
+
 # Extracted from Rails v8.0
 require_relative "logger_silence"
 require_relative "logger_thread_safe_level"
@@ -50,8 +55,6 @@ module ActiveSupport
       end
     end
 
-    private
-
     def self.normalize_sources(sources)
       sources.map do |source|
         source = source.path if source.respond_to?(:path)
@@ -59,5 +62,7 @@ module ActiveSupport
         source
       end
     end
+
+    private_class_method :normalize_sources
   end
 end

data/lib/activesupport-logger.rb

@@ -1,13 +1,17 @@
 # Ruby stdlib
 require "logger"
 
+# Load this gem's compatibility shim before Active Support can resolve Rails'
+# implementation of active_support/logger. The shim delegates back here and
+# marks the feature as loaded, preventing a later superclass mismatch.
+require "active_support/logger"
+
 # External libraries
 require "active_support/version"
 require "version_gem"
 require "backports/3.1.0/array/intersect"
 
 # This library
-require_relative "activesupport/logger/version"
 
 # Original from whatever version of Rails / ActiveSupport is loaded...
 require "active_support/concern"
@@ -40,11 +44,8 @@ require_relative "activesupport/logger_silence"
 # Compare SHA with latest commit to check for changes:
 # https://github.com/rails/rails/blob/main/activesupport/lib/active_support/logger.rb
 require_relative "activesupport/logger"
+require_relative "activesupport/logger/version"
 
-# Namespace for the Version of this gem (and nothing else)
-module Activesupport
-end
-
-Activesupport::Logger::Version.class_eval do
+ActiveSupport::LoggerVersion.class_eval do
   extend VersionGem::Basic
 end

data/sig/activesupport/logger.rbs

@@ -0,0 +1,22 @@
+module Activesupport
+  module Logger
+    VERSION: String
+    module Version
+      VERSION: String
+    end
+    # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+  end
+end
+
+module ActiveSupport
+  module Version
+    VERSION: String
+  end
+  VERSION: String
+  module Logger
+  end
+
+  module LoggerVersion
+    VERSION: String
+  end
+end