ext/v8/v8_obj.cpp in therubyracer-0.7.1 vs ext/v8/v8_obj.cpp in therubyracer-0.7.2.pre

@@ -1,11 +1,10 @@
 #include "v8_obj.h"
 #include "v8_ref.h"
 #include "v8_value.h"
 #include "v8_template.h"
 #include "v8_external.h"
-#include "converters.h"
 
 using namespace v8;
 
 #include <cstdio>
 
@@ -25,17 +24,17 @@
     } else {
       return rr_v82rb(obj->Get(rr_rb2v8(key)->ToString()));
     }
   }
   
-  VALUE New(VALUE clazz) {
+  VALUE New(VALUE rbclass) {
     HandleScope handles;
     if (!Context::InContext()) {
       rb_raise(rb_eScriptError, "Object::New() called without an entered Context");
       return Qnil;
     }
-    return V8_Ref_Create(clazz, Object::New());
+    return rr_v8_ref_create(rbclass, Object::New());
   }
   
   VALUE Set(VALUE self, VALUE key, VALUE value) {
     HandleScope handles;
     Local<Object> obj = unwrap(self);
@@ -57,38 +56,29 @@
     if (Context::InContext()) {
       unwrap(self)->SetHiddenValue(rr_rb2v8(key)->ToString(), rr_rb2v8(value));
     } else {
       rb_raise(rb_eScriptError, "Object::SetHiddenValue() called without an entered Context");
     }
-    //TODO: need to store a reference here? what's the best way
-    // rr_v8_ref_setref(self, "RubyPeer", )
     return Qnil;
   }
   VALUE GetHiddenValue(VALUE self, VALUE key) {
     HandleScope scope;
     return rr_v82rb(unwrap(self)->GetHiddenValue(rr_rb2v8(key)->ToString()));
   }
 }
 
 void rr_init_obj() {
   rr_cV8_C_Object = rr_define_class("Object", rr_cV8_C_Value);
-  rb_define_attr(rr_cV8_C_Object, "context", 1, 0);
   rr_define_singleton_method(rr_cV8_C_Object, "New", New, 0);
   rr_define_method(rr_cV8_C_Object, "Get", Get, 1);
   rr_define_method(rr_cV8_C_Object, "Set", Set, 2);
   rr_define_method(rr_cV8_C_Object, "GetPropertyNames", GetPropertyNames, 0);
   rr_define_method(rr_cV8_C_Object, "GetHiddenValue", GetHiddenValue, 1);
   rr_define_method(rr_cV8_C_Object, "SetHiddenValue", SetHiddenValue, 2);
 }
 
 VALUE rr_reflect_v8_object(Handle<Value> value) {
   Local<Object> object(Object::Cast(*value));
-  Local<Value> peer = object->GetHiddenValue(String::New("TheRubyRacer::RubyObject"));
+  Local<Value> peer = object->GetHiddenValue(String::NewSymbol("TheRubyRacer::RubyObject"));
   return peer.IsEmpty() ? rr_v8_ref_create(rr_cV8_C_Object, object) : (VALUE)External::Unwrap(peer);
 }
 
-
-v8::Handle<v8::Value> rr_reflect_rb_object(VALUE value) {
-  Local<Object> o = Racer_Create_V8_ObjectTemplate(value)->NewInstance();
-  o->SetHiddenValue(String::New("TheRubyRacer::RubyObject"), rr_v8_external_create(value));
-  return o;  
-}