json_tagged_logger 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca97d589d38e918e570eab76849c3589dcb4afcffdc40d225f41ea5a61933dba
-  data.tar.gz: a7bcb458e29394d91f312cf2b0cb478a43a46f546810fdad6837221456ca2ffc
+  metadata.gz: 21f6070b94acf4230c68254797e06759ee1d75ca7b857054f3c95d7a872c3d8c
+  data.tar.gz: 2fd59fe5624bfcdf4aa7d8e104d138e70c804e237ae8eacbbcc950172b2d53c8
 SHA512:
-  metadata.gz: 3509d3b59ed3c6f4d77e78ae8c105f1eb7301ff706857a817689d2da97f2e23ca0b7400d90cae961d0ec51d01a6bbe86c375e4ecc4322fb307cba18575ea473f
-  data.tar.gz: 168f3b44c2db71af307c5dff9b2ad73858872093e6f0e22e41728b0c97d407e76e4bb56692a368800c840921749310a9bee6b869faed1b4f55ccd21737c54db7
+  metadata.gz: 8e9529f75a8ca997b6f074cf370001e147c4853a3eaac0d7e1a55dd46f5a358e685d1b09d17e8fc62d9f12b8a0c4a11194cdf59e50dfbac88314ed8c1e492805
+  data.tar.gz: 8cc532c45f74566380a38ca5a71dc1fdbb3874bcdb8bdf3890be770aced174391b736b3951e0f6087fc70be6ade9c86e91a836ae0f47257e054de2e45c1f0c71

data/README.md

@@ -110,7 +110,7 @@ those will be added to the `tags` key in the JSON document
 
 ## Why?
 
-On its own, `ActiveSupport::TaggedLogging` adds individual tags wrapped in squre brackets at the start of each line of log output. A configuration like
+On its own, `ActiveSupport::TaggedLogging` adds individual tags wrapped in square brackets at the start of each line of log output. A configuration like
 
 ```ruby
 Rails.application.configure do

data/lib/json_tagged_logger/formatter.rb

@@ -1,12 +1,15 @@
 require 'active_support/core_ext/hash/keys'
+require 'active_support/tagged_logging'
 require 'json'
 
 module JsonTaggedLogger
   class Formatter
+    include ActiveSupport::TaggedLogging::Formatter
+
     attr_accessor :pretty_print
 
     def initialize(pretty_print: false)
-      @pretty_pretty = pretty_print
+      @pretty_print = pretty_print
     end
 
     def call(severity, _time, _progname, message)
@@ -22,7 +25,7 @@ module JsonTaggedLogger
         log[:tags] = text_tags.to_a
       end
 
-      bare_message = message_without_tags(message)
+      bare_message = message_without_tags(message.to_s)
 
       begin
         parsed_message = JSON.parse(bare_message)
@@ -37,8 +40,7 @@ module JsonTaggedLogger
 
           log.merge!(parsed_message)
         else
-          #binding.irb
-          log.merge!(msg: parsed_message.strip)
+          log.merge!(msg: parsed_message.to_s.strip)
         end
       end
 
@@ -56,6 +58,8 @@ module JsonTaggedLogger
           tag = JSON.parse(t)
         rescue JSON::ParserError
           tag = t
+        rescue TypeError
+          tag = t.to_s
         ensure
           if tag.is_a?(Hash)
             json_tags << tag

data/lib/json_tagged_logger/logger.rb

@@ -3,9 +3,24 @@ require 'active_support/tagged_logging'
 
 module JsonTaggedLogger
   module Logger
-    def self.new(logger)
-      logger.formatter = Formatter.new
-      ActiveSupport::TaggedLogging.new(logger)
+    def self.new(logger, pretty_print: false)
+      logger = logger.clone
+      logger.formatter =  JsonTaggedLogger::Formatter.new(pretty_print: pretty_print)
+      logger.extend(self)
     end
+
+    delegate :push_tags, :pop_tags, :clear_tags!, to: :formatter
+
+    def tagged(*tags)
+      if block_given?
+        formatter.tagged(*tags) { yield self }
+      else
+        logger = JsonTaggedLogger::Logger.new(self)
+        logger.formatter = JsonTaggedLogger::Formatter.new
+        logger.push_tags(*formatter.current_tags, *tags)
+        logger
+      end
+    end
+
   end
 end

data/lib/json_tagged_logger/version.rb

@@ -1,3 +1,3 @@
 module JsonTaggedLogger
-  VERSION = "0.6.0"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_tagged_logger
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Sean Santry
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '5.2'
 description: Formatter for logging with ActiveSupport::TaggedLogging as JSON
 email:
 - sean@santry.us
@@ -108,14 +108,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: JSON Tagged Log Formatter