* added files:

	  * lib/soap/header/*
	  * lib/soap/rpc/httpserver.rb
	  * lib/wsdl/soap/cgiStubCreator.rb
	  * lib/wsdl/soap/classDefCreator.rb
	  * lib/wsdl/soap/classDefCreatorSupport.rb
	  * lib/wsdl/soap/clientSkeltonCreator.rb
	  * lib/wsdl/soap/driverCreator.rb
	  * lib/wsdl/soap/mappingRegistryCreator.rb
	  * lib/wsdl/soap/methodDefCreator.rb
	  * lib/wsdl/soap/servantSkeltonCreator.rb
	  * lib/wsdl/soap/standaloneServerStubCreator.rb
	  * lib/wsdl/xmlSchema/enumeration.rb
	  * lib/wsdl/xmlSchema/simpleRestriction.rb
	  * lib/wsdl/xmlSchema/simpleType.rb
	  * lib/xsd/codegen/*
	  * lib/xsd/codegen.rb
	  * sample/soap/authheader/*
	  * sample/soap/raa2.4/*
	  * sample/soap/ssl/*
	  * sample/soap/swa/*
	  * sample/soap/whois.rb
	  * sample/wsdl/raa2.4/*
	  * test/soap/header/*
	  * test/soap/ssl/*
	  * test/soap/struct/*
	  * test/soap/swa/*
	  * test/soap/wsdlDriver/*
	  * test/wsdl/multiplefault.wsdl
	  * test/wsdl/simpletype/*
	  * test/wsdl/test_multiplefault.rb

	* modified files:
	  * lib/soap/baseData.rb
	  * lib/soap/element.rb
	  * lib/soap/generator.rb
	  * lib/soap/netHttpClient.rb
	  * lib/soap/parser.rb
	  * lib/soap/property.rb
	  * lib/soap/soap.rb
	  * lib/soap/streamHandler.rb
	  * lib/soap/wsdlDriver.rb
	  * lib/soap/wsdlDriver.rb
	  * lib/soap/encodingstyle/handler.rb
	  * lib/soap/encodingstyle/literalHandler.rb
	  * lib/soap/encodingstyle/soapHandler.rb
	  * lib/soap/mapping/factory.rb
	  * lib/soap/mapping/mapping.rb
	  * lib/soap/mapping/registry.rb
	  * lib/soap/mapping/rubytypeFactory.rb
	  * lib/soap/mapping/wsdlRegistry.rb
	  * lib/soap/rpc/cgistub.rb
	  * lib/soap/rpc/driver.rb
	  * lib/soap/rpc/proxy.rb
	  * lib/soap/rpc/router.rb
	  * lib/soap/rpc/soaplet.rb
	  * lib/soap/rpc/standaloneServer.rb
	  * lib/wsdl/data.rb
	  * lib/wsdl/definitions.rb
	  * lib/wsdl/operation.rb
	  * lib/wsdl/parser.rb
	  * lib/wsdl/soap/definitions.rb
	  * lib/wsdl/xmlSchema/complexContent.rb
	  * lib/wsdl/xmlSchema/complexType.rb
	  * lib/wsdl/xmlSchema/data.rb
	  * lib/wsdl/xmlSchema/parser.rb
	  * lib/wsdl/xmlSchema/schema.rb
	  * lib/xsd/datatypes.rb
	  * lib/xsd/qname.rb
	  * sample/soap/sampleStruct/server.rb
	  * sample/wsdl/amazon/AmazonSearch.rb
	  * sample/wsdl/amazon/AmazonSearchDriver.rb
	  * test/soap/test_property.rb
	  * test/soap/calc/test_calc_cgi.rb
	  * test/wsdl/test_emptycomplextype.rb

	* summary
	  * add SOAP Header mustUnderstand support.

	  * add HTTP client SSL configuration and Cookies support (works
	    completely with http-access2).

	  * add header handler for handling sending/receiving SOAP Header.

	  * map Ruby's anonymous Struct to common SOAP Struct in SOAP Object
	    Model.  it caused error.

	  * add WSDL simpleType support to restrict lexical value space.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6565 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 30 insertions, 61 deletions

diff --git a/lib/soap/baseData.rb b/lib/soap/baseData.rb
index 30963f1d64..49c1d2d1f4 100644
--- a/lib/soap/baseData.rb
+++ b/lib/soap/baseData.rb
@@ -1,5 +1,5 @@
 # soap/baseData.rb: SOAP4R - Base type library
-# Copyright (C) 2000, 2001, 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
+# Copyright (C) 2000, 2001, 2003, 2004  NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
 
 # 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;
@@ -30,20 +30,10 @@ end
 
 
 ###
-## Marker of SOAP/DM types.
+## for SOAP type(base and compound)
 #
-module SOAPType; end
-
-
-###
-## Mix-in module for SOAP base type instances.
-#
-module SOAPBasetype
-  include SOAPType
-  include SOAP
-
+module SOAPType
   attr_accessor :encodingstyle
-
   attr_accessor :elename
   attr_accessor :id
   attr_reader :precedents
@@ -51,17 +41,18 @@ module SOAPBasetype
   attr_accessor :parent
   attr_accessor :position
   attr_reader :extraattr
+  attr_accessor :definedtype
 
-public
-
-  def initialize(*vars)
-    super(*vars)
+  def initialize(*arg)
+    super(*arg)
     @encodingstyle = nil
     @elename = XSD::QName.new
     @id = nil
     @precedents = []
+    @root = false
     @parent = nil
     @position = nil
+    @definedtype = nil
     @extraattr = {}
   end
 
@@ -76,38 +67,27 @@ end
 
 
 ###
-## Mix-in module for SOAP compound type instances.
+## for SOAP base type
 #
-module SOAPCompoundtype
+module SOAPBasetype
   include SOAPType
   include SOAP
 
-  attr_accessor :encodingstyle
-
-  attr_accessor :elename
-  attr_accessor :id
-  attr_reader :precedents
-  attr_accessor :root
-  attr_accessor :parent
-  attr_accessor :position
-  attr_reader :extraattr
+  def initialize(*arg)
+    super(*arg)
+  end
+end
 
-  attr_accessor :definedtype
 
-public
+###
+## for SOAP compound type
+#
+module SOAPCompoundtype
+  include SOAPType
+  include SOAP
 
-  def initialize(type)
-    super()
-    @type = type
-    @encodingstyle = nil
-    @elename = XSD::QName.new
-    @id = nil
-    @precedents = []
-    @root = false
-    @parent = nil
-    @position = nil
-    @definedtype = nil
-    @extraattr = {}
+  def initialize(*arg)
+    super(*arg)
   end
 end
 
@@ -122,18 +102,11 @@ class SOAPReference < XSD::NSDBase
 public
 
   attr_accessor :refid
-  attr_accessor :elename
 
   # Override the definition in SOAPBasetype.
   def initialize(obj = nil)
     super()
     @type = XSD::QName.new
-    @encodingstyle = nil
-    @elename = XSD::QName.new
-    @id = nil
-    @precedents = []
-    @root = false
-    @parent = nil
     @refid = nil
     @obj = nil
     __setobj__(obj) if obj
@@ -198,11 +171,6 @@ class SOAPExternalReference < XSD::NSDBase
   def initialize
     super()
     @type = XSD::QName.new
-    @encodingstyle = nil
-    @elename = XSD::QName.new
-    @precedents = []
-    @root = false
-    @parent = nil
   end
 
   def referred
@@ -377,7 +345,8 @@ class SOAPStruct < XSD::NSDBase
 public
 
   def initialize(type = nil)
-    super(type || XSD::QName.new)
+    super()
+    @type = type || XSD::QName.new
     @array = []
     @data = []
   end
@@ -459,7 +428,7 @@ private
 end
 
 
-# SOAPElement is not typed so it does not derive NSDBase.
+# SOAPElement is not typed so it is not derived from NSDBase.
 class SOAPElement
   include Enumerable
 
@@ -534,7 +503,7 @@ class SOAPElement
     else
       hash = {}
       each do |k, v|
-	hash[k] = v.to_obj
+	hash[k] = v.is_a?(SOAPElement) ? v.to_obj : v.to_s
       end
       hash
     end
@@ -547,8 +516,7 @@ class SOAPElement
   end
 
   def self.decode(elename)
-    o = SOAPElement.new
-    o.elename = elename
+    o = SOAPElement.new(elename)
     o
   end
 
@@ -557,7 +525,7 @@ class SOAPElement
     if hash_or_string.is_a?(Hash)
       hash_or_string.each do |k, v|
 	child = self.from_obj(v)
-	child.elename = XSD::QName.new(nil, k)
+	child.elename = k.is_a?(XSD::QName) ? k : XSD::QName.new(nil, k.to_s)
 	o.add(child)
       end
     else
@@ -616,7 +584,8 @@ public
   attr_reader :arytype
 
   def initialize(type = nil, rank = 1, arytype = nil)
-    super(type || XSD::QName.new)
+    super()
+    @type = type || XSD::QName.new
     @rank = rank
     @data = Array.new
     @sparse = false