jbarnette-johnson 1.0.0.20090402144841 → 1.0.0.20090402155420

data/ext/spidermonkey/ruby_land_proxy.c

@@ -185,27 +185,28 @@ respond_to_p(int argc, const VALUE* argv, VALUE self)
 static VALUE
 native_call(int argc, VALUE* argv, VALUE self)
 {
-  // FIXME: This should really call super#native_call.
   if (!function_p(self))
-    rb_raise(rb_eRuntimeError, "This Johnson::SpiderMonkey::RubyLandProxy isn't a function.");
+    rb_raise(rb_eRuntimeError,
+      "This Johnson::SpiderMonkey::RubyLandProxy isn't a function.");
 
   if (argc < 1)
     rb_raise(rb_eArgError, "Target object required");
 
   RubyLandProxy* proxy;
   Data_Get_Struct(self, RubyLandProxy, proxy);
-  JSContext * context = johnson_get_current_context(proxy->runtime);
-  
-  PREPARE_RUBY_JROOTS(context, 1);
-  
+
   jsval proxy_value;
-  JCHECK(get_jsval_for_proxy(proxy, &proxy_value));
-  JROOT(proxy_value);
+
+  if (!get_jsval_for_proxy(proxy, &proxy_value))
+    raise_js_error_in_ruby(proxy->runtime);
 
   jsval global;
-  JCHECK(convert_to_js(proxy->runtime, argv[0], &global));
 
-  JRETURN_RUBY(call_js_function_value(proxy->runtime, global, proxy_value, argc - 1, &(argv[1])));
+  if (!convert_to_js(proxy->runtime, argv[0], &global))
+    raise_js_error_in_ruby(proxy->runtime);
+
+  return call_js_function_value(proxy->runtime, global, proxy_value,
+    argc - 1, &(argv[1]));
 }
 
 static void

data/johnson.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{johnson}
-  s.version = "1.0.0.20090402144841"
+  s.version = "1.0.0.20090402155420"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Barnette", "Aaron Patterson", "Yehuda Katz", "Matthew Draper"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jbarnette-johnson
 version: !ruby/object:Gem::Version 
-  version: 1.0.0.20090402144841
+  version: 1.0.0.20090402155420
 platform: ruby
 authors: 
 - John Barnette