1 files changed, 73 insertions, 29 deletions
diff --git a/lib/soap/rpc/soaplet.rb b/lib/soap/rpc/soaplet.rb
index 7cb5e32375..0c1427acf5 100644
--- a/lib/soap/rpc/soaplet.rb
+++ b/lib/soap/rpc/soaplet.rb
@@ -1,5 +1,5 @@
 # SOAP4R - SOAP handler servlet for WEBrick
-# Copyright (C) 2001, 2002, 2003  NAKAMURA, Hiroshi <[email protected]>.
+# Copyright (C) 2001, 2002, 2003, 2004  NAKAMURA, Hiroshi <[email protected]>.
 
 # This program is copyrighted free software by NAKAMURA, Hiroshi.  You can
 # redistribute it and/or modify it under the same terms of Ruby's license;
@@ -22,20 +22,28 @@ public
   def initialize
     @router_map = {}
     @app_scope_router = ::SOAP::RPC::Router.new(self.class.name)
+    @headerhandlerfactory = []
+    @app_scope_headerhandler = nil
   end
 
-  # Add servant klass whose object has request scope.  A servant object is
-  # instantiated for each request.
+  # Add servant factory whose object has request scope.  A servant object is
+  # instanciated for each request.
   #
-  # Bare in mind that servant klasses are distinguished by HTTP SOAPAction
+  # Bear in mind that servant factories are distinguished by HTTP SOAPAction
   # header in request.  Client which calls request-scoped servant must have a
-  # SOAPAction header which is a namespace of the servant klass.
+  # SOAPAction header which is a namespace of the servant factory.
   # I mean, use Driver#add_method_with_soapaction instead of Driver#add_method
   # at client side.
   #
-  def add_rpc_request_servant(klass, namespace, mapping_registry = nil)
-    router = RequestRouter.new(klass, namespace, mapping_registry)
-    add_router(namespace, router)
+  # A factory must respond to :create.
+  #
+  def add_rpc_request_servant(factory, namespace, mapping_registry = nil)
+    unless factory.respond_to?(:create)
+      raise TypeError.new("factory must respond to 'create'")
+    end
+    router = setup_request_router(namespace)
+    router.factory = factory
+    router.mapping_registry = mapping_registry
   end
 
   # Add servant object which has application scope.
@@ -46,6 +54,17 @@ public
   end
   alias add_servant add_rpc_servant
 
+  def add_rpc_request_headerhandler(factory)
+    unless factory.respond_to?(:create)
+      raise TypeError.new("factory must respond to 'create'")
+    end
+    @headerhandlerfactory << factory
+  end
+
+  def add_rpc_headerhandler(obj)
+    @app_scope_headerhandler = obj
+  end
+  alias add_headerhandler add_rpc_headerhandler
 
   ###
   ## Servlet interfaces for WEBrick.
@@ -67,21 +86,23 @@ public
   def do_POST(req, res)
     namespace = parse_soapaction(req.meta_vars['HTTP_SOAPACTION'])
     router = lookup_router(namespace)
-    begin
-      conn_data = ::SOAP::StreamHandler::ConnectionData.new
-      conn_data.receive_string = req.body
-      conn_data.receive_contenttype = req['content-type']
-      conn_data = router.route(conn_data)
-      if conn_data.is_fault
+    with_headerhandler(router) do |router|
+      begin
+	conn_data = ::SOAP::StreamHandler::ConnectionData.new
+	conn_data.receive_string = req.body
+	conn_data.receive_contenttype = req['content-type']
+	conn_data = router.route(conn_data)
+	if conn_data.is_fault
+	  res.status = WEBrick::HTTPStatus::RC_INTERNAL_SERVER_ERROR
+	end
+	res.body = conn_data.send_string
+	res['content-type'] = conn_data.send_contenttype
+      rescue Exception => e
+	conn_data = router.create_fault_response(e)
 	res.status = WEBrick::HTTPStatus::RC_INTERNAL_SERVER_ERROR
+	res.body = conn_data.send_string
+	res['content-type'] = conn_data.send_contenttype || "text/xml"
       end
-      res.body = conn_data.send_string
-      res['content-type'] = conn_data.send_contenttype
-    rescue Exception => e
-      conn_data = router.create_fault_response(e)
-      res.status = WEBrick::HTTPStatus::RC_INTERNAL_SERVER_ERROR
-      res.body = conn_data.send_string
-      res['content-type'] = conn_data.send_contenttype || "text/xml"
     end
 
     if res.body.is_a?(IO)
@@ -92,17 +113,16 @@ public
 private
 
   class RequestRouter < ::SOAP::RPC::Router
-    def initialize(klass, namespace, mapping_registry = nil)
+    attr_accessor :factory
+
+    def initialize(namespace = nil)
       super(namespace)
-      if mapping_registry
-	self.mapping_registry = mapping_registry
-      end
-      @klass = klass
       @namespace = namespace
+      @factory = nil
     end
 
     def route(soap_string)
-      obj = @klass.new
+      obj = @factory.create
       namespace = self.actor
       router = ::SOAP::RPC::Router.new(@namespace)
       SOAPlet.add_servant_to_router(router, obj, namespace)
@@ -110,6 +130,12 @@ private
     end
   end
 
+  def setup_request_router(namespace)
+    router = @router_map[namespace] || RequestRouter.new(namespace)
+    add_router(namespace, router)
+    router
+  end
+
   def add_router(namespace, router)
     @router_map[namespace] = router
   end
@@ -132,11 +158,29 @@ private
     end
   end
 
+  def with_headerhandler(router)
+    if @app_scope_headerhandler and
+	!router.headerhandler.include?(@app_scope_headerhandler)
+      router.headerhandler.add(@app_scope_headerhandler)
+    end
+    handlers = @headerhandlerfactory.collect { |f| f.create }
+    begin
+      handlers.each { |h| router.headerhandler.add(h) }
+      yield(router)
+    ensure
+      handlers.each { |h| router.headerhandler.delete(h) }
+    end
+  end
+
   class << self
   public
     def add_servant_to_router(router, obj, namespace)
       ::SOAP::RPC.defined_methods(obj).each do |name|
-	add_servant_method_to_router(router, obj, namespace, name)
+        begin
+          add_servant_method_to_router(router, obj, namespace, name)
+        rescue SOAP::RPC::MethodDefinitionError => e
+          p e if $DEBUG
+        end
       end
     end
 
@@ -145,7 +189,7 @@ private
       soapaction = nil
       method = obj.method(name)
       param_def = ::SOAP::RPC::SOAPMethod.create_param_def(
-        (1..method.arity.abs).collect { |i| "p#{ i }" })
+	(1..method.arity.abs).collect { |i| "p#{ i }" })
       router.add_method(obj, qname, soapaction, name, param_def)
     end
   end