paul_bunyan 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 171388d288887542610c069c558db27316b5126e
-  data.tar.gz: fe2ec569d2228aa11a55e2b16bdbcaacd5075a92
+SHA256:
+  metadata.gz: 6cd239b74337270ec4552ab5b968097fb992fc10f16865db5636a72b470e8d01
+  data.tar.gz: '09a9523fcc3b38208a572ffe57baebfa28c085c709c3ac0adf94b4db34982035'
 SHA512:
-  metadata.gz: 28d191b3a06b5d193e1bcf530a8e60ae0de981909695009d7610d256db62fb8ad459c1ec50b6efe43aa7af9c543cf34d516a52f91fc589a7f62801832d46f146
-  data.tar.gz: 960b65912617acd94f0eec1a67020586a2eb04243f770523e5861f24c1fee4e080c296058e76308e8e8fa0adaee4234ff8d023cc604cbd0dc6902630cdbb38fa
+  metadata.gz: 98d74e92f6f9b2c575ab9511b8070724aa181e1a7f8c60fa72f004db79eb301defdfdce8b185bb21ff034204383a7aeb190e7c748cba3b5e2722691c78a7391d
+  data.tar.gz: eb3cc2f0857fd064339635230a56246adbab2da6a88a3c95e72696fe3be4db246462e083aaa6d40ed96c4368ea4c0d7c686a46acbe0f2d9551a3040791402f3e

data/lib/paul_bunyan/metadata_logging.rb

@@ -1,23 +1,31 @@
 module PaulBunyan
   module MetadataLogging
     def clear_metadata!
-      formatter.clear_metadata!
+      formatter.clear_metadata! if formatter.respond_to?(:clear_metadata!)
     end
 
     def with_metadata(metadata)
-      formatter.with_metadata(metadata) { yield self }
+      if formatter.respond_to?(:with_metadata)
+        formatter.with_metadata(metadata) { yield self }
+      else
+        yield self
+      end
     end
 
     def add_metadata(metadata)
-      formatter.add_metadata(metadata)
+      formatter.add_metadata(metadata) if formatter.respond_to?(:add_metadata)
     end
 
     def remove_metadata(metadata)
-      formatter.remove_metadata(metadata)
+      formatter.remove_metadata(metadata) if formatter.respond_to?(:remove_metadata)
     end
 
     def current_metadata
-      formatter.current_metadata
+      if formatter.respond_to?(:current_metadata)
+        return formatter.current_metadata
+      else
+        return {}
+      end
     end
 
     def flush

data/lib/paul_bunyan/railtie.rb

@@ -17,6 +17,16 @@ module PaulBunyan
       Rails.env.development? || Rails.env.test?
     end
 
+    def self.rake_task?
+      File.basename($0) == 'rake'
+    end
+
+    def self.migrating?
+      rake_task? && ARGV.include?('db:migrate')
+    end
+
+    delegate :rake_task?, :migrating?, to: :class
+
     # Set up the config and some defaults
     config.logging = ActiveSupport::OrderedOptions.new
     config.logging.override_location = !Rails.env.test?
@@ -27,18 +37,20 @@ module PaulBunyan
     initializer 'initalize_logger.logging', group: :all, before: :initialize_logger do |app|
       logging_config = config.logging
 
-      new_logger = PaulBunyan.add_logger(ActiveSupport::Logger.new(log_target(app.config)))
-      new_logger.level = PaulBunyan::Level.coerce_level(ENV['LOG_LEVEL'] || ::Rails.application.config.log_level || 'INFO')
-      new_logger.formatter = logging_config.formatter
-      new_logger.extend(ActiveSupport::TaggedLogging) if logging_config.formatter.respond_to?(:tagged)
-      new_logger.extend(PaulBunyan::MetadataLogging) if logging_config.formatter.respond_to?(:with_metadata)
+      unless migrating?
+        new_logger = PaulBunyan.add_logger(ActiveSupport::Logger.new(log_target(app.config)))
+        new_logger.level = PaulBunyan::Level.coerce_level(ENV['LOG_LEVEL'] || ::Rails.application.config.log_level || 'INFO')
+        new_logger.formatter = logging_config.formatter
+        new_logger.extend(ActiveSupport::TaggedLogging) if logging_config.formatter.respond_to?(:tagged)
+        new_logger.extend(PaulBunyan::MetadataLogging) if logging_config.formatter.respond_to?(:with_metadata)
 
-      if logging_config.handle_request_logging
-        unsubscribe_default_log_subscribers
-        LogSubscriber.subscribe_to_events
-      end
+        if logging_config.handle_request_logging
+          unsubscribe_default_log_subscribers
+          LogSubscriber.subscribe_to_events
+        end
 
-      Rails.logger = PaulBunyan.logger
+        Rails.logger = PaulBunyan.logger
+      end
     end
 
     console do

data/lib/paul_bunyan/text_formatter.rb

@@ -5,7 +5,7 @@ end
 
 module PaulBunyan
   class TextFormatter < Logger::Formatter
-    include ActiveSupport::TaggedLogging::Formatter if defined?(ActiveSupport::TaggedLogging)
+    include ActiveSupport::TaggedLogging::Formatter if defined?(ActiveSupport::TaggedLogging::Formatter)
 
     def initialize(include_metadata: true)
       @include_metadata = include_metadata

data/lib/paul_bunyan/version.rb

@@ -1,3 +1,3 @@
 module PaulBunyan
-  VERSION = '1.5.2'
+  VERSION = '1.5.3'
 end

data/spec/lib/paul_bunyan/metadata_logging_spec.rb

@@ -1,62 +1,108 @@
 require 'spec_helper'
 
 describe PaulBunyan::MetadataLogging do
-  subject { Object.new }
-  let(:formatter) { double('formatter') }
+  context "with a formatter that supports metadata" do
+    subject { Object.new }
+    let(:formatter) { double('formatter') }
 
-  before do
-    subject.extend(PaulBunyan::MetadataLogging)
-    allow(subject).to receive(:formatter).and_return(formatter)
-  end
+    before do
+      subject.extend(PaulBunyan::MetadataLogging)
+      allow(subject).to receive(:formatter).and_return(formatter)
+    end
 
-  it 'must delegate clear_metadata! to the formatter' do
-    expect(formatter).to receive(:clear_metadata!)
-    subject.clear_metadata!
-  end
+    it 'must delegate clear_metadata! to the formatter' do
+      expect(formatter).to receive(:clear_metadata!)
+      subject.clear_metadata!
+    end
 
-  it 'must delegate with_metadata to the formatter' do
-    expect(formatter).to receive(:with_metadata).with(foo: 'bar').and_yield
-    subject.with_metadata(foo: 'bar') do |logger|
-      expect(subject).to eq logger
+    it 'must delegate with_metadata to the formatter' do
+      expect(formatter).to receive(:with_metadata).with(foo: 'bar').and_yield
+      subject.with_metadata(foo: 'bar') do |logger|
+        expect(subject).to eq logger
+      end
     end
-  end
 
-  it 'must delegate add_metadata to the formatter' do
-    expect(formatter).to receive(:add_metadata).with(foo: 'bar')
-    subject.add_metadata(foo: 'bar')
-  end
+    it 'must delegate add_metadata to the formatter' do
+      expect(formatter).to receive(:add_metadata).with(foo: 'bar')
+      subject.add_metadata(foo: 'bar')
+    end
 
-  it 'must delegate current_metadata to the formatter' do
-    expect(formatter).to receive(:current_metadata).and_return({})
-    subject.current_metadata
-  end
+    it 'must delegate current_metadata to the formatter' do
+      expect(formatter).to receive(:current_metadata).and_return({})
+      subject.current_metadata
+    end
+
+    it 'must delegate remove_metadata to the formatter' do
+      expect(formatter).to receive(:remove_metadata).with(foo: 'bar')
+      subject.remove_metadata(foo: 'bar')
+    end
+
+    context '#flush' do
+      it 'clears metadata on the formatter' do
+        expect(formatter).to receive(:clear_metadata!)
+        subject.flush
+      end
+
+      it 'sends flush to a parent' do
+        klass = Class.new
+        klass.class_eval do
+          def flush
+            flush_behavior()
+          end
+        end
+
+        metadata_logger = klass.new
+        metadata_logger.extend(PaulBunyan::MetadataLogging)
+        allow(metadata_logger).to receive(:formatter).and_return(formatter)
+        allow(formatter).to receive(:clear_metadata!)
 
-  it 'must delegate remove_metadata to the formatter' do
-    expect(formatter).to receive(:remove_metadata).with(foo: 'bar')
-    subject.remove_metadata(foo: 'bar')
+        expect(metadata_logger).to receive(:flush_behavior)
+        metadata_logger.flush
+      end
+    end
   end
 
-  context '#flush' do
-    it 'clears metadata on the formatter' do
-      expect(formatter).to receive(:clear_metadata!)
-      subject.flush
+  context "with a formatter that does not support metadata" do
+    subject { Object.new }
+    let(:formatter) { PaulBunyan::TextFormatter.new }
+
+    before do
+      subject.extend(PaulBunyan::MetadataLogging)
+      allow(subject).to receive(:formatter).and_return(formatter)
     end
 
-    it 'sends flush to a parent' do
-      klass = Class.new
-      klass.class_eval do
-        def flush
-          flush_behavior()
-        end
+    it 'must not call clear_metadata! on the formatter' do
+      expect(formatter).to_not respond_to(:clear_metadata!)
+      subject.clear_metadata!
+    end
+
+    it 'must delegate with_metadata to the formatter' do
+      expect(formatter).to_not respond_to(:with_metadata)
+      subject.with_metadata(foo: 'bar') do |logger|
+        expect(subject).to eq logger
       end
+    end
+
+    it 'must delegate add_metadata to the formatter' do
+      expect(formatter).to_not respond_to(:add_metadata)
+      subject.add_metadata(foo: 'bar')
+    end
 
-      metadata_logger = klass.new
-      metadata_logger.extend(PaulBunyan::MetadataLogging)
-      allow(metadata_logger).to receive(:formatter).and_return(formatter)
-      allow(formatter).to receive(:clear_metadata!)
+    it 'must delegate current_metadata to the formatter' do
+      expect(formatter).to_not respond_to(:current_metadata)
+      subject.current_metadata
+    end
+
+    it 'must delegate remove_metadata to the formatter' do
+      expect(formatter).to_not respond_to(:remove_metadata)
+      subject.remove_metadata(foo: 'bar')
+    end
 
-      expect(metadata_logger).to receive(:flush_behavior)
-      metadata_logger.flush
+    context '#flush' do
+      it 'clears metadata on the formatter' do
+        expect(formatter).to_not respond_to(:clear_metadata!)
+        subject.flush
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paul_bunyan
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Duane Johnson
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_store
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Logging for all the things