moon-logfmt 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad3d92684b23cd251495e9723dddbcd87db16ae8
-  data.tar.gz: e393c13c1f7c40e8d64313cf48d2826f93ae82a4
+  metadata.gz: d2c2cc32328979904f5d73fb7f1854accb1fea25
+  data.tar.gz: eaba4aa399c6d09e44dafa80db2de33fb501723e
 SHA512:
-  metadata.gz: ce0188e6c9f29a7a43f33648d460b2b66bd088b0f2bd14afb1eb9f6c24af87582f92925f657e06e72fb5a9679ef74e09d681cf7b2967e0eb795af51f921aad94
-  data.tar.gz: f81eca8be731925137a3777842e74d75ad727dfe0b95f339ca2e5f3a13e952a5ccf747a3376fbd4ab293eecdc2e4abe3f0cb9598426a1d488fe52cdda7ecb79c
+  metadata.gz: b0286984499da77e1646e3fb5488f94e92f22e8f6946e8e2a845beaedce3a310f4be01b16b3451b38d07e2e40052a5e871d1da98ba0a58730ed63bb658007b08
+  data.tar.gz: 5faa79d4482fcc8efc9fb40a8374d52e25e70f32b515a1a406f7e947ec9bd3c8b375a98833adcb15e22a3e4c5924782202ae9cc182986fab184f5af93a50ba58

data/lib/moon-logfmt/logger.rb

@@ -9,7 +9,6 @@ module Moon
     # #new will copy the current logger and append its context data
     class Logger
       include StdlibLoggable
-      include Severity
 
       # The default datetime string format
       # @return [String]
@@ -67,21 +66,6 @@ module Moon
         self
       end
 
-      # @param [Integer] severity
-      # @return [Symbol]
-      private def severity_to_symbol(severity)
-        case severity
-        when DEBUG   then :debug
-        when INFO    then :info
-        when WARN    then :warn
-        when ERROR   then :error
-        when FATAL   then :fatal
-        when UNKNOWN then :unknown
-        else
-          severity.to_s
-        end
-      end
-
       # Adds timestamp information to the provided data
       #
       # @param [Hash<Symbol, Object>] data  to add timestamp to
@@ -95,18 +79,22 @@ module Moon
       # @param [Hash<[String, Symbol], String>] data
       # @return [String]
       private def format_context(severity, time, progname, ctx)
-        data = {}
-        data[:level] = severity_to_symbol(severity) if severity
-        timestamp_context(data) if @timestamp
-        data[:progname] = progname if progname
-        data.merge!(ctx)
         str = []
-        Logfmt.escape_context_data data do |key, value|
+        Moon::Logfmt.escape_context_data ctx do |key, value|
           str << @key_value_formatter.call(key, value)
         end
         @formatter.call(severity, time, progname, str.join(' '))
       end
 
+      private def transform_context(severity, time, progname, ctx)
+        data = {}
+        data[:level] = Moon::Logfmt.loglevel_to_symbol(severity) if severity
+        timestamp_context(data) if @timestamp
+        data[:progname] = progname if progname
+        data.merge!(context.merge(ctx))
+        data
+      end
+
       protected def write_to_logdev(str)
         @io.puts str
       end
@@ -117,7 +105,8 @@ module Moon
       # @param [String] progname
       # @param [Hash] ctx
       protected def write_context(severity, time, progname, ctx)
-        write_to_logdev format_context(severity, time, progname, context.merge(ctx))
+        result_ctx = transform_context(severity, time, progname, ctx)
+        write_to_logdev format_context(severity, time, progname, result_ctx)
       end
 
       # Writes a new log line

data/lib/moon-logfmt/stdlib_loggable.rb

@@ -16,8 +16,15 @@ module Moon
       # @yieldreturn [String] message
       def add(severity, message = nil, progname = nil, &block)
         return if severity < @level
-        message = message || (block && block.call)
-        msg = message || progname
+        msg = if block_given?
+          block.call
+        elsif message
+          message
+        else
+          tmp = progname
+          progname = nil
+          tmp
+        end
         data = {}
         msg.is_a?(Hash) ? data.merge!(msg) : data.store(:msg, msg)
         write_context(severity, Time.now, progname, data)

data/lib/moon-logfmt/utils.rb

@@ -45,6 +45,21 @@ module Moon
       end
     end
 
+    # @param [Integer] loglevel
+    # @return [Symbol]
+    def self.loglevel_to_symbol(loglevel)
+      case loglevel
+      when Moon::Logfmt::Severity::DEBUG   then :debug
+      when Moon::Logfmt::Severity::INFO    then :info
+      when Moon::Logfmt::Severity::WARN    then :warn
+      when Moon::Logfmt::Severity::ERROR   then :error
+      when Moon::Logfmt::Severity::FATAL   then :fatal
+      when Moon::Logfmt::Severity::UNKNOWN then :unknown
+      else
+        loglevel.to_s
+      end
+    end
+
     # (see Moon::Logfmt::Logger#initialize)
     def self.new(*args, &block)
       Moon::Logfmt::Logger.new(*args, &block)

data/lib/moon-logfmt/version.rb

@@ -3,7 +3,7 @@ module Moon
     # Version module
     module Version
       # @return [Integer, nil]
-      MAJOR, MINOR, TEENY, PATCH = 1, 1, 0, nil
+      MAJOR, MINOR, TEENY, PATCH = 1, 2, 0, nil
       # @return [String]
       STRING = [MAJOR, MINOR, TEENY, PATCH].compact.join('.')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moon-logfmt
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Blaž Hrastnik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: moon-null_io
@@ -169,9 +169,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: An implementation of Logfmt encoding.
 test_files: []
-has_rdoc: