lumberjack 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9350195577ae682b1f668a183aed2c0e1635e2bad8abb9af751c9f11f4b33fee
-  data.tar.gz: 3ebedf23e6eb462df564030b332ee9fd0f71d9198d6276480405ca21ce28d3f6
+  metadata.gz: db9d72af596912080ab89e900718d2dc1a4d27dda1eb8320d540fa096325b209
+  data.tar.gz: 0737c0a2bde27fa687af82a6ac65f8ede65abdbe175462bc8c39e515569d3a23
 SHA512:
-  metadata.gz: 6c8230a0536fe98b8f817c275a5cc6e9d5764ea5dab8f0b1b92e1c274280c1528cebfb94767538eecf886240dc6a3fa6fe6adededffaac38815577bcfb739675
-  data.tar.gz: 3e64d451e6aa85298c3a5877bcfcef109381acd09553a250861886528ea352e5f5194db323cf0c253f2018dc130f4323f21ed1d51753cfcad7c3dbb09390affc
+  metadata.gz: 941b206a2ffcb38760669f04658f9a52ec6eee063e2d76505db7c29c0a2f6b7e2d481fdffa0c88ee6eadc189fcb416e89b0e8490d8eea8513ededefd2ccef21b
+  data.tar.gz: fa95906ee0eb896b77eb33958223831a4b8f8c43b6f1a84a21df93388ee7f37c974c0fb0bdbc1bda1e9836af00d26aed0c11576409bcb153a3cd7dab3e4373c1

data/CHANGELOG.md

@@ -4,6 +4,26 @@ 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.4
+
+### Added
+
+- Added `Lumberjack::Logger#with_progname` alias for `set_progname` to match the naming convention used for setting temporary levels.
+
+### Fixed
+
+- Ensure that the safety check for circular calls to `Lumberjack::Logger#add_entry` cannot lose state.
+
+## 1.3.3
+
+### Added
+
+- Added `Lumberjack::Utils#expand_tags` method to expand a hash of tags that may contain nested hashes or dot notation keys.
+
+### Changed
+
+- Updated `Lumberjack::Utils#flatten_tags` to convert all keys to strings.
+
 ## 1.3.2
 
 ### Fixed

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.4

data/lib/lumberjack/logger.rb

@@ -200,12 +200,12 @@ module Lumberjack
     #   logger.add_entry(:warn, "Request took a long time")
     #   logger.add_entry(Logger::DEBUG){"Start processing with options #{options.inspect}"}
     def add_entry(severity, message, progname = nil, tags = nil)
-      begin
-        severity = Severity.label_to_level(severity) unless severity.is_a?(Integer)
-        return true unless device && severity && severity >= level
+      severity = Severity.label_to_level(severity) unless severity.is_a?(Integer)
+      return true unless device && severity && severity >= level
+      return true if Thread.current[:lumberjack_logging]
 
-        return true if Thread.current[:lumberjack_logging]
-        Thread.current[:lumberjack_logging] = true
+      begin
+        Thread.current[:lumberjack_logging] = true # Prevent circular calls to add_entry
 
         time = Time.now
 
@@ -380,7 +380,7 @@ module Lumberjack
 
     # Return +true+ if +INFO+ messages are being logged.
     #
-
+    # @return [Boolean]
     def info?
       level <= INFO
     end
@@ -465,7 +465,7 @@ module Lumberjack
     # @param [Integer, String, Symbol] level The log level to use inside the block.
     # @return [Object] The result of the block.
     def log_at(level, &block)
-      silence(level, &block)
+      with_level(level, &block)
     end
 
     # Set the program name that is associated with log messages. If a block
@@ -481,6 +481,15 @@ module Lumberjack
       end
     end
 
+    # Set the logger progname for the duration of the block.
+    #
+    # @yield [Object] The block to execute with the program name set.
+    # @param [String] value The program name to use.
+    # @return [Object] The result of the block.
+    def with_progname(value, &block)
+      set_progname(value, &block)
+    end
+
     # Get the program name associated with log messages.
     #
     # @return [String]

data/lib/lumberjack/utils.rb

@@ -103,7 +103,10 @@ module Lumberjack
       # Flatten a tag hash to a single level hash with dot notation for nested keys.
       #
       # @param tag_hash [Hash] The hash to flatten.
-      # @return [Hash] The flattened hash.
+      # @return [Hash<String, Object>] The flattened hash.
+      # @example
+      #   expand_tags(user: {id: 123, name: "Alice"}, action: "login")})
+      #   # => {"user.id" => 123, "user.name" => "Alice", "action" => "login"}
       def flatten_tags(tag_hash)
         return {} unless tag_hash.is_a?(Hash)
 
@@ -113,11 +116,26 @@ module Lumberjack
               result["#{key}.#{sub_key}"] = sub_value
             end
           else
-            result[key] = value
+            result[key.to_s] = value
           end
         end
       end
 
+      # Expand a hash of tags that may contain nested hashes or dot notation keys. Dot notation tags
+      # will be expanded into nested hashes.
+      #
+      # @param tags [Hash] The hash of tags to expand.
+      # @return [Hash] The expanded hash with dot notation keys.
+      #
+      # @example
+      #   expand_tags({"user.id" => 123, "user.name" => "Alice", "action" => "login"})
+      #   # => {"user" => {"id" => 123, "name" => "Alice"}, "action" => "login"}
+      def expand_tags(tags)
+        return {} unless tags.is_a?(Hash)
+
+        expand_dot_notation_hash(tags)
+      end
+
       private
 
       def slugify(str)
@@ -128,6 +146,34 @@ module Lumberjack
         str.chomp!("-")
         str
       end
+
+      def expand_dot_notation_hash(hash, expanded = {})
+        return hash unless hash.is_a?(Hash)
+
+        hash.each do |key, value|
+          key = key.to_s
+          if key.include?(".")
+            main_key, sub_key = key.split(".", 2)
+            main_key_hash = expanded[main_key]
+            unless main_key_hash.is_a?(Hash)
+              main_key_hash = {}
+              expanded[main_key] = main_key_hash
+            end
+            expand_dot_notation_hash({sub_key => value}, main_key_hash)
+          elsif value.is_a?(Hash)
+            key_hash = expanded[key]
+            unless key_hash.is_a?(Hash)
+              key_hash = {}
+              expanded[key] = key_hash
+            end
+            expand_dot_notation_hash(value, key_hash)
+          else
+            expanded[key] = value
+          end
+        end
+
+        expanded
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lumberjack
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Brian Durand
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-22 00:00:00.000000000 Z
+date: 2025-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler