ougai 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 023fe0a75fea490d495f73f3ba484240d1b9de15
-  data.tar.gz: e91f1dbf146eafb6e889b2a8efd87e93c13da3c1
+  metadata.gz: 19e44070a0143cd04e7b874389e53a46032065cb
+  data.tar.gz: 18dc7eb966f376c057a75a4e9fc3d243eff2d853
 SHA512:
-  metadata.gz: 27498f3e30636bc343f07d70c088c5801f72d859c93039505f7d566a5c73c0c4443486f6a3d2075ccae1dd7cee38fa009d64413b0d8f3f835e6bd07bd70c7752
-  data.tar.gz: f6600fda8275ffd90f48a0720c768c64cc7d8e0e35c9992dd8d3c496910d64160a445525c53ad6ce0449068d2571d7b5192ec3e23be9ef1cbb93d71ee72e1b0d
+  metadata.gz: 631e1f0dea4f969cedef17930a09754ed3b3f00dbdeb306b38e572beffb82198c6d8aeb1d9eb81244221579094238c392d9feb46a1e465524a4b96ab6863e370
+  data.tar.gz: 51573402bd3bd1dc8e2f00d5d2d1d76dafc841bade69c2079425f8f03b9a380ee102af93cd0b45100977cf3edf0a2529713523d713933b2fbcd7889a9d25fa13

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ougai (1.6.4)
+    ougai (1.6.5)
       oj (~> 3.4)
 
 GEM
@@ -48,4 +48,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   1.16.0
+   1.16.1

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.6.3-green.svg)](http://www.rubydoc.info/gems/ougai/1.6.3/)
+[![document](https://img.shields.io/badge/document-1.6.4-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

@@ -102,46 +102,54 @@ module Ougai
       end
     end
 
-    def create_item_with_1arg(msg)
+    def create_item_with_1arg(arg)
       item = {}
-      if msg.is_a?(Exception)
-        item[:msg] = msg.to_s
-        set_exc(item, msg)
-      elsif msg.is_a?(Hash)
-        item[:msg] = @default_message unless msg.key?(:msg)
-        item.merge!(msg)
+      if arg.is_a?(Exception)
+        item[:msg] = arg.to_s
+        set_exc(item, arg)
+      elsif arg.is_a?(String)
+        item[:msg] = arg
       else
-        item[:msg] = msg.to_s
+        item.merge!(as_hash(arg))
+        item[:msg] ||= @default_message
       end
       item
     end
 
-    def create_item_with_2args(msg, ex)
+    def create_item_with_2args(arg1, arg2)
       item = {}
-      if ex.is_a?(Exception)
-        item[:msg] = msg.to_s
-        set_exc(item, ex)
-      elsif ex.is_a?(Hash)
-        item.merge!(ex)
-        if msg.is_a?(Exception)
-          set_exc(item, msg)
-        else
-          item[:msg] = msg.to_s
-        end
+      if arg2.is_a?(Exception) # msg, ex
+        item[:msg] = arg1.to_s
+        set_exc(item, arg2)
+      elsif arg1.is_a?(Exception) # ex, data
+        set_exc(item, arg1)
+        item.merge!(as_hash(arg2))
+        item[:msg] ||= arg1.to_s
+      else # msg, data
+        item[:msg] = arg1.to_s
+        item.merge!(as_hash(arg2))
       end
       item
     end
 
     def create_item_with_3args(msg, ex, data)
-      item = {}
-      set_exc(item, ex) if ex.is_a?(Exception)
-      item.merge!(data) if data.is_a?(Hash)
-      item[:msg] = msg.to_s
-      item
+      {}.tap do |item|
+        set_exc(item, ex) if ex.is_a?(Exception)
+        item.merge!(as_hash(data))
+        item[:msg] = msg.to_s
+      end
     end
 
     def set_exc(item, exc)
       item[@exc_key] = @formatter.serialize_exc(exc)
     end
+
+    def as_hash(data)
+      if data.is_a?(Hash) || data.respond_to?(:to_hash)
+        data
+      else
+        { data: data }
+      end
+    end
   end
 end

data/lib/ougai/version.rb

@@ -1,3 +1,3 @@
 module Ougai
-  VERSION = '1.6.4'
+  VERSION = '1.6.5'
 end

data/spec/logger_spec.rb

@@ -128,6 +128,34 @@ describe Ougai::Logger do
       end
     end
 
+    context 'with data that can respond to_hash' do
+      it 'outputs valid' do
+        class Dummy
+          def to_hash
+            { foo: 1 }
+          end
+        end
+
+        logger.send(method, Dummy.new)
+        expect(item).to be_log_message('No message', log_level)
+        expect(item).to include_data(foo: 1)
+      end
+    end
+
+    context 'with data that cannot respond to_hash' do
+      it '(array) outputs valid' do
+        logger.send(method, ['bar', 2])
+        expect(item).to be_log_message('No message', log_level)
+        expect(item).to include_data(data: ['bar', 2])
+      end
+
+      it '(number) outputs valid' do
+        logger.send(method, 999)
+        expect(item).to be_log_message('No message', log_level)
+        expect(item).to include_data(data: 999)
+      end
+    end
+
     context 'with message and data' do
       it 'outputs valid' do
         logger.send(method, log_msg, data_id: 99, action: 'insert')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ougai
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Toshimitsu Takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-18 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj