php_process 0.0.6 → 0.0.7

data/Gemfile

@@ -2,8 +2,9 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem "knjrbfw", ">= 0.0.31"
 gem "php-serialize4ruby"
+gem "wref"
+gem "tsafe"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/examples/example_phpexcel.rb

@@ -23,7 +23,7 @@ objPHPExcel.getProperties.setDescription("Test document for Office 2007 XLSX, ge
 
 #Add some data
 print "#{Time.now} Add some data\n"
-objPHPExcel.setActiveSheetIndex(0);
+objPHPExcel.setActiveSheetIndex(0)
 objPHPExcel.getActiveSheet.SetCellValue('A1', 'Hello')
 objPHPExcel.getActiveSheet.SetCellValue('B2', 'world!')
 objPHPExcel.getActiveSheet.SetCellValue('C1', 'Hello')

data/lib/php_process.rb

@@ -1,7 +1,7 @@
-require "knjrbfw"
-require "knj/wref"
-require "base64"
+require "wref"
+require "tsafe"
 require "php-serialize4ruby"
+require "base64"
 require "open3"
 
 #This class starts a PHP-process and proxies various calls to it. It also spawns proxy-objects, which can you can call like they were normal Ruby-objects.
@@ -32,10 +32,14 @@ class Php_process
     @args = args
     @debug = @args[:debug]
     @send_count = 0
-    @responses = Knj::Threadsafe::Synced_hash.new
-    @object_ids = Knj::Threadsafe::Synced_hash.new
-    @object_unset_ids = Knj::Threadsafe::Synced_array.new
-    @objects = Knj::Wref_map.new
+    
+    @responses = Tsafe::MonHash.new
+    
+    @object_ids = Tsafe::MonHash.new
+    @object_unset_ids = Tsafe::MonArray.new
+    @objects = Wref_map.new
+    
+    @constant_val_cache = Tsafe::MonHash.new
     
     #Used for 'create_func'.
     @callbacks = {}
@@ -234,7 +238,13 @@ class Php_process
   
   #Returns the value of a constant on the PHP-side.
   def constant_val(name)
-    return self.send(:type => :constant_val, :name => name)
+    const_name = name.to_s
+    
+    if !@constant_val_cache.key?(const_name)
+      @constant_val_cache[const_name] = self.send(:type => :constant_val, :name => name)
+    end
+    
+    return @constant_val_cache[const_name]
   end
   
   #Returns various informations about boths sides memory in a hash.

data/lib/php_script.php

@@ -1,7 +1,9 @@
 #!/usr/bin/env php5
 <?php
 
+//Controls the PHP-process on the PHP-side.
 class php_process{
+  //Opens stdin and stdout for processing. Sets various helper-variables.
   function __construct(){
     $this->sock_stdin = fopen("php://stdin", "r");
     $this->sock_stdout = fopen("php://stdout", "w");
@@ -10,11 +12,13 @@ class php_process{
     $this->objects_count = 0;
     $this->created_functions = array();
     $this->proxy_to_func = array("call_created_func", "constant_val", "create_func", "func", "get_var", "memory_info", "object_cache_info", "object_call", "require_once_path", "set_var", "static_method_call", "unset_ids");
+    $this->func_specials = array("constant", "define", "die", "exit", "require", "require_once", "include", "include_once");
     $this->send_count = 0;
     
     print "php_script_ready:" . getmypid() . "\n";
   }
   
+  //Starts listening in stdin for new instructions. Calls 'handle_line' for every line gotten.
   function start_listening(){
     while(true){
       $line = fgets($this->sock_stdin, 1048576);
@@ -22,6 +26,7 @@ class php_process{
     }
   }
   
+  //Writes the given data to stdout. Serializes and encodes it as well and increases the 'send_count'-variable.
   function send($data){
     $id = $this->send_count;
     $this->send_count++;
@@ -33,6 +38,7 @@ class php_process{
     //return $this->read_answer($id);
   }
   
+  //Handles the given instruction. It parses it and then calls the relevant method.
   function handle_line($line){
     $data = explode(":", $line);
     $type = $data[0];
@@ -62,6 +68,7 @@ class php_process{
     }
   }
   
+  //Parses objects into special arrays, which again will be turned into proxy-objects on the Ruby-side. Recursivly scans arrays to do the same.
   function parse_data($data){
     if (is_array($data)){
       foreach($data as $key => $val){
@@ -95,6 +102,7 @@ class php_process{
     }
   }
   
+  //Recursivly read the given data from the Ruby-side. Changing special arrays into the objects they refer to.
   function read_parsed_data($data){
     if (is_array($data) and array_key_exists("type", $data) and $data["type"] == "proxyobj" and array_key_exists("id", $data)){
       $object = $this->objects[$data["id"]]["obj"];
@@ -117,12 +125,14 @@ class php_process{
     }
   }
   
+  //Answers a request ID with the given data. Writes it to stdout.
   function answer($id, $data){
     if (!fwrite($this->sock_stdout, "answer:" . $id . ":" . base64_encode(serialize($this->parse_data($data))) . "\n")){
       throw new exception("Could not write to socket.");
     }
   }
   
+  //Ruby wants spawn an object. Cache it and return (Ruby will tell us when to unset it automatically).
   function new_object($id, $args){
     $class = $args["class"];
     $new_args = $this->read_parsed_data($args["args"]);
@@ -133,6 +143,7 @@ class php_process{
     $this->answer($id, $object);
   }
   
+  //Ruby wants to set an instance variable on an object. Do that and answer with 'true'.
   function set_var($id, $args){
     $object = $this->objects[$args["id"]]["obj"];
     if (!$object){
@@ -143,6 +154,7 @@ class php_process{
     $this->answer($id, true);
   }
   
+  //Ruby wants to read an instance variable on an object. Return the variable's value.
   function get_var($id, $args){
     $object = $this->objects[$args["id"]]["obj"];
     if (!$object){
@@ -152,6 +164,7 @@ class php_process{
     $this->answer($id, $object->$args["name"]);
   }
   
+  //Ruby wants to call a method on an object. Do that and return the result.
   function object_call($id, $args){
     if (!array_key_exists($args["id"], $this->objects)){
       throw new exception("No object by that ID: " . $args["id"]);
@@ -173,12 +186,12 @@ class php_process{
     $this->answer($id, $res);
   }
   
+  //Ruby wants to call a function. Do that and return the result.
   function func($id, $args){
     //These functions cant be called normally. Hack them with eval instead.
-    $specials = array("die", "exit", "require", "require_once", "include", "include_once");
     $newargs = $this->read_parsed_data($args["args"]);
     
-    if (in_array($args["func_name"], $specials)){
+    if (in_array($args["func_name"], $this->func_specials)){
       $eval_str = $args["func_name"] . "(";
       $count = 0;
       foreach($newargs as $key => $val){
@@ -203,6 +216,7 @@ class php_process{
     $this->answer($id, $res);
   }
   
+  //Ruby has given us various object-IDs to unset. Unset them from cache and return 'true'.
   function unset_ids($id, $args){
     foreach($args["ids"] as $obj_id){
       if (!array_key_exists($obj_id, $this->objects)){
@@ -222,6 +236,7 @@ class php_process{
     $this->answer($id, true);
   }
   
+  //Ruby wants information about the object-cache on the PHP-side. Return that in an array.
   function object_cache_info($id, $args){
     $types = array();
     foreach($this->objects as $key => $val){
@@ -238,6 +253,7 @@ class php_process{
     ));
   }
   
+  //Ruby wants to call a static method. Answers with the result.
   function static_method_call($id, $args){
     $call_arr = array($args["class_name"], $args["method_name"]);
     
@@ -255,6 +271,7 @@ class php_process{
     $this->answer($id, $res);
   }
   
+  //Creates a function which can be used for callbacks on the Ruby-side.
   function create_func($id, $args){
     $cb_id = $args["callback_id"];
     $func = create_function("", "global \$php_process; \$php_process->call_back_created_func(" . $cb_id . ", func_get_args());");
@@ -266,6 +283,7 @@ class php_process{
     $this->answer($id, true);
   }
   
+  //This function is called, when a create-function is called. It then callbacks to Ruby, where a 'Proc' will be executed.
   function call_back_created_func($func_id, $args){
     $this->send(array(
       "type" => "call_back_created_func",
@@ -274,6 +292,7 @@ class php_process{
     ));
   }
   
+  //Ruby wants to call a created function. Pretty much just executes that function. This is useually done for debugging callbacks.
   function call_created_func($id, $args){
     $func = $this->created_functions[$args["id"]]["func"];
     if (!$func){
@@ -297,10 +316,12 @@ class php_process{
     $this->answer($id, $res);
   }
   
+  //Ruby wants to read a constant. This is not done by 'func', because of keeping caching posibility open and not wanting to eval.
   function constant_val($id, $args){
     $this->answer($id, constant($args["name"]));
   }
   
+  //Returns various information about the object-cache.
   function memory_info($id, $args){
     $this->answer($id, array(
       "objects" => count($this->objects),

data/php_process.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{php_process}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-05-08}
+  s.date = %q{2012-05-22}
   s.description = %q{Spawns a PHP process and proxies calls to it, making it possible to proxy objects and more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -41,16 +41,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<knjrbfw>, [">= 0.0.31"])
       s.add_runtime_dependency(%q<php-serialize4ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<wref>, [">= 0"])
+      s.add_runtime_dependency(%q<tsafe>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<knjrbfw>, [">= 0.0.31"])
       s.add_dependency(%q<php-serialize4ruby>, [">= 0"])
+      s.add_dependency(%q<wref>, [">= 0"])
+      s.add_dependency(%q<tsafe>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -58,8 +60,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<knjrbfw>, [">= 0.0.31"])
     s.add_dependency(%q<php-serialize4ruby>, [">= 0"])
+    s.add_dependency(%q<wref>, [">= 0"])
+    s.add_dependency(%q<tsafe>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/spec/php_process_spec.rb

@@ -11,6 +11,18 @@ describe "PhpProcess" do
     $php = Php_process.new(:debug => false, :debug_stderr => true)
     
     
+    #It should be able to handle constants very fast by using cache.
+    $php.func("define", "TEST_CONSTANT", 5)
+    raise "Expected 'TEST_CONSTANT'-constant to exist but it didnt." if !$php.func("defined", "TEST_CONSTANT")
+    
+    Timeout.timeout(1) do
+      0.upto(10000) do
+        const = $php.constant_val("TEST_CONSTANT")
+        raise "Expected const to be 5 but it wasnt: #{const}." if const != 5
+      end
+    end
+    
+    
     #Test function calls without arguments.
     pid = $php.func("getmypid")
     raise "Invalid PID: #{pid}" if pid.to_i <= 0
@@ -73,8 +85,7 @@ describe "PhpProcess" do
     tw.close
     tw = nil
     
-    
-    
+        
     #Test PHPExcel.
     $php.func("require_once", "PHPExcel.php")
     tw = $php.new("knj_table_writer", {

metadata

@@ -2,7 +2,7 @@
 name: php_process
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,22 +10,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-08 00:00:00 +02:00
+date: 2012-05-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: knjrbfw
+  name: php-serialize4ruby
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.31
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: php-serialize4ruby
+  name: wref
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -36,8 +36,19 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: tsafe
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,10 +56,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -56,10 +67,10 @@ dependencies:
         version: "3.12"
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -67,10 +78,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,10 +89,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,7 +100,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 description: Spawns a PHP process and proxies calls to it, making it possible to proxy objects and more.
 email: k@spernj.org
 executables: []
@@ -127,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4239415254216203709
+      hash: 537427075948440521
       segments: 
       - 0
       version: "0"