overrider 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfc96db5c2b0821331d448087dbb5737a480a94dfec4512b4713a3ab44375deb
-  data.tar.gz: 190c64c0e997937c2442864d134ab8ceaf6558e1b41acb8429aca47719cbde83
+  metadata.gz: c417392909ef2a0f683cc5e2b13f217383eb6219d82b98f2e4dcbb02960b40ac
+  data.tar.gz: 855689641cc3992f9da0e65abd3efa8c4353ce1fb9f7d9d39a41484f85704339
 SHA512:
-  metadata.gz: 00fcfb5131bcc6f7160f15a447ccfd98fb988b9aa91d1238550bbe0dae580ad53defb338bddfa095a93f3ad388ab0116311d68549fb279b478f9e78e92db8ff4
-  data.tar.gz: 4d643fd6a432df8006670dd588205df282867501b715f9707f1835e0522c2f175e26e6e16f9500b7a9074de65aa73e31adc69dc63eea638c0ee5ff14813fedeb
+  metadata.gz: e1b7030c31d7c823f2bfcbe02781271bb882f2cf9b631e3e9ae50560c00e981f155a003e9188bb09142f4f3d87ec29b2c61a53c352768cffb6ce09742e22b911
+  data.tar.gz: 95e5d9d96127c4160cec6c8d55aa3968da975a6051ebdae93a12a36ec08c4078abd99cfaca324721fe77943ac0999d2b869499764ac1129015ce5f1c48d59b12

data/README.md

@@ -52,6 +52,35 @@ class B2 < B1
 end # => raise
 ```
 
+### for Production
+If you want to disable Abstriker, write `Abstriker.disable = true` at first line.
+If Abstriker is disabled, TracePoint never runs, and so there is no overhead of VM instruction.
+
+### Caution
+
+Must not call `override` outer class definition.
+
+ex.
+
+```ruby
+class A1
+  def foo
+  end
+end
+
+class A2 < A1
+  extend Overrider
+
+  def foo
+  end
+end
+
+A2.send(:override, :foo)
+```
+
+This case leaves enabled TracePoint.
+It is very high overhead.
+
 ### Examples
 
 #### include module method after override method

data/lib/overrider.rb

@@ -12,19 +12,53 @@ module Overrider
     end
   end
 
+  @disable = false
+
+  def self.disable=(v)
+    @disable = v
+  end
+
+  def self.disabled?
+    @disable
+  end
+
+  def self.enabled?
+    !disabled?
+  end
+
   private
 
-  def override(symbol)
-    caller_info = caller_locations(1, 1)[0]
-    event_type = if caller_info.label.match?(/block/)
-      :b_return
-    else
-      :end
+  using Module.new {
+    refine Module do
+      def detect_event_type
+        caller_info = caller_locations(2, 1)[0]
+        if caller_info.label.match?(/block/)
+          [:b_call, :b_return, :raise]
+        else
+          [:end, :raise]
+        end
+      end
     end
+  }
+
+  def override(symbol)
+    return if Overrider.disabled?
+
+    event_type = detect_event_type
+
+    block_count = 1
+    @__overrider_trace_point ||= TracePoint.trace(*event_type) do |t|
+      if t.event == :raise
+        @__overrider_trace_point.disable
+        @__overrider_trace_point = nil
+        next
+      end
+
+      block_count += 1 if t.event == :b_call
+      block_count -= 1 if t.event == :b_return
 
-    @__overrider_trace_point ||= TracePoint.trace(event_type) do |t|
       klass = t.self
-      if klass == self
+      if klass == self && (t.event == :end || t.event == :b_return && block_count.zero?)
         @ensure_overrides.each do |n|
           meth = klass.instance_method(n)
           unless meth.super_method
@@ -43,16 +77,23 @@ module Overrider
   end
 
   def override_singleton_method(symbol)
-    caller_info = caller_locations(1, 1)[0]
-    event_type = if caller_info.label.match?(/block/)
-      :b_return
-    else
-      :end
-    end
+    return if Overrider.disabled?
+
+    event_type = detect_event_type
+
+    block_count = 1
+    @__overrider_singleton_trace_point ||= TracePoint.trace(*event_type) do |t|
+      if t.event == :raise
+        @__overrider_singleton_trace_point.disable
+        @__overrider_singleton_trace_point = nil
+        next
+      end
+
+      block_count += 1 if t.event == :b_call
+      block_count -= 1 if t.event == :b_return
 
-    @__overrider_singleton_trace_point ||= TracePoint.trace(event_type) do |t|
       klass = t.self
-      if klass == self
+      if klass == self && (t.event == :end || t.event == :b_return && block_count.zero?)
         @ensure_overrides.each do |n|
           meth = klass.singleton_class.instance_method(n)
           unless meth.super_method

data/lib/overrider/version.rb

@@ -1,3 +1,3 @@
 module Overrider
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: overrider
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - joker1007