php_vm 1.0.3 → 1.0.4

data/ext/php_vm/php_vm.c

@@ -315,7 +315,7 @@ zend_class_entry* get_zend_class_entry(VALUE self)
 	}
 
 	PHPNativeResource *p;
-	Data_Get_Struct(rb_iv_get(self, "php_native_resource"), PHPNativeResource, p);
+	Data_Get_Struct(resource, PHPNativeResource, p);
 	if (p) {
 		return p->ce;
 	}
@@ -330,7 +330,7 @@ zval* get_zval(VALUE self)
 	}
 
 	PHPNativeResource *p;
-	Data_Get_Struct(rb_iv_get(self, "php_native_resource"), PHPNativeResource, p);
+	Data_Get_Struct(resource, PHPNativeResource, p);
 	if (p) {
 		return p->zobj;
 	}
@@ -421,6 +421,7 @@ VALUE rb_php_class_initialize(VALUE self, VALUE v_name)
 	// set resource
 	PHPNativeResource *p = ALLOC(PHPNativeResource);
 	p->ce = *ce;
+	p->zobj = NULL;
 	VALUE resource = Data_Wrap_Struct(CLASS_OF(self), 0, php_native_resource_delete, p);
 	rb_iv_set(self, "php_native_resource", resource);
 
@@ -538,7 +539,7 @@ void Init_php_vm()
 	rb_define_singleton_method(rb_mPHPVM, "exec", rb_php_vm_exec, 1);
 	rb_define_singleton_method(rb_mPHPVM, "getClass", rb_php_vm_getClass, 1);
 
-	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.0.3"));
+	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.0.4"));
 
 	// class PHPVM::PHPClass
 	rb_cPHPClass = rb_define_class_under(rb_mPHPVM, "PHPClass", rb_cObject);

data/ext/php_vm/php_vm_v2z.c

@@ -76,11 +76,10 @@ void value_to_zval(VALUE v, zval *z)
 			break;
 		// object string
 		default:{
-			VALUE cls = CLASS_OF(v);
-			if (cls==rb_cPHPObject || cls==rb_ePHPExceptionObject) {
-				// wrap php object
-				// TODO
-				z = get_zval(v);
+			zval *resource_zobj = get_zval(v);
+			if (resource_zobj) {
+				// php native resource
+				*z = *resource_zobj;
 			} else {
 				// other to_s
 				v = rb_obj_as_string(v);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: php_vm
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-23 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies: []
 description: php_vm is a native bridge between Ruby and PHP.
 email: