contextual_logger 0.7.0.pre.1 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: db2ddb0fd337802c9bdca1b26a2ac56bc4f5e22a
-  data.tar.gz: 8b7e1072c37e2f5b7fe2a737edc73587ea30a465
+SHA256:
+  metadata.gz: 8bf5d991457c3e1e038e0d7642e80169cacddaac144146b1015c308096705f89
+  data.tar.gz: 8c4d4e0b68c474d4440ce0032f02694a51b53a3b17ce5c3590dafc48b5c6d5f4
 SHA512:
-  metadata.gz: 93dc2308fc3526720f51fbca56564525e084982250e65291e763b9d73ad417000513b4f7401d2abdacfa5a9a1dafcdd0c6991fd7ee1fa8bb37d87083a210069d
-  data.tar.gz: 24c27c5268cfb1e631e0199cdbe65387eea5ef07e5344da8a1ebd3be190d73b829b4c2d2d777f7203b475591ad532c87b9501e3c0a5ba3a6ac08ed6c9bc7278c
+  metadata.gz: a4f3565314ca38f74e0396f3621deede596c1b3e342d4599fccafa08340b908ea1e9f1250c99acf8af48c6594ce70d66f263deebb0c49d527bbc80b7bb7a05fd
+  data.tar.gz: 6210de2c953e183e90065e7da09984f608d873e6ce07d965037daa2e6fad0eaaca031b8858cbe5d72aa31b1cc5467ce22e0fdc092bd7e9d16a33950512dff940

data/lib/contextual_logger.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support'
+require 'active_support/core_ext/module/delegation'
 require 'json'
 require_relative './contextual_logger/redactor'
 require_relative './contextual_logger/context/handler'
@@ -132,25 +133,23 @@ module ContextualLogger
     end
 
     def format_message(severity, timestamp, progname, message, context: {})
-      message_hash = message_hash_with_context(severity, timestamp, progname, message, context: context)
-
       if @formatter
-        @formatter.call(severity, timestamp, progname, message_hash)
+        @formatter.call(severity, timestamp, progname, { message: ContextualLogger.normalize_message(message) }.merge!(context))
       else
-        "#{message_hash.to_json}\n"
+        "#{basic_json_log_entry(severity, timestamp, progname, message, context: context)}\n"
       end
     end
 
-    def message_hash_with_context(severity, timestamp, progname, message, context:)
-      message_hash =
-        {
-          message:   ContextualLogger.normalize_message(message),
-          severity:  severity,
-          timestamp: timestamp
-        }
+    def basic_json_log_entry(severity, timestamp, progname, message, context:)
+      message_hash = {
+        message:   ContextualLogger.normalize_message(message),
+        severity:  severity,
+        timestamp: timestamp
+      }
       message_hash[:progname] = progname if progname
 
-      message_hash.merge!(context)
+      # using merge! instead of merge for speed of operation
+      message_hash.merge!(context).to_json
     end
   end
 end

data/lib/contextual_logger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ContextualLogger
-  VERSION = '0.7.0.pre.1'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contextual_logger
 version: !ruby/object:Gem::Version
-  version: 0.7.0.pre.1
+  version: 0.9.1
 platform: ruby
 authors:
 - James Ebentier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -67,12 +67,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: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Add context to your logger