callwith 0.0.1 → 0.0.2

data/ext/callwith_ext.c

@@ -64,8 +64,8 @@ void Init_with_ext()
   rb_undef_alloc_func(rb_cCallWith);
   rb_define_singleton_method(rb_cCallWith, "create", callwith_s_create, 2);
   rb_define_method(rb_cCallWith, "__instance_eval__", rb_obj_instance_eval, -1);
-  rb_define_method(rb_cCallWith, "__with__obj__", callwith_obj, 0);
-  rb_define_method(rb_cCallWith, "__with__self_obj__", callwith_self_obj, 0);
-  rb_define_method(rb_cCallWith, "__with__cleanup__", callwith_cleanup, 0);
+  rb_define_method(rb_cCallWith, "__callwith__obj__", callwith_obj, 0);
+  rb_define_method(rb_cCallWith, "__callwith__self_obj__", callwith_self_obj, 0);
+  rb_define_method(rb_cCallWith, "__callwith__cleanup__", callwith_cleanup, 0);
 }
 

data/lib/callwith.rb

@@ -15,15 +15,19 @@ def callwith(*objs, &block)
   last = nil
   objs.each do |obj|
     p = CallWith.create(obj, self)
-    last = p.__instance_eval__(&block)
+    begin
+      last = p.__instance_eval__(&block)
+    ensure
+      p.__callwith__cleanup__()
+    end
   end
   return last
 end
 
 class CallWith
   def method_missing(method, *args, &block)
-    obj = __with__obj__()
-    self_obj = __with__self_obj__()
+    obj = __callwith__obj__()
+    self_obj = __callwith__self_obj__()
 
     if obj.respond_to?(method)
       obj.__send__(method, *args, &block)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: callwith
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Paul Brannan