action_tracer 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 571e846122caa7adaac3bf172d8554d39bfc78c8227a6dbcc5ec02e7c675c000
-  data.tar.gz: 88caafd405cfe90801a6ed65fe61a8b464fb8467c4ed8bd012edf7ac7ebb4dbc
+  metadata.gz: 421d6789ec680cc762a0844c9182d4dd8b03a5c6371c1a1852cb1fd0e2c0746a
+  data.tar.gz: b13b98ed44e0cb98df31709135170e6764eb11df43ba528d696cfa253835cec8
 SHA512:
-  metadata.gz: c553fc5f4b408233ad1883899f2cfee9f5c38f19499c7312c023a5774d6a483c2250d57a6a9d8ab99772f2ca02f95a34d98594dc8216e79bffaad560c4781959
-  data.tar.gz: ea31f4fe2bdb38abc5a8607eaf4ea90269507f19430c024730fa98655da6c589c49f07163b120818c24d92e602c2e26ab36ebf95a57c97ef8dc60110110572cb
+  metadata.gz: a97e4728b5ca7f02f7ee5c2bb384edeba87bf5eaac370bdf2dbfdc6833ccc7607595618234df5ac7c7e76c1701fcb18e90ffe4ff886528c75ca0a279432b8562
+  data.tar.gz: 1c81fe333dd9815b5dbcd93689d5443e17e39e2bdf4876639e432e66282b5f1f64d993f2f84d9232e065f862ef13c651aacfc58e4fc48b3ad9a19ed07191f0ce

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.3
+
+* Deal with Rails7.x.
+
 ## 0.2.2
 
 * Log filters even when controllers raise error.

data/lib/action_tracer/filters.rb

@@ -51,15 +51,23 @@ module ActionTracer
       @action = action
     end
 
-    def self.build(controller)
-      filters = { before: [], after: [], around: [] }
-      raw_filters = controller.__callbacks[:process_action].send(:chain).group_by(&:kind)
-      raw_filters.each do |kind, filter|
-        filters[kind] = filter.map(&:raw_filter).map do |f|
-          Filter.new(f, method: f.is_a?(Symbol) ? controller.method(f) : f)
+    class << self
+      def build(controller)
+        filters = { before: [], after: [], around: [] }
+        raw_filters = controller.__callbacks[:process_action].send(:chain).group_by(&:kind)
+        raw_filters.each do |kind, filter|
+          filters[kind] = filter.map { |f| f.__send__(filter_method) }.map do |f|
+            Filter.new(f, method: f.is_a?(Symbol) ? controller.method(f) : f)
+          end
         end
+        new(filters[:before], filters[:after], filters[:around], action: Action.build(controller))
+      end
+
+      private
+
+      def filter_method
+        @filter_method ||= Rails::VERSION::MAJOR > 6 ? :filter : :raw_filter
       end
-      new(filters[:before], filters[:after], filters[:around], action: Action.build(controller))
     end
 
     def print

data/lib/action_tracer/monkey_patches/active_support/callbacks.rb

@@ -5,20 +5,64 @@ module ActionTracer
     module ActiveSupport
       module Callbacks
         module CallTemplate
-          def expand(*)
-            target, block, method, *arguments = super
-            if target.is_a? ActionController::Base
-              case method
-              when :instance_exec # filter is a proc
-                ActionTracer.applied_filters << block
-              when String         # filter is an object
-                ActionTracer.applied_filters << block
-              when Symbol         # filter is a method
-                ActionTracer.applied_filters << method
+          if Rails::VERSION::MAJOR > 6
+            module MethodCall
+              def expand(*)
+                super.tap { ActionTracer.applied_filters << @method_name }
+              end
+
+              def make_lambda
+                super >> proc { ActionTracer.applied_filters << @method_name }
+              end
+
+              def inverted_lambda
+                super >> proc { ActionTracer.applied_filters << @method_name }
+              end
+            end
+
+            module ProcCall
+              def expand(*)
+                super.tap { ActionTracer.applied_filters << @override_target }
+              end
+
+              def make_lambda
+                super >> proc { ActionTracer.applied_filters << @override_target }
+              end
+
+              def inverted_lambda
+                super >> proc { ActionTracer.applied_filters << @override_target }
+              end
+            end
+
+            module InstanceExec
+              def expand(*)
+                super.tap { ActionTracer.applied_filters << @override_block }
+              end
+
+              def make_lambda
+                super >> proc { ActionTracer.applied_filters << @override_block }
+              end
+
+              def inverted_lambda
+                super >> proc { ActionTracer.applied_filters << @override_block }
               end
             end
+          else
+            def expand(*)
+              target, block, method, *arguments = super
+              if target.is_a? ActionController::Base
+                case method
+                when :instance_exec # filter is a proc
+                  ActionTracer.applied_filters << block
+                when String         # filter is an object
+                  ActionTracer.applied_filters << block
+                when Symbol         # filter is a method
+                  ActionTracer.applied_filters << method
+                end
+              end
 
-            [target, block, method, *arguments]
+              [target, block, method, *arguments]
+            end
           end
         end
       end

data/lib/action_tracer/railtie.rb

@@ -23,7 +23,29 @@ module ActionTracer
     initializer "action_tracer" do
       ActiveSupport.on_load(:action_controller) do
         require "action_tracer/monkey_patches/active_support/callbacks"
-        ::ActiveSupport::Callbacks::CallTemplate.prepend ActionTracer::MonkeyPatches::ActiveSupport::Callbacks::CallTemplate
+        if Rails::VERSION::MAJOR > 6
+          [
+            ::ActiveSupport::Callbacks::CallTemplate::MethodCall,
+            ::ActiveSupport::Callbacks::CallTemplate::ObjectCall,
+          ].each do |klass|
+            klass.prepend ActionTracer::MonkeyPatches::ActiveSupport::Callbacks::CallTemplate::MethodCall
+          end
+          [
+            ::ActiveSupport::Callbacks::CallTemplate::InstanceExec0,
+            ::ActiveSupport::Callbacks::CallTemplate::InstanceExec1,
+            ::ActiveSupport::Callbacks::CallTemplate::InstanceExec2,
+          ].each do |klass|
+            klass.prepend ActionTracer::MonkeyPatches::ActiveSupport::Callbacks::CallTemplate::InstanceExec
+          end
+          [
+            ::ActiveSupport::Callbacks::CallTemplate::ProcCall,
+          ].each do |klass|
+            klass.prepend ActionTracer::MonkeyPatches::ActiveSupport::Callbacks::CallTemplate::ProcCall
+          end
+        else
+          ::ActiveSupport::Callbacks::CallTemplate.prepend ActionTracer::MonkeyPatches::ActiveSupport::Callbacks::CallTemplate
+        end
+
         require "action_tracer/monkey_patches/abstract_controller/callbacks"
         ::ActionController::Base.prepend ActionTracer::MonkeyPatches::AbstractController::Callbacks
 

data/lib/action_tracer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActionTracer
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_tracer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - makicamel
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-27 00:00:00.000000000 Z
+date: 2022-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -99,7 +99,7 @@ homepage: https://github.com/makicamel/action_tracer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -114,8 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Log Rails application actions and filters when accepts a request
 test_files: []