ougai 1.9.1-java → 2.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ae6d84b8f46bc06fde403b3e4952ddc21a3370c10381b47495468ad6155cf27
-  data.tar.gz: 44214cb40f7eeb084b5fb29b68ddb27fd2d0d3d9007b85d4f3de08a7b4442fe9
+  metadata.gz: f6f4e99226326c7076a1297c07e51f19722d73481f9ab9fa2e4d046a8d615ec7
+  data.tar.gz: 143e18dede3293499083e217d36dd26c153a363abf8cf431fa7241e38e64d775
 SHA512:
-  metadata.gz: 96d8cccd04b2ee45766f0474971198d201e8e74077d6f2ca2072186415d2ea851f92f0b2a75efc7b39ee2dea228feeddf8e822aea32b765f867fc38f8803e584
-  data.tar.gz: 757a08c82faf06941b0e1bfacf8908e51bbd8dbd468d55f2e64a8d55f4b127e4bd152175367e700577aa734cc908c75a05e14fca082d7190aa795ed6f978158d
+  metadata.gz: 99699d2fa46285cc2c22a7cf573cdba0da0097f089aab051dbb87a6bb50f1ff9d42be36767e1d023ed259cdf6224fd8064af31e0efc0fafe22b5d007751beef3
+  data.tar.gz: bb92aa7447bd94a71b8222876401bf7063e116dbbc3c9f462130147b56528761962c87dec6472a12d6a4af3a4edb344b9d10b7543034342b0f2de3624122c44e

data/Gemfile

@@ -5,6 +5,8 @@ gemspec
 
 group :test do
   gem 'amazing_print'
+  gem 'rake', '~> 13.2'
+  gem 'rspec', '~> 3.13'
   gem 'simplecov', '< 0.18', require: false
   gem 'timecop'
   gem 'yard'

data/Gemfile.lock

@@ -1,52 +1,56 @@
 PATH
   remote: .
   specs:
-    ougai (1.9.1-java)
-      jrjackson (~> 0.4)
+    ougai (2.1.0)
+      logger (~> 1.5)
+      oj (~> 3.17)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    amazing_print (1.2.2)
-    diff-lcs (1.4.4)
-    docile (1.3.0)
-    jrjackson (0.4.13-java)
-    json (2.1.0-java)
-    rake (13.0.3)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    amazing_print (2.0.0)
+    bigdecimal (4.1.2)
+    diff-lcs (1.6.2)
+    docile (1.4.1)
+    json (2.20.0)
+    logger (1.7.0)
+    oj (3.17.3)
+      bigdecimal (>= 3.0)
+      ostruct (>= 0.2)
+    ostruct (0.6.3)
+    rake (13.4.2)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
-    simplecov (0.16.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    simplecov (0.17.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    timecop (0.9.1)
-    yard (0.9.12)
+    timecop (0.9.11)
+    yard (0.9.44)
 
 PLATFORMS
-  java
-  universal-java-15
+  x86_64-linux
 
 DEPENDENCIES
   amazing_print
-  bundler (>= 2.1.4)
   ougai!
-  rake (>= 13.0.1)
-  rspec (>= 3.9.0)
+  rake (~> 13.2)
+  rspec (~> 3.13)
   simplecov (< 0.18)
   timecop
   yard
 
 BUNDLED WITH
-   2.2.4
+   2.3.3

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2020 Toshimitsu Takahashi
+Copyright (c) 2016-2026 Toshimitsu Takahashi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -2,14 +2,12 @@ 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.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)
+[![document](https://img.shields.io/badge/document-2.1.0-green.svg)](http://www.rubydoc.info/gems/ougai/)
+[![CI](https://github.com/tilfin/ougai/actions/workflows/ci.yml/badge.svg)](https://github.com/tilfin/ougai/actions/workflows/ci.yml)
 
-A structured logging system is capable of handling a message, structured data or an exception easily.
-It has JSON formatters compatible with [Bunyan](https://github.com/trentm/node-bunyan) or [pino](https://github.com/pinojs/pino) for Node.js and
-human readable formatter with [Amazing Print](https://github.com/amazing-print/amazing_print) for console.
+A structured logging system that is capable of handling a message, structured data, or an exception easily.
+It has JSON formatters compatible with [Bunyan](https://github.com/trentm/node-bunyan) or [pino](https://github.com/pinojs/pino) for Node.js, and a
+human-readable formatter with [Amazing Print](https://github.com/amazing-print/amazing_print) for the console.
 
 ## Installation
 
@@ -33,14 +31,13 @@ $ gem install ougai
 
 ## Usage
 
-**Ougai::Logger** is sub-class of original [Logger](https://ruby-doc.org/stdlib-2.4.1/libdoc/logger/rdoc/Logger.html) in Ruby.
-All arguments of the `initialize` pass through itself to **::Logger**.
+**Ougai::Logger** is a sub-class of the standard [Logger](https://ruby-doc.org/stdlib-2.4.1/libdoc/logger/rdoc/Logger.html) in Ruby.
+All arguments of the `initialize` pass through to **::Logger**.
 
 ```ruby
-require 'rubygems'
 require 'ougai'
 
-logger = Ougai::Logger.new(STDOUT)
+logger = Ougai::Logger.new($stdout)
 ```
 
 ### TRACE level
@@ -176,7 +173,7 @@ logger.fatal do
 end
 ```
 
-To specify more than one of a message, an exception and custom data, the block returns them as an array.
+To specify more than one message, exception, and custom data, the block returns them as an array.
 
 ### Adding custom fields to all logs
 
@@ -194,7 +191,18 @@ logger.info('Hello!', user: { name: 'Jiro' }, version: '2.3')
 ```
 
 If any field of with_fields is specified in each log, the field is overridden.
-But if the field's type is *Array*, both with_field value and logging value are merged with `concat` and `uniq`.
+If the field's type is *Array*, both with_field value and logging value are merged with `concat` and `uniq`.
+
+If the field's type is *Hash*, then values are merged recursively.
+
+```ruby
+logger.with_fields = { version: '1.1.0', user: { name: 'Taro' } }
+logger.debug(user: { age: 19 })
+```
+
+```json
+{"name":"test","hostname":"mint","pid":30182,"level":20,"time":"2017-07-22T20:52:12.332+09:00","v":0,"version":"1.1.0","msg":"No message","user":{"name":"Taro","age":19}}
+```
 
 ### Create a child logger
 
@@ -242,6 +250,8 @@ child_logger.debug('This is not outputted')
 
 If any field exists in both parent log and child log, the parent value is overridden or merged by child value.
 
+If the field's type is *Hash*, then values are merged recursively.
+
 ### Hook before logging
 
 Setting `before_log` of logger or child an *lambda* with `data` field, a process can be run before log each output.
@@ -344,7 +354,6 @@ gem 'amazing_print'
 Set *Ougai::Formatters::Readable* instance to `formatter` accessor
 
 ```ruby
-require 'rubygems'
 require 'ougai'
 
 logger = Ougai::Logger.new(STDOUT)
@@ -353,7 +362,7 @@ logger.formatter = Ougai::Formatters::Readable.new
 
 ### Screen result example
 
-![Screen Shot](https://github.com/tilfin/ougai/blob/images/ougai_readable_format.png?raw=true)
+![Screen Shot](https://github.com/tilfin/ougai/blob/images/ougai_readable_format_2-1.png?raw=true)
 
 
 ## How to use with famous products, services and libraries

data/lib/ougai/logging.rb

@@ -120,6 +120,8 @@ module Ougai
       base_data.merge!(inferior_data) do |_, base_v, inferior_v|
         if base_v.is_a?(Array) and inferior_v.is_a?(Array)
           (inferior_v + base_v).uniq
+        elsif base_v.is_a?(Hash) and inferior_v.is_a?(Hash)
+          weak_merge!(base_v, inferior_v)
         else
           base_v
         end

data/lib/ougai/version.rb

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

metadata

@@ -1,71 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: ougai
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 2.1.0
 platform: java
 authors:
 - Toshimitsu Takahashi
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-  name: jrjackson
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.4
-  name: bundler
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.4
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.0.1
-  name: rake
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: '1.5'
 - !ruby/object:Gem::Dependency
+  name: jrjackson
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
-  name: rspec
-  type: :development
+        version: '0.4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: '0.4'
 description: |2
       A structured logging system is capable of handling a message, custom data or an exception easily.
       It has JSON formatters compatible with Bunyan or pino for Node.js and human readable formatter with Amazing Print for console.
@@ -93,20 +64,10 @@ files:
 - lib/ougai/serializers/json_jr_jackson.rb
 - lib/ougai/serializers/json_oj.rb
 - lib/ougai/version.rb
-- spec/child_logger_spec.rb
-- spec/formatters/base_spec.rb
-- spec/formatters/bunyan_spec.rb
-- spec/formatters/pino_spec.rb
-- spec/formatters/readable_spec.rb
-- spec/logger_spec.rb
-- spec/logging_spec.rb
-- spec/ougai_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/tilfin/ougai
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -114,25 +75,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: JSON logger compatible with node-bunyan or pino is capable of handling structured
   data easily.
-test_files:
-- spec/child_logger_spec.rb
-- spec/logging_spec.rb
-- spec/ougai_spec.rb
-- spec/spec_helper.rb
-- spec/logger_spec.rb
-- spec/formatters/pino_spec.rb
-- spec/formatters/readable_spec.rb
-- spec/formatters/base_spec.rb
-- spec/formatters/bunyan_spec.rb
+test_files: []