php_process 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/php_process.rb

@@ -3,6 +3,7 @@ require "tsafe" if !Kernel.const_defined?(:Tsafe)
 require "php-serialize4ruby"
 require "base64"
 require "open3"
+require "thread"
 
 #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.
 #===Examples
@@ -37,6 +38,7 @@ class Php_process
     @args = args
     @debug = @args[:debug]
     @send_count = 0
+    @send_mutex = Mutex.new
     
     @responses = Tsafe::MonHash.new
     
@@ -276,12 +278,16 @@ class Php_process
   def send_real(hash)
     $stderr.print "Sending: #{hash[:args]}\n" if @debug and hash[:args]
     str = Base64.strict_encode64(PHP.serialize(hash))
-    @stdin.write("send:#{@send_count}:#{str}\n")
-    id = @send_count
-    @send_count += 1
     
-    #Slep a tiny bit to wait for first answer.
-    sleep 0.001
+    #Find new ID for the send-request.
+    id = nil
+    @send_mutex.synchronize do
+      id = @send_count
+      @send_count += 1
+    end
+    
+    @responses[id] = Queue.new
+    @stdin.write("send:#{id}:#{str}\n")
     
     #Then return result.
     return read_result(id)
@@ -289,23 +295,12 @@ class Php_process
   
   #Searches for a result for a ID and returns it. Runs 'check_alive' to see if the process should be interrupted.
   def read_result(id)
-    loop do
-      if @responses.key?(id)
-        resp = @responses[id]
-        @responses.delete(id)
-        
-        if resp.is_a?(Hash) and resp["type"] == "error"
-          raise "#{resp["msg"]}\n\n#{resp["bt"]}"
-        end
-        
-        $stderr.print "Found answer #{id} - returning it.\n" if @debug
-        return read_parsed_data(resp)
-      end
-      
-      check_alive
-      sleep 0.01
-      $stderr.print "Waiting for answer to ID: #{id}\n" if @debug
-    end
+    $stderr.print "Waiting for answer to ID: #{id}\n" if @debug
+    resp = @responses[id].pop
+    @responses.delete(id)
+    raise "#{resp["msg"]}\n\n#{resp["bt"]}" if resp.is_a?(Hash) and resp["type"] == "error"
+    $stderr.print "Found answer #{id} - returning it.\n" if @debug
+    return read_parsed_data(resp)
   end
   
   #Checks if something is wrong. Maybe stdout got closed or a fatal error appeared on stderr?
@@ -357,7 +352,7 @@ class Php_process
           $stderr.print "Received: #{id}:#{type}:#{args}\n" if @debug
           
           if type == "answer"
-            @responses[id] = args
+            @responses[id].push(args)
           elsif type == "send"
             if args["type"] == "call_back_created_func"
               Thread.new do

data/php_process.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{php_process}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-10}
+  s.date = %q{2012-10-17}
   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 = [

data/spec/php_process_spec.rb

@@ -151,6 +151,7 @@ describe "PhpProcess" do
     
     #Send argument 'kasper' which will be what "$callback_from_php" will be changed to.
     func.call("kasper")
+    sleep 0.1
     raise "Expected callback from PHP to change variable but it didnt: '#{$callback_from_php}'." if $callback_from_php != "kasper"
     
     
@@ -162,6 +163,29 @@ describe "PhpProcess" do
     raise "Cache count should be below #{cache_info1["count"]} but it wasnt: #{cache_info2}." if cache_info2["count"] >= cache_info1["count"]
     
     
+    #Test thread-safety and more.
+    ts = []
+    1.upto(25) do |tcount|
+      ts << Thread.new do
+        str = $php.func("substr", "Kasper Johansen", 0, 100)
+        
+        0.upto(250) do
+          kasper_str = $php.func("substr", str, 0, 6)
+          johansen_str = $php.func("substr", str, 7, 15)
+          
+          raise "Expected 'Kasper' but got '#{kasper_str}'." if kasper_str != "Kasper"
+          raise "Expected 'Johansen' but got '#{johansen_str}'." if johansen_str != "Johansen"
+          
+          STDOUT.print "."
+        end
+      end
+    end
+    
+    ts.each do |t|
+      t.join
+    end
+    
+    
     #Destroy the object.
     $php.destroy
   end

metadata

@@ -1,105 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: php_process
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.11
   prerelease: 
-  version: 0.0.10
 platform: ruby
-authors: 
+authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-10 00:00:00 +02:00
+date: 2012-10-17 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: php-serialize4ruby
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &15324340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *15324340
+- !ruby/object:Gem::Dependency
   name: wref
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &15323460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *15323460
+- !ruby/object:Gem::Dependency
   name: tsafe
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &15322720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *15322720
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &15322080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *15322080
+- !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &15321440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.12"
+      - !ruby/object:Gem::Version
+        version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *15321440
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &15320700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *15320700
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &15320000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *id007
-description: Spawns a PHP process and proxies calls to it, making it possible to proxy objects and more.
+  version_requirements: *15320000
+description: Spawns a PHP process and proxies calls to it, making it possible to proxy
+  objects and more.
 email: k@spernj.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -115,34 +113,31 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/kaspernj/php_process
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2945607344719233429
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3803288112951647499
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby-to-PHP bridge
 test_files: []
-