@@ -189,3 +189,4 @@ A quick cap of the current lib/ionize directory: treetop treetop.rb version.rb + doc/getting_started.txt @@ -160,8 +160,6 @@ zval *create_array() { return new_array; } - - VALUE php_array_keys(VALUE self) { REQUIRE_PHP_SESSION; @@ -576,7 +574,7 @@ VALUE php_include_file(VALUE self, VALUE filename) { return result; } - +/* VALUE php_call_user_function1(VALUE self, VALUE function_name) { REQUIRE_PHP_SESSION; VALUE result; @@ -621,10 +619,10 @@ VALUE php_call_user_function2(VALUE self, VALUE function_name, VALUE arg1) { // inspect_zhash(args[0]); if (FAILURE == call_user_function(EG(function_table), NULL, &funcname, &return_value, 1, args)) { - if (EG(exception)) { - zval *msg = zend_read_property(zend_exception_get_default(TSRMLS_C), EG(exception), "message", sizeof("message")-1, 0 TSRMLS_CC); - printf("Php error message is %s\n" , Z_STRVAL_P(msg)); - } + // if (EG(exception)) { + // zval *msg = zend_read_property(zend_exception_get_default(TSRMLS_C), EG(exception), "message", sizeof("message")-1, 0 TSRMLS_CC); + // printf("Php error message is %s\n" , Z_STRVAL_P(msg)); + // } rb_raise(rb_eRuntimeError, "Calling php function failed"); return Qnil; @@ -666,13 +664,13 @@ VALUE php_call_user_function3(VALUE self, VALUE function_name, VALUE arg1, VALUE zval *z_arg1; MAKE_STD_ZVAL(z_arg1); rb_value2zval2(arg1, z_arg1); args[0] = z_arg1; zval *z_arg2; MAKE_STD_ZVAL(z_arg2); rb_value2zval2(arg2, z_arg2); args[1] = z_arg2; - /* - MAKE_STD_ZVAL(args[0]); - rb_value2zval2(arg1, args[0]); + + //MAKE_STD_ZVAL(args[0]); + //rb_value2zval2(arg1, args[0]); - MAKE_STD_ZVAL(args[1]); - rb_value2zval2(arg2, args[1]); - */ + //MAKE_STD_ZVAL(args[1]); + //rb_value2zval2(arg2, args[1]); + if (FAILURE == call_user_function(EG(function_table), NULL, &funcname, &return_value, 2, args TSRMLS_CC)) { rb_raise(rb_eRuntimeError, "Calling php function failed"); @@ -810,6 +808,35 @@ VALUE php_call_user_function7(VALUE self, VALUE function_name, VALUE arg1, VALUE return result; } +*/ + +VALUE php_call_user_function_n(int argc, VALUE *argv, VALUE self) { + zval *args[argc-1]; + + zval return_value; + zval funcname; + + VALUE result; + + rb_value2zval2(argv[0], &funcname); + + int i; + for (i = 1; i < argc; i++) { + MAKE_STD_ZVAL(args[i-1]); + rb_value2zval2(argv[i], args[i-1]); + } + + if (FAILURE == call_user_function(EG(function_table), NULL, &funcname, &return_value, argc-1, args TSRMLS_CC)) { + // TODO: Raise an error of what actually went wrong.. + rb_raise(rb_eRuntimeError, "Calling php function failed"); + return Qnil; + } + + result = zval2rb_value_p(&return_value); + + return result; +} + /******************************************************* @@ -978,7 +1005,6 @@ static VALUE ionize_php_array_new2(zval *zvalue_p) { static VALUE ionize_php_array_real_inspect(VALUE self) { // printf("Doing real php array inspect\n"); - REQUIRE_PHP_SESSION; VALUE str, hash_key, hash_value; @@ -1229,8 +1255,6 @@ static VALUE ionize_php_array_has_key(VALUE self, VALUE key) { *******************************************************/ static void ionize_php_object_free(ionize_php_object_t *ionize_object) { - // REQUIRE_PHP_SESSION; - if (ionize_object->zvalue_p) { zval_ptr_dtor(&ionize_object->zvalue_p); } @@ -1281,11 +1305,44 @@ static VALUE ionize_php_object_inspect(VALUE self) { str = rb_obj_as_string(self); OBJ_INFECT(str, self); - RSTRING(str)->ptr[RSTRING(str)->len-1]=' '; + RSTRING(str)->ptr[RSTRING(str)->len-1] = ' '; return str; } +VALUE ionize_php_object_call_function_n(int argc, VALUE *argv, VALUE self) { + REQUIRE_PHP_SESSION; + + ionize_php_object_t *ionize_object; + Data_Get_Struct(self, ionize_php_object_t, ionize_object); + + zval *args[argc-1]; + + zval return_value; + zval funcname; + + VALUE result; + + rb_value2zval2(argv[0], &funcname); + + int i; + for (i = 1; i < argc; i++) { + MAKE_STD_ZVAL(args[i-1]); + rb_value2zval2(argv[i], args[i-1]); + } + + if (FAILURE == call_user_function(CG(function_table), &ionize_object->zvalue_p, &funcname, &return_value, argc-1, args TSRMLS_CC)) { + // TODO: Raise an error of what actually went wrong.. + rb_raise(rb_eRuntimeError, "Calling php function failed"); + return Qnil; + } + + result = zval2rb_value_p(&return_value); + + return result; +} + + /******************************************************* Ionize::Php::Resource (Php resources that live in Rubyland) @@ -1373,6 +1430,7 @@ VALUE php_session_end_b(VALUE self) { } +/* VALUE php_last_error_message(VALUE self) { if (EG(exception)) { zval *msg = zend_read_property(zend_exception_get_default(TSRMLS_C), EG(exception), "message", sizeof("message")-1, 0 TSRMLS_CC); @@ -1381,6 +1439,7 @@ VALUE php_last_error_message(VALUE self) { return Qnil; } } +*/ void Init_ionize_php_ext() { @@ -1395,17 +1454,11 @@ void Init_ionize_php_ext() { // Ionize::Php rb_define_module_function(rb_mIonizePhp, "eval", ionize_php_eval_string, 1); rb_define_module_function(rb_mIonizePhp, "include", php_include_file, 1); - rb_define_module_function(rb_mIonizePhp, "last_error_message", php_last_error_message, 0); + // rb_define_module_function(rb_mIonizePhp, "last_error_message", php_last_error_message, 0); // rb_define_module_function(rb_mIonizePhp, "array_keys", php_array_keys, 0); - rb_define_module_function(rb_mIonizePhp, "call_function1", php_call_user_function1, 1); - rb_define_module_function(rb_mIonizePhp, "call_function2", php_call_user_function2, 2); - rb_define_module_function(rb_mIonizePhp, "call_function3", php_call_user_function3, 3); - rb_define_module_function(rb_mIonizePhp, "call_function4", php_call_user_function4, 4); - rb_define_module_function(rb_mIonizePhp, "call_function5", php_call_user_function5, 5); - rb_define_module_function(rb_mIonizePhp, "call_function6", php_call_user_function6, 6); - rb_define_module_function(rb_mIonizePhp, "call_function7", php_call_user_function7, 7); + rb_define_module_function(rb_mIonizePhp, "call_function_n", php_call_user_function_n, -1); rb_define_module_function(rb_mIonizePhp, "session", php_session_with_block, 0); rb_define_module_function(rb_mIonizePhp, "session_start!", php_session_start_b, 0); @@ -1433,6 +1486,7 @@ void Init_ionize_php_ext() { rb_cIonizePhpObject = rb_define_class_under(rb_mIonizePhp, "Object", rb_cObject); rb_define_method(rb_cIonizePhpObject, "inspect", ionize_php_object_inspect, 0); rb_define_method(rb_cIonizePhpObject, "instance_variables_hash", ionize_php_object_instance_variables_hash, 0); + rb_define_method(rb_cIonizePhpObject, "call_function_n", ionize_php_object_call_function_n, -1); // Ionize::Php::Resource rb_cIonizePhpResource = rb_define_class_under(rb_mIonizePhp, "Resource", rb_cObject); ext/ionize_php_ext.c ext/ionize_php_ext.o ext/ionize_php_ext.so @@ -1,17 +1,12 @@ require File.dirname(__FILE__) + '/ionize_php_ext' -Ionize::Php.start_session! +Ionize::Php.session do + result = Ionize::Php.eval(%Q{ return array("okay" => 100, "color" => "red"); }) + keys = Ionize::Php.call_function_n('array_keys', result) + puts keys.inspect + + link = Ionize::Php.call_function_n('mysql_connect', 'localhost', 'mysql_user', 'mysql_password') + Ionize::Php.call_function_n('mysql_close', link) +end -result = Ionize::Php.eval(%Q{ return array("okay" => 100, "color" => "red"); }) -keys = Ionize::Php.call_function2('array_keys', result) -puts keys.inspect - -values = Ionize::Php.call_function2('array_values', result) -puts values.inspect - -last = Ionize::Php.call_function2('array_pop', result) -puts result.inspect -puts last.inspect - -Ionize::Php.end_session! ext/test.rb @@ -40,38 +40,38 @@ describe "Working with Php::Array" do it "should take an array as a php argument" do stack = Ionize::Php::Array.from_array(["orange", "banana", "apple", "raspberry"]) - fruit = Ionize::Php.call_function2('array_pop', stack) + fruit = Ionize::Php.call_function_n('array_pop', stack) stack.to_hash.should == {0 => "orange", 1 => "banana", 2 => "apple"} fruit.should == "raspberry" end it "should take nested arrays" do array = Ionize::Php.eval(%Q{ return array('a' => 'apple', 'b' => 'banana', 'c' => array ('x', 'y', 'z')); }) - result = Ionize::Php.call_function3('print_r', array, true) + result = Ionize::Php.call_function_n('print_r', array, true) result.should == "Array\n(\n [a] => apple\n [b] => banana\n [c] => Array\n (\n [0] => x\n [1] => y\n [2] => z\n )\n\n)\n" end it "should return the array keys" do result = Ionize::Php.eval(%Q{ return array(0 => 100, "color" => "red"); }) - keys = Ionize::Php.call_function2('array_keys', result) + keys = Ionize::Php.call_function_n('array_keys', result) keys.to_hash.should == {0 => 0, 1 => "color"} end it "should return the array values" do result = Ionize::Php.eval(%Q{ return array(0 => 100, "color" => "red"); }) - values = Ionize::Php.call_function2('array_values', result) + values = Ionize::Php.call_function_n('array_values', result) values.to_hash.should == {0 => 100, 1 => "red"} end it "should flip the array" do result = Ionize::Php.eval(%Q{ return array(0 => 100, "color" => "red"); }) - flipped = Ionize::Php.call_function2('array_flip', result) + flipped = Ionize::Php.call_function_n('array_flip', result) flipped.to_hash.should == {100 => 0, "red" => "color"} end it "should pad the array" do input = Ionize::Php.eval(%Q{ return array(12, 10, 9); }) - new_input = Ionize::Php.call_function4('array_pad', input, 5, 0); + new_input = Ionize::Php.call_function_n('array_pad', input, 5, 0); new_input.to_hash.should == {0 => 12, 1 => 10, 2 => 9, 3 => 0, 4 => 0} end @@ -107,11 +107,11 @@ describe "Working with Php::Array" do it "should maintain the array's internal pointer" do array = Ionize::Php::Array.from_array(['step one', 'step two', 'step three', 'step four']) - Ionize::Php.call_function2('current', array).should == "step one" - Ionize::Php.call_function2('next', array) - Ionize::Php.call_function2('next', array) - Ionize::Php.call_function2('current', array).should == "step three" - Ionize::Php.call_function2('reset', array) - Ionize::Php.call_function2('current', array).should == "step one" + Ionize::Php.call_function_n('current', array).should == "step one" + Ionize::Php.call_function_n('next', array) + Ionize::Php.call_function_n('next', array) + Ionize::Php.call_function_n('current', array).should == "step three" + Ionize::Php.call_function_n('reset', array) + Ionize::Php.call_function_n('current', array).should == "step one" end end spec/extension/array_spec.rb @@ -17,30 +17,12 @@ describe "Working with call_function and eval" do end it "should provide the right version number" do - Ionize::Php.call_function1('phpversion').should == "5.2.9" - end - - it "should give the string length" do - Ionize::Php.call_function2('strlen', 'abc').should == 3 - end - - it "should ... " do - Ionize::Php.call_function3('substr', "abcdef", -1).should == "f" - end - - it "should find the string length of a big text file" do - Ionize::Php.call_function2('strlen', File.read("/home/robinhoode/dev/ruby/other/ionize/spec/fixtures/drupal_4.php")).should == 5212 - end - - it "should parse a small bit of php" do - calling do - Ionize::Php.call_function2('token_get_all', %Q{ <?php phpinfo(); ?> }) - end.should_not raise_error + Ionize::Php.call_function_n('phpversion').should == "5.2.9" end it "should call a php function with a null argument with segfaulting" do calling do - Ionize::Php.call_function2('empty', nil) + Ionize::Php.call_function_n('empty', nil) end.should_not raise_error end spec/extension/call_and_eval_spec.rb @@ -51,6 +51,8 @@ describe "Working with objects" do end it "should call an object's function" do - raise "Not implemented" + veggie = Ionize::Php.eval(%Q{ return new Vegetable(true, "blue"); }) + veggie.call_function_n('is_edible').should == true + veggie.call_function_n('what_color').should == "blue" end end spec/extension/object_spec.rb @@ -17,6 +17,6 @@ describe "Working with resources" do end it "should return a resource" do - handle = Ionize::Php.call_function3('fopen', "spec/fixtures/drupal_1.php", "r") + handle = Ionize::Php.call_function_n('fopen', "spec/fixtures/drupal_1.php", "r") end end spec/extension/resource_spec.rb @@ -16,4 +16,22 @@ describe "Working with php strings" do Ionize::Php.session_end! end + it "should give the string length" do + Ionize::Php.call_function_n('strlen', 'abc').should == 3 + end + + it "should find the substring of a given string " do + Ionize::Php.call_function_n('substr', "abcdef", -1).should == "f" + end + + it "should find the string length of a big text file" do + Ionize::Php.call_function_n('strlen', File.read("/home/robinhoode/dev/ruby/other/ionize/spec/fixtures/drupal_4.php")).should == 5212 + end + + it "should parse a small bit of php" do + calling do + Ionize::Php.call_function_n('token_get_all', %Q{ <?php phpinfo(); ?> }) + end.should_not raise_error + end + end spec/extension/strings_spec.rb 52c6bd3cd37b00335e5f13d3bed094a38b926f85 farleyknight farleyknight+github@gmail.com http://github.com/farleyknight/ionize/commit/4dbb5b69c8951e790eb855cdd4ba915b46ea1cb7 4dbb5b69c8951e790eb855cdd4ba915b46ea1cb7 2009-06-07T15:31:15-07:00 2009-06-07T15:31:15-07:00 Added support for variable number of arguments and object method calls 476307c36ecc874a137043959795eb5de63661fd farleyknight farleyknight+github@gmail.com