ougai 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da3e50121cd1ca747fdf84a266ab60d0fe8d71eb
-  data.tar.gz: 3c93d87d0c32eb0e6a30c0ab0577b537476b3de8
+  metadata.gz: b0be28a9823a80734981fe6333f87b5369e61094
+  data.tar.gz: 4fee2e596d358d32409c86e46235539bfc796dee
 SHA512:
-  metadata.gz: 3c7eed367fc984d280ac8f4cfb802c1836ec2918b57dc1c233ab4084585ef115e12d451cafd7c10d0014be7d2d31ea92c877bef8b4e1a2ab02a8947c0b180e42
-  data.tar.gz: 875f603ca33e5349c2edc0a2cec508b39afb4fab9db4545fec82369c1c7a8e383abcd2afb48da8ce597e669eaca357f686a7cc9e633920ac3a5a1d24ae097f10
+  metadata.gz: 1845cb73f37a0a48406f66d24dc68dcc2f6d6f4a161feaae880ab20557baf7bac77d1032fcfe131e028cd9e6c866f52949e3bf2e74dfdea0e728799912b5d2ea
+  data.tar.gz: ea9ac008a278ae1e879c5fdaf7080c9e2e0dbca1f781f4deade03c794eba36dd894d0bab6568c7a2d88681737a163cfa95b9801db7b5dbd566891071c8dbb170

data/README.md

@@ -350,6 +350,7 @@ logger.formatter = Ougai::Formatters::Readable.new
 - [Forward logs to Fluentd](https://github.com/tilfin/ougai/wiki/Forward-logs-to-Fluentd)
 - [Forward logs to Logentries](https://github.com/tilfin/ougai/wiki/Forward-logs-to-Logentries)
 - [Use as ServerEngine logger](https://github.com/tilfin/ougai/wiki/Use-as-ServerEngine-logger)
+- [Forward logs to Loggly](https://github.com/tilfin/ougai/wiki/Forward-logs-to-Loggly)
 
 ## License
 

data/lib/ougai/child_logger.rb

@@ -46,14 +46,14 @@ module Ougai
     # @private
     def chain(severity, args, fields, hooks)
       hooks.push(@before_log) if @before_log
-      @parent.chain(severity, args, merge_fields(@with_fields, fields), hooks)
+      @parent.chain(severity, args, weak_merge!(fields, @with_fields), hooks)
     end
 
     protected
 
     def append(severity, args)
       hooks = @before_log ? [@before_log] : []
-      @parent.chain(severity, args, @with_fields, hooks)
+      @parent.chain(severity, args, @with_fields.dup, hooks)
     end
   end
 end

data/lib/ougai/formatters/bunyan.rb

@@ -9,8 +9,8 @@ module Ougai
     class Bunyan < Base
       attr_accessor :jsonize, :with_newline
 
-      def initialize
-        super
+      def initialize(*args)
+        super(*args)
         @jsonize = true
         @with_newline = true
       end

data/lib/ougai/logger.rb

@@ -59,7 +59,7 @@ module Ougai
     # @private
     def chain(severity, args, fields, hooks)
       hooks.push(@before_log) if @before_log
-      write(severity, args, merge_fields(@with_fields, fields), hooks)
+      write(severity, args, weak_merge!(fields, @with_fields), hooks)
     end
 
     protected
@@ -81,7 +81,7 @@ module Ougai
     end
 
     def write(severity, args, fields, hooks)
-      data = merge_fields(fields, to_item(args))
+      data = weak_merge!(to_item(args), fields)
       hooks.each do |hook|
         return false if hook.call(data) == false
       end

data/lib/ougai/logging.rb

@@ -102,12 +102,12 @@ module Ougai
     end
 
     # @private
-    def merge_fields(base_data, new_data)
-      base_data.merge(new_data) do |_, base_val, new_val|
-        if base_val.is_a?(Array) and new_val.is_a?(Array)
-          (base_val + new_val).uniq
+    def weak_merge!(base_data, inferior_data)
+      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
         else
-          new_val
+          base_v
         end
       end
     end

data/lib/ougai/version.rb

@@ -1,3 +1,3 @@
 module Ougai
-  VERSION = "1.5.5"
+  VERSION = "1.5.6"
 end

data/spec/formatters/bunyan_spec.rb

@@ -20,6 +20,15 @@ describe Ougai::Formatters::Bunyan do
 
   let(:formatter) { described_class.new }
 
+  context '#initialize' do
+    let(:appname) { 'dummy app name' }
+
+    it 'suceeds with arguments' do
+      fmt = described_class.new(appname)
+      expect(fmt.app_name).to eq(appname)
+    end
+  end
+
   context 'jsonize is true and with_newline is true' do
     subject { formatter.call('DEBUG', Time.now, nil, data) }
 

data/spec/logging_spec.rb

@@ -1,18 +1,18 @@
 require 'spec_helper'
 
 describe Ougai::Logging do
-  describe '#merge_fields' do
+  describe '#weak_merge!' do
     let(:target) { m = described_class; Class.new{ include m }.new }
 
     it 'merges with unique elements in array' do
       result = nil
       target.instance_eval do
-        result = merge_fields({ foo: [1, 2], bar: 'base', baz: ['A'] },
-                              { foo: [2, 3], bar: 'over', baz: ['B'] })
+        result = weak_merge!({ foo: [1, 2], bar: 'base', baz: ['A'] },
+                             { foo: [2, 3], bar: 'inferior', baz: ['B'] })
       end
-      expect(result[:foo]).to eq([1, 2, 3])
-      expect(result[:bar]).to eq('over')
-      expect(result[:baz]).to eq(['A', 'B'])
+      expect(result[:foo]).to eq([2, 3, 1])
+      expect(result[:bar]).to eq('base')
+      expect(result[:baz]).to eq(['B', 'A'])
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ougai
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - Toshimitsu Takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-21 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,17 +103,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: JSON logger compatible with node-bunyan is capable of handling structured
   data easily.
 test_files:
+- spec/child_logger_spec.rb
 - spec/formatters/base_spec.rb
 - spec/formatters/bunyan_spec.rb
 - spec/formatters/readable_spec.rb
-- spec/child_logger_spec.rb
-- spec/logging_spec.rb
 - spec/logger_spec.rb
+- spec/logging_spec.rb
 - spec/ougai_spec.rb
 - spec/spec_helper.rb