trace_tree 0.2.15 → 0.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '049be0b5875c06742a76fbc283f9a124f20fd574d5bdc529e5f5094181997ebe'
-  data.tar.gz: 7e98c2c3cffc65244f69873d41a1925af401e5c02aee917046eef611f87b4aba
+  metadata.gz: cb7a1e555384e2acad9ff6f9b7f51a120cbd35bca05afa9ce7470e358d3f3ea7
+  data.tar.gz: 4cfb486a427b2c6dc2aaff7b1fa5e4a9183bdf52249ee20b23cc580ea76e8081
 SHA512:
-  metadata.gz: 6c297f28ffe610ddbf6e920350f9ba76f86ff1561b600775d59921d26e83abf1332a65d084be21252e7e93d71c58284738373b2051698404379951ee19916573
-  data.tar.gz: a35991a7ebd980020a5c82b42d2c0da53b9b4d25b6617d77979d148fff3d7257fed9b2fd3f264bf7fc19b3e5863b243960c3006878a198bbbaa933481d90d98b
+  metadata.gz: a9ee20d2b1adbb2105567b5d392f2e586b13abe14da5e471d1379af837848379f7b6f52e4f76d45668d98e814125b0bb5c4596194840ad2de21fc613853ea3e7
+  data.tar.gz: bfa96688b71d085e54ec44990de682d4054c0d28d0b9d0c5bfc2e84b71c85830e916ee7c4d4d5f37a7ea985b7ccd3b5d25a7c2612e42401f49c7ec17762521cc

data/lib/trace_tree/version.rb

@@ -1,3 +1,3 @@
 class TraceTree
-  VERSION = "0.2.15"
+  VERSION = "0.2.16"
 end

data/lib/trace_tree.rb

@@ -96,35 +96,39 @@ class TraceTree
   end
 
   def make_filter
-    filters = []
-
-    if opt.key?(:in)
-      @in = Array(opt[:in] || //)
-      filters << '@in.any?{ |pattern| pattern =~ point.path }'
-    end
-
-    if opt.key?(:out)
-      @out = Array(opt[:out])
-      filters << '@out.all?{ |pattern| pattern !~ point.path }'
-    end
+    stack_filter =
+      if (@no_methods = Array(opt[:no_methods])).empty?
+        nil
+      else
+        stack_filter = 'return false unless outside_hidden_stack?(point)'
+      end
 
-    if opt.key?(:no_methods)
-      @no_methods = Array(opt[:no_methods])
-      filters << 'outside_hidden_stack?(point)'
-    end
+    path_filter =
+      if opt.key?(:in) || opt.key?(:out)
+        @in = Array(opt[:in] || //)
+        @out = Array(opt[:out])
+        'return false unless @in.any?{ |pattern| pattern =~ point.path } && @out.all?{ |pattern| pattern !~ point.path }'
+      else
+        nil
+      end
 
-    if filters.empty?
+    if stack_filter.nil? && path_filter.nil?
       return @deal = -> point { trace_points << point_loader.create(point) }
     end
 
-    self.singleton_class.class_eval <<-EOM
+    filter_method = <<-EOM
       def wanted? point
         return false if point.end_of_trace?
-        return true if native?(point) || point.thread_relative? || point.method_defined_by_define_method?
-        #{filters.join(' && ')}
+        return true if native?(point) || point.thread_relative?
+        #{stack_filter}
+        return true if point.method_defined_by_define_method?
+        #{path_filter}
+        true
       end
     EOM
 
+    self.singleton_class.class_eval filter_method
+
     @deal = -> point do
       po = point_loader.create(point)
       trace_points << po if wanted? po

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trace_tree
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - ken
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-17 00:00:00.000000000 Z
+date: 2019-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler