airbrake 9.5.1 → 9.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b5f9ef24127cd1a044a2959d8c90efd26e39db56e85ade6708340fc66009e36
-  data.tar.gz: 4e79c36be0244afaf4e9716b1d6d7b195cecf3b35bcd0ecfd95afaa426c02c69
+  metadata.gz: 5e8ae1c646cf9107329a7413bd0654873c55b47a84a51c7c25d6c7655768c1fd
+  data.tar.gz: 516194657a9ceca56fd9843f39d4293a74ccee6db11f6ad084519924eb911b46
 SHA512:
-  metadata.gz: 9f8a4e8a07779cee46cb1b7d308db3d97bd9f1008aa4082966dbe0fffc8a043cf78439a7ad8b762887369ce37f1d245b70f9df73a899a1ccfd1b0880854e60bf
-  data.tar.gz: cf80d00213697bf952a3fa6c20a0cdd936381ced3005dccdefed28d4de912f243390e8916f571a3fbc234766bdfd7b8656cdf143010c14b0d7ef5b06372e51a2
+  metadata.gz: 75c112cdf4780dedae3ee51e1d83637f16c2cc1c76fb2cbc077ffa64ebb8dde3aeed4cb589ce3056975fda8f28e36f0dc4e7d212f554a0d413c4d0751bffe02a
+  data.tar.gz: 18e7c15a1630ff39730cb1b8c36f21ea333b2b12f202bbb75e0b82e4c3a4676df1c7b2fc4e8c779559c588b34ce8fc2338ef6992c487274e3254a72b47f09464

data/lib/airbrake/rack/route_filter.rb

@@ -14,7 +14,7 @@ module Airbrake
 
         notice[:context][:route] =
           if action_dispatch_request?(request)
-            Airbrake::Rails::App.recognize_route(request)
+            rails_route(request)
           elsif sinatra_request?(request)
             sinatra_route(request)
           end
@@ -22,6 +22,11 @@ module Airbrake
 
       private
 
+      def rails_route(request)
+        return unless (route = Airbrake::Rails::App.recognize_route(request))
+        route.path.spec.to_s
+      end
+
       def sinatra_route(request)
         return unless (route = request.env['sinatra.route'])
         route.split(' ').drop(1).join(' ')

data/lib/airbrake/rails/action_controller_route_subscriber.rb

@@ -3,21 +3,11 @@ require 'airbrake/rails/app'
 
 module Airbrake
   module Rails
-    # @return [String]
-    CONTROLLER_KEY = 'controller'.freeze
-
-    # @return [String]
-    ACTION_KEY = 'action'.freeze
-
     # ActionControllerRouteSubscriber sends route stat information, including
     # performance data.
     #
     # @since v8.0.0
     class ActionControllerRouteSubscriber
-      def initialize
-        @app = Airbrake::Rails::App.new
-      end
-
       def call(*args)
         # We don't track routeless events.
         return unless (routes = Airbrake::Rack::RequestStore[:routes])
@@ -28,12 +18,20 @@ module Airbrake
         )
         return unless route
 
-        routes[route] = {
+        routes[find_route_name(route)] = {
           method: event.method,
           response_type: event.response_type,
           groups: {}
         }
       end
+
+      def find_route_name(route)
+        if route.app.respond_to?(:app) && route.app.app.respond_to?(:engine_name)
+          "#{route.app.app.engine_name}##{route.path.spec}"
+        else
+          route.path.spec.to_s
+        end
+      end
     end
   end
 end

data/lib/airbrake/rails/app.rb

@@ -1,14 +1,12 @@
 module Airbrake
   module Rails
-    # App is a wrapper around Rails.application and Rails::Engine.
+    # App is a wrapper around Rails.application.
     #
     # @since v9.0.3
     # @api private
     class App
-      Route = Struct.new(:path, :controller, :action)
-
       def self.recognize_route(request)
-        ::Rails.application.routes.router.recognize(request) do |route, _parameters|
+        ::Rails.application.routes.router.recognize(request) do |route, _params|
           # Rails can recognize multiple routes for the given request. For
           # example, if we visit /users/2/edit, then Rails sees these routes:
           #   * "/users/:id/edit(.:format)"
@@ -16,41 +14,9 @@ module Airbrake
           #
           # We return the first route as, what it seems, the most optimal
           # approach.
-          return route.path.spec.to_s
+          return route
         end
       end
-
-      def routes
-        @routes ||= app_routes.merge(engine_routes).flat_map do |(engine_name, routes)|
-          routes.map { |rails_route| build_route(engine_name, rails_route) }
-        end
-      end
-
-      private
-
-      def app_routes
-        # Engine name is nil because this is default (non-engine) routes.
-        { nil => ::Rails.application.routes.routes.routes }
-      end
-
-      def engine_routes
-        ::Rails::Engine.subclasses.flat_map.with_object({}) do |engine, hash|
-          next if (eng_routes = engine.routes.routes.routes).none?
-
-          hash[engine.engine_name] = eng_routes
-        end
-      end
-
-      def build_route(engine_name, rails_route)
-        engine_prefix = engine_name
-        engine_prefix += '#' if engine_prefix
-
-        Route.new(
-          "#{engine_prefix}#{rails_route.path.spec}",
-          rails_route.defaults[:controller],
-          rails_route.defaults[:action]
-        )
-      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 = '9.5.1'.freeze
+  AIRBRAKE_VERSION = '9.5.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 9.5.1
+  version: 9.5.2
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake-ruby