contextual_logger 0.5.0 → 0.5.1.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2982d6e312ab94acc9d71c3ed92d127f3c52c1cb
-  data.tar.gz: 031bc0dc6c086dbbb8f3795db550514814482b38
+  metadata.gz: dc1bc39461eb0dd1ba1a76df5ed2bb4b9f693cf7
+  data.tar.gz: ca4b6f5152b8e863e5f94b67ccea99c0396b6e9e
 SHA512:
-  metadata.gz: 0c07df2056f512b6190f6aee23911f0da948c9625e89b4c0acb0d2449713c84eaa468c4cd20964e2bdf3790b178cff23ccbf8818536a20b01ba41c57c1f1f6f4
-  data.tar.gz: c91b9641c769391a31209725ad60b2b375c89e60f337c59118cbbf092cd291a23cbceed321e9caf6acf35c3dab898c19c220a473ed3abe351758b73bcea9b43a
+  metadata.gz: b2b7152f692ed66a50af3688584ae278038a051335e0fa6e9498eeba0c58fb7d2f186c30f06ec72751034334f9d2e8b7410d69ee454d96416853af8c49348a9c
+  data.tar.gz: 618dda35bbafe38dedc55fec558f138161cfb137302e0b7c7d7af4de0b64a891795dbaa1f0b46358ae60da451d5abe537ddb22501f53318a58f05482baad80c1

data/lib/contextual_logger.rb

@@ -59,38 +59,48 @@ module ContextualLogger
     end
 
     def debug(message = nil, context = {})
-      add_if_enabled(Logger::Severity::DEBUG, message || yield, context: context)
+      add(Logger::Severity::DEBUG, message || yield, **context)
     end
 
     def info(message = nil, context = {})
-      add_if_enabled(Logger::Severity::INFO, message || yield, context: context)
+      add(Logger::Severity::INFO, message || yield, **context)
     end
 
     def warn(message = nil, context = {})
-      add_if_enabled(Logger::Severity::WARN, message || yield, context: context)
+      add(Logger::Severity::WARN, message || yield, **context)
     end
 
     def error(message = nil, context = {})
-      add_if_enabled(Logger::Severity::ERROR, message || yield, context: context)
+      add(Logger::Severity::ERROR, message || yield, **context)
     end
 
     def fatal(message = nil, context = {})
-      add_if_enabled(Logger::Severity::FATAL, message || yield, context: context)
+      add(Logger::Severity::FATAL, message || yield, **context)
     end
 
     def unknown(message = nil, context = {})
-      add_if_enabled(Logger::Severity::UNKNOWN, message || yield, context: context)
+      add(Logger::Severity::UNKNOWN, message || yield, **context)
     end
 
     def log_level_enabled?(severity)
       severity >= level
     end
 
-    def add_if_enabled(severity, message, context:)
+    def add(init_severity, message = nil, init_progname = nil, **context)   # Ruby will prefer to match hashes up to last ** argument
+      severity = init_severity || UNKNOWN
       if log_level_enabled?(severity)
-        @progname ||= nil
-        write_entry_to_log(severity, Time.now, @progname, message, context: current_context_for_thread.deep_merge(context))
+        progname = init_progname || @progname
+        if message.nil?
+          if block_given?
+            message = yield
+          else
+            message = init_progname
+            progname = @progname
+          end
+        end
+        write_entry_to_log(severity, Time.now, progname, message, context: current_context_for_thread.deep_merge(context))
       end
+
       true
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contextual_logger
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1.pre.1
 platform: ruby
 authors:
 - James Ebentier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-12 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -65,9 +65,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13