sonnet 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3961783bc4eb8f519c30df1a232e34031827335f1e4804f5c5d444ef15bfb57c
-  data.tar.gz: 2fccb0e4851778f673a1ff10de4a6ed771a919c7692612d0320cfabf3728d849
+  metadata.gz: bdf5b36a10d488d4e99a45a1341adae68639e2cf7b78177c4b5a343768676f56
+  data.tar.gz: 766ea1806f922074e2524ab6d430c6dcd4cd596edcefcd29c76e50deafdccf8a
 SHA512:
-  metadata.gz: 133fb98a3a340477a2076b35d7256aaeb52f6b43e62c1f1b7703d0b4b16a599dabd7defbd7127f3d7ad1463a4de175946db9ca4d05735e63616be0a5b6749c4c
-  data.tar.gz: bde201a3bddec39c6179d0b371aabfae9d2a9039f1975bb155ad68db0ccb4bebeb5c416f3ab5c933334a03b3196edde874360699823c4afa6f3c0c2d5cc14463
+  metadata.gz: 17a5c66a3641e776facb3bcdcac5e85722a31e5aca95915e8e639d2e7415bc94dcd7e1be4b856b99883d03df73fa53a78ec4d1d0b10fb362b0fe977af320f0ea
+  data.tar.gz: 9b6c95572efa27e5179134c92eda5650490de3dc8ad856f1bbad171e86a4836976631a49f30e9cd5f36a0c843f3299cc5a39e0a9d065197c796f2e5a46e87db3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sonnet (0.1.6)
+    sonnet (0.1.7)
 
 GEM
   remote: https://rubygems.org/

data/lib/sonnet/formatter.rb

@@ -54,7 +54,8 @@ module Sonnet
 
     def context
       self.class.current_context.inject({}) do |memo, context|
-        tags = memo.fetch(:tags, []) + [*context.delete(:tags)].compact
+        context = context.dup
+        tags = memo.fetch(:tags, []) + [*context.delete(:tags)].flatten.compact
         tag_context = tags.empty? ? {} : { tags: tags }
         memo.merge(context).merge(tag_context)
       end

data/lib/sonnet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sonnet
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/test/logger_test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "test_helper"
 
 class LoggerTest < Minitest::Test

data/test/rails_logger_test.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+# Stub out some Rails constants and methods
+Rails = Module.new
+Rails::Engine = Class.new do
+  def self.config
+    OpenStruct.new
+  end
+end
+ActiveSupport = Module.new
+ActiveSupport::LoggerThreadSafeLevel = Module.new
+LoggerSilence = Module.new
+
+class Array
+  def present?
+    length > 0
+  end
+end
+
+require 'sonnet/rails'
+
+class RailsLoggerTest < Minitest::Test
+  def setup
+    logger.extend(Sonnet::Logger)
+  end
+
+  def test_tagged_string
+    logger.tagged('request_id') do
+      logger.info("What's the story, morning glory?")
+    end
+    assert_equal log[0][:tags], ['request_id']
+  end
+
+  def test_tagged_array
+    logger.tagged(['request_id']) do
+      logger.info("What's the story, morning glory?")
+    end
+    assert_equal log[0][:tags], ['request_id']
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sonnet
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Cory Kaufman-Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,8 +104,8 @@ files:
 - lib/sonnet/version.rb
 - sonnet.gemspec
 - test/logger_test.rb
+- test/rails_logger_test.rb
 - test/sonnet/formatter_test.rb
-- test/sonnet_test.rb
 - test/test_helper.rb
 homepage: https://github.com/allspiritseve/sonnet
 licenses:

data/test/sonnet_test.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-require "test_helper"
-
-class SonnetTest < Minitest::Test
-  Error = Class.new(StandardError)
-
-  def test_log_info
-    logger.info("What's the story, morning glory?")
-    assert_log_line log[0], level: "info", message: "What's the story, morning glory?"
-  end
-
-  def test_log_debug
-    logger.debug("this should not be logged")
-    assert_nil log[0]
-    logger.level = Logger::DEBUG
-    logger.debug("this should be logged")
-    assert_log_line log[0], level: "debug", message: "this should be logged"
-  end
-
-  def test_log_exception
-    logger.error(Error.new("something went wrong"))
-    assert_log_line log[0], message: "something went wrong"
-  end
-
-  def test_log_with_context
-    logger.with_context(color: "blue") { logger.info("What's the story, morning glory?") }
-    logger.info("definitely maybe")
-    assert_log_line log[0], color: "blue", message: "What's the story, morning glory?"
-    assert_log_line log[1], message: "definitely maybe"
-  end
-
-  def test_new
-    logger = Sonnet::Logger.new(Logger.new(io))
-    assert_equal logger.formatter, Sonnet::Formatter
-    logger.info("What's the story, morning glory?")
-    assert_log_line log[0], level: "info", message: "What's the story, morning glory?"
-  end
-
-  def assert_log_line(actual, expected)
-    assert_equal expected, actual.slice(*expected.keys)
-  end
-
-  def logger
-    @logger ||= Logger.new(io).tap { |logger| logger.extend(Sonnet::Logger) }
-  end
-
-  def io
-    @io ||= StringIO.new
-  end
-
-  def log
-    io.string.each_line.map { |line| JSON.parse(line, symbolize_names: true) }
-  end
-end