airbrake 9.4.4 → 9.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 645e4f963a8955c17a652cf468917e2ae514f849
-  data.tar.gz: 4f383442884699b67bd81943fd1c64cb527eb2d1
+SHA256:
+  metadata.gz: dc5653068c80669e6ed4a43ffc993715337e59ae4b13169fbc9cf5b82e438804
+  data.tar.gz: 272a62d259ac08b1cbd66db11b84fbbae272fb12aea9a6edefd6e3d9d26d18db
 SHA512:
-  metadata.gz: dab6ccce21fc171ef09f1d3e103ca6a02e943f997d17731da3d752ffcc789f46647789b189b827a26daace21683edc9dc6d3ada9dfebff3e869f5881d945ec5f
-  data.tar.gz: 3f2582844fd96b45c1e378a30b5950e32b05393630c2b716e15ffe49c244321e42f1db0646c3d3bf2a315efa09c07d8d16a3a72064c1a8f6c57be36200e09dbd
+  metadata.gz: ae7993740f12db8a622f4264157bf71cc9e84e7f2674a1d73e61202217823ea478f3f512cdc9eaeafb828517d5101417be65869c51d1a27624bc22ae9724cbc6
+  data.tar.gz: 2bc63b888f983a7622a1e63caa4d6cc76597aacbfcb28dcc79484da038ee2cafc91773edb40a3061b771f091579a5b3f701b5c456f2d7aba35ac0b3af76d03e7

data/lib/airbrake/rack/route_filter.rb

@@ -1,3 +1,5 @@
+require 'airbrake/rails/app'
+
 module Airbrake
   module Rack
     # Adds route slugs to context/route.
@@ -23,16 +25,8 @@ module Airbrake
       private
 
       def rails_route(request)
-        ::Rails.application.routes.router.recognize(request) do |route, _parameters|
-          # 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)"
-          #   *  "/"
-          #
-          # We return the first route as, what it seems, the most optimal
-          # approach.
-          return route.path.spec.to_s
-        end
+        return unless (route = Airbrake::Rails::App.recognize_route(request))
+        route.path.spec.to_s
       end
 
       def sinatra_route(request)

data/lib/airbrake/rails/action_controller_route_subscriber.rb

@@ -8,31 +8,28 @@ module Airbrake
     #
     # @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])
 
         event = Airbrake::Rails::Event.new(*args)
-        route = find_route(event.params)
+        route = Airbrake::Rails::App.recognize_route(
+          Airbrake::Rack::RequestStore[:request]
+        )
         return unless route
 
-        routes[route.path] = {
+        routes[find_route_name(route)] = {
           method: event.method,
           response_type: event.response_type,
           groups: {}
         }
       end
 
-      private
-
-      def find_route(params)
-        @app.routes.find do |route|
-          route.controller == params['controller'] &&
-            route.action == params['action']
+      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

data/lib/airbrake/rails/app.rb

@@ -1,43 +1,22 @@
 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 routes
-        @routes ||= app_routes.merge(engine_routes).flat_map do |(engine_name, routes)|
-          routes.map { |rails_route| build_route(engine_name, rails_route) }
+      def self.recognize_route(request)
+        ::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)"
+          #   *  "/"
+          #
+          # We return the first route as, what it seems, the most optimal
+          # approach.
+          return 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/rails/railtie.rb

@@ -44,7 +44,7 @@ module Airbrake
 
       # rubocop:disable Metrics/BlockLength
       initializer('airbrake.action_controller') do
-        ActiveSupport.on_load(:action_controller) do
+        ActiveSupport.on_load(:action_controller, run_once: true) do
           # Patches ActionController with methods that allow us to retrieve
           # interesting request data. Appends that information to notices.
           require 'airbrake/rails/action_controller'
@@ -93,11 +93,14 @@ module Airbrake
       # rubocop:enable Metrics/BlockLength
 
       initializer('airbrake.active_record') do
-        ActiveSupport.on_load(:active_record) do
+        ActiveSupport.on_load(:active_record, run_once: true) do
           # Reports exceptions occurring in some bugged ActiveRecord callbacks.
           # Applicable only to the versions of Rails lower than 4.2.
-          require 'airbrake/rails/active_record'
-          include Airbrake::Rails::ActiveRecord
+          if defined?(::Rails) &&
+             Gem::Version.new(::Rails.version) <= Gem::Version.new('4.2')
+            require 'airbrake/rails/active_record'
+            include Airbrake::Rails::ActiveRecord
+          end
 
           if defined?(ActiveRecord) && Airbrake::Config.instance.query_stats
             # Send SQL queries.
@@ -117,7 +120,7 @@ module Airbrake
       end
 
       initializer('airbrake.active_job') do
-        ActiveSupport.on_load(:active_job) do
+        ActiveSupport.on_load(:active_job, run_once: true) do
           # Reports exceptions occurring in ActiveJob jobs.
           require 'airbrake/rails/active_job'
           include Airbrake::Rails::ActiveJob
@@ -125,7 +128,7 @@ module Airbrake
       end
 
       initializer('airbrake.action_cable') do
-        ActiveSupport.on_load(:action_cable) do
+        ActiveSupport.on_load(:action_cable, run_once: true) do
           # Reports exceptions occurring in ActionCable connections.
           require 'airbrake/rails/action_cable'
         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.4.4'.freeze
+  AIRBRAKE_VERSION = '9.5.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airbrake
 version: !ruby/object:Gem::Version
-  version: 9.4.4
+  version: 9.5.3
 platform: ruby
 authors:
 - Airbrake Technologies, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake-ruby
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.6'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +226,34 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.13.0
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.11.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.11.3
+- !ruby/object:Gem::Dependency
+  name: rack-cache
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -394,7 +422,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Airbrake is an online tool that provides robust exception tracking in any