diff options
-rw-r--r-- | lib/soap/mapping/factory.rb | 8 | ||||
-rw-r--r-- | lib/soap/mapping/rubytypeFactory.rb | 6 | ||||
-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 |
5 files changed, 26 insertions, 20 deletions
diff --git a/lib/soap/mapping/factory.rb b/lib/soap/mapping/factory.rb index f181773687..bf68701229 100644 --- a/lib/soap/mapping/factory.rb +++ b/lib/soap/mapping/factory.rb @@ -87,14 +87,6 @@ class Factory Thread.current[:SOAPMarshalDataKey][node.id] = obj end - def name2typename(name) - capitalize(name) - end - - def capitalize(target) - target.gsub(/^([a-z])/) { $1.tr!('[a-z]', '[A-Z]') } - end - private def setiv2ary(obj, node, map) diff --git a/lib/soap/mapping/rubytypeFactory.rb b/lib/soap/mapping/rubytypeFactory.rb index 0b4af8b8e4..a447715add 100644 --- a/lib/soap/mapping/rubytypeFactory.rb +++ b/lib/soap/mapping/rubytypeFactory.rb @@ -344,9 +344,6 @@ private typestr = Mapping.elename2name(node['type'].data) klass = Mapping.class_from_name(typestr) if klass.nil? - klass = Mapping.class_from_name(name2typename(typestr)) - end - if klass.nil? return false end unless klass <= ::Struct @@ -401,9 +398,6 @@ private typestr = Mapping.elename2name(node.type.name) klass = Mapping.class_from_name(typestr) if klass.nil? - klass = Mapping.class_from_name(name2typename(typestr)) - end - if klass.nil? return nil end if klass <= ::Exception diff --git a/lib/soap/wsdlDriver.rb b/lib/soap/wsdlDriver.rb index 0961751474..d1a1a6cf29 100644 --- a/lib/soap/wsdlDriver.rb +++ b/lib/soap/wsdlDriver.rb @@ -205,11 +205,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) @@ -261,6 +257,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 e50356cf35..bb49f2099c 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 1d7759605e..b2a195d41f 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 |