airbrake 8.0.0 → 8.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58dfa88edec41b78188ac561cf0d81082e07eed1
-  data.tar.gz: 63b3966c976c755528967ae46327f6950ee45cb8
+  metadata.gz: ea6485ecf20f5f11c790480b7653686d4e703376
+  data.tar.gz: 64c9bd038461f5947afb3f8f2fa637c9235dbd0b
 SHA512:
-  metadata.gz: babede27bbfa28a9ed3eeb7346c3d47157325a7827d8840b3fc47d9ae41a1b835ff10511ac48f039881e96a2111804537384cd9b78b25ba37cdced559b688b4e
-  data.tar.gz: 81b850c2c9060789f5f69f6974d37a56beb2597dcf282b6ce30d2c48702d4d81987463508849345a196f7edc9078d6c2dbf9046805eaf8d61bd0e3187d4ba7ba
+  metadata.gz: d1a7974fa3dc0bc5ff235c1788538b98c2691f4a287214fcc405e63683b613fc5dc8290be164998194e47ea3b40ab1481f3cdb2da84cfa81f8e95900ac5da811
+  data.tar.gz: a6f4a2f3854083930daf617a2055899ccb15664d4d96c8b9e03c1e7bdaf54d542bb9c72f7a28a33ee08a041facac83f07ea9b23c2042c1bcdf7885bb14c7fc45

data/lib/airbrake/rack.rb

@@ -1,4 +1,5 @@
 require 'airbrake/rack/user'
+require 'airbrake/rack/user_filter'
 require 'airbrake/rack/context_filter'
 require 'airbrake/rack/session_filter'
 require 'airbrake/rack/http_params_filter'

data/lib/airbrake/rack/context_filter.rb

@@ -35,13 +35,10 @@ module Airbrake
         add_framework_version(context)
 
         controller = request.env['action_controller.instance']
-        if controller
-          context[:component] = controller.controller_name
-          context[:action] = controller.action_name
-        end
+        return unless controller
 
-        user = Airbrake::Rack::User.extract(request.env)
-        notice[:context].merge!(user.as_json) if user
+        context[:component] = controller.controller_name
+        context[:action] = controller.action_name
       end
 
       private

data/lib/airbrake/rack/middleware.rb

@@ -13,6 +13,7 @@ module Airbrake
       #   information and append it to notices
       RACK_FILTERS = [
         Airbrake::Rack::ContextFilter,
+        Airbrake::Rack::UserFilter,
         Airbrake::Rack::SessionFilter,
         Airbrake::Rack::HttpParamsFilter,
         Airbrake::Rack::HttpHeadersFilter,

data/lib/airbrake/rack/user_filter.rb

@@ -0,0 +1,23 @@
+module Airbrake
+  module Rack
+    # Adds current user information.
+    #
+    # @since v8.0.1
+    class UserFilter
+      # @return [Integer]
+      attr_reader :weight
+
+      def initialize
+        @weight = 99
+      end
+
+      # @see Airbrake::FilterChain#refine
+      def call(notice)
+        return unless (request = notice.stash[:rack_request])
+
+        user = Airbrake::Rack::User.extract(request.env)
+        notice[:context].merge!(user.as_json) if user
+      end
+    end
+  end
+end

data/lib/airbrake/version.rb

@@ -1,5 +1,5 @@
 # We use Semantic Versioning v2.0.0
 # More information: http://semver.org/
 module Airbrake
-  AIRBRAKE_VERSION = '8.0.0'.freeze
+  AIRBRAKE_VERSION = '8.0.1'.freeze
 end

data/spec/unit/rack/context_filter_spec.rb

@@ -5,8 +5,6 @@ RSpec.describe Airbrake::Rack::ContextFilter do
     Rack::MockRequest.env_for(url, opts)
   end
 
-  subject { described_class.new }
-
   let(:notice) do
     Airbrake.build_notice('oops').tap do |notice|
       notice.stash[:rack_request] = Rack::Request.new(env_for(uri, opts))

data/spec/unit/rack/http_headers_filter_spec.rb

@@ -5,8 +5,6 @@ RSpec.describe Airbrake::Rack::HttpHeadersFilter do
     Rack::MockRequest.env_for(url, opts)
   end
 
-  subject { described_class.new }
-
   let(:notice) do
     Airbrake.build_notice('oops').tap do |notice|
       notice.stash[:rack_request] = Rack::Request.new(env_for(uri, opts))

data/spec/unit/rack/http_params_filter_spec.rb

@@ -5,8 +5,6 @@ RSpec.describe Airbrake::Rack::HttpParamsFilter do
     Rack::MockRequest.env_for(url, opts)
   end
 
-  subject { described_class.new }
-
   let(:notice) do
     Airbrake.build_notice('oops').tap do |notice|
       notice.stash[:rack_request] = Rack::Request.new(env_for(uri, opts))

data/spec/unit/rack/request_body_filter_spec.rb

@@ -5,8 +5,6 @@ RSpec.describe Airbrake::Rack::RequestBodyFilter do
     Rack::MockRequest.env_for(url, opts)
   end
 
-  subject { described_class.new }
-
   let(:notice) do
     Airbrake.build_notice('oops').tap do |notice|
       notice.stash[:rack_request] = Rack::Request.new(env_for(uri, opts))

data/spec/unit/rack/session_filter_spec.rb

@@ -5,8 +5,6 @@ RSpec.describe Airbrake::Rack::SessionFilter do
     Rack::MockRequest.env_for(url, opts)
   end
 
-  subject { described_class.new }
-
   let(:notice) do
     Airbrake.build_notice('oops').tap do |notice|
       notice.stash[:rack_request] = Rack::Request.new(env_for(uri, opts))

data/spec/unit/rack/user_filter_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+RSpec.describe Airbrake::Rack::UserFilter do
+  def env_for(url, opts = {})
+    Rack::MockRequest.env_for(url, opts)
+  end
+
+  let(:notice) do
+    Airbrake.build_notice('oops').tap do |notice|
+      notice.stash[:rack_request] = Rack::Request.new(env_for('/', {}))
+    end
+  end
+
+  let(:user_payload) { { username: 'bingo' } }
+  let(:user) { Airbrake::Rack::User.new(double(user_payload)) }
+
+  it "delegates extraction of the current user information" do
+    expect(Airbrake::Rack::User).to receive(:extract).and_return(user)
+    subject.call(notice)
+    expect(notice[:context][:user]).to eq(user_payload)
+  end
+
+  context "when no current user is found" do
+    let(:user) { Airbrake::Rack::User.new(double) }
+
+    it "does not include the user key in the payload" do
+      expect(Airbrake::Rack::User).to receive(:extract).and_return(user)
+      subject.call(notice)
+      expect(notice[:context].keys).not_to include(:user)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 8.0.0
+  version: 8.0.1
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake-ruby
@@ -257,6 +257,7 @@ files:
 - lib/airbrake/rack/route_filter.rb
 - lib/airbrake/rack/session_filter.rb
 - lib/airbrake/rack/user.rb
+- lib/airbrake/rack/user_filter.rb
 - lib/airbrake/rails.rb
 - lib/airbrake/rails/action_controller.rb
 - lib/airbrake/rails/action_controller_subscriber.rb
@@ -296,6 +297,7 @@ files:
 - spec/unit/rack/request_body_filter_spec.rb
 - spec/unit/rack/route_filter_spec.rb
 - spec/unit/rack/session_filter_spec.rb
+- spec/unit/rack/user_filter_spec.rb
 - spec/unit/rack/user_spec.rb
 - spec/unit/rake/tasks_spec.rb
 - spec/unit/shoryuken_spec.rb
@@ -341,6 +343,7 @@ test_files:
 - spec/unit/rack/middleware_spec.rb
 - spec/unit/rack/session_filter_spec.rb
 - spec/unit/rack/context_filter_spec.rb
+- spec/unit/rack/user_filter_spec.rb
 - spec/unit/rack/user_spec.rb
 - spec/unit/rack/route_filter_spec.rb
 - spec/integration/sinatra/sinatra_spec.rb