lumberjack 1.2.3 → 1.2.8

data/lib/lumberjack/rack.rb

@@ -2,8 +2,8 @@
 
 module Lumberjack
   module Rack
-    require_relative "rack/unit_of_work.rb"
-    require_relative "rack/request_id.rb"
-    require_relative "rack/context.rb"
+    require_relative "rack/unit_of_work"
+    require_relative "rack/request_id"
+    require_relative "rack/context"
   end
 end

data/lib/lumberjack/rack/request_id.rb

@@ -16,7 +16,7 @@ module Lumberjack
       def call(env)
         request_id = env[REQUEST_ID]
         if request_id && @abbreviated
-          request_id = request_id.split('-', 2).first
+          request_id = request_id.split("-", 2).first
         end
         Lumberjack.unit_of_work(request_id) do
           @app.call(env)

data/lib/lumberjack/rack/unit_of_work.rb

@@ -6,7 +6,7 @@ module Lumberjack
       def initialize(app)
         @app = app
       end
-      
+
       def call(env)
         Lumberjack.unit_of_work do
           @app.call(env)

data/lib/lumberjack/severity.rb

@@ -11,7 +11,7 @@ module Lumberjack
     FATAL = ::Logger::Severity::FATAL
     UNKNOWN = ::Logger::Severity::UNKNOWN
 
-    SEVERITY_LABELS = %w(DEBUG INFO WARN ERROR FATAL UNKNOWN).freeze
+    SEVERITY_LABELS = %w[DEBUG INFO WARN ERROR FATAL UNKNOWN].freeze
 
     class << self
       def level_to_label(severity)
@@ -22,6 +22,5 @@ module Lumberjack
         SEVERITY_LABELS.index(label.to_s.upcase) || UNKNOWN
       end
     end
-
   end
 end

data/lib/lumberjack/tag_formatter.rb

@@ -9,7 +9,6 @@ module Lumberjack
   # tag_formatter.add(["password", "email"]) { |value| "***" }
   # tag_formatter.add("finished_at", Lumberjack::Formatter::DateTimeFormatter.new("%Y-%m-%dT%H:%m:%S%z"))
   class TagFormatter
-
     def initialize
       @formatters = {}
       @default_formatter = nil
@@ -87,12 +86,11 @@ module Lumberjack
       if formatter.is_a?(TaggedLoggerSupport::Formatter)
         formatter.__formatter
       elsif formatter.is_a?(Symbol)
-        formatter_class_name = "#{formatter.to_s.gsub(/(^|_)([a-z])/){|m| $~[2].upcase}}Formatter"
+        formatter_class_name = "#{formatter.to_s.gsub(/(^|_)([a-z])/) { |m| $~[2].upcase }}Formatter"
         Formatter.const_get(formatter_class_name).new
       else
         formatter
       end
     end
-
   end
 end

data/lib/lumberjack/tagged_logger_support.rb

@@ -6,7 +6,6 @@ require "forwardable"
 module Lumberjack
   # Methods to make Lumberjack::Logger API compatible with ActiveSupport::TaggedLogger.
   module TaggedLoggerSupport
-
     class Formatter < DelegateClass(Lumberjack::Formatter)
       extend Forwardable
       def_delegators :@logger, :tagged, :push_tags, :pop_tags, :clear_tags!

data/lib/lumberjack/tagged_logging.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Lumberjack
+  # Monkey patch for ActiveSupport::TaggedLogger so it doesn't blow up when
+  # a Lumberjack logger is trying to be wrapped. This module will be automatically
+  # included in ActiveSupport::TaggedLogger if activesupport is already loaded.
+  module TaggedLogging
+    class << self
+      def included(base)
+        base.singleton_class.send(:prepend, ClassMethods)
+      end
+    end
+
+    module ClassMethods
+      def new(logger)
+        if logger.is_a?(Lumberjack::Logger)
+          logger = logger.tagged_logger! unless logger.respond_to?(:tagged)
+          logger
+        else
+          super
+        end
+      end
+    end
+  end
+end
+
+if defined?(ActiveSupport::TaggedLogging)
+  ActiveSupport::TaggedLogging.include(Lumberjack::TaggedLogging)
+end

data/lib/lumberjack/tags.rb

@@ -27,7 +27,7 @@ module Lumberjack
         if hash.all? { |key, value| key.is_a?(String) && !value.is_a?(Proc) }
           return hash
         end
-        
+
         copy = {}
         hash.each do |key, value|
           if value.is_a?(Proc) && (value.arity == 0 || value.arity == -1)

data/lib/lumberjack/template.rb

@@ -14,7 +14,7 @@ module Lumberjack
   # If your tag name contains characters other than alpha numerics and the underscore, you must surround it
   # with curly brackets: `:{http.request-id}`.
   class Template
-    TEMPLATE_ARGUMENT_ORDER = %w(:time :severity :progname :pid :message :tags).freeze
+    TEMPLATE_ARGUMENT_ORDER = %w[:time :severity :progname :pid :message :tags].freeze
     MILLISECOND_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%3N"
     MICROSECOND_TIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%6N"
     PLACEHOLDER_PATTERN = /:(([a-z0-9_]+)|({[^}]+}))/i.freeze
@@ -86,7 +86,7 @@ module Lumberjack
     def tag_args(tags, tag_vars)
       return [nil] * (tag_vars.size + 1) if tags.nil? || tags.size == 0
 
-      tags_string = String.new
+      tags_string = ""
       tags.each do |name, value|
         unless value.nil? || tag_vars.include?(name)
           value = value.to_s

data/lumberjack.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |spec|
-  spec.name = 'lumberjack'
-  spec.version = File.read(File.expand_path("../VERSION", __FILE__)).strip
-  spec.authors = ['Brian Durand']
-  spec.email = ['bbdurand@gmail.com']
+  spec.name = "lumberjack"
+  spec.version = File.read(File.join(__dir__, "VERSION")).strip
+  spec.authors = ["Brian Durand"]
+  spec.email = ["bbdurand@gmail.com"]
 
   spec.summary = "A simple, powerful, and very fast logging utility that can be a drop in replacement for Logger or ActiveSupport::BufferedLogger."
   spec.homepage = "https://github.com/bdurand/lumberjack"
@@ -10,26 +10,22 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  ignore_files = %w(
-    .gitignore
-    .travis.yml
+  ignore_files = %w[
+    .
     Appraisals
     Gemfile
     Gemfile.lock
     Rakefile
     gemfiles/
     spec/
-  )
-  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
-    `git ls-files -z`.split("\x0").reject{ |f| ignore_files.any?{ |path| f.start_with?(path) } }
+  ]
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject { |f| ignore_files.any? { |path| f.start_with?(path) } }
   end
 
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = ">= 2.3.0"
 
-  spec.add_development_dependency("rspec", ["~> 3.0"])
-  spec.add_development_dependency("timecop")
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "bundler"
 end

metadata

@@ -1,59 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: lumberjack
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.8
 platform: ruby
 authors:
 - Brian Durand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-05 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -74,7 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
-- MIT_LICENSE
+- MIT_LICENSE.txt
 - README.md
 - VERSION
 - lib/lumberjack.rb
@@ -106,6 +64,7 @@ files:
 - lib/lumberjack/severity.rb
 - lib/lumberjack/tag_formatter.rb
 - lib/lumberjack/tagged_logger_support.rb
+- lib/lumberjack/tagged_logging.rb
 - lib/lumberjack/tags.rb
 - lib/lumberjack/template.rb
 - lumberjack.gemspec