ougai 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d30c9475aab949b8119bbb1bb5b921b82cab591f
-  data.tar.gz: 1a60805fd8a9602104c4f45180b54f1db48c5a81
+  metadata.gz: 54135d508028ceae123d4ac6554fdcfce52709c5
+  data.tar.gz: 9e7701c90d42b6db02d05d2c845687ac62bd60a5
 SHA512:
-  metadata.gz: abb0ce860369b3ff1bf6f3f853e965dae781fd73cf341c954f2fd5f1d9316027850fe6c29eb339cf3b4d9e4abc870af1f39e27a9eb11845ac3532905ab89ed25
-  data.tar.gz: 31bd2e3c9795548c6b47c4a874b0dee68fd98242037040601fc81f8806c2cdff5b3b005cbb708e83ddbe72c168551b67ad437f1dafa855d2f5db63b00942c502
+  metadata.gz: 4a52e06b9b082e80e7df479a073e390df104e5066ce434eb4c12edb8bbf56250c7ef46908cee56cb6130724da7671c3a4f86a52e297b5f983379cd18839b4f23
+  data.tar.gz: 3a84a43bbd5d6207b102794d210cc4dd9fdb74426dc3890663d12f6b40b8a326211c56d3510b76c88626481718782da5aff69692ee17b42de707f3f5bdb4d91a

data/lib/ougai/formatters/readable.rb

@@ -3,12 +3,13 @@ require 'ougai/formatters/base'
 module Ougai
   module Formatters
     class Readable < Base
-      attr_accessor :plain, :trace_indent
+      attr_accessor :plain, :trace_indent, :excluded_fields
 
       def initialize(opts = {})
         super(opts[:app_name], opts[:hostname])
         @trace_indent = opts[:trace_indent] || 4
         @plain = opts[:plain] || false
+        @excluded_fields = opts[:excluded_fields] || []
         load_awesome_print
       end
 
@@ -16,12 +17,10 @@ module Ougai
         msg = data.delete(:msg)
         level = @plain ? severity : colored_level(severity)
         strs = ["[#{time.iso8601(3)}] #{level}: #{msg}"]
-        if data.key?(:err)
-          err = data.delete(:err)
-          err_str = "  #{err[:name]} (#{err[:message]}):"
-          err_str += "\n    " + err[:stack] if err.key?(:stack)
+        if err_str = create_err_str(data)
           strs.push(err_str)
         end
+        @excluded_fields.each { |f| data.delete(f) }
         unless data.empty?
           strs.push(data.ai({ plain: @plain }))
         end
@@ -44,6 +43,14 @@ module Ougai
         "\e[#{color}m#{severity}\e[0m"
       end
 
+      def create_err_str(data)
+        return nil unless data.key?(:err)
+        err = data.delete(:err)
+        err_str = "  #{err[:name]} (#{err[:message]}):"
+        err_str += "\n    " + err[:stack] if err.key?(:stack)
+        err_str
+      end
+
       private
 
       def load_awesome_print

data/lib/ougai/logger.rb

@@ -9,8 +9,8 @@ module Ougai
       super(*args)
       @default_message = 'No message'
       @exc_key = :err
-      @formatter = create_formatter
       @with_fields = {}
+      @formatter = create_formatter
     end
 
     def debug(message = nil, ex = nil, data = nil, &block)

data/lib/ougai/version.rb

@@ -1,3 +1,3 @@
 module Ougai
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/formatters/readable_spec.rb

@@ -61,4 +61,18 @@ describe Ougai::Formatters::Readable do
       expect(subject.gsub(/\e\[([;\d]+)?m/, '')).to include("error1.rb\n  error2.rb")
     end
   end
+
+  context 'when logger has excluded_fields' do
+    subject do
+      described_class.new(excluded_fields: [:status, :method]).call('DEBUG', Time.now, nil, data)
+    end
+
+    it 'includes valid strings' do
+      expect(subject).to include("\e[0;37mDEBUG\e[0m: Log Message!")
+      plain_subject = subject.gsub(/\e\[([;\d]+)?m/, '')
+      expect(plain_subject).to include(':path => "/"')
+      expect(plain_subject).not_to include(':status => 200')
+      expect(plain_subject).not_to include(':method => "GET"')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ougai
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Toshimitsu Takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-22 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: JSON logger compatible with node-bunyan is capable of handling data easily.