tracia 0.2.6 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e8c70f863ced4e60aeeb7d6dc343f568a88df17cb67d039adc7c921fa8149a8
-  data.tar.gz: f60c5dc69ccfe8318d5ba951dfbe546e013c87eb0d3641345aaffe96d416d524
+  metadata.gz: ac587bcc0c01258f1220731adda063b6c83a7f66e87fe51da334286e7f629c7a
+  data.tar.gz: 972cfa5242cb2570aa6e9614fc30fa43937cf8c23390af260c0685b57573d094
 SHA512:
-  metadata.gz: 998c2b5b36a92167c085ca15a0898002c06c5419f9e484342f7b7aa0607bdb8fbdd63c08af26eb219c77d3021828e2bc9a4776cd2d893798d7e0a4d8bb5fd803
-  data.tar.gz: 86aa94fb518e44b9498562212c3ad91dbafaadd08af53eb3580b4ae8d07452b5274369d5d99e7b87c93ab38fc9468d17a3e0280f3dca9e5622908ccd227b3978
+  metadata.gz: d7631de3f1aaa6cae27892e120ba4eadb9318c04f4461c8697141278642d4fd18253fc8b11abb26408a306d683c0e71f8c356f03dd8c862273fdbaf4a2c6ac36
+  data.tar.gz: 6410a901a160249b4dab2eebe147f7a517e2ffc5da81a99d097e12d031a59e631a3b5c4ec44dfbb6566cc34d416768725cf1dd7aa09db7713e7c72719f1a7e67

data/lib/tracia/frame.rb

@@ -50,16 +50,7 @@ class Tracia
       "#{klass}#{call_sym}#{method_name}"
     end
 
-    INSTANCE_METHOD_SHARP = '#'
-
     def source_location
-      if @file == nil
-        meth = call_sym == INSTANCE_METHOD_SHARP ? klass.instance_method(method_name) : klass.method(method_name)
-        src_loc = meth.source_location
-        @file = src_loc[0]
-        @lineno = src_loc[1]
-      end
-
       "#{GemPaths.shorten(@file)}:#{@lineno}"
     end
   end

data/lib/tracia/gem_paths.rb

@@ -4,9 +4,7 @@ class Tracia
   module GemPaths
     ABSTRACTS = {}
 
-    ::YAML.load(`gem env`.gsub(/=>/, ':'))['RubyGems Environment']
-      .detect{ |hash| hash.has_key?('GEM PATHS') }['GEM PATHS']
-      .each_with_index { |path, i| ABSTRACTS["GemPath#{i}"] = path }
+    ::Gem.path.each_with_index { |path, i| ABSTRACTS["GemPath#{i}"] = path }
 
     class << self
       def shorten(location)

data/lib/tracia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Tracia
-  VERSION = "0.2.6"
+  VERSION = "0.2.9"
 end

data/lib/tracia.rb

@@ -10,6 +10,8 @@ require "binding_of_callers"
 class Tracia
   class Error < StandardError; end
 
+  INSTANCE_METHOD_SHARP = '#'
+
   attr_accessor :level, :error, :depth
 
   class << self
@@ -88,13 +90,33 @@ class Tracia
 
     root = @stack[0]
     if root
-      non_tail_recursion!([root]) if @non_tail_recursion
+      eliminate_tail_recursion!([root]) if @non_tail_recursion
       @logger.call(root)
     end
   end
 
   private
 
+  def eliminate_tail_recursion!(stack)
+    @specific_recursion =
+      case @non_tail_recursion
+      when true
+        -> (_) { true }
+      else
+        target_recursions = Array === @non_tail_recursion ? @non_tail_recursion : [@non_tail_recursion]
+        target_recursions.map!{ |h| Frame.new(h[:klass], h[:call_sym], h[:method_name], nil, nil) }
+        -> (current) do
+          target_recursions.any? do |tr|
+            current.klass == tr.klass &&
+              current.call_sym == tr.call_sym &&
+              current.method_name == tr.method_name
+          end
+        end
+      end
+
+    non_tail_recursion!(stack)
+  end
+
   def non_tail_recursion!(stack)
     current_frame = stack.last
     last_idx = current_frame.children.count - 1
@@ -103,7 +125,9 @@ class Tracia
       next unless Frame === child
       next non_tail_recursion!([child]) if last_idx != idx
 
-      recursion_idx = stack.index{ |frame| frame.same_klass_and_method?(child) }
+      # pp (stack + [child]).map{|f| "#{f.send(:class_and_method)}:#{f.object_id}" }
+
+      recursion_idx = @specific_recursion[child] && stack.rindex{ |frame| frame.same_klass_and_method?(child) }
       if recursion_idx
         parent = stack[recursion_idx - 1]
         parent.children << child
@@ -140,8 +164,6 @@ class Tracia
     @frames_to_reject.any?{ |rj| rj =~ raw_frame.file }
   end
 
-  EMPTY_SRC_LOC = []
-
   def convert_to_frames(callers)
     callers.map! do |c|
       _binding = c._binding
@@ -151,9 +173,8 @@ class Tracia
 
       source_location =
         if _binding.frame_type == :method
-          # meth = call_symbol == INSTANCE_METHOD_SHARP ? klass.instance_method(frame_env) : klass.method(frame_env)
-          # meth.source_location
-          EMPTY_SRC_LOC
+          meth = call_symbol == INSTANCE_METHOD_SHARP ? klass.instance_method(frame_env) : klass.method(frame_env)
+          meth.source_location
         else
           _binding.source_location
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tracia
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.9
 platform: ruby
 authors:
 - ken
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.8
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: binding_of_callers
   requirement: !ruby/object:Gem::Requirement