trace_tree 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc09963c20ff9fa2325a140cdba7f52a365a86e6345c91c0b73ed7e84954da88
-  data.tar.gz: b4fc0967633be32701de2ae30fffe7c5d96d010a061f3885cda766ea893db261
+  metadata.gz: bd2acac6d571e0747380b7a119f10ceae8b047677da86922aacf86d61f230e1e
+  data.tar.gz: 9f99a54c748d8e36b92e11dba833e7059da16ee5fa486412e5c70c35c2186ffc
 SHA512:
-  metadata.gz: 39a369877af219019c3bdf138733c265a69f20af06661c3c84fcc529b78e75e9e3007eac211755cbecd1c79eab33bfa2c32ec5d84cddc1f9c2d6d283c928b5eb
-  data.tar.gz: 7ecbd1ecc5e2ecc2fafadefa02a41482bbed8e44790fc6f41b6aa1ba72e01b9e79f8e75141824ff4a99d52d6c7168fe8918898b9626f87031912c065389f6eb5
+  metadata.gz: 7597b9d86bf09817082dbdec9dd31a7a18f80afda328b437d7b7d023ff8e77983e09399e53e2d7f6e8026f13100aac29a48feecfd98ad1fc1319389ffeda7eb9
+  data.tar.gz: a69bef456553b83d05d749973c8e923080708bd27a3793b2639b13869f44932fbb85589a52c0695790ff9661043c7bfa55de9db0cc211521cebef7a7fbf6804a

data/lib/trace_tree/point/ccall_kernel_extend.rb

@@ -3,7 +3,7 @@ class TraceTree
     class CcallKernelExtend < Point
       def parameters
         first_callee = callees[0]
-        first_callee.respond_to?(:mixin) ? first_callee.mixin : first_callee.current.klass
+        first_callee.respond_to?(:mixin) ? first_callee.mixin : first_callee.class_name
       end
 
       def self.event_class_method

data/lib/trace_tree/point/ccall_module_include.rb

@@ -9,7 +9,7 @@ class TraceTree
       # first callee should be append_features(), check if it is native or custom
       def parameters
         first_callee = callees[0]
-        Module == first_callee.class_name ? first_callee.return_value : first_callee.current.klass
+        Module == first_callee.class_name ? first_callee.return_value : first_callee.class_name
       end
 
     end

data/lib/trace_tree/point/ccall_module_prepend.rb

@@ -8,7 +8,7 @@ class TraceTree
 
       def parameters
         first_callee = callees[0]
-        Module == first_callee.class_name ? first_callee.return_value : first_callee.current.klass
+        Module == first_callee.class_name ? first_callee.return_value : first_callee.class_name
       end
 
     end

data/lib/trace_tree/point.rb

@@ -7,7 +7,8 @@ class TraceTree
     include TreeGraphable
     include TreeHtmlable
 
-    attr_reader :current, :thread, :frame_env
+    attr_reader :thread, :frame_env
+    attr_reader :call_symbol, :class_name
     attr_accessor :terminal, :config
 
     Interfaces = [:event, :defined_class, :method_id, :path, :lineno]
@@ -73,24 +74,31 @@ EOM
 
       @return_value = trace_point.return_value if x_return?
       @thread = Thread.current
+      return if thread?
 
-      unless thread?
-        there = trace_point.binding.of_caller(3)
-        @current = BindingOfCallers::Revealed.new there
-        @frame_env = current.frame_env.to_sym
+      if event == :c_call || event == :c_return
+        @call_symbol = '#'
+        @frame_env = method_id
+        @class_name = defined_class
+        return
       end
+
+      there = trace_point.binding.of_caller(3)
+      current = BindingOfCallers::Revealed.new there
+      @call_symbol = current.call_symbol
+      @frame_env = current.frame_env.to_sym
+      @class_name = current.klass
     rescue => e
-      puts e
+      puts e.message
+      puts(Interfaces.each_with_object({}){|attr, h| h[attr] = send(attr)})
+      puts e.backtrace
+      raise e
     end
 
     def b_call?
       event == :b_call
     end
 
-    def c_call?
-      event == :c_call
-    end
-
     def class?
       event == :class
     end
@@ -157,22 +165,12 @@ EOM
       @km ||= "#{class_name}#{call_symbol}#{method_name}"
     end
 
-    def class_name
-      c_call? ? defined_class : current.klass
-    rescue
-      puts event
-    end
-
     def method_name
-      return method_id if c_call?
+      return method_id if event == :c_call
       return frame_env if b_call? || class?
       (method_id == frame_env) ? method_id : "#{method_id} -> #{frame_env}"
     end
 
-    def call_symbol
-      c_call? ? '#' : current.call_symbol
-    end
-
     def source_location
       "#{path}:#{lineno}"
     end
@@ -182,7 +180,6 @@ EOM
     end
 
     class Loader
-
       attr_reader :point_classes, :config
 
       def initialize *enhancement, config

data/lib/trace_tree/version.rb

@@ -1,3 +1,3 @@
 class TraceTree
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trace_tree
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-19 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler