php_vm 1.0.2 → 1.0.3

data/README.md

@@ -0,0 +1,23 @@
+php_vm
+======================
+php_vm is a native bridge between Ruby and PHP.
+
+
+Requirements
+------
+* php (sapi/embed)
+
+
+Installation
+------
+	$ gem install php_vm
+
+
+Install PHP (sapi/embed)
+------
+	$ git clone git://github.com/php/php-src.git
+	$ cd php-src
+	$ ./buildconf
+	$ ./configure --prefix=/usr/local --enable-embed=shared --disable-cli --disable-cgi --without-pear
+	$ make
+	$ sudo make install

data/ext/php_vm/php_vm.c

@@ -347,8 +347,8 @@ VALUE rb_php_vm_require(VALUE cls, VALUE filepath)
 	filepath = rb_funcall(filepath, rb_intern("gsub"), 2, rb_str_new2("\""), rb_str_new2("\\\""));
 
 	VALUE code = rb_str_new2("require \"");
-	code = rb_str_plus(code, filepath);
-	code = rb_str_plus(code, rb_str_new2("\";"));
+	rb_str_cat(code, RSTRING_PTR(filepath), RSTRING_LEN(filepath));
+	rb_str_cat2(code, "\";");
 
 	php_eval_string(RSTRING_PTR(code), RSTRING_LEN(code));
 
@@ -362,8 +362,8 @@ VALUE rb_php_vm_require_once(VALUE cls, VALUE filepath)
 	filepath = rb_funcall(filepath, rb_intern("gsub"), 2, rb_str_new2("\""), rb_str_new2("\\\""));
 
 	VALUE code = rb_str_new2("require_once \"");
-	code = rb_str_plus(code, filepath);
-	code = rb_str_plus(code, rb_str_new2("\";"));
+	rb_str_cat(code, RSTRING_PTR(filepath), RSTRING_LEN(filepath));
+	rb_str_cat2(code, "\";");
 
 	php_eval_string(RSTRING_PTR(code), RSTRING_LEN(code));
 
@@ -538,7 +538,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.2"));
+	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.0.3"));
 
 	// class PHPVM::PHPClass
 	rb_cPHPClass = rb_define_class_under(rb_mPHPVM, "PHPClass", rb_cObject);

data/ext/php_vm/php_vm_v2z.c

@@ -10,29 +10,37 @@ static void value_to_zval_array(VALUE v, zval *z)
 	long i;
 	for (i=0; i<RARRAY_LEN(v); i++) {
 		zval *new_var;
-		MAKE_STD_ZVAL(z);
+		MAKE_STD_ZVAL(new_var);
 		value_to_zval(RARRAY_PTR(v)[i], new_var);
 
 		zend_hash_next_index_insert(Z_ARRVAL_P(z), &new_var, sizeof(zval *), NULL);
 	}
 }
 
+static int hash_flatten_yield(VALUE key, VALUE value, VALUE ary)
+{
+	rb_ary_push(ary, key);
+	rb_ary_push(ary, value);
+	return 0;
+}
+
 static void value_to_zval_hash(VALUE v, zval *z)
 {
-	array_init(z);
+	VALUE v_arr = rb_ary_new();
+	rb_hash_foreach(v, hash_flatten_yield, v_arr);
 
-	v = rb_funcall(v, rb_intern("flatten"), 0);
+	array_init(z);
 
 	long i;
-	for (i=0; i<RARRAY_LEN(v); i+=2) {
-		VALUE v_key = RARRAY_PTR(v)[i];
-		StringValue(v_key);
+	for (i=0; i<RARRAY_LEN(v_arr); i+=2) {
+		VALUE v_key = RARRAY_PTR(v_arr)[i];
+		v_key = rb_obj_as_string(v_key);
 
 		zval *z_value;
-		MAKE_STD_ZVAL(z);
-		value_to_zval(RARRAY_PTR(v)[i+1], z_value);
+		MAKE_STD_ZVAL(z_value);
+		value_to_zval(RARRAY_PTR(v_arr)[i+1], z_value);
 
-		add_assoc_zval_ex(z, RSTRING_PTR(v_key), RSTRING_LEN(v), z_value);
+		add_assoc_zval_ex(z, RSTRING_PTR(v_key), RSTRING_LEN(v_key)+1, z_value);
 	}
 }
 
@@ -71,9 +79,11 @@ void value_to_zval(VALUE v, zval *z)
 			VALUE cls = CLASS_OF(v);
 			if (cls==rb_cPHPObject || cls==rb_ePHPExceptionObject) {
 				// wrap php object
+				// TODO
+				z = get_zval(v);
 			} else {
 				// other to_s
-				StringValue(v);
+				v = rb_obj_as_string(v);
 				ZVAL_STRING(z, RSTRING_PTR(v), 1);
 			}
 		}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: php_vm
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -21,6 +21,7 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - LICENSE
+- README.md
 - Rakefile
 - ext/php_vm/extconf.rb
 - ext/php_vm/php_vm.c