loga 1.3.0 → 1.4.0

data/spec/fixtures/rails50/public/robots.txt

@@ -0,0 +1,5 @@
+# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file
+#
+# To ban all spiders from the entire site uncomment the next two lines:
+# User-agent: *
+# Disallow: /

data/spec/integration/rails/railtie_spec.rb

@@ -60,5 +60,30 @@ RSpec.describe Loga::Railtie do
         end
       end
     end
+
+    context 'ActionController' do
+      [
+        'exist_fragment?.action_controller',
+        'expire_fragment.action_controller',
+        'expire_page.action_controller',
+        'halted_callback.action_controller',
+        'logger.action_controller',
+        'process_action.action_controller',
+        'read_fragment.action_controller',
+        'redirect_to.action_controller',
+        'send_data.action_controller',
+        'send_file.action_controller',
+        'start_processing.action_controller',
+        'unpermitted_parameters.action_controller',
+        'write_fragment.action_controller',
+        'write_page.action_controller',
+      ].each do |notification|
+        let(:notification) { notification }
+
+        it 'removes ActionController::LogSubscriber' do
+          expect(subscribers).to_not include(ActionController::LogSubscriber)
+        end
+      end
+    end
   end
 end

data/spec/integration/rails/request_spec.rb

@@ -26,17 +26,32 @@ describe 'Integration with Rails', timecop: true do
     expect(json_response).to eq('action' => 'show', 'controller' => 'application')
   end
 
-  context 'when a template is rendered' do
-    let(:action_view_notifications) do
-      json_entries.select { |e| e.to_json =~ /Rendered/ }
-    end
+  it 'includes the controller name and action' do
+    get '/ok'
+    expect(json).to include('_request.controller' => 'ApplicationController#ok')
+  end
+
+  describe 'LogSubscriber' do
+    context 'ActionController' do
+      let(:action_controller_notifications) do
+        json_entries.select { |e| e.to_json =~ /Processing by|Completed/ }
+      end
 
-    before { put '/users/5' }
+      it 'silences ActionController::LogSubscriber' do
+        get '/show'
+        expect(action_controller_notifications).to be_empty
+      end
+    end
 
-    specify { expect(last_response.status).to eq(200) }
+    context 'ActionView' do
+      let(:action_view_notifications) do
+        json_entries.select { |e| e.to_json =~ /Rendered/ }
+      end
 
-    it 'silences ActionView::LogSubscriber' do
-      expect(action_view_notifications).to be_empty
+      it 'silences ActionView::LogSubscriber' do
+        put '/users/5'
+        expect(action_view_notifications).to be_empty
+      end
     end
   end
 

data/spec/integration/sinatra_spec.rb

@@ -51,4 +51,9 @@ describe 'Rack request logger with Sinatra', timecop: true do
   end
 
   include_examples 'request logger'
+
+  it 'does not include the controller name and action' do
+    get '/ok'
+    expect(json).to_not include('_request.controller')
+  end
 end

data/spec/support/request_spec.rb

@@ -5,7 +5,7 @@ RSpec.shared_examples 'request logger' do
           { username: 'yoshi' },
           'HTTP_USER_AGENT' => 'Chrome', 'HTTP_X_REQUEST_ID' => '471a34dc'
 
-      expect(json).to match(
+      expect(json).to include(
         'version'             => '1.1',
         'host'                => 'bird.example.com',
         'short_message'       => 'GET /ok?username=yoshi 200 in 0ms',
@@ -35,7 +35,7 @@ RSpec.shared_examples 'request logger' do
            { email: 'hello@world.com' },
            'HTTP_USER_AGENT' => 'Chrome', 'HTTP_X_REQUEST_ID' => '471a34dc'
 
-      expect(json).to match(
+      expect(json).to include(
         'version'             => '1.1',
         'host'                => 'bird.example.com',
         'short_message'       => 'POST /users?username=yoshi 200 in 0ms',
@@ -66,7 +66,7 @@ RSpec.shared_examples 'request logger' do
     it 'specifies the original path' do
       get '/new', {}, 'HTTP_USER_AGENT' => 'Chrome', 'HTTP_X_REQUEST_ID' => '471a34dc'
 
-      expect(json).to match(
+      expect(json).to include(
         'version'             => '1.1',
         'host'                => 'bird.example.com',
         'short_message'       => 'GET /new 302 in 0ms',
@@ -94,7 +94,7 @@ RSpec.shared_examples 'request logger' do
           { username: 'yoshi' },
           'HTTP_USER_AGENT' => 'Chrome', 'HTTP_X_REQUEST_ID' => '471a34dc'
 
-      expect(json).to match(
+      expect(json).to include(
         'version'              => '1.1',
         'host'                 => 'bird.example.com',
         'short_message'        => 'GET /error?username=yoshi 500 in 0ms',
@@ -123,7 +123,7 @@ RSpec.shared_examples 'request logger' do
     it 'does not log the framework exception' do
       get '/not_found', {}, 'HTTP_X_REQUEST_ID' => '471a34dc'
 
-      expect(json).to match(
+      expect(json).to include(
         'version'              => '1.1',
         'host'                 => 'bird.example.com',
         'short_message'        => 'GET /not_found 404 in 0ms',

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

@@ -5,6 +5,14 @@ describe Loga::Rack::Request do
   let(:full_path) { '/' }
   let(:env)       { Rack::MockRequest.env_for(full_path, options) }
 
+  let(:action_controller_class) do
+    ApplicationController = Class.new do
+      def action_name
+        'index'
+      end
+    end
+  end
+
   subject { described_class.new(env) }
 
   describe '#uuid' do
@@ -26,6 +34,46 @@ describe Loga::Rack::Request do
     end
   end
 
+  describe '#action_controller_instance' do
+    let(:action_controller_instance) { action_controller_class.new }
+
+    context 'when ACTION_CONTROLLER_INSTANCE is present' do
+      let(:options) do
+        { 'action_controller.instance' => action_controller_instance }
+      end
+      it 'returns the instance' do
+        expect(subject.action_controller_instance).to eq(action_controller_instance)
+      end
+    end
+
+    context 'when ACTION_DISPATCH_REQUEST_ID blank' do
+      it 'returns nil' do
+        expect(subject.action_controller_instance).to be_nil
+      end
+    end
+  end
+
+  describe '#action_controller' do
+    let(:options) do
+      { 'action_controller.instance' => action_controller_class.new }
+    end
+
+    it 'returns the controller with the action_name' do
+      expect(subject.action_controller).to eq('ApplicationController#index')
+    end
+  end
+
+  describe '#request_id' do
+    let(:action_dispatch_request_id) { 'ABCD' }
+    let(:options) do
+      { 'action_dispatch.request_id' => action_dispatch_request_id }
+    end
+
+    it 'aliases to uuid' do
+      expect(subject.request_id).to eq(subject.uuid)
+    end
+  end
+
   describe '#original_path' do
     let(:path)    { 'users/5/oranges' }
     let(:options) { { 'loga.request.original_path' => path } }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loga
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Funding Circle
@@ -169,14 +169,15 @@ files:
 - circle.yml
 - gemfiles/rails32.gemfile
 - gemfiles/rails40.gemfile
+- gemfiles/rails50.gemfile
 - gemfiles/sinatra14.gemfile
 - gemfiles/unit.gemfile
 - lib/loga.rb
 - lib/loga/configuration.rb
 - lib/loga/event.rb
 - lib/loga/ext/rails/rack/debug_exceptions.rb
+- lib/loga/ext/rails/rack/logger.rb
 - lib/loga/ext/rails/rack/logger3.rb
-- lib/loga/ext/rails/rack/logger4.rb
 - lib/loga/formatter.rb
 - lib/loga/parameter_filter.rb
 - lib/loga/rack/logger.rb
@@ -245,6 +246,44 @@ files:
 - spec/fixtures/rails40/public/500.html
 - spec/fixtures/rails40/public/favicon.ico
 - spec/fixtures/rails40/public/robots.txt
+- spec/fixtures/rails50/Rakefile
+- spec/fixtures/rails50/app/controllers/application_controller.rb
+- spec/fixtures/rails50/app/helpers/application_helper.rb
+- spec/fixtures/rails50/app/views/layouts/application.html.erb
+- spec/fixtures/rails50/app/views/user.html.erb
+- spec/fixtures/rails50/bin/bundle
+- spec/fixtures/rails50/bin/rails
+- spec/fixtures/rails50/bin/rake
+- spec/fixtures/rails50/bin/setup
+- spec/fixtures/rails50/bin/update
+- spec/fixtures/rails50/config.ru
+- spec/fixtures/rails50/config/application.rb
+- spec/fixtures/rails50/config/boot.rb
+- spec/fixtures/rails50/config/cable.yml
+- spec/fixtures/rails50/config/environment.rb
+- spec/fixtures/rails50/config/environments/development.rb
+- spec/fixtures/rails50/config/environments/production.rb
+- spec/fixtures/rails50/config/environments/test.rb
+- spec/fixtures/rails50/config/initializers/application_controller_renderer.rb
+- spec/fixtures/rails50/config/initializers/backtrace_silencers.rb
+- spec/fixtures/rails50/config/initializers/cookies_serializer.rb
+- spec/fixtures/rails50/config/initializers/filter_parameter_logging.rb
+- spec/fixtures/rails50/config/initializers/inflections.rb
+- spec/fixtures/rails50/config/initializers/mime_types.rb
+- spec/fixtures/rails50/config/initializers/new_framework_defaults.rb
+- spec/fixtures/rails50/config/initializers/session_store.rb
+- spec/fixtures/rails50/config/initializers/wrap_parameters.rb
+- spec/fixtures/rails50/config/locales/en.yml
+- spec/fixtures/rails50/config/puma.rb
+- spec/fixtures/rails50/config/routes.rb
+- spec/fixtures/rails50/config/secrets.yml
+- spec/fixtures/rails50/public/404.html
+- spec/fixtures/rails50/public/422.html
+- spec/fixtures/rails50/public/500.html
+- spec/fixtures/rails50/public/apple-touch-icon-precomposed.png
+- spec/fixtures/rails50/public/apple-touch-icon.png
+- spec/fixtures/rails50/public/favicon.ico
+- spec/fixtures/rails50/public/robots.txt
 - spec/integration/rails/railtie_spec.rb
 - spec/integration/rails/request_spec.rb
 - spec/integration/sinatra_spec.rb
@@ -342,6 +381,44 @@ test_files:
 - spec/fixtures/rails40/public/500.html
 - spec/fixtures/rails40/public/favicon.ico
 - spec/fixtures/rails40/public/robots.txt
+- spec/fixtures/rails50/Rakefile
+- spec/fixtures/rails50/app/controllers/application_controller.rb
+- spec/fixtures/rails50/app/helpers/application_helper.rb
+- spec/fixtures/rails50/app/views/layouts/application.html.erb
+- spec/fixtures/rails50/app/views/user.html.erb
+- spec/fixtures/rails50/bin/bundle
+- spec/fixtures/rails50/bin/rails
+- spec/fixtures/rails50/bin/rake
+- spec/fixtures/rails50/bin/setup
+- spec/fixtures/rails50/bin/update
+- spec/fixtures/rails50/config.ru
+- spec/fixtures/rails50/config/application.rb
+- spec/fixtures/rails50/config/boot.rb
+- spec/fixtures/rails50/config/cable.yml
+- spec/fixtures/rails50/config/environment.rb
+- spec/fixtures/rails50/config/environments/development.rb
+- spec/fixtures/rails50/config/environments/production.rb
+- spec/fixtures/rails50/config/environments/test.rb
+- spec/fixtures/rails50/config/initializers/application_controller_renderer.rb
+- spec/fixtures/rails50/config/initializers/backtrace_silencers.rb
+- spec/fixtures/rails50/config/initializers/cookies_serializer.rb
+- spec/fixtures/rails50/config/initializers/filter_parameter_logging.rb
+- spec/fixtures/rails50/config/initializers/inflections.rb
+- spec/fixtures/rails50/config/initializers/mime_types.rb
+- spec/fixtures/rails50/config/initializers/new_framework_defaults.rb
+- spec/fixtures/rails50/config/initializers/session_store.rb
+- spec/fixtures/rails50/config/initializers/wrap_parameters.rb
+- spec/fixtures/rails50/config/locales/en.yml
+- spec/fixtures/rails50/config/puma.rb
+- spec/fixtures/rails50/config/routes.rb
+- spec/fixtures/rails50/config/secrets.yml
+- spec/fixtures/rails50/public/404.html
+- spec/fixtures/rails50/public/422.html
+- spec/fixtures/rails50/public/500.html
+- spec/fixtures/rails50/public/apple-touch-icon-precomposed.png
+- spec/fixtures/rails50/public/apple-touch-icon.png
+- spec/fixtures/rails50/public/favicon.ico
+- spec/fixtures/rails50/public/robots.txt
 - spec/integration/rails/railtie_spec.rb
 - spec/integration/rails/request_spec.rb
 - spec/integration/sinatra_spec.rb