chalk-log 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b64a5b481dbbd3e6b520960eb91a62c16adb4e84
-  data.tar.gz: f53bd63e7b8ab85a973530ec20ca98fad29bec29
+  metadata.gz: 51740a04663dc5789cf617d795902c878753da4d
+  data.tar.gz: ddce4867174594d0e261b1451cf8fcf2bb195e44
 SHA512:
-  metadata.gz: 708304b9c0a3bd9304dae206683bf183eccb34f4108530d73b39965383abeb40c2431900d9f034410c6134695184eaf7f9be64bf60ccda076797423202a5b4a1
-  data.tar.gz: 69636ca78d2d41573ce3972b883665270b80114c076bee20d60a1177a2f24181d46d0429056f2a346e2656ef231f17833bcbfd62dda72acd5ca9546aef1682cc
+  metadata.gz: 599c1125ff94b46bd016c78a45126b6648bedd03a0fe92d20c10d9595a57eaf81e9e9c9e64ef2862545525f07af68b1a4df0dd68ba70fe90a5fe96e3eb4607c3
+  data.tar.gz: f9f6143c0c9cac78ee48e5629d01b7b849766047dd3bfcf959337f4c0231846083584a3173326f73875b385e3c1a877dd1171b93b0edf7e1c2e174ae04553326

data/lib/chalk-log/layout.rb

@@ -50,6 +50,7 @@ class Chalk::Log::Layout < ::Logging::Layout
 
     # Data provided by blocks may not be arrays yet
     data = [data] unless data.kind_of?(Array)
+    data = data.dup # Make a private copy that we can mutate
     info = data.pop if data.last.kind_of?(Hash)
     error = data.pop if data.last.kind_of?(Exception)
     message = data.pop if data.last.kind_of?(String)
@@ -66,7 +67,7 @@ class Chalk::Log::Layout < ::Logging::Layout
       span: span.to_s,
       message: message,
       error: error,
-      info: (info && info.merge(contextual_info || {})) || contextual_info,
+      info: (info && (contextual_info || {}).merge(info)) || contextual_info,
       pid: pid
       )
   end
@@ -95,7 +96,7 @@ class Chalk::Log::Layout < ::Logging::Layout
     if info
       message << ' ' if message
       message ||= ''
-      info!(message, info)
+      message << format_hash(info)
     end
 
     if error
@@ -109,12 +110,6 @@ class Chalk::Log::Layout < ::Logging::Layout
     message
   end
 
-  # Displaying info hash
-
-  def info!(message, info)
-    message << format_hash(info.merge(contextual_info || {}))
-  end
-
   def display(key, value)
     begin
       value = json(value)

data/lib/chalk-log/version.rb

@@ -1,5 +1,5 @@
 module Chalk
   module Log
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end

data/test/functional/log.rb

@@ -201,6 +201,13 @@ module Critic::Functional
           end
         end
 
+        it 'prefers explicit information over the context' do
+          log.with_contextual_info(omg: 'wtf') do
+            log.info("message", omg: 'ponies')
+          end
+          assert_logged("omg=ponies")
+        end
+
         it 'requires a block' do
           exn = assert_raises(ArgumentError) do
             log.with_contextual_info(i_am_not: "passing a block")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chalk-log
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Stripe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2016-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chalk-config
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Chalk::Log makes any class loggable. It provides a logger that can be used
@@ -171,3 +171,4 @@ test_files:
 - test/functional/log.rb
 - test/unit/_lib.rb
 - test/unit/chalk-log/utils.rb
+has_rdoc: