yog 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a368faf2b40b6f7874d643db6cdf6d92f888f11d11e6d9592564f99e9f347c8
-  data.tar.gz: 9326d66736f140ab0ca623efb54596e3dd90dba49e7256107a10679b83f8436c
+  metadata.gz: 75d9f8013927b9e382cb7b01d4007167d0ade47f1a018f3be60e2042530e29f1
+  data.tar.gz: 5a02f9b446a8b614bd406afbdfd4fedadbd3214fabacce26eb9861e0a71b2609
 SHA512:
-  metadata.gz: 7a76c80aeabb756397ec4aa6a5311dee0d781590a4fbcff68177f7b580bf02d5c8b9118cb288e65005208a2b801beb121319b4b0f077b8152a1386a85fa7757b
-  data.tar.gz: fcb89cc14d962bed269ac576503861a99e82c61c0da22ea34415199210310139bc05e01438f1a9c44229b47db2eecf115245ac76aa0da6630d4179e7060a96fa
+  metadata.gz: dff04a9a278360f3b82b8cfa21f90469fc0401d59373e193ebf5b021d342ff017044973578df2e5978e760b1b7a6e01b936ff190ef9b4644513b7ae42693ed42
+  data.tar.gz: b2b11557f4b030a64a722ef966b9bfcad0d2924058ae0c555358b673ed7843965950d4f9689775e0184f5e37448601253000a3b5008d06d77912f0ba35f44068

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    yog (0.0.0)
+    yog (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/yog.rb

@@ -16,24 +16,30 @@ class Yog
 
   # Log a message. Logs any given block's duration as `elapsed=float` ms.
   def write(msg, **fields)
+    if @output.nil?
+      return block_given? && yield
+    end
+
     if msg.is_a?(Hash)
-      fields, msg = msg, nil
+      msg, fields = nil, fields.merge(msg)
     end
 
-    result = if block_given?
-      start = Time.now
+    start = Time.now.utc
+    prefix = { now: start }
+    result = nil
 
-      yield.tap do
-        fields[:duration] = (Time.now - start) * 1000
-      end
+    if msg
+      prefix[:msg] = msg
     end
 
-    unless @output.nil?
-      prefix = { now: Time.now.utc, msg: msg }
-      combined = Yog.merge(prefix, fields, @context)
-      @output.puts(@generator.generate(combined))
+    if block_given?
+      result = yield
+      prefix[:duration] = (Time.now - start) * 1000
     end
 
+    combined = Yog.merge(prefix, fields, @context)
+    @output.puts(@generator.generate(combined))
+
     result
   end
 

data/lib/yog/logfmt.rb

@@ -6,7 +6,7 @@ class Yog
 
   # https://brandur.org/logfmt
   module Logfmt
-    def self.generate(**fields)
+    def self.generate(fields)
       fields.map { |k, v| "#{k}=#{render(v)}" }.join(" ")
     end
 
@@ -14,12 +14,18 @@ class Yog
 
     def self.render(v)
       case v
+      when NilClass
+        "nil"
+      when TrueClass
+        "true"
+      when FalseClass
+        "false"
       when DateTime, Time
         v.iso8601(2)
       when Float
         sprintf("%.2f", v)
-      when NilClass
-        "nil"
+      when Numeric
+        v.to_s
       when String
         (/[ '",{}\[\]:=]/ =~ v) ? v.inspect : v
       else

data/yog.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = "yog"
-  spec.version = "0.1.0"
+  spec.version = "0.2.0"
   spec.authors = ["John Barnette"]
   spec.email = ["john@jbarnette.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - John Barnette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-15 00:00:00.000000000 Z
+date: 2018-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler