action_tracer 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1d5ce6f77e55850f0208941baa76ad2e6b842fc191a45816a7acc08fdd9295b
-  data.tar.gz: '09d69bcc6c5865871fc0ce8a560f3f41a3fb951bbd2bd08051b4ba45526b7d97'
+  metadata.gz: 0061b0039b327ef7923b1ccb60a49d3ecc299f93fbf13061087b90f0ae511865
+  data.tar.gz: bba51412925a6b3d23aeabc2e68c58ce6c572323a7ac4ba749f0de077dcc42af
 SHA512:
-  metadata.gz: a45589c3b67d0108093a9f8e221173d64147cc2b2f06a6fa67ece389d08767e7062b0b6789a68116005944d921aef969685e0b4fe1bc074eb3dc0abb8781ef36
-  data.tar.gz: 0aee1ec34d63aad007062478cf5c2f97df97ddbd6975a63744c6acac4aa16602d97feb5327de1131c6f5fff3d00edee1bfc707568606b115e81f0c2787619fc5
+  metadata.gz: 25be298bf88d787985c8b056fec084b225623de7d904b1872a541fcd3da338214ed31169492e4fceae38ca7568c2592280ce3b7483f608a3c8f6fba7cbfd717d
+  data.tar.gz: 4f90d3dfef39cdf116bff177057a74d8f889a33a23e66a6e68685057acef8cc4e15ae8d432d413848621d6009309f65c14718d2738c2551a02a0ff234e2d4a2f

data/.gitignore

@@ -6,6 +6,8 @@
 /pkg/
 /spec/reports/
 /tmp/
-
-# rspec failure tracking
-.rspec_status
+/log/
+/test/log/
+/test/tmp/
+Gemfile.lock
+.byebug_history

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.2.4
+
+* Fix bug for Rails7.x support.
+
+## 0.2.3
+
+* Deal with Rails7.x.
+
+## 0.2.2
+
+* Log filters even when controllers raise error.
+
 ## 0.2.1
 
 * Fix not to raise error when controllers does not have action definitions.

data/action_tracer.gemspec

@@ -23,8 +23,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport"
   spec.add_dependency "actionpack"
-
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "byebug"
+  spec.add_development_dependency "minitest"
 end

data/lib/action_tracer/action_tracer.rb

@@ -6,6 +6,7 @@ module ActionTracer
   class << self
     def log(controller)
       result = yield
+    ensure
       Filters.build(controller).print
       applied_filters.clear
       ActionTracer.logger.info ""

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 { |result| ActionTracer.applied_filters << @method_name; result }
+              end
+
+              def inverted_lambda
+                super >> proc { |result| ActionTracer.applied_filters << @method_name; result }
+              end
+            end
+
+            module ProcCall
+              def expand(*)
+                super.tap { ActionTracer.applied_filters << @override_target }
+              end
+
+              def make_lambda
+                super >> proc { |result| ActionTracer.applied_filters << @override_target; result }
+              end
+
+              def inverted_lambda
+                super >> proc { |result| ActionTracer.applied_filters << @override_target; result }
+              end
+            end
+
+            module InstanceExec
+              def expand(*)
+                super.tap { ActionTracer.applied_filters << @override_block }
+              end
+
+              def make_lambda
+                super >> proc { |result| ActionTracer.applied_filters << @override_block; result }
+              end
+
+              def inverted_lambda
+                super >> proc { |result| ActionTracer.applied_filters << @override_block; result }
               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.1"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_tracer
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - makicamel
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-06 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,21 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -113,7 +99,7 @@ homepage: https://github.com/makicamel/action_tracer
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -128,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: []