Skip to content
This repository has been archived by the owner on Aug 18, 2018. It is now read-only.

Commit

Permalink
Make with() work. [#31 state:resolved]
Browse files Browse the repository at this point in the history
  • Loading branch information
@jbarnette
jbarnette committed Apr 19, 2008
1 parent 6e7dd78 commit 6b3683d
Show file tree
Hide file tree
Showing 3 changed files with 108 additions and 26 deletions.
125 changes: 101 additions & 24 deletions ext/spidermonkey/js_land_proxy.c
View file
Expand Up @@ -3,16 +3,17 @@
static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval);
static JSBool set(JSContext* context, JSObject* obj, jsval id, jsval* retval);
static JSBool construct(JSContext* js_context, JSObject* obj, uintN argc, jsval* argv, jsval* retval);
static JSBool resolve(JSContext *js_context, JSObject *obj, jsval id, uintN flags, JSObject **objp);
static void finalize(JSContext* context, JSObject* obj);

static JSClass JSLandProxyClass = {
"JSLandProxy", JSCLASS_HAS_PRIVATE,
"JSLandProxy", JSCLASS_HAS_PRIVATE | JSCLASS_NEW_RESOLVE,
JS_PropertyStub,
JS_PropertyStub,
get,
set,
JS_EnumerateStub,
JS_ResolveStub,
resolve,
JS_ConvertStub,
finalize
};
Expand All @@ -33,9 +34,60 @@ static JSClass JSLandClassProxyClass = {
construct
};

static JSBool autovivified_p(VALUE ruby_context, VALUE self, char* name)
{
return rb_funcall(ruby_context, rb_intern("autovivified?"), 2,
self, ID2SYM(rb_intern(name)));
}

static JSBool const_p(VALUE self, char* name)
{
return rb_obj_is_kind_of(self, rb_cModule)
&& rb_is_const_id(rb_intern(name))
&& rb_funcall(self, rb_intern("const_defined?"), 1, ID2SYM(rb_intern(name)));
}

static JSBool global_p(char* name)
{
return rb_ary_includes(rb_f_global_variables(), rb_str_new2(name));
}

static JSBool method_p(VALUE self, char* name)
{
return rb_funcall(self, rb_intern("respond_to?"), 1, ID2SYM(rb_intern(name)));
}

static JSBool has_key_p(VALUE self, char*name)
{
return rb_funcall(self, rb_intern("respond_to?"), 1, ID2SYM(rb_intern("[]")))
&& rb_funcall(self, rb_intern("respond_to?"), 1, ID2SYM(rb_intern("key?")))
&& rb_funcall(self, rb_intern("key?"), 1, rb_str_new2(name));
}

static JSBool respond_to_p(JSContext* js_context, JSObject* obj, char* name)
{
VALUE ruby_context;
assert(ruby_context = (VALUE)JS_GetContextPrivate(js_context));

OurContext* context;
Data_Get_Struct(ruby_context, OurContext, context);

VALUE self;
VALUE symbol = ID2SYM(rb_intern(name));

assert(self = (VALUE)JS_GetInstancePrivate(
context->js, obj, JS_GET_CLASS(context->js, obj), NULL));

return autovivified_p(ruby_context, self, name)
|| const_p(self, name)
|| global_p(name)
|| method_p(self, name)
|| has_key_p(self, name);
}

static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval)
{
// pull out our Ruby object, which is embedded in js_context
// pull out our Ruby context, which is embedded in js_context

VALUE ruby_context;
assert(ruby_context = (VALUE)JS_GetContextPrivate(js_context));
Expand All @@ -50,10 +102,10 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval)
VALUE self;
assert(self = (VALUE)JS_GetInstancePrivate(context->js, obj, JS_GET_CLASS(context->js, obj), NULL));

char* key = JS_GetStringBytes(JSVAL_TO_STRING(id));
VALUE ruby_id = rb_intern(key);

if(!strcasecmp("__iterator__", key)) {
char* name = JS_GetStringBytes(JSVAL_TO_STRING(id));
VALUE ruby_id = rb_intern(name);
if(!strcasecmp("__iterator__", name)) {
jsval nsJohnson;
assert(JS_GetProperty(context->js, context->global, "Johnson", &nsJohnson) || JSVAL_VOID == nsJohnson);

Expand All @@ -70,7 +122,7 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval)
// matching the property we're looking for, pull the value out of
// that map.

if (rb_funcall(ruby_context, rb_intern("autovivified?"), 2, self, ID2SYM(ruby_id)))
if (autovivified_p(ruby_context, self, name))
{
*retval = convert_to_js(context,
rb_funcall(ruby_context, rb_intern("autovivified"), 2, self, ID2SYM(ruby_id)));
Expand All @@ -79,46 +131,50 @@ static JSBool get(JSContext* js_context, JSObject* obj, jsval id, jsval* retval)
// if the Ruby object is a Module or Class and has a matching
// const defined, return the converted result of const_get

else if (rb_obj_is_kind_of(self, rb_cModule)
&& rb_is_const_id(ruby_id)
&& rb_funcall(self, rb_intern("const_defined?"), 1, ID2SYM(ruby_id)))
else if (const_p(self, name))
{
*retval = convert_to_js(context,
rb_funcall(self, rb_intern("const_get"), 1, ID2SYM(ruby_id)));
}

// If its a global, return the global
else if (rb_ary_includes(rb_f_global_variables(), rb_str_new2(key)))
// otherwise, if it's a global, return the global
else if (global_p(name))
{
*retval = convert_to_js(context, rb_gv_get(key));
*retval = convert_to_js(context, rb_gv_get(name));
}

// otherwise, if the Ruby object has a 0-arity method named the same as
// the property we're trying to get, call it and return the converted result

else if (rb_funcall(self, rb_intern("respond_to?"), 1, ID2SYM(ruby_id)))
else if (method_p(self, name))
{
VALUE method = rb_funcall(self, rb_intern("method"), 1, ID2SYM(ruby_id));
int arity = NUM2INT(rb_funcall(method, rb_intern("arity"), 0));

if (arity == 0)
*retval = convert_to_js(context, rb_funcall(self, ruby_id, 0));
}
else
{
// otherwise, if the Ruby object quacks sorta like a hash (it responds to
// "[]" and "key?"), index it by key and return the converted result

VALUE indexable_p = rb_funcall(self, rb_intern("respond_to?"), 1, ID2SYM(rb_intern("[]")));
VALUE has_key_p = rb_funcall(self, rb_intern("respond_to?"), 1, ID2SYM(rb_intern("key?")));

if (indexable_p && has_key_p)
*retval = convert_to_js(context, rb_funcall(self, rb_intern("[]"), 1, rb_str_new2(key)));
// otherwise, if the Ruby object quacks sorta like a hash (it responds to
// "[]" and "key?"), index it by key and return the converted result

else if (has_key_p(self, name))
{
*retval = convert_to_js(context, rb_funcall(self, rb_intern("[]"), 1, rb_str_new2(name)));
}

return JS_TRUE;
}

// called for lazily resolved properties, which should go away
static JSBool get_and_destroy_resolved_property(
JSContext* js_context, JSObject* obj, jsval id, jsval* retval)
{
char* name = JS_GetStringBytes(JSVAL_TO_STRING(id));
JS_DeleteProperty(js_context, obj, name);
return get(js_context, obj, id, retval);
}

static JSBool set(JSContext* js_context, JSObject* obj, jsval id, jsval* value)
{
VALUE ruby_context;
Expand Down Expand Up @@ -190,6 +246,27 @@ static JSBool construct(JSContext* js_context, JSObject* obj, uintN argc, jsval*
return JS_TRUE;
}

static JSBool resolve(JSContext *js_context, JSObject *obj, jsval id, uintN flags, JSObject **objp)
{
VALUE ruby_context;
assert(ruby_context = (VALUE)JS_GetContextPrivate(js_context));

OurContext* context;
Data_Get_Struct(ruby_context, OurContext, context);

char* name = JS_GetStringBytes(JS_ValueToString(js_context, id));

if (respond_to_p(js_context, obj, name))
{
assert(JS_DefineProperty(js_context, obj, name, JSVAL_TRUE,
get_and_destroy_resolved_property, set, JSPROP_ENUMERATE));

*objp = obj;
}

return JS_TRUE;
}

static JSBool method_missing(JSContext* js_context, JSObject* obj, uintN argc, jsval* argv, jsval* retval)
{
VALUE ruby_context;
Expand Down
3 changes: 2 additions & 1 deletion test/helper.rb
View file
Expand Up @@ -21,7 +21,8 @@ def assert_js(expression, options={})
end

def assert_js_equal(expected, expression, options={})
context = options[:context] || @context
context = options.delete(:context) || @context
options.each { |k, v| context[k.to_s] = v }
assert_equal(expected, context.evaluate(expression))
end
end
Expand Down
6 changes: 5 additions & 1 deletion test/johnson/spidermonkey/js_land_proxy_test.rb
View file
Expand Up @@ -212,7 +212,11 @@ def test_class_proxies_provide_a_ctor
def test_dwims_blocks
@context["foo"] = Foo.new
assert_js_equal(4, "foo.xform(2, function(x) { return x * 2 })")
end
end

def test_scope_for_with
assert_js_equal(84, "with (rb) { b + b }", :rb => { "b" => 42 })
end
end
end
end

0 comments on commit 6b3683d

Please sign in to comment.