ougai 1.9.0-java → 1.9.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '070906348af0a90b6f60555ca773d819f143e24df5fd1a7737cc6fd7f9f90743'
-  data.tar.gz: 58786804341818ed4505266e756ecdd1bb60d26747473c36064b84329aa9b7e2
+  metadata.gz: 0ae6d84b8f46bc06fde403b3e4952ddc21a3370c10381b47495468ad6155cf27
+  data.tar.gz: 44214cb40f7eeb084b5fb29b68ddb27fd2d0d3d9007b85d4f3de08a7b4442fe9
 SHA512:
-  metadata.gz: 8243e1692543873342bded8f2188d1adf34180fcb569412964f0dfaacfc4c27ac206165c53c6521c4da27bd93370c65810f8d47f4e1b7db7eb9d747cbb20ee07
-  data.tar.gz: '08869aecc437d6c5e2c861e16498c0122064891ac8c14ce17fa1eb6e5420b2b31a3d7210b5d797ba2663873dfc96beebdb3266bd272d12921f35dc536e824ae8'
+  metadata.gz: 96d8cccd04b2ee45766f0474971198d201e8e74077d6f2ca2072186415d2ea851f92f0b2a75efc7b39ee2dea228feeddf8e822aea32b765f867fc38f8803e584
+  data.tar.gz: 757a08c82faf06941b0e1bfacf8908e51bbd8dbd468d55f2e64a8d55f4b127e4bd152175367e700577aa734cc908c75a05e14fca082d7190aa795ed6f978158d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ougai (1.9.0-java)
+    ougai (1.9.1-java)
       jrjackson (~> 0.4)
 
 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: java
 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
   requirement: !ruby/object:Gem::Requirement