contextual_logger 1.3.0.dg.pre.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96fa2fd042325883674d751a6b2443c23e9e6b195f9f15ade2826832c6557735
-  data.tar.gz: 180923158cdaac1c7cd63755ca93e4cda42aaf48bab442b21981264a255a5765
+  metadata.gz: 5a1e7646d07dccdd7cc32b76e5fc208741b8e9159a3ecbafe358bbe4e108d146
+  data.tar.gz: 52a2c52248c74fb8f9da1ce9fb13f1d8eca51f54b33356237825831b86a03881
 SHA512:
-  metadata.gz: 66081a0a05dded370cf77b2e60b2c20884e8993a362bf6be4674b3c4b0c95d4811c208b8b6ab64ea99495fc7ca05b16ba9ef779cb39f4169620a06eac0c12fce
-  data.tar.gz: 04d1997d713eec2231a08e2085728db8ef438268835b4ac6e3eb866ec01c7d5df0447677de127c286236aa0485d4e233b36214234aa661cd0c30c6fe52eaaef8
+  metadata.gz: 0ba3b1504ba17953998665cfac2c04c14f0add53d901bebc1ca34f89c4f9e8076f15c8d24ba8eeb61d6fedd9fe9658d664c373911f35565cc70c806c6b3c4156
+  data.tar.gz: 771842eec3b0665fbea0ecded92cba37758d8d55d38350959dbf9e7b3b6f5c38225a37cc44b98aaaef6678842d7727191dbbe84106231737b67cd7bbbbcf8a56

data/lib/contextual_logger/redactor.rb

@@ -21,6 +21,8 @@ module ContextualLogger
       end
     end
 
+    # @param log_line [String]
+    # @return [String]
     def redact(log_line)
       if redaction_regex
         log_line.gsub(redaction_regex, '<redacted>')

data/lib/contextual_logger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ContextualLogger
-  VERSION = '1.3.0.dg.pre.0'
+  VERSION = '1.4.0'
 end

data/lib/contextual_logger.rb

@@ -19,9 +19,6 @@ module ContextualLogger
     unknown: Logger::Severity::UNKNOWN
   }.freeze
 
-  class LambdaAlreadyDefinedError < StandardError
-  end
-
   class << self
     def new(logger)
       logger.extend(LoggerMixin)
@@ -54,32 +51,12 @@ module ContextualLogger
   module LoggerMixin
     include Context
 
-    delegate :register_secret, :register_secret_regex, to: :redactor
+    delegate :register_secret, :register_secret_regex, :redact, to: :redactor
 
     def global_context
       @global_context ||= Context::EMPTY_CONTEXT
     end
 
-    def add_global_context_lambda(field, lambda)
-      if field.blank?
-        raise ArgumentError, "The field cannot be empty"
-      end
-
-      unless lambda.respond_to?(:call)
-        raise ArgumentError, "A lambda must respond to the :call method"
-      end
-
-      if global_context_lambdas[field]
-        raise ::ContextualLogger::LambdaAlreadyDefinedError, "A lambda for `#{field}` is already defined"
-      end
-
-      @global_context_lambdas[field] = lambda
-    end
-
-    def global_context_lambdas
-      @global_context_lambdas ||= {}
-    end
-
     def global_context=(context)
       if (global_context_lock_message = ::ContextualLogger.global_context_lock_message)
         raise ::ContextualLogger::GlobalContextIsLocked, global_context_lock_message
@@ -159,8 +136,7 @@ module ContextualLogger
           message = arg1
           progname = arg2 || @progname
         end
-        full_context = evaluate_global_context_lambdas(deep_merge_with_current_context(context))
-        write_entry_to_log(severity, Time.now, progname, message, context: full_context)
+        write_entry_to_log(severity, Time.now, progname, message, context: deep_merge_with_current_context(context))
       end
 
       true
@@ -209,13 +185,17 @@ module ContextualLogger
         current_context
       end
     end
+  end
 
-    def evaluate_global_context_lambdas(context)
-      if global_context_lambdas.empty?
-        context
-      else
-        global_context_lambdas.transform_values { |lambda| lambda.call }.merge(context)
-      end
+  module BroadcastLoggerMixin
+    method_names = LOG_LEVEL_NAMES_TO_SEVERITY.keys << :add
+
+    method_names.each do |method_name|
+      class_eval(<<~EOS, __FILE__, __LINE__ + 1)
+        def #{method_name}(...)
+          dispatch { |logger| logger.#{method_name}(...) }
+        end
+      EOS
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contextual_logger
 version: !ruby/object:Gem::Version
-  version: 1.3.0.dg.pre.0
+  version: 1.4.0
 platform: ruby
 authors:
 - James Ebentier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2024-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6.0'
 description: A way to add context to the logs you have
 email: jebentier@invoca.com
 executables: []
@@ -69,11 +69,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: Add context to your logger