deferral 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4478021f73e80fbf08a0d2830543684653ea7513c836c7c03ae798b9fe96798
-  data.tar.gz: 78d3092455e200432ca094fef131875060330fe72d9ea4498b5c7e2485d43d9b
+  metadata.gz: df6589679f83c024ae2b3e33c2a172f86b7b71b94b135b79af9fa80201d8911f
+  data.tar.gz: 2265ea2d27731ffc8abe5f358b67bc3ef91538334969af2a0bfb29adef86fa21
 SHA512:
-  metadata.gz: 33bdfd6fcd268d83299f9f7c78fe377e14ee041d00a65d2b0c19b556dbe9cc9bece3370089546ce619b857c89b7bc894a1e73987ebe564c44b2c483a218d6c19
-  data.tar.gz: 6375625cb220f0aa1f138e8c776591e9e226ed752d3ef0bda2e9583ac33f3649386e18e9360b69df84fab346bf38cf72e591a3613f8a014b43891035f099c61b
+  metadata.gz: 2ecb6345db973339220e9cd5b2b57d1c6f0d80f6d1b5e64519348cda9df3a66a3abcf21d508d72ca882b0eb096c8fa26af898a0642c67bd01aa93a2aa7f01d76
+  data.tar.gz: 86d0896af5471e7f1c9d64e2458567b06a298479050e687541fc3d6dd48e50f124464db2b91c876b011fe9448a261abe4fb32fe9245ec083a5444525fa334e89

data/README.md

@@ -3,12 +3,14 @@
 ```ruby
 # gem install deferral
 
-require "deferral"
+require "deferral/toplevel"
+using Deferral::TopLevel
+# it makes "defer" without module name available everywhere in this file
 
 def my_method_name
   # ...
   file = File.open("my_file", "r")
-  Deferral.defer { file.close }
+  defer { file.close }
 
   file.write "data..."
   # ...
@@ -19,16 +21,15 @@ def my_method_name(list)
   # ...
   list.each do |item|
     file = File.open(item, "r")
-    Deferral.defer { file.close }
+    defer { file.close }
 
     file.write "data..."
     # ...
   end # `file.close` is called at the end of block
 end
 
-require "deferral/toplevel"
-using Deferral::TopLevel
-# it makes "defer" without module name available everywhere in this file
+# "deferral" imports `Deferral.defer`, not to inject top-level methods widely.
+require "deferral"
 
 # or enable everywhere! (DANGER!)
 require "deferral/kernel_ext"

data/lib/deferral.rb

@@ -11,38 +11,52 @@ module Deferral
   #   end
   # end
 
-  def self.defer(&block)
-    raise ArgumentError, "release block is not specified" unless block
+  module Mixin
+    def defer(&block)
+      raise ArgumentError, "release block is not specified" unless block
 
-    store = (Thread.current[:deferral_store] ||= {})
-    if !store.empty? && !store[:stack].empty?
-      store[:stack].last.add(block)
-      return
-    end
+      store = (Thread.current[:deferral_store] ||= {})
+      if !store.empty? && !store[:stack].empty?
+        store[:stack].last.add(block)
+        return
+      end
 
-    stack = store[:stack] = [StackFrame.new(:root)] # root stack frame as first "caller" position of this method
-    first_return = true
+      stack = store[:stack] = [StackFrame.new(:root)] # root stack frame as first "caller" position of this method
+      first_return = true
 
-    trace = TracePoint.new(:call, :return, :b_call, :b_return) do |tp|
-      if tp.event == :return && first_return # return from this method
-        first_return = false
-        next
-      end
+      trace = TracePoint.new(:call, :return, :b_call, :b_return) do |tp|
+        if tp.event == :return && first_return # return from this method
+          first_return = false
+          next
+        end
 
-      case tp.event
-      when :call, :b_call
-        stack << StackFrame.new(tp.event)
-      when :return, :b_return
-        frame = stack.pop
-        frame.release!
-        if frame.root?
-          trace.disable
+        case tp.event
+        when :call, :b_call
+          if tp.defined_class == Deferral::Mixin && tp.method_id == :defer
+            # invocation of "defer" itself - ignore it
+            next
+          end
+
+          stack << StackFrame.new(tp.event)
+        when :return, :b_return
+          if tp.defined_class == Deferral::Mixin && tp.method_id == :defer
+            # invocation of "defer" itself - ignore it
+            next
+          end
+
+          frame = stack.pop
+          frame.release!
+          if frame.root?
+            trace.disable
+          end
+        else
+          raise "unexpected TracePoint event:#{tp.event}"
         end
-      else
-        raise "unexpected TracePoint event:#{tp.event}"
       end
+      stack.last.add(block)
+      trace.enable
     end
-    stack.last.add(block)
-    trace.enable
   end
+
+  extend Mixin
 end

data/lib/deferral/kernel_ext.rb

@@ -1,7 +1,5 @@
 require_relative "../deferral"
 
 module Kernel
-  def defer(&block)
-    Deferral.defer(&block)
-  end
+  include Deferral::Mixin
 end

data/lib/deferral/stack_frame.rb

@@ -20,7 +20,7 @@ module Deferral
       @releases.reverse.each do |r|
         begin
           r.call
-        rescue Exception => e
+        rescue Exception
           # ignore all exceptions ...
           # no way to add "suppressed" exceptions to the exception already thrown
         end

data/lib/deferral/toplevel.rb

@@ -2,8 +2,6 @@ require_relative "../deferral"
 
 module Deferral::TopLevel
   refine Kernel do
-    def defer(&block)
-      Deferral.defer(&block)
-    end
+    include Deferral::Mixin
   end
 end

data/lib/deferral/version.rb

@@ -1,3 +1,3 @@
 module Deferral
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deferral
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-13 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler