ougai 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b9254ac3650ca12026fbd3d3c6b474a8de478fb81ea82f19fecdff6b62c8b17
-  data.tar.gz: 95c71a88355673d0821596503057ad46761c3b508ab7a0b72b806462f8a3af7f
+  metadata.gz: eedebaea46d0f9d0d03d575e527f2499a2d483e839915c8bbe412de268cd26db
+  data.tar.gz: 284223f62d6bd3e1a472a076297f66581bbf718fa5bb0e6cd6bef3515a5ef242
 SHA512:
-  metadata.gz: 9c7cdf6d3ad6cfbaae66438cc40971a5cbd978ad9585c2ed4538cea3530184f53a3e0f2a87c22cfcfc581ecbb596eb7b7d2468edc26e7c1b05d27832d856bbcf
-  data.tar.gz: bed8c16d8e851d7b64d52b86084c13f333a0cee873ab4c1bd8670083c700597a587cb6edf39cead61711af747d30b0723d6bf63ac6eadd1c4de0fb7611d8f16c
+  metadata.gz: cc3c4a339f6fbea07ddfb4e75c96f101295da12d73112efaea997217382557c69ac7f130bd26693ecf880c73c65dc07e369dcc9e9b2105ff588cec018a7812bc
+  data.tar.gz: abd28e5dc00a61cac547ac8492f272c2d58c75363b3694b9d4334078549d482c4075b9b3f1463486c54c647e427dd33788185b4d11f75bb6abdc6bf9e8bc2a40

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ougai (1.9.0)
+    ougai (1.9.1)
       oj (~> 3.10)
 
 GEM

data/README.md

@@ -2,7 +2,7 @@ Ougai
 =====
 
 [![Gem Version](https://badge.fury.io/rb/ougai.svg)](https://badge.fury.io/rb/ougai)
-[![document](https://img.shields.io/badge/document-1.9.0-green.svg)](http://www.rubydoc.info/gems/ougai/)
+[![document](https://img.shields.io/badge/document-1.9.1-green.svg)](http://www.rubydoc.info/gems/ougai/)
 [![Build Status](https://travis-ci.org/tilfin/ougai.svg?branch=master)](https://travis-ci.org/tilfin/ougai)
 [![Code Climate](https://codeclimate.com/github/tilfin/ougai/badges/gpa.svg)](https://codeclimate.com/github/tilfin/ougai)
 [![Test Coverage](https://codeclimate.com/github/tilfin/ougai/badges/coverage.svg)](https://codeclimate.com/github/tilfin/ougai/coverage)

data/lib/ougai/logger.rb

@@ -39,8 +39,8 @@ module Ougai
     # @param logger [Logger] The logger receiving broadcast logs.
     def self.broadcast(logger)
       Module.new do |mdl|
-        define_method(:add) do |*args, &block|
-          logger.add(*args, &block)
+        define_method(:_log) do |*args, &block|
+          logger._log(*args, &block)
           super(*args, &block)
         end
 

data/lib/ougai/logging.rb

@@ -28,7 +28,7 @@ module Ougai
     # @return [Boolean] true
     # @see Logging#debug
     def trace(message = nil, ex = nil, data = nil, &block)
-      add(TRACE, message, ex, data, &block)
+      _log(TRACE, message, ex, data, &block)
     end
 
     # Log any one or more of a message, an exception and structured data as DEBUG.
@@ -39,42 +39,42 @@ module Ougai
     # @yieldreturn [String|Exception|Object|Array] Any one or more of former parameters
     # @return [Boolean] true
     def debug(message = nil, ex = nil, data = nil, &block)
-      add(DEBUG, message, ex, data, &block)
+      _log(DEBUG, message, ex, data, &block)
     end
 
     # Log any one or more of a message, an exception and structured data as INFO.
     # @return [Boolean] true
     # @see Logging#debug
     def info(message = nil, ex = nil, data = nil, &block)
-      add(INFO, message, ex, data, &block)
+      _log(INFO, message, ex, data, &block)
     end
 
     # Log any one or more of a message, an exception and structured data as WARN.
     # @return [Boolean] true
     # @see Logging#debug
     def warn(message = nil, ex = nil, data = nil, &block)
-      add(WARN, message, ex, data, &block)
+      _log(WARN, message, ex, data, &block)
     end
 
     # Log any one or more of a message, an exception and structured data as ERROR.
     # @return [Boolean] true
     # @see Logging#debug
     def error(message = nil, ex = nil, data = nil, &block)
-      add(ERROR, message, ex, data, &block)
+      _log(ERROR, message, ex, data, &block)
     end
 
     # Log any one or more of a message, an exception and structured data as FATAL.
     # @return [Boolean] true
     # @see Logging#debug
     def fatal(message = nil, ex = nil, data = nil, &block)
-      add(FATAL, message, ex, data, &block)
+      _log(FATAL, message, ex, data, &block)
     end
 
     # Log any one or more of a message, an exception and structured data as UNKNOWN.
     # @return [Boolean] true
     # @see Logging#debug
     def unknown(message = nil, ex = nil, data = nil, &block)
-      add(UNKNOWN, message, ex, data, &block)
+      _log(UNKNOWN, message, ex, data, &block)
     end
 
     # Whether the current severity level allows for logging TRACE.
@@ -91,14 +91,18 @@ module Ougai
     # @param data [Object] Any structured data
     # @yieldreturn [String|Exception|Object|Array] Any one or more of former parameters
     # @return [Boolean] true
-    def add(severity, *args)
+    def add(severity, message = nil, ex = nil, data = nil, &block)
+      _log(severity, message, ex, data, &block)
+    end
+
+    alias log add
+
+    def _log(severity, *args)
       severity ||= UNKNOWN
       return true if level > severity
       append(severity, block_given? ? yield : args)
     end
 
-    alias log add
-
     # @private
     def chain(_severity, _args, _fields, _hooks)
       raise NotImplementedError

data/lib/ougai/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ougai
-  VERSION = '1.9.0'
+  VERSION = '1.9.1'
 end

data/spec/logging_spec.rb

@@ -42,22 +42,30 @@ describe Ougai::Logging do
     context 'severity is specified level' do
       it 'calls append with specified level' do
         data = double('data')
-        expect(subject).to receive(:append).with(::Logger::Severity::DEBUG, ['debug message', data])
+        expect(subject).to receive(:append).with(::Logger::Severity::DEBUG, ['debug message', data, nil])
         subject.add(::Logger::Severity::DEBUG, 'debug message', data)
       end
     end
 
     context 'severity is nil' do
       it 'calls append with UNKNOWN level' do
-        expect(subject).to receive(:append).with(::Logger::Severity::UNKNOWN, ['message'])
+        expect(subject).to receive(:append).with(::Logger::Severity::UNKNOWN, ['message', nil, nil])
         subject.add(nil, 'message')
       end
     end
 
-    context 'block given' do
-      it 'calls append with yielded arguments' do
-        expect(subject).to receive(:append).with(::Logger::Severity::WARN, ['block message'])
-        subject.log(::Logger::Severity::WARN) { ['block message'] }
+    context 'with block that yields message' do
+      it 'calls append with yielded message' do
+        expect(subject).to receive(:append).with(::Logger::Severity::WARN, 'block message')
+        subject.add(::Logger::Severity::WARN) { 'block message' }
+      end
+    end
+
+    context 'with block that yields array' do
+      it 'calls append with yielded array' do
+        data = double('data')
+        expect(subject).to receive(:append).with(::Logger::Severity::WARN, ['block message', data])
+        subject.add(::Logger::Severity::WARN) { ['block message', data] }
       end
     end
   end
@@ -66,19 +74,19 @@ describe Ougai::Logging do
     context 'severity is specified' do
       it 'calls append with specified level' do
         ex = Exception.new
-        expect(subject).to receive(:append).with(::Logger::Severity::FATAL, ['fatal message', ex])
+        expect(subject).to receive(:append).with(::Logger::Severity::FATAL, ['fatal message', ex, nil])
         subject.log(::Logger::Severity::FATAL, 'fatal message', ex)
       end
     end
 
     context 'severity is nil' do
       it 'calls append with UNKNOWN level' do
-        expect(subject).to receive(:append).with(::Logger::Severity::UNKNOWN, ['message'])
+        expect(subject).to receive(:append).with(::Logger::Severity::UNKNOWN, ['message', nil, nil])
         subject.log(nil, 'message')
       end
     end
 
-    context 'block given' do
+    context 'with block' do
       it 'calls append with yielded arguments' do
         ex = Exception.new
         data = double('data')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ougai
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Toshimitsu Takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj