yog 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75d9f8013927b9e382cb7b01d4007167d0ade47f1a018f3be60e2042530e29f1
-  data.tar.gz: 5a02f9b446a8b614bd406afbdfd4fedadbd3214fabacce26eb9861e0a71b2609
+  metadata.gz: db8903f2744b37ff04bc5dd36f44edb790b4878d176fd77a900ff5cef858680b
+  data.tar.gz: 03a96abc9076220df30f0b55be41befb92eee172dc88d0224be0cdad8ce3f732
 SHA512:
-  metadata.gz: dff04a9a278360f3b82b8cfa21f90469fc0401d59373e193ebf5b021d342ff017044973578df2e5978e760b1b7a6e01b936ff190ef9b4644513b7ae42693ed42
-  data.tar.gz: b2b11557f4b030a64a722ef966b9bfcad0d2924058ae0c555358b673ed7843965950d4f9689775e0184f5e37448601253000a3b5008d06d77912f0ba35f44068
+  metadata.gz: 46fbe2aa15a5fab09ba295a39fdb9673154a949dbaec4506322ee3d0b36a5b2b89ef337e594386f6c3dffe659c611f6319cc3662bf9caf7033faa716d738a825
+  data.tar.gz: c18237cde2eaf11e02e8cc6ba567709464972e3730b974a29e01c1cdbfda6ed5e3001af87785d15cab5d5b56f39cf372c92555fa883fce0da318699b571ca569

data/lib/yog.rb

@@ -15,9 +15,9 @@ class Yog
   end
 
   # Log a message. Logs any given block's duration as `elapsed=float` ms.
-  def write(msg, **fields)
+  def info(msg, **fields)
     if @output.nil?
-      return block_given? && yield
+      return (yield if block_given?)
     end
 
     if msg.is_a?(Hash)
@@ -37,7 +37,7 @@ class Yog
       prefix[:duration] = (Time.now - start) * 1000
     end
 
-    combined = Yog.merge(prefix, fields, @context)
+    combined = prefix.merge(@context).merge(fields)
     @output.puts(@generator.generate(combined))
 
     result
@@ -45,30 +45,30 @@ class Yog
 
   # Log an error.
   def error(ex, **fields)
-    write(ex.message, at: "error", type: ex.class, **fields)
+    info(error: ex.message, type: ex.class, **fields)
   end
 
   # Update the context.
-  def push(**fields)
-    self.tap { @context.merge!(fields) }
+  def set(**fields)
+    tap { @context.merge!(fields) }
   end
 
   # Create a new log with more context.
   def with(**fields)
     self.class.new \
-      context: Yog.merge(@context, fields),
+      context: @context.merge(fields),
       generator: @generator,
       output: @output
   end
 
   ### Helpers for the default log
 
-  # The log for Yog(), Yog.push(), and Yog.with().
-  def self.current
+  # The log for Yog(), Yog.set(), and Yog.with().
+  def self.default
     logs.first
   end
 
-  # A stack of receivers with the current log first.
+  # A stack of receivers with the default log first.
   def self.logs
     Thread.current[:logs] ||= [new]
   end
@@ -80,38 +80,33 @@ class Yog
     logs.shift
   end
 
-  # Update the context of the current log.
-  def self.push(**fields)
-    current.push(fields)
+  # Update the context of the default log.
+  def self.set(**fields)
+    default.set(fields)
   end
 
-  # Create a new log by extending the context of the current log.
+  # Create a new log by extending the context of the default log.
   def self.with(**fields)
-    current.with(fields)
+    default.with(fields)
   end
 
-  # Write a line to the current log.
-  def self.write(msg, **fields, &block)
-    current.write(msg, fields, &block)
+  # Write a line to the default log.
+  def self.info(msg, **fields, &block)
+    default.info(msg, fields, &block)
   end
 
-  # Log an error to the current log.
+  # Log an error to the default log.
   def self.error(ex, **fields)
-    current.error(ex, fields)
-  end
-
-  # Internal: Combine a list of contexts.
-  def self.merge(*contexts)
-    contexts.inject { |a, b| a.merge(b) }
+    default.error(ex, fields)
   end
 end
 
-# Write a line to the current log.
+# Write a line to the default log.
 def Yog(msg, **fields, &block)
   case msg
   when Exception
     Yog.error(msg, fields)
   else
-    Yog.write(msg, fields, &block)
+    Yog.info(msg, fields, &block)
   end
 end

data/lib/yog/logfmt.rb

@@ -21,7 +21,7 @@ class Yog
       when FalseClass
         "false"
       when DateTime, Time
-        v.iso8601(2)
+        v.iso8601(3)
       when Float
         sprintf("%.2f", v)
       when Numeric

data/lib/yog/rack.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "rack/request"
+require "rack/utils"
+require "securerandom"
+require "yog"
+
+class Yog
+  class Rack
+    def initialize(app, **ctx)
+      @app = app
+      @ctx = ctx.merge(svc: "rack")
+    end
+
+    def call(env)
+      now = Time.now
+      req = ::Rack::Request.new(env)
+      rid = (env["HTTP_X_REQUEST_ID"] ||= SecureRandom.uuid)
+
+      Yog.context **@ctx, rid: rid do
+        begin
+          res = @app.call(env)
+        ensure
+          duration = (Time.now - now) * 1000
+          status, headers, * = res
+          headers["X-Request-ID"] ||= rid
+
+          Yog ::Rack::Utils::HTTP_STATUS_CODES[status],
+            at: "finish",
+            method: req.request_method,
+            path: req.fullpath,
+            status: status,
+            duration: duration
+        end
+      end
+    end
+  end
+end

data/yog.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |spec|
   spec.name = "yog"
-  spec.version = "0.2.0"
+  spec.version = "0.3.0"
   spec.authors = ["John Barnette"]
   spec.email = ["john@jbarnette.com"]
 
-  spec.summary = "A lightweight Ruby library for emitting logfmt style log lines."
+  spec.summary = "A Ruby library for emitting logfmt style log lines."
   spec.homepage = "https://github.com/jbarnette/yog"
   spec.license = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yog
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - John Barnette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-14 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - docs/CODE_OF_CONDUCT.md
 - lib/yog.rb
 - lib/yog/logfmt.rb
+- lib/yog/rack.rb
 - yog.gemspec
 homepage: https://github.com/jbarnette/yog
 licenses:
@@ -125,5 +126,5 @@ rubyforge_project:
 rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
-summary: A lightweight Ruby library for emitting logfmt style log lines.
+summary: A Ruby library for emitting logfmt style log lines.
 test_files: []