diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/soap/wsdlDriver.rb | 24 | ||||
| -rw-r--r-- | lib/wsdl/soap/operation.rb | 5 | ||||
| -rw-r--r-- | lib/wsdl/xmlSchema/schema.rb | 3 |
3 files changed, 26 insertions, 6 deletions
diff --git a/lib/soap/wsdlDriver.rb b/lib/soap/wsdlDriver.rb index cd93e3dee..4b36bd08b 100644 --- a/lib/soap/wsdlDriver.rb +++ b/lib/soap/wsdlDriver.rb @@ -206,11 +206,7 @@ class WSDLDriver log(DEBUG) { "call: parameters '#{ params.inspect }'." } op_info = @operations[method_name] - parts_names = op_info.bodyparts.collect { |part| part.name } - obj = create_method_obj(parts_names, params) - method = Mapping.obj2soap(obj, @wsdl_mapping_registry, op_info.optype_name) - method.elename = op_info.op_name - method.type = XSD::QName.new # Request should not be typed. + method = create_method_struct(op_info, params) req_header = nil req_body = SOAPBody.new(method) req_env = SOAPEnvelope.new(req_header, req_body) @@ -264,6 +260,24 @@ class WSDLDriver private + def create_method_struct(op_info, params) + parts_names = op_info.bodyparts.collect { |part| part.name } + obj = create_method_obj(parts_names, params) + method = Mapping.obj2soap(obj, @wsdl_mapping_registry, op_info.optype_name) + if method.members.size != parts_names.size + new_method = SOAPStruct.new + method.each do |key, value| + if parts_names.include?(key) + new_method.add(key, value) + end + end + method = new_method + end + method.elename = op_info.op_name + method.type = XSD::QName.new # Request should not be typed. + method + end + def create_method_obj(names, params) o = Object.new for idx in 0 ... params.length diff --git a/lib/wsdl/soap/operation.rb b/lib/wsdl/soap/operation.rb index e50356cf3..bb49f2099 100644 --- a/lib/wsdl/soap/operation.rb +++ b/lib/wsdl/soap/operation.rb @@ -104,7 +104,10 @@ private op_name.namespace = soapbody.namespace end if soapbody.parts - raise NotImplementedError.new("soap:body parts") + target = soapbody.parts.split(/\s+/) + bodyparts = name_info.parts.find_all { |part| + target.include?(part.name) + } else bodyparts = name_info.parts end diff --git a/lib/wsdl/xmlSchema/schema.rb b/lib/wsdl/xmlSchema/schema.rb index 1d7759605..b2a195d41 100644 --- a/lib/wsdl/xmlSchema/schema.rb +++ b/lib/wsdl/xmlSchema/schema.rb @@ -43,6 +43,9 @@ class Schema < Info o = ComplexType.new @complextypes << o o + when SimpleTypeName + STDERR.puts("Restriction of basetype with simpleType definition is ignored for now.") + nil when ElementName o = Element.new @elements << o |