diver_down 0.0.1.alpha9 → 0.0.1.alpha11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7a272e39e974d543ceec5219e3b5505bca70d0a61afae0632107eb3cc5645fe
-  data.tar.gz: c6df48a9145a3d87c6b8816b6a37830bdbab3c6404d0d0347cb43bf3be636ec1
+  metadata.gz: daf9083c911966538705b30bf44a609d38623c14f10bba3fc48782194d6bdba2
+  data.tar.gz: '0596dffb7428713e3daad2102f756d9b2396ca53b7c4200e8a873998493f4291'
 SHA512:
-  metadata.gz: 5a1d631fe52cab90a2c005f96480751007056414accfb50d3aaa59f337614c69cd5082ed77b456f68b4fce5f4ff17404296df2e84f82159b4abdcdf354d2b996
-  data.tar.gz: 3144ca2c364a66e8d20db470887f6d7499d05ffdb39a379b85d4aac093808971963baa76340863dc93f2e2480af4d2dba035a2874c2926f23bd015cff5b39f59
+  metadata.gz: 39c405fc2f3a6c73f3e818275f42f16b938cbc7342fcf22a2391827268c8d3b395b3734686a6e0da3854936ac4b9c938c8ac11b1f050abc668fbbe36373865d1
+  data.tar.gz: 98e7070abeaa7f74a3c18c6e6528d23afd5fec87779378d8afc7cf0558b7a7e04dca8bdec7284658aff8884e4f99f9d79bbff22673af9e6cd2111eb1e55a1f50

data/lib/diver_down/trace/session.rb

@@ -46,6 +46,10 @@ module DiverDown
           next if TracePoint == tp.defined_class
 
           case tp.event
+          when :b_call
+            call_stack.push
+          when :b_return
+            call_stack.pop
           when :call, :c_call
             # puts "#{tp.method_id} #{tp.path}:#{tp.lineno}"
             if call_stack.ignored?
@@ -66,7 +70,8 @@ module DiverDown
               next
             end
 
-            source_name = DiverDown::Helper.normalize_module_name(mod) if @module_set.include?(mod)
+            source_name = normalize_module_name(mod, tp)
+
             pushed = false
 
             unless source_name.nil?
@@ -136,6 +141,25 @@ module DiverDown
 
         nil
       end
+
+      # Return nil if resolved module do not exist.
+      # Like an AnonymousController in rspec-rails.
+      def normalize_module_name(mod, tp)
+        normalized = nil
+        normalized ||= constantizable_source_name(DiverDown::Helper.normalize_module_name(mod)) if @module_set.include?(mod)
+
+        # NOTE: Only one anonymous class is traced back to support `AnonymousController` in rspec-rails, but it can be traced back further
+        normalized ||= constantizable_source_name(DiverDown::Helper.normalize_module_name(mod.superclass)) if DiverDown::Helper.class?(mod) && mod != DiverDown::Helper.resolve_module(tp.defined_class) && @module_set.include?(mod.superclass)
+
+        normalized
+      end
+
+      def constantizable_source_name(source_name)
+        DiverDown::Helper.constantize(source_name)
+        source_name
+      rescue NameError
+        nil
+      end
     end
   end
 end

data/lib/diver_down/trace/tracer.rb

@@ -3,9 +3,18 @@
 module DiverDown
   module Trace
     class Tracer
+      DEFAULT_TRACE_EVENTS = %i[
+        call
+        return
+        c_call
+        c_return
+        b_call
+        b_return
+      ].freeze
+
       # @return [Array<Symbol>]
       def self.trace_events
-        @trace_events || %i[call c_call return c_return]
+        @trace_events || DEFAULT_TRACE_EVENTS
       end
 
       # @param events [Array<Symbol>]

data/lib/diver_down/trace.rb

@@ -11,16 +11,12 @@ module DiverDown
     require 'diver_down/trace/redefine_ruby_methods'
     require 'diver_down/trace/ignored_method_ids'
 
-    @trace_events = %i[
-      call c_call return c_return
-    ]
-
     # Trace only Ruby-implemented methods because tracing C-implemented methods is very slow
     # Override Ruby only with the minimal set of methods needed to trace dependencies.
     #
     # @return [void]
     def self.trace_only_ruby_world!(map = DiverDown::Trace::RedefineRubyMethods::DEFAULT_METHODS)
-      DiverDown::Trace::Tracer.trace_events = %i[call return]
+      DiverDown::Trace::Tracer.trace_events = DiverDown::Trace::Tracer::DEFAULT_TRACE_EVENTS - %i[c_call c_return]
       DiverDown::Trace::RedefineRubyMethods.redefine_c_methods(map)
     end
   end

data/lib/diver_down/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DiverDown
-  VERSION = '0.0.1.alpha9'
+  VERSION = '0.0.1.alpha11'
 end