loga 2.2.0 → 2.3.0

data/spec/unit/loga/formatters/simple_formatter_spec.rb

@@ -20,6 +20,7 @@ describe Loga::Formatters::SimpleFormatter do
 
     context 'when the message parameter is a nil' do
       let(:message) { nil }
+
       specify do
         expect(subject).to eq("I, #{time_pid} nil\n")
       end
@@ -100,7 +101,9 @@ describe Loga::Formatters::SimpleFormatter do
       let(:tags) { %w[USER_54321 EmailWorker] }
 
       before do
+        # rubocop:disable RSpec/AnyInstance
         allow_any_instance_of(described_class).to receive(:current_tags).and_return(tags)
+        # rubocop:enable RSpec/AnyInstance
       end
 
       specify do

data/spec/unit/loga/log_subscribers/action_mailer_spec.rb

@@ -5,14 +5,15 @@ require 'loga/log_subscribers/action_mailer'
 RSpec.describe Loga::LogSubscribers::ActionMailer do
   subject(:mailer) { described_class.new }
 
-  let(:event) do
-    double('event', payload: payload, duration: 0.0001, time: Time.now)
-  end
+  before { stub_loga }
 
-  before do
-    Loga.reset
-
-    Loga.configure(service_name: 'hello_world_app')
+  let(:event) do
+    instance_double(
+      'ActiveSupport::Notifications::Event',
+      payload: payload,
+      duration: 0.0001,
+      time: Time.now,
+    )
   end
 
   describe '#deliver' do
@@ -25,9 +26,9 @@ RSpec.describe Loga::LogSubscribers::ActionMailer do
       end
 
       it 'logs an info message' do
-        expect(Loga.logger).to receive(:info).with(kind_of(Loga::Event))
-
+        allow(Loga.logger).to receive(:info)
         mailer.deliver(event)
+        expect(Loga.logger).to have_received(:info).with(kind_of(Loga::Event))
       end
     end
   end
@@ -42,9 +43,9 @@ RSpec.describe Loga::LogSubscribers::ActionMailer do
       end
 
       it 'logs an info message' do
-        expect(Loga.logger).to receive(:debug).with(kind_of(Loga::Event))
-
+        allow(Loga.logger).to receive(:debug)
         mailer.process(event)
+        expect(Loga.logger).to have_received(:debug).with(kind_of(Loga::Event))
       end
     end
   end
@@ -60,9 +61,9 @@ RSpec.describe Loga::LogSubscribers::ActionMailer do
       end
 
       it 'logs an info message' do
-        expect(Loga.logger).to receive(:info).with(kind_of(Loga::Event))
-
+        allow(Loga.logger).to receive(:info)
         mailer.receive(event)
+        expect(Loga.logger).to have_received(:info).with(kind_of(Loga::Event))
       end
     end
   end

data/spec/unit/loga/parameter_filter_spec.rb

@@ -11,8 +11,8 @@ RSpec.describe Loga::ParameterFilter do
     end
 
     it 'compiles filters only once' do
-      expect(compiled_filters).to receive(:compile).once
       2.times { subject.filter(params) }
+      expect(compiled_filters).to have_received(:compile).once
     end
   end
 

data/spec/unit/loga/rack/logger_spec.rb

@@ -1,7 +1,10 @@
 require 'spec_helper'
 require 'rack/test'
 
+# rubocop:disable RSpec/SubjectStub, RSpec/MessageSpies, RSpec/VerifiedDoubles
 describe Loga::Rack::Logger do
+  subject { described_class.new(app) }
+
   let(:env)     { Rack::MockRequest.env_for('/about_us?limit=1', options) }
   let(:options) { {} }
   let(:app)     {  ->(_env) { [response_status, {}, ''] } }
@@ -18,8 +21,6 @@ describe Loga::Rack::Logger do
     )
   end
 
-  subject { described_class.new(app) }
-
   before { Loga.instance_variable_set(:@configuration, configuration) }
 
   shared_examples 'logs the event' do |details|
@@ -54,8 +55,9 @@ describe Loga::Rack::Logger do
     end
 
     it "logs the Loga::Event with severity #{details[:level]}" do
-      expect(logger).to receive(level).with(an_instance_of(Loga::Event))
+      allow(logger).to receive(level)
       subject.call(env)
+      expect(logger).to have_received(level).with(an_instance_of(Loga::Event))
     end
   end
 
@@ -96,7 +98,7 @@ describe Loga::Rack::Logger do
       include_examples 'logs the event', level: :info
     end
 
-    context 'when the exception is on rack.exception', focus: true do
+    context 'when the exception is on rack.exception' do
       let(:response_status)  { 500 }
       let(:exception)        { StandardError }
       let(:logged_exception) { exception }
@@ -124,12 +126,14 @@ describe Loga::Rack::Logger do
         let(:tags) { [:foo] }
 
         it 'yields the app with tags' do
-          expect(logger).to receive(:tagged).with(:tag) do |&block|
+          allow(logger).to receive(:tagged)
+          subject.call(env)
+          expect(logger).to have_received(:tagged).with(:tag) do |&block|
             expect(block.call).to eq(:response)
           end
-          subject.call(env)
         end
       end
     end
   end
 end
+# rubocop:enable RSpec/SubjectStub, RSpec/MessageSpies, RSpec/VerifiedDoubles

data/spec/unit/loga/rack/request_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Loga::Rack::Request do
+  subject { described_class.new(env) }
+
   let(:options)   { {} }
   let(:full_path) { '/' }
   let(:env)       { Rack::MockRequest.env_for(full_path, options) }
@@ -23,8 +25,6 @@ describe Loga::Rack::Request do
     allow(Loga).to receive(:configuration).and_return(config)
   end
 
-  subject { described_class.new(env) }
-
   describe '#uuid' do
     let(:action_dispatch_request_id) { 'ABCD' }
 
@@ -32,6 +32,7 @@ describe Loga::Rack::Request do
       let(:options) do
         { 'action_dispatch.request_id' => action_dispatch_request_id }
       end
+
       it 'returns the middleware value' do
         expect(subject.uuid).to eq(action_dispatch_request_id)
       end
@@ -90,7 +91,7 @@ describe Loga::Rack::Request do
 
     let(:options) { { 'loga.request.original_path' => path } }
 
-    context 'request with sensitive parameters' do
+    describe 'request with sensitive parameters' do
       it 'returns the path with sensitive parameters filtered' do
         expect(subject.filtered_full_path).to eq('/hello?password=[FILTERED]&color=red')
       end

data/spec/unit/loga/utilities_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
 describe Loga::Utilities do
-  subject { Object.new.extend(Loga::Utilities) }
+  subject { Object.new.extend(described_class) }
 
   describe 'duration_in_ms#(started_at, ended_at)' do
+    subject { super().duration_in_ms(start_time, end_time) }
+
     let(:start_time) { Time.new(2002, 10, 31, 2, 2, 2.0) }
     let(:end_time)   { Time.new(2002, 10, 31, 2, 2, 2.6789) }
 
-    subject { super().duration_in_ms(start_time, end_time) }
-
     it 'calculates elapsed time rounding the nearest millisecond' do
       expect(subject).to eq(679)
     end

data/spec/unit/loga_spec.rb

@@ -12,15 +12,17 @@ describe Loga do
 
   describe '.configure' do
     it 'configures Loga' do
-      expect(Loga::Configuration).to receive(:new).with(options, {}).and_call_original
+      allow(Loga::Configuration).to receive(:new).and_call_original
       subject.configure(options)
+      expect(Loga::Configuration).to have_received(:new).with(options, {})
     end
 
     context 'when framework options provided' do
       it 'configures Loga' do
-        expect(Loga::Configuration)
-          .to receive(:new).with(options, framework_options).and_call_original
+        allow(Loga::Configuration).to receive(:new).and_call_original
         subject.configure(options, framework_options)
+        expect(Loga::Configuration).to have_received(:new)
+          .with(options, framework_options)
       end
     end
 
@@ -61,6 +63,7 @@ describe Loga do
 
     context 'when Loga is configured' do
       before { subject.configure(options) }
+
       specify { expect(subject.logger).to be_kind_of(Logger) }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: loga
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Funding Circle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-15 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -164,34 +164,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeredis
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.57.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: 0.57.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  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: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -231,6 +259,7 @@ files:
 - gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
 - gemfiles/rails52.gemfile
+- gemfiles/sidekiq51.gemfile
 - gemfiles/sinatra14.gemfile
 - gemfiles/unit.gemfile
 - lib/loga.rb
@@ -249,6 +278,8 @@ files:
 - lib/loga/rack/request_id.rb
 - lib/loga/railtie.rb
 - lib/loga/service_version_strategies.rb
+- lib/loga/sidekiq.rb
+- lib/loga/sidekiq/job_logger.rb
 - lib/loga/tagged_logging.rb
 - lib/loga/utilities.rb
 - lib/loga/version.rb
@@ -263,7 +294,10 @@ files:
 - spec/integration/rails/action_mailer_spec.rb
 - spec/integration/rails/railtie_spec.rb
 - spec/integration/rails/request_spec.rb
+- spec/integration/sidekiq_spec.rb
 - spec/integration/sinatra_spec.rb
+- spec/loga/sidekiq/job_logger_spec.rb
+- spec/loga/sidekiq_spec.rb
 - spec/spec_helper.rb
 - spec/support/gethostname_shared.rb
 - spec/support/helpers.rb
@@ -300,7 +334,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Facilitate log aggregation via unified logging
@@ -315,7 +349,10 @@ test_files:
 - spec/integration/rails/action_mailer_spec.rb
 - spec/integration/rails/railtie_spec.rb
 - spec/integration/rails/request_spec.rb
+- spec/integration/sidekiq_spec.rb
 - spec/integration/sinatra_spec.rb
+- spec/loga/sidekiq/job_logger_spec.rb
+- spec/loga/sidekiq_spec.rb
 - spec/spec_helper.rb
 - spec/support/gethostname_shared.rb
 - spec/support/helpers.rb