rails_tracepoint_stack 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37171281cd058faf3a6dadf86d4a2e56e57417f1ccf46af6d010a2a1f5657562
-  data.tar.gz: 7bc1956035baaf3308ed562024c7376eb59a6c6bb59e23e450a66f51e2b2d650
+  metadata.gz: a3045ee154f570e6a780af9aff0edfcd18822b3394a0f268ee9a4e07e6d5769f
+  data.tar.gz: 9865f094f0a70ffcb474148aaab7ee6712ac63450326bf7e3385dfc55e1c123f
 SHA512:
-  metadata.gz: 0f452899bde414b1a11dce5fd483843b980629c1dad42aa73b045c9c3315dd9226b36cd98f47b8a5c11221aed26d2aaf62c87fd294a07145936a100c164f3a07
-  data.tar.gz: 37fb83da7315e329a9d75ad32ca198c7464be7aadead056abd19f0a1ad3190e859c0d4c4bb47572a0755cb259349b45bd3984ec50ef74ece89a843aa4f2d5c52
+  metadata.gz: 6c5482941d4e5119b88133eca986cdb87c490d0ed6e69ed0df5a09ebe1d2efebff0c4abbf9b554abf44cbab80038b96b3bf53cb8c86b1052b967d7ad307573d8
+  data.tar.gz: 699757a6965a6101ee9b80e5039580840a5e34de1271538a286d95c6ea5d2f0e678e666c8f098b2a93df5896868fc821182258f4d07616684bace6857087e7b8

data/lib/rails_tracepoint_stack/filter/custom_trace_selector_filter.rb

@@ -0,0 +1,19 @@
+module RailsTracepointStack
+  module Filter
+    module CustomTraceSelectorFilter
+      def is_a_trace_required_to_watch_by_the_custom_configs?(trace:)
+        return false unless RailsTracepointStack.configuration.file_path_to_filter_patterns.any?
+
+        !filter_match_a_custom_pattern_to_be_not_ignored?(trace)
+      end
+
+      private
+
+      def filter_match_a_custom_pattern_to_be_not_ignored?(trace)
+        RailsTracepointStack.configuration.file_path_to_filter_patterns.any? do |pattern|
+          trace.file_path.match?(pattern)
+        end
+      end
+    end
+  end
+end

data/lib/rails_tracepoint_stack/filter/trace_from_dependencies_filter.rb

@@ -0,0 +1,42 @@
+require 'rails_tracepoint_stack/filter/gem_path'
+require 'rails_tracepoint_stack/filter/rb_config'
+
+module RailsTracepointStack
+  module Filter
+    module TraceFromDependenciesFilter
+      def should_ignore_because_is_a_internal_dependency?(trace:)
+        return false if not_ignore_external_source_traces?
+        
+        file_path_starts_with_gem_path?(trace) ||
+        file_path_starts_with_ruby_lib_path?(trace) ||
+        file_path_include_bundler_gems_path?(trace)
+      end
+
+      private
+
+      def file_path_starts_with_gem_path?(trace)
+        gem_paths.any? { |path| trace.file_path.start_with?(path) }
+      end
+   
+      def file_path_starts_with_ruby_lib_path?(trace)
+        trace.file_path.start_with?(ruby_lib_path)
+      end
+  
+      def file_path_include_bundler_gems_path?(trace)
+        trace.file_path.include?("gems/bundler")
+      end
+  
+      def gem_paths
+        @gem_paths ||= RailsTracepointStack::Filter::GemPath.full_gem_path
+      end
+  
+      def ruby_lib_path
+        @ruby_lib_path ||= RailsTracepointStack::Filter::RbConfig.ruby_lib_path
+      end
+
+      def not_ignore_external_source_traces?
+        RailsTracepointStack.configuration.log_external_sources
+      end
+    end
+  end
+end

data/lib/rails_tracepoint_stack/filter/trace_from_ruby_code_filter.rb

@@ -0,0 +1,17 @@
+module RailsTracepointStack
+  module Filter
+    module TraceFromRubyCodeFilter
+      def should_ignore_because_is_ruby_trace?(trace:)
+        return false if not_ignore_external_source_traces?
+
+        trace.file_path.start_with?('<internal:') || trace.file_path == '(eval)'
+      end 
+
+      private
+
+      def not_ignore_external_source_traces?
+        RailsTracepointStack.configuration.log_external_sources
+      end
+    end
+  end
+end

data/lib/rails_tracepoint_stack/filter/trace_to_ignore_filter.rb

@@ -0,0 +1,14 @@
+module RailsTracepointStack
+  module Filter
+    module TraceToIgnoreFilter
+      def attends_some_custom_pattern_to_ignore?(trace:)
+        return false unless RailsTracepointStack.configuration.ignore_patterns.any?
+        
+        RailsTracepointStack
+          .configuration
+          .ignore_patterns
+          .any? { |pattern| trace.file_path.match?(pattern) }
+      end
+    end
+  end
+end

data/lib/rails_tracepoint_stack/trace_filter.rb

@@ -1,63 +1,30 @@
-require 'rails_tracepoint_stack/filter/gem_path'
-require 'rails_tracepoint_stack/filter/rb_config'
+require 'rails_tracepoint_stack/filter/custom_trace_selector_filter'
+require 'rails_tracepoint_stack/filter/trace_from_dependencies_filter'
+require 'rails_tracepoint_stack/filter/trace_from_ruby_code_filter'
+require 'rails_tracepoint_stack/filter/trace_to_ignore_filter'
 
 module RailsTracepointStack
-  class TraceFilter
-    def self.ignore_trace?(trace:)
-      if defined_file_path_to_filter_patterns?
-        not_matches_file_path_to_filter_patterns?(trace)
-      else
-        contains_to_ignore_strings?(trace) || from_gempath_or_lib_path?(trace) || is_a_to_ignore_pattern?(trace)
+  module TraceFilter
+    include RailsTracepointStack::Filter::CustomTraceSelectorFilter
+    include RailsTracepointStack::Filter::TraceFromDependenciesFilter
+    include RailsTracepointStack::Filter::TraceFromRubyCodeFilter
+    include RailsTracepointStack::Filter::TraceToIgnoreFilter
+
+    def ignore_trace?(trace:)
+      if attends_some_custom_pattern_to_ignore?(trace: trace)
+        return true
       end
-    end
-
-    private
-
-    def self.contains_to_ignore_strings?(trace)
-      trace.file_path.start_with?('<internal:') || trace.file_path == '(eval)'
-    end
-
-    def self.from_gempath_or_lib_path?(trace)
-      !RailsTracepointStack.configuration&.log_external_sources &&
-      (
-        file_path_starts_with_gem_path?(trace) ||
-        file_path_starts_with_ruby_lib_path?(trace) ||
-        file_path_starts_with_bundler_path?(trace)
-      )
-    end
-
-    def self.is_a_to_ignore_pattern?(trace)
-      RailsTracepointStack.configuration&.ignore_patterns&.any? { |pattern| trace.file_path.match?(pattern) }
-    end
-
-    def self.file_path_starts_with_gem_path?(trace)
-     gem_paths.any? { |path| trace.file_path.start_with?(path) }
-    end
-
-    def self.file_path_starts_with_ruby_lib_path?(trace)
-      trace.file_path.start_with?(ruby_lib_path)
-    end
-
-    def self.file_path_starts_with_bundler_path?(trace)
-      trace.file_path.include?("gems/bundler")
-    end
-
-    def self.gem_paths
-      @gem_paths ||= RailsTracepointStack::Filter::GemPath.full_gem_path
-    end
-
-    def self.ruby_lib_path
-      @ruby_lib_path ||= RailsTracepointStack::Filter::RbConfig.ruby_lib_path
-    end
-
-    def self.defined_file_path_to_filter_patterns?
-      RailsTracepointStack.configuration&.file_path_to_filter_patterns&.any?
-    end
-
-    def self.not_matches_file_path_to_filter_patterns?(trace)
-      !RailsTracepointStack.configuration.file_path_to_filter_patterns.any? do |pattern|
-        trace.file_path.match?(pattern)
+      if is_a_trace_required_to_watch_by_the_custom_configs?(trace: trace)
+        return false
       end
+      if should_ignore_because_is_a_internal_dependency?(trace: trace)
+        return true
+      end
+      if should_ignore_because_is_ruby_trace?(trace: trace)
+        return true
+      end 
+
+      return false
     end
   end
 end

data/lib/rails_tracepoint_stack/tracer.rb

@@ -6,12 +6,13 @@ require 'rails_tracepoint_stack/log_formatter'
 
 module RailsTracepointStack
   class Tracer
+    include RailsTracepointStack::TraceFilter
     # TODO: Tracer.new shoud return the tracer. Is weird to call Tracer.new.tracer
     def tracer
       @tracer ||= TracePoint.new(:call) do |tracepoint|
         trace = RailsTracepointStack::Trace.new(trace_point: tracepoint)
 
-        next if RailsTracepointStack::TraceFilter.ignore_trace?(trace: trace)
+        next if ignore_trace?(trace: trace)
 
         # TODO: Use proper OO
         message = RailsTracepointStack::LogFormatter.message trace

data/lib/rails_tracepoint_stack/version.rb

@@ -1,3 +1,3 @@
 module RailsTracepointStack
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/rails_tracepoint_stack.rb

@@ -1,4 +1,3 @@
-require 'json'
 require 'rails_tracepoint_stack/configuration'
 require 'rails_tracepoint_stack/log_formatter'
 require 'rails_tracepoint_stack/tracer'
@@ -7,11 +6,14 @@ $rails_tracer_rtps = nil
 
 module RailsTracepointStack
   class << self
-    attr_accessor :configuration, :logger
+    attr_writer :configuration, :logger
+
+    def configuration
+      @configuration ||= RailsTracepointStack::Configuration.new
+    end
   end
 
   def self.configure
-    self.configuration ||= RailsTracepointStack::Configuration.new
     yield(configuration)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_tracepoint_stack
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Carlos Daniel Pohlod
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-24 00:00:00.000000000 Z
+date: 2024-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -60,8 +60,12 @@ extra_rdoc_files: []
 files:
 - lib/rails_tracepoint_stack.rb
 - lib/rails_tracepoint_stack/configuration.rb
+- lib/rails_tracepoint_stack/filter/custom_trace_selector_filter.rb
 - lib/rails_tracepoint_stack/filter/gem_path.rb
 - lib/rails_tracepoint_stack/filter/rb_config.rb
+- lib/rails_tracepoint_stack/filter/trace_from_dependencies_filter.rb
+- lib/rails_tracepoint_stack/filter/trace_from_ruby_code_filter.rb
+- lib/rails_tracepoint_stack/filter/trace_to_ignore_filter.rb
 - lib/rails_tracepoint_stack/log_formatter.rb
 - lib/rails_tracepoint_stack/logger.rb
 - lib/rails_tracepoint_stack/trace.rb