lumberjack 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a69bd8640229dc5e150255f601f1280dfe4fb325cee8879aa202114cd335512f
-  data.tar.gz: b2cd71293d94653f03ed04df094d69587d76e2b544d8a46149d139d7e952c0fc
+  metadata.gz: 9350195577ae682b1f668a183aed2c0e1635e2bad8abb9af751c9f11f4b33fee
+  data.tar.gz: 3ebedf23e6eb462df564030b332ee9fd0f71d9198d6276480405ca21ce28d3f6
 SHA512:
-  metadata.gz: 484530ed54b537da178e956fc654ddcfc81fa74cfed495ba94ca04e1e350d1e29089198da6d77bb700cc227a5ee49949ac8d40c09c152e7e2ffc3ab7a7f6e7a5
-  data.tar.gz: f0025936e20a24d8da09d2dd9cd863aaface259ce2b1b21eff590f7bbb22daa7fcd5a67f192c0abe428131ab145ab0cd271143ab01b7f6b665db69ebcb63becf
+  metadata.gz: 6c8230a0536fe98b8f817c275a5cc6e9d5764ea5dab8f0b1b92e1c274280c1528cebfb94767538eecf886240dc6a3fa6fe6adededffaac38815577bcfb739675
+  data.tar.gz: 3e64d451e6aa85298c3a5877bcfcef109381acd09553a250861886528ea352e5f5194db323cf0c253f2018dc130f4323f21ed1d51753cfcad7c3dbb09390affc

data/CHANGELOG.md

@@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.3.2
+
+### Fixed
+
+- Fixed `NoMethodError` when setting the device via the `Lumberjack::Logger#device=` method.
+
+## 1.3.1
+
+### Added
+
+- Added `Lumberjack::Logger#context` method to set up a context block for the logger. This is the same as calling `Lumberjack::Logger#tag` with an empty hash.
+- Log entries now remove empty tag values so they don't have to be removed downstream.
+
+### Fixed
+
+- ActiveSupport::TaggedLogger now calls `Lumberjack::Logger#tag_globally` to prevent deprecation warnings.
+
 ## 1.3.0
 
 ### Added

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.2

data/lib/lumberjack/log_entry.rb

@@ -26,9 +26,9 @@ module Lumberjack
       @progname = progname
       @pid = pid
       # backward compatibility with 1.0 API where the last argument was the unit of work id
-      @tags = if tags.nil? || tags.is_a?(Hash)
-        tags
-      else
+      @tags = if tags.is_a?(Hash)
+        compact_tags(tags)
+      elsif !tags.nil?
         {UNIT_OF_WORK_ID => tags}
       end
     end
@@ -80,5 +80,37 @@ module Lumberjack
       tags&.each { |name, value| tags_string << " #{name}:#{value.inspect}" }
       tags_string
     end
+
+    def compact_tags(tags)
+      delete_keys = nil
+      compacted_keys = nil
+
+      tags.each do |key, value|
+        if value.nil? || value == ""
+          delete_keys ||= []
+          delete_keys << key
+        elsif value.is_a?(Hash)
+          compacted_value = compact_tags(value)
+          if compacted_value.empty?
+            delete_keys ||= []
+            delete_keys << key
+          elsif !value.equal?(compacted_value)
+            compacted_keys ||= []
+            compacted_keys << [key, compacted_value]
+          end
+        elsif value.is_a?(Array) && value.empty?
+          delete_keys ||= []
+          delete_keys << key
+        end
+      end
+
+      return tags if delete_keys.nil? && compacted_keys.nil?
+
+      tags = tags.dup
+      delete_keys&.each { |key| tags.delete(key) }
+      compacted_keys&.each { |key, value| tags[key] = value }
+
+      tags
+    end
   end
 end

data/lib/lumberjack/logger.rb

@@ -96,9 +96,7 @@ module Lumberjack
     # @param [Lumberjack::Device] device The new logging device.
     # @return [void]
     def device=(device)
-      @logdev = if device
-        open_device(device, options)
-      end
+      @logdev = device.nil? ? nil : open_device(device, {})
     end
 
     # Get the timestamp format on the device if it has one.
@@ -515,6 +513,15 @@ module Lumberjack
       end
     end
 
+    # Set up a context block for the logger. All tags added within the block will be cleared when
+    # the block exits.
+    #
+    def context(&block)
+      thread_tags = thread_local_value(:lumberjack_logger_tags)&.dup
+      thread_tags ||= {}
+      push_thread_local_value(:lumberjack_logger_tags, thread_tags, &block)
+    end
+
     # Add global tags to the logger that will appear on all log entries.
     #
     # @param [Hash] tags The tags to set.

data/lib/lumberjack/tagged_logger_support.rb

@@ -38,19 +38,18 @@ module Lumberjack
     end
 
     # Compatibility with ActiveSupport::TaggedLogging which only supports adding tags as strings.
-    # If a tag looks like "key:value"  or "key=value", it will be added as a key value pair.
-    # Otherwise it will be appended to a list named "tagged".
+    # Tags will be added to the "tagged" key in the logger's tags hash as an array.
     def tagged(*tags, &block)
-      tag_hash = {}
-      tags.flatten.each do |tag|
-        tagged_values = Array(tag_hash["tagged"] || self.tags["tagged"])
-        tag_hash["tagged"] = tagged_values + [tag]
+      tagged_values = Array(tag_value("tagged"))
+      flattened_tags = tags.flatten.collect(&:to_s).reject do |tag|
+        tag.respond_to?(:blank?) ? tag.blank? : tag.empty?
       end
+      tagged_values += flattened_tags unless flattened_tags.empty?
 
       if block || in_tag_context?
-        tag(tag_hash, &block)
+        tag("tagged" => tagged_values, &block)
       else
-        tag_globally(tag_hash)
+        tag_globally("tagged" => tagged_values)
       end
     end
 
@@ -59,13 +58,24 @@ module Lumberjack
     end
 
     def pop_tags(size = 1)
-      tagged_values = Array(@tags["tagged"])
+      tagged_values = tag_value("tagged")
+      return unless tagged_values.is_a?(Array)
+
       tagged_values = ((tagged_values.size > size) ? tagged_values[0, tagged_values.size - size] : nil)
-      tag("tagged" => tagged_values)
+
+      if in_tag_context?
+        tag("tagged" => tagged_values)
+      else
+        tag_globally("tagged" => tagged_values)
+      end
     end
 
     def clear_tags!
-      tag("tagged" => nil)
+      if in_tag_context?
+        tag("tagged" => nil)
+      else
+        tag_globally("tagged" => nil)
+      end
     end
   end
 end

data/lumberjack.gemspec

@@ -8,6 +8,12 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/bdurand/lumberjack"
   spec.license = "MIT"
 
+  spec.metadata = {
+    "homepage_uri" => spec.homepage,
+    "source_code_uri" => spec.homepage,
+    "changelog_uri" => "#{spec.homepage}/blob/main/CHANGELOG.md"
+  }
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   ignore_files = %w[

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lumberjack
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Brian Durand
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-19 00:00:00.000000000 Z
+date: 2025-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,10 @@ files:
 homepage: https://github.com/bdurand/lumberjack
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/bdurand/lumberjack
+  source_code_uri: https://github.com/bdurand/lumberjack
+  changelog_uri: https://github.com/bdurand/lumberjack/blob/main/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths: