lumberjack_json_device 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a56676552a2828e2d6bae426aefe12de9fd0261e450f88aaba136092b22c87a
-  data.tar.gz: c52bf71d1afd5910fbc73e3d615dd113da9ee6eb4c4b25e6e90871d00b96f363
+  metadata.gz: 81b9e1a335053608bb8428db2f6828acd748c02ec0610c0c064e060ab94fe36c
+  data.tar.gz: 9a1bf5cb6cce667cde7837624be8db44826976abb4c07c9568481d89efd38c16
 SHA512:
-  metadata.gz: 74c584ab2ee896e681ce40a90fd49ff15191ce19fd6e77b405d3ec83af79952c146b3bd1523ce48dd239f6a4966a5d868f1dfd45edc0f40c17ad1a05a2bb805b
-  data.tar.gz: 37e88180c62cef6d1f0548556e90ea3249f631e23c7001092cb296c9537f4d54570c4652cf09835a0dbafe2ba2b6e061b92e1a480ff10a012ec55e2c76d38982
+  metadata.gz: 3226afbeeb3c72a0e60b940e26fa47973882d6f5770dff91d0d859087c0399a033c1dd54982da74a03fddd8e8fc7acc2849773b0a20bf362d1c4551314a5ba4e
+  data.tar.gz: 2068343690c36690deda5c7c6b91d9c9f1ba8663ad375f28f064ab88d9acdb9ffdb8912b04611c4898363c024bcc01d9e6fca8ab8293a58db3a72992234ff4b7

data/.github/workflows/continuous_integration.yml

@@ -3,13 +3,14 @@ name: Continuous Integration
 on:
   push:
     branches:
-      - master
+      - main
       - actions-*
     tags:
       - v*
   pull_request:
     branches-ignore:
       - actions-*
+  workflow_dispatch:
 
 env:
   BUNDLE_CLEAN: "true"
@@ -30,7 +31,7 @@ jobs:
           - ruby: "2.7"
           - ruby: "2.5"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:

data/CHANGE_LOG.md

@@ -4,6 +4,12 @@ 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).
 
+## 2.1.0
+
+### Changed
+
+- Tags that contain arrays of hashes are no longer expanded to nested hashes if the hashes in the array use dot nottion in their keys. The hashes in the array will now be included as is in JSON output.
+
 ## 2.0.0
 
 ### Added

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/lib/lumberjack_json_device.rb

@@ -164,7 +164,7 @@ module Lumberjack
       set_attribute(data, @progname_key, entry.progname) if @progname_key
       set_attribute(data, @pid_key, entry.pid) if @pid_key
 
-      tags = dereference_tags(entry.tags) if entry.tags
+      tags = Lumberjack::Utils.expand_tags(entry.tags) if entry.tags
       extracted_tags = nil
       if @custom_keys.size > 0 && !tags&.empty?
         extracted_tags = []
@@ -198,45 +198,6 @@ module Lumberjack
 
     private
 
-    def dereference_tags(tags)
-      updated_tags = nil
-      remove_tags = nil
-
-      tags.each do |original_key, value|
-        updated_tags ||= tags.dup unless original_key.is_a?(String)
-        key = original_key.to_s
-
-        dot_index = key.index(".")
-        if dot_index
-          remove_tags ||= []
-          remove_tags << original_key
-          updated_tags ||= tags.dup
-          sub_key = key[dot_index + 1..-1]
-          key = key[0, dot_index]
-          existing_vals = updated_tags[key]
-          unless existing_vals.is_a?(Hash)
-            existing_vals = {}
-            updated_tags[key] = existing_vals
-          end
-          existing_vals.merge!(dereference_tags({sub_key => value}))
-        elsif value.is_a?(Enumerable)
-          updated_tags ||= tags.dup
-          updated_tags[key] = if value.is_a?(Hash)
-            dereference_tags(value)
-          else
-            value.collect { |v| v.is_a?(Hash) ? dereference_tags(v) : v }
-          end
-        elsif updated_tags
-          updated_tags[key] = value
-        end
-      end
-
-      return tags unless updated_tags
-
-      remove_tags&.each { |key| updated_tags.delete(key) }
-      updated_tags
-    end
-
     def tag_value(tags, name)
       return nil if tags.nil?
       return tags[name] unless name.is_a?(Array)

data/lumberjack_json_device.gemspec

@@ -28,5 +28,5 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.5"
 
-  spec.add_dependency "lumberjack", ">=1.3"
+  spec.add_dependency "lumberjack", ">=1.3.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lumberjack_json_device
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Brian Durand
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-19 00:00:00.000000000 Z
+date: 2025-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lumberjack
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.3
 description:
 email:
 - bbdurand@gmail.com