ougai 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c54bd7fa12af6d228cace05fc29a5b7d3505e29
-  data.tar.gz: ed95bd29269e64789b7d32d23cc28dea027ef8cf
+  metadata.gz: 97be7511c1c17536603cf512a2f8c107e40ff021
+  data.tar.gz: e2c08a3c8e6833e0ef2622d0fb264b75dba77e94
 SHA512:
-  metadata.gz: 23bc030f29a729ee496228a21c9f42962b057801a9f7bc4cb857e73818a55eac9365ef326f40edb8c70b9907d44dc5570bd8e660e88f6df45414fe57bc22263c
-  data.tar.gz: a9ec8277f83d6c02ffcced038af1ceeaadd1564a6982bbf23bb6b37c0471a739e3b463c691a45c0fc07ce379062c7ebdc654621a29d6a37955b2721efb7562a6
+  metadata.gz: d457ca8fbff8a3a22003eb9c4878b7b0af931a04d58d89f950733ab80a22de0095f5ee5a16d4c6f8b7695d327434ea12c9629710656df3a32c9543bf1de5c39b
+  data.tar.gz: '0974027ba5cd59d0e8418abb5a2e5b89ee0145cd7cf002d9ea497c871b4c2305952ac3bf56bb06ac5298eb5d8b74f20e2d674aacd8d62e5081861aa4fc853dc8'

data/lib/ougai/formatters/readable.rb

@@ -14,20 +14,26 @@ module Ougai
         @trace_indent = opts[:trace_indent] || 4
         @plain = opts[:plain] || false
         @excluded_fields = opts[:excluded_fields] || []
-        load_awesome_print
+        load_dependent
       end
 
       def call(severity, time, progname, data)
         msg = data.delete(:msg)
         level = @plain ? severity : colored_level(severity)
-        strs = ["[#{format_datetime(time)}] #{level}: #{msg}"]
-        if err_str = create_err_str(data)
-          strs.push(err_str)
-        end
+        dt = format_datetime(time)
+        err_str = create_err_str(data)
+
         @excluded_fields.each { |f| data.delete(f) }
-        unless data.empty?
-          strs.push(data.ai({ plain: @plain }))
-        end
+        data_str = create_data_str(data)
+        format_log_parts(dt, level, msg, err_str, data_str)
+      end
+
+      protected
+
+      def format_log_parts(datetime, level, msg, err, data)
+        strs = ["[#{datetime}] #{level}: #{msg}"]
+        strs.push(err) if err
+        strs.push(data) if data
         strs.join("\n") + "\n"
       end
 
@@ -59,9 +65,12 @@ module Ougai
         err_str
       end
 
-      private
+      def create_data_str(data)
+        return nil if data.empty?
+        data.ai({ plain: @plain })
+      end
 
-      def load_awesome_print
+      def load_dependent
         require 'awesome_print'
       rescue LoadError
         puts 'You must install the awesome_print gem to use this output.'

data/lib/ougai/version.rb

@@ -1,3 +1,3 @@
 module Ougai
-  VERSION = "1.5.3"
+  VERSION = "1.5.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ougai
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Toshimitsu Takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-17 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler