soap4r 1.5.7 → 1.5.8

data/bin/wsdl2ruby.rb

@@ -17,8 +17,10 @@ private
     ['--client_skelton','-c', GetoptLong::OPTIONAL_ARGUMENT],
     ['--servant_skelton','-s', GetoptLong::OPTIONAL_ARGUMENT],
     ['--cgi_stub','-g', GetoptLong::OPTIONAL_ARGUMENT],
+    ['--servlet_stub','-l', GetoptLong::OPTIONAL_ARGUMENT],
     ['--standalone_server_stub','-a', GetoptLong::OPTIONAL_ARGUMENT],
     ['--driver','-d', GetoptLong::OPTIONAL_ARGUMENT],
+    ['--drivername_postfix','-n', GetoptLong::REQUIRED_ARGUMENT],
     ['--force','-f', GetoptLong::NO_ARGUMENT],
     ['--quiet','-q', GetoptLong::NO_ARGUMENT],
   ]
@@ -68,9 +70,11 @@ Options:
   --client_skelton [servicename]
   --servant_skelton [porttypename]
   --cgi_stub [servicename]
+  --servlet_stub [servicename]
   --standalone_server_stub [servicename]
   --driver [porttypename]
-  --module_path [Module::Path::Name]
+  --drivername_postfix driver_classname_postfix
+  --module_path Module::Path::Name
   --force
   --quiet
 
@@ -110,9 +114,11 @@ __EOU__
   	  end
    	when "--classdef", "--mapping_registry",
             "--client_skelton", "--servant_skelton",
-            "--cgi_stub", "--standalone_server_stub",
+            "--cgi_stub", "--servlet_stub", "--standalone_server_stub",
             "--driver"
   	  opt[name.sub(/^--/, '')] = arg.empty? ? nil : arg
+        when "--drivername_postfix"
+          opt['drivername_postfix'] = arg
 	when "--force"
 	  opt['force'] = true
         when "--quiet"

data/lib/soap/baseData.rb

@@ -9,6 +9,7 @@
 require 'xsd/datatypes'
 require 'soap/soap'
 require 'xsd/codegen/gensupport'
+require 'soap/mapping/mapping'
 
 
 module SOAP
@@ -27,6 +28,10 @@ public
     d.elename = elename
     d
   end
+
+  def to_data(str)
+    new(str).data
+  end
 end
 
 
@@ -106,6 +111,10 @@ module SOAPCompoundtype
   end
 end
 
+# marker for compound types which have named accessor
+module SOAPNameAccessible
+end
+
 
 ###
 ## Convenience datatypes.
@@ -156,6 +165,14 @@ public
     end
   end
 
+  # for referenced base type such as a long value from Axis.
+  # base2obj requires a node to respond to :data
+  def data
+    if @obj.respond_to?(:data)
+      @obj.data
+    end
+  end
+
   def refidstr
     '#' + @refid
   end
@@ -257,6 +274,60 @@ class SOAPLanguage < XSD::XSDLanguage
   SOAPENCType = QName.new(EncodingNamespace, LanguageLiteral)
 end
 
+class SOAPNMTOKEN < XSD::XSDNMTOKEN
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, NMTOKENLiteral)
+end
+
+class SOAPNMTOKENS < XSD::XSDNMTOKENS
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, NMTOKENSLiteral)
+end
+
+class SOAPName < XSD::XSDName
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, NameLiteral)
+end
+
+class SOAPNCName < XSD::XSDNCName
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, NCNameLiteral)
+end
+
+class SOAPID < XSD::XSDID
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, IDLiteral)
+end
+
+class SOAPIDREF < XSD::XSDIDREF
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, IDREFLiteral)
+end
+
+class SOAPIDREFS < XSD::XSDIDREFS
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, IDREFSLiteral)
+end
+
+class SOAPENTITY < XSD::XSDENTITY
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, ENTITYLiteral)
+end
+
+class SOAPENTITIES < XSD::XSDENTITIES
+  include SOAPBasetype
+  extend SOAPModuleUtils
+  SOAPENCType = QName.new(EncodingNamespace, ENTITIESLiteral)
+end
+
 class SOAPBoolean < XSD::XSDBoolean
   include SOAPBasetype
   extend SOAPModuleUtils
@@ -454,8 +525,9 @@ end
 ## Compound datatypes.
 #
 class SOAPStruct < XSD::NSDBase
-  include SOAPCompoundtype
   include Enumerable
+  include SOAPCompoundtype
+  include SOAPNameAccessible
 
 public
 
@@ -466,7 +538,7 @@ public
     @data = []
   end
 
-  def to_s()
+  def to_s
     str = ''
     self.each do |key, data|
       str << "#{key}: #{data}\n"
@@ -475,7 +547,12 @@ public
   end
 
   def add(name, value)
-    add_member(name, value)
+    value = SOAPNil.new if value.nil?
+    @array.push(name)
+    value.elename = value.elename.dup_name(name)
+    @data.push(value)
+    value.parent = self if value.respond_to?(:parent=)
+    value
   end
 
   def [](idx)
@@ -554,17 +631,6 @@ public
     s.elename = elename
     s
   end
-
-private
-
-  def add_member(name, value = nil)
-    value = SOAPNil.new if value.nil?
-    @array.push(name)
-    value.elename = value.elename.dup_name(name)
-    @data.push(value)
-    value.parent = self if value.respond_to?(:parent=)
-    value
-  end
 end
 
 
@@ -572,6 +638,7 @@ end
 class SOAPElement
   include Enumerable
   include SOAPCompoundtype
+  include SOAPNameAccessible
 
   attr_accessor :type
   # Text interface.
@@ -582,8 +649,8 @@ class SOAPElement
     super()
     if elename.nil?
       elename = XSD::QName::EMPTY
-    elsif !elename.is_a?(XSD::QName)
-      elename = XSD::QName.new(nil, elename)
+    else
+      elename = Mapping.to_qname(elename)
     end
     @encodingstyle = LiteralNamespace
     @elename = elename
@@ -606,7 +673,11 @@ class SOAPElement
 
   # Element interfaces.
   def add(value)
-    add_member(value.elename.name, value)
+    name = value.elename.name
+    @array.push(name)
+    @data.push(value)
+    value.parent = self if value.respond_to?(:parent=)
+    value
   end
 
   def [](idx)
@@ -639,7 +710,7 @@ class SOAPElement
   end
 
   def to_obj
-    if members.empty?
+    if !have_member
       @text
     else
       hash = {}
@@ -697,6 +768,7 @@ class SOAPElement
   #   if else:
   #     value is added as an XML element with the key name.
   def self.from_obj(obj, namespace = nil)
+    return obj if obj.is_a?(SOAPElement)
     o = SOAPElement.new(nil)
     case obj
     when nil
@@ -752,15 +824,6 @@ class SOAPElement
       XSD::QName.new(namespace, obj.to_s)
     end
   end
-
-private
-
-  def add_member(name, value)
-    @array.push(name)
-    @data.push(value)
-    value.parent = self if value.respond_to?(:parent=)
-    value
-  end
 end
 
 
@@ -829,18 +892,14 @@ public
     if idxary.size != @rank
       raise ArgumentError.new("given #{idxary.size} params does not match rank: #{@rank}")
     end
-
     retrieve(idxary)
   end
 
   def []=(*idxary)
     value = idxary.slice!(-1)
-
     if idxary.size != @rank
-      raise ArgumentError.new("given #{idxary.size} params(#{idxary})" +
-        " does not match rank: #{@rank}")
+      raise ArgumentError.new("given #{idxary.size} params(#{idxary}) does not match rank: #{@rank}")
     end
-
     idx = 0
     while idx < idxary.size
       if idxary[idx] + 1 > @size[idx]
@@ -848,10 +907,8 @@ public
       end
       idx += 1
     end
-
     data = retrieve(idxary[0, idxary.size - 1])
     data[idxary.last] = value
-
     if value.is_a?(SOAPType)
       value.elename = ITEM_NAME
       # Sync type
@@ -861,7 +918,6 @@ public
       end
       value.type ||= @type
     end
-
     @offset = idxary
     value.parent = self if value.respond_to?(:parent=)
     offsetnext
@@ -961,7 +1017,7 @@ private
   def traverse_data(data, rank = 1)
     idx = 0
     while idx < ranksize(rank)
-      if rank < @rank
+      if rank < @rank and data[idx]
 	traverse_data(data[idx], rank + 1) do |*v|
 	  v[1, 0] = idx
        	  yield(*v)
@@ -995,10 +1051,6 @@ private
     end
   end
 
-  # Module function
-
-public
-
   def self.decode(elename, type, arytype)
     typestr, nofary = parse_type(arytype.name)
     rank = nofary.count(',') + 1
@@ -1021,13 +1073,11 @@ public
     o
   end
 
-private
-
   def self.create_arytype(typename, rank)
     "#{typename}[" << ',' * (rank - 1) << ']'
   end
 
-  TypeParseRegexp = Regexp.new('^(.+)\[([\d,]*)\]$')
+  TypeParseRegexp = Regexp.new('^(.+)\[([\d,]*)\]$', nil, 'NONE')
 
   def self.parse_type(string)
     TypeParseRegexp =~ string

data/lib/soap/element.rb

@@ -60,7 +60,6 @@ public
     super(EleFaultName)
     @elename = EleFaultName
     @encodingstyle = EncodingNamespace
-
     if faultcode
       self.faultcode = faultcode
       self.faultstring = faultstring
@@ -78,8 +77,8 @@ public
   end
 
   def encode(generator, ns, attrs = {})
-    SOAPGenerator.assign_ns(attrs, ns, EnvelopeNamespace)
-    SOAPGenerator.assign_ns(attrs, ns, EncodingNamespace)
+    Generator.assign_ns(attrs, ns, EnvelopeNamespace)
+    Generator.assign_ns(attrs, ns, EncodingNamespace)
     attrs[ns.name(AttrEncodingStyleName)] = EncodingNamespace
     name = ns.name(@elename)
     generator.encode_tag(name, attrs)
@@ -139,7 +138,6 @@ class SOAPBody < SOAPStruct
 	return node
       end
     end
-
     raise Parser::FormatDecodeError.new('no root element')
   end
 end
@@ -171,7 +169,10 @@ public
     attrs.each do |key, value|
       @element.extraattr[key] = value
     end
-    @element.extraattr[AttrMustUnderstandName] = (@mustunderstand ? '1' : '0')
+    # to remove mustUnderstand attribute, set it to nil
+    unless @mustunderstand.nil?
+      @element.extraattr[AttrMustUnderstandName] = (@mustunderstand ? '1' : '0')
+    end
     if @encodingstyle
       @element.extraattr[AttrEncodingStyleName] = @encodingstyle
     end
@@ -209,9 +210,11 @@ class SOAPHeader < SOAPStruct
 
   def add(name, value)
     actor = value.extraattr[AttrActorName]
-    mu = (value.extraattr[AttrMustUnderstandName] == '1')
+    mu = value.extraattr[AttrMustUnderstandName]
     encstyle = value.extraattr[AttrEncodingStyleName]
-    item = SOAPHeaderItem.new(value, mu, encstyle, actor)
+    mu_value = mu.nil? ? nil : (mu == '1')
+    # to remove mustUnderstand attribute, set it to nil
+    item = SOAPHeaderItem.new(value, mu_value, encstyle, actor)
     super(name, item)
   end
 
@@ -257,7 +260,7 @@ class SOAPEnvelope < XSD::NSDBase
   end
 
   def encode(generator, ns, attrs = {})
-    SOAPGenerator.assign_ns(attrs, ns, elename.namespace, SOAPNamespaceTag)
+    Generator.assign_ns(attrs, ns, elename.namespace)
     name = ns.name(@elename)
     generator.encode_tag(name, attrs)
     yield(@header) if @header and @header.encode?

data/lib/soap/encodingstyle/handler.rb

@@ -94,12 +94,23 @@ class Handler
   def decode_epilogue
   end
 
-  def encode_qname(attrs, ns, qname)
-    unless qname.namespace.nil?
-      SOAPGenerator.assign_ns(attrs, ns, qname.namespace)
-      ns.name(qname)
+  def encode_attr_key(attrs, ns, qname)
+    if qname.namespace.nil?
+      qname.name
     else
+      unless ns.assigned_as_tagged?(qname.namespace)
+        Generator.assign_ns!(attrs, ns, qname.namespace)
+      end
+      ns.name_attr(qname)
+    end
+  end
+
+  def encode_qname(attrs, ns, qname)
+    if qname.namespace.nil?
       qname.name
+    else
+      Generator.assign_ns(attrs, ns, qname.namespace)
+      ns.name(qname)
     end
   end
 end

data/lib/soap/encodingstyle/literalHandler.rb

@@ -31,10 +31,9 @@ class LiteralHandler < Handler
     name = generator.encode_name(ns, data, attrs)
     data.extraattr.each do |key, value|
       next if !@generate_explicit_type and key == XSD::AttrTypeName
-      # ToDo: check generator.attributeformdefault here
       keytag = key
       if key.is_a?(XSD::QName)
-        keytag = encode_qname(attrs, ns, key)
+        keytag = encode_attr_key(attrs, ns, key)
       end
       if value.is_a?(XSD::QName)
         value = encode_qname(attrs, ns, value)
@@ -51,8 +50,7 @@ class LiteralHandler < Handler
       generator.encode_rawstring(data.to_s)
     when XSD::XSDString
       generator.encode_tag(name, attrs)
-      str = data.to_s
-      str = XSD::Charset.encoding_to_xml(str, @charset) if @charset
+      str = decode_str(data.to_s)
       generator.encode_string(str)
     when XSD::XSDAnySimpleType
       generator.encode_tag(name, attrs)
@@ -69,14 +67,16 @@ class LiteralHandler < Handler
         generator.encode_child(ns, child, data)
       end
     when SOAPElement
-      # passes 2 times for simplifying namespace definition
-      data.each do |key, value|
-        if value.elename.namespace
-          SOAPGenerator.assign_ns(attrs, ns, value.elename.namespace)
+      unless generator.use_default_namespace
+        # passes 2 times for simplifying namespace definition
+        data.each do |key, value|
+          if value.elename.namespace
+            Generator.assign_ns(attrs, ns, value.elename.namespace)
+          end
         end
       end
       if data.text and data.text.is_a?(XSD::QName)
-        SOAPGenerator.assign_ns(attrs, ns, data.text.namespace)
+        Generator.assign_ns(attrs, ns, data.text.namespace)
       end
       generator.encode_tag(name, attrs)
       if data.text
@@ -85,7 +85,7 @@ class LiteralHandler < Handler
         else
           text = data.text
         end
-        generator.encode_rawstring(text)
+        generator.encode_string(text)
       end
       data.each do |key, value|
         generator.encode_child(ns, value, data)
@@ -111,17 +111,16 @@ class LiteralHandler < Handler
   #
   def decode_tag(ns, elename, attrs, parent)
     @textbuf.clear
-    extraattrs = decode_attrs(ns, attrs)
-    if extraattrs[XSD::AttrNilName] == 'true'
+    if attrs[XSD::AttrNilName] == 'true'
       o = SOAPNil.decode(elename)
     else
       o = SOAPElement.decode(elename)
     end
-    if definedtype = extraattrs[XSD::AttrTypeName]
+    if definedtype = attrs[XSD::AttrTypeName]
       o.type = ns.parse(definedtype)
     end
     o.parent = parent
-    o.extraattr.update(extraattrs)
+    o.extraattr.update(attrs)
     decode_parent(parent, o)
     o
   end
@@ -138,15 +137,6 @@ class LiteralHandler < Handler
     @textbuf << text
   end
 
-  def decode_attrs(ns, attrs)
-    extraattr = {}
-    attrs.each do |key, value|
-      qname = ns.parse_local(key)
-      extraattr[qname] = value
-    end
-    extraattr
-  end
-
   def decode_prologue
   end
 
@@ -181,7 +171,7 @@ private
     case node
     when XSD::XSDString, SOAPElement
       if @charset
-	node.set(XSD::Charset.encoding_from_xml(textbufstr, @charset))
+	node.set(decode_str(textbufstr))
       else
 	node.set(textbufstr)
       end
@@ -189,6 +179,10 @@ private
       # Nothing to do...
     end
   end
+
+  def decode_str(str)
+    @charset ? XSD::Charset.encoding_from_xml(str, @charset) : str
+  end
 end
 
 LiteralHandler.new