ougai 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 19e44070a0143cd04e7b874389e53a46032065cb
-  data.tar.gz: 18dc7eb966f376c057a75a4e9fc3d243eff2d853
+SHA256:
+  metadata.gz: 9f157af11b2825f79fbf60a4db4cbb10b07609d0d640533574904d31fa1a8ed1
+  data.tar.gz: 7b117078406bef661d44c87c3409af0c8e5b8021486bf79ddd25ec157e945abf
 SHA512:
-  metadata.gz: 631e1f0dea4f969cedef17930a09754ed3b3f00dbdeb306b38e572beffb82198c6d8aeb1d9eb81244221579094238c392d9feb46a1e465524a4b96ab6863e370
-  data.tar.gz: 51573402bd3bd1dc8e2f00d5d2d1d76dafc841bade69c2079425f8f03b9a380ee102af93cd0b45100977cf3edf0a2529713523d713933b2fbcd7889a9d25fa13
+  metadata.gz: 864a2b7aa5d44ffe192dda4c32970bf53e8d278aeaabcba3073c0c15362fa5edd3594a710dda41cc79dbad7fa8341e6577098c63599b44dadcf49f647afc3a82
+  data.tar.gz: a611c0ae6e1c7b19d0b0952f4438ed0128f65d9f61cd5978cfd38079d117ffc4adaaf84cb3d6e73358ee010d67af4738906981ff4a79568a2e7eefaeec9ff949

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ougai (1.6.5)
+    ougai (1.6.6)
       oj (~> 3.4)
 
 GEM

data/lib/ougai.rb

@@ -6,5 +6,6 @@ require 'ougai/formatters/for_json'
 require 'ougai/formatters/bunyan'
 require 'ougai/formatters/readable'
 require 'ougai/formatters/pino'
+require 'ougai/serializer'
 require 'ougai/child_logger'
 require 'ougai/logger'

data/lib/ougai/formatters/for_json.rb

@@ -1,5 +1,3 @@
-require 'oj'
-
 module Ougai
   # The features for JSON formatter
   # @attr [Boolean] jsonize Whether log should converts JSON
@@ -12,6 +10,7 @@ module Ougai
     def init_opts_for_json(opts)
       @jsonize = opts.fetch(:jsonize, true)
       @with_newline = opts.fetch(:with_newline, true)
+      @serializer = Ougai::Serializer.for_json
     end
 
     def to_level(severity)
@@ -33,14 +32,11 @@ module Ougai
       end
     end
 
-    OJ_OPTIONS = { mode: :custom, time_format: :xmlschema,
-                   use_as_json: true, use_to_hash: true, use_to_json: true }
-
     # requires convert_time(data) method
     def dump(data)
       return data unless @jsonize
       convert_time(data)
-      str = Oj.dump(data, OJ_OPTIONS)
+      str = @serializer.serialize(data)
       str << "\n" if @with_newline
       str
     end

data/lib/ougai/serializer.rb

@@ -0,0 +1,13 @@
+module Ougai
+  class Serializer
+    def self.for_json
+      if RUBY_PLATFORM =~ /java/
+        require 'ougai/serializers/json_jr_jackson'
+        Serializers::JsonJrJackson.new
+      else
+        require 'ougai/serializers/json_oj'
+        Serializers::JsonOj.new
+      end
+    end
+  end
+end

data/lib/ougai/serializers/json_jr_jackson.rb

@@ -0,0 +1,9 @@
+require 'jrjackson'
+
+module Ougai::Serializers
+  class JsonJrJackson < Ougai::Serializer
+    def serialize(data)
+      JrJackson::Json.dump(data)
+    end
+  end
+end

data/lib/ougai/serializers/json_oj.rb

@@ -0,0 +1,12 @@
+require 'oj'
+
+module Ougai::Serializers
+  class JsonOj < Ougai::Serializer
+    OJ_OPTIONS = { mode: :custom, time_format: :xmlschema,
+                   use_as_json: true, use_to_hash: true, use_to_json: true }
+
+    def serialize(data)
+      Oj.dump(data, OJ_OPTIONS)
+    end
+  end
+end

data/lib/ougai/version.rb

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

data/spec/logger_spec.rb

@@ -29,7 +29,7 @@ describe Ougai::Logger do
       err = actual[:err]
       err[:message] == expected \
         && err[:name] = 'StandardError' \
-        && err[:stack].include?('ougai/spec')
+        && err[:stack].include?('<main>')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ougai
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Toshimitsu Takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -89,6 +89,9 @@ files:
 - lib/ougai/formatters/readable.rb
 - lib/ougai/logger.rb
 - lib/ougai/logging.rb
+- lib/ougai/serializer.rb
+- 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
@@ -119,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: JSON logger compatible with node-bunyan or pino is capable of handling structured