ruby-core

Hi,
I have made a patch to the XMLRPC implementation used in Ruby to allow  
more flexibility in it's usage. I have developed this to let the  
developer choose which transport system to use. The http  
implementation is normally used, but for some needs i had to use local  
domain sockets.
To obtain this i have added support for socket factories.
There is a  new initialization method to set the socket factory (and  
new3 has been adapted) and the initialize method has 10 arguments now.  
The main difference is in the do_rpc method that will issue e new  
socket from the factory and write the request to it and will read the  
answer. The limitation is that since there is no protocol the socket  
must be closed to end the communication.

------------------
Dario Meloni

Attachments (1)

client.rb.patch (3.07 KB, text/x-diff)

diff --git a/client.rb b/client.rb
index 398b21b..58050ce 100644
--- a/client.rb
+++ b/client.rb
@@ -282,6 +282,13 @@ require "net/http"
 
 module XMLRPC
 
+  # sockets returned from issue, must be closed after received each answer
+  class SocketFactory
+      def issue() # returns a new socket to be used with the library
+         raise "This class must be subclassed"
+      end
+  end
+
   class Client
    
     USER_AGENT = "XMLRPC::Client (Ruby #{RUBY_VERSION})"
@@ -293,12 +300,18 @@ module XMLRPC
     # Constructors -------------------------------------------------------------------
 
     def initialize(host=nil, path=nil, port=nil, proxy_host=nil, proxy_port=nil, 
-                   user=nil, password=nil, use_ssl=nil, timeout=nil)
+                   user=nil, password=nil, use_ssl=nil, timeout=nil, socket=nil)
 
       @http_header_extra = nil
       @http_last_response = nil 
       @cookie = nil
-
+      @socket = socket
+     
+      if @socket != nil then
+          if ! @socket.is_a? XMLRPC::SocketFactory then
+              raise "The socket parameter was not a XMLRPC::SocketFactory subclass"
+          end
+      end
       @host       = host || "localhost"
       @path       = path || "/RPC2"
       @proxy_host = proxy_host
@@ -324,8 +337,10 @@ module XMLRPC
       @proxy_port = @proxy_port.to_i if @proxy_port != nil
 
       # HTTP object for synchronous calls
+      if @socket == nil then
       Net::HTTP.version_1_2
       @http = Net::HTTP.new(@host, @port, @proxy_host, @proxy_port) 
+      end
       @http.use_ssl = @use_ssl if @use_ssl
       @http.read_timeout = @timeout
       @http.open_timeout = @timeout
@@ -366,11 +381,17 @@ module XMLRPC
       hash.each { |k,v| h[k.to_s.downcase] = v }
 
       self.new(h['host'], h['path'], h['port'], h['proxy_host'], h['proxy_port'], h['user'], h['password'],
-               h['use_ssl'], h['timeout'])
+               h['use_ssl'], h['timeout'], h['socket'])
     end
 
     alias new_from_hash new3
 
+    def new4( socket ) 
+        self.new(nil,nil,nil,nil,nil,nil,nil,nil,nil,socket)
+    end
+    
+    alias new_with_socket new4
+
     end
 
 
@@ -498,6 +519,19 @@ module XMLRPC
     end
 
     def do_rpc(request, async=false)
+      data = nil
+      if @socket != nil then # using user socket
+          # must do the same things, send the same things (header and post http structure)
+          # but to the socket! not to a http/https server
+          sock = @socket.issue()
+          if sock.write(request) != request.length then
+              raise "Not all the data has been sent"
+          end
+          # read the whole data until the socket is closed (not sure this works for now)
+          data = sock.read()
+          # after any answer the socket is closed
+          return data # return data to the parser
+      else
       header = {  
        "User-Agent"     =>  USER_AGENT,
        "Content-Type"   => "text/xml; charset=utf-8",
@@ -564,8 +598,8 @@ module XMLRPC
 
       c = resp["Set-Cookie"]
       @cookie = c if c
-
       return data
+      end
     end
 
     def gen_multicall(methods=[], async=false)

Thread

Prev Next

In This Thread

Prev Next