binding_of_caller 0.5.0 → 0.6.0

data/README.md

@@ -13,7 +13,7 @@ call stack, not limited to just the immediate caller.
 
 **Recommended for use only in debugging situations. Do not use this in production apps.**
 
-**Only works in MRI Ruby 1.9.2**
+**Only works in MRI Ruby 1.9.2 and 1.9.3**
 
 * Install the [gem](https://rubygems.org/gems/binding_of_caller): `gem install binding_of_caller`
 * See the [source code](http://github.com/banister/binding_of_caller)
@@ -50,8 +50,7 @@ This project is a spinoff from the [Pry REPL project.](http://pry.github.com)
 Features and limitations
 -------------------------
 
-* Only works with MRI 1.9.2
-* Broken in 1.9.3, support will hopefully be provided in the near future.
+* Only works with MRI 1.9.2 and 1.9.3
 * Does not work in 1.8.7, but there is a well known (continuation-based) hack to get a `Binding#of_caller` there.
 
 Contact

data/ext/binding_of_caller/binding_of_caller.c

@@ -93,6 +93,25 @@ static rb_control_frame_t * find_valid_frame(rb_control_frame_t * cfp, rb_contro
   return NULL;
 }
 
+static VALUE
+frametype_name(VALUE flag)
+{
+  switch (flag & VM_FRAME_MAGIC_MASK) {
+  case VM_FRAME_MAGIC_METHOD: return string2sym("method");
+  case VM_FRAME_MAGIC_BLOCK:  return string2sym("block");
+  case VM_FRAME_MAGIC_CLASS:  return string2sym("class");
+  case VM_FRAME_MAGIC_TOP:    return string2sym("top");
+  case VM_FRAME_MAGIC_FINISH: return string2sym("finish");
+  case VM_FRAME_MAGIC_CFUNC:  return string2sym("cfunc");
+  case VM_FRAME_MAGIC_PROC:   return string2sym("proc");
+  case VM_FRAME_MAGIC_IFUNC:  return string2sym("ifunc");
+  case VM_FRAME_MAGIC_EVAL:   return string2sym("eval");
+  case VM_FRAME_MAGIC_LAMBDA: return string2sym("lambda");
+  default:
+    rb_raise(rb_eRuntimeError, "Unknown frame type! got flag: %d", FIX2INT(flag));
+  }
+}
+
 static VALUE binding_of_caller(VALUE self, VALUE rb_level)
 {
   rb_thread_t *th;
@@ -125,34 +144,22 @@ static VALUE binding_of_caller(VALUE self, VALUE rb_level)
   bind->filename = cfp->iseq->filename;
   bind->line_no = rb_vm_get_sourceline(cfp);
 
-  rb_iv_set(bindval, "@frame_type", cfp->flag);
+  rb_iv_set(bindval, "@frame_type", frametype_name(cfp->flag));
+  rb_iv_set(bindval, "@frame_description", cfp->iseq->name);
+
   return bindval;
 }
 
-
 static VALUE
-frametype_name(VALUE flag)
+frame_type(VALUE self)
 {
-  switch (flag & VM_FRAME_MAGIC_MASK) {
-  case VM_FRAME_MAGIC_METHOD: return string2sym("method");
-  case VM_FRAME_MAGIC_BLOCK:  return string2sym("block");
-  case VM_FRAME_MAGIC_CLASS:  return string2sym("class");
-  case VM_FRAME_MAGIC_TOP:    return string2sym("top");
-  case VM_FRAME_MAGIC_FINISH: return string2sym("finish");
-  case VM_FRAME_MAGIC_CFUNC:  return string2sym("cfunc");
-  case VM_FRAME_MAGIC_PROC:   return string2sym("proc");
-  case VM_FRAME_MAGIC_IFUNC:  return string2sym("ifunc");
-  case VM_FRAME_MAGIC_EVAL:   return string2sym("eval");
-  case VM_FRAME_MAGIC_LAMBDA: return string2sym("lambda");
-  default:
-    rb_raise(rb_eRuntimeError, "frame_type can only be returned for bindings created with Binding#of_caller().");
-  }
+  return rb_iv_get(self, "@frame_type");
 }
 
 static VALUE
-frame_type(VALUE self)
+frame_description(VALUE self)
 {
-  return frametype_name(rb_iv_get(self, "@frame_type"));
+  return rb_iv_get(self, "@frame_description");
 }
 
 static VALUE frame_count(VALUE self)
@@ -199,6 +206,7 @@ Init_binding_of_caller()
   rb_define_method(mBindingOfCaller, "of_caller", binding_of_caller, 1);
   rb_define_method(mBindingOfCaller, "frame_count", frame_count, 0);
   rb_define_method(mBindingOfCaller, "frame_type", frame_type, 0);
+  rb_define_method(mBindingOfCaller, "frame_description", frame_description, 0);
   rb_define_method(mBindingOfCaller, "callers", callers, 0);
   rb_include_module(rb_cBinding, mBindingOfCaller);
 }

data/lib/binding_of_caller/version.rb

@@ -1,3 +1,3 @@
 module BindingOfCaller
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: binding_of_caller
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-05 00:00:00.000000000 Z
+date: 2011-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &70308421840640 !ruby/object:Gem::Requirement
+  requirement: &70166101101640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70308421840640
+  version_requirements: *70166101101640
 description: Retrieve the binding of a method's caller. Can also retrieve bindings
   even further up the stack. Currently only works for MRI 1.9.2.
 email: jrmair@gmail.com
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Retrieve the binding of a method's caller. Can also retrieve bindings even