bindex 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a786a7432d70960e943a5114f81888e4ae66a856
-  data.tar.gz: 62378c2b62cf68d181882727ca55d97cfd22e0f9
+  metadata.gz: ee2e50960f0fc636073a2d4a2597d169fae84bf2
+  data.tar.gz: d456453d22c61a8f19a6c8e1a73c149c7930a386
 SHA512:
-  metadata.gz: 4b5d57034831194f380cbf8912b10560f9e5368cfec9e800b5c62069660c838f8209344a9a682eb277f80a5184b70d5271288b0c89f14745ee234c0d92287430
-  data.tar.gz: 43f9c1b35db5f6d58ea66ce7d9152b450dbb7abf308a4988fefb41745cfccc3dccb570eb3355702ad19bb25d1cf6e0d07e9662a1a8fd9f626ae444898a6066c5
+  metadata.gz: 28100af5bd5b378da0a983d381c10f235ccfb98db38ad6513fa9ac5b793042f07c5755912fe8b1723c8b36438929a4b96aed02b64810fe5b6c6b4e2dda1ddd37
+  data.tar.gz: da0c772ab6d28e3d1edfe1b2284c86fbf2d7a3cbca0a2a3d782807268b97ef2c95bcdd0d0b4e9a208458b0e1be8a181db76aa9af2a66df88915d943ee00eea2e

data/ext/bindex/com/gsamokovarov/bindex/SetExceptionBindingsEventHook.java

@@ -16,6 +16,9 @@ public class SetExceptionBindingsEventHook extends EventHook {
         RubyArray bindings = RubyBindingsCollector.collectCurrentFor(context);
         RubyException exception = (RubyException) context.runtime.getGlobalVariables().get("$!");
 
-        exception.setInstanceVariable("@bindings", bindings);
+        IRubyObject exceptionBindings = exception.getInstanceVariable("@bindings");
+        if (exceptionBindings == null || exceptionBindings.isNil()) {
+            exception.setInstanceVariable("@bindings", bindings);
+        }
     }
 }

data/ext/bindex/cruby.c

@@ -2,6 +2,7 @@
 #include <ruby/debug.h>
 
 VALUE bx_mBindex;
+static ID id_bindings;
 
 static VALUE
 current_bindings_callback(const rb_debug_inspector_t *context, void *data)
@@ -32,8 +33,13 @@ set_exception_bindings_callback(VALUE tpval, void *data)
 {
   rb_trace_arg_t *trace_arg = rb_tracearg_from_tracepoint(tpval);
   VALUE exception = rb_tracearg_raised_exception(trace_arg);
+  VALUE bindings = rb_attr_get(exception, id_bindings);
 
-  rb_iv_set(exception, "bindings", current_bindings());
+  /* Set the bindings, only if they haven't been set already. This may reset
+   * the binding during reraise. */
+  if (NIL_P(bindings)) {
+    rb_ivar_set(exception, id_bindings, current_bindings());
+  }
 }
 
 void
@@ -52,9 +58,8 @@ bx_current_bindings(VALUE self)
 static VALUE
 bx_exc_bindings(VALUE self)
 {
-  VALUE bindings;
+  VALUE bindings = rb_attr_get(self, id_bindings);
 
-  bindings = rb_iv_get(self, "bindings");
   if (NIL_P(bindings)) {
     bindings = rb_ary_new();
   }
@@ -66,6 +71,7 @@ void
 Init_cruby(void)
 {
   bx_mBindex = rb_define_module("Bindex");
+  id_bindings = rb_intern("bindings");
 
   rb_define_singleton_method(bx_mBindex, "current_bindings", bx_current_bindings, 0);
   rb_define_method(rb_eException, "bindings", bx_exc_bindings, 0);

data/lib/bindex/version.rb

@@ -1,3 +1,3 @@
 module Bindex
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,72 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: bindex
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Genadi Samokovarov
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-18 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.4'
-  name: minitest
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.4'
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake-compiler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email:
 - gsamokovarov@gmail.com
 executables: []
@@ -109,7 +109,7 @@ homepage: https://github.com/gsamokovarov/bindex
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -124,9 +124,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 2.6.8
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Bindings for your Ruby exceptions
 test_files: