mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4.
== SOAP client and server == === for both client side and server side === * improved document/literal service support. style(rpc,document)/use(encoding, literal) combination are all supported. for the detail about combination, see test/soap/test_style.rb. * let WSDLEncodedRegistry#soap2obj map SOAP/OM to Ruby according to WSDL as well as obj2soap. closes #70. * let SOAP::Mapping::Object handle XML attribute for doc/lit service. you can set/get XML attribute via accessor methods which as a name 'xmlattr_' prefixed (<foo name="bar"/> -> Foo#xmlattr_name). === client side === * WSDLDriver capitalized name operation bug fixed. from 1.5.3-ruby1.8.2, operation which has capitalized name (such as KeywordSearchRequest in AWS) is defined as a method having uncapitalized name. (converted with GenSupport.safemethodname to handle operation name 'foo-bar'). it introduced serious incompatibility; in the past, it was defined as a capitalized. define capitalized method as well under that circumstance. * added new factory interface 'WSDLDriverFactory#create_rpc_driver' to create RPC::Driver, not WSDLDriver (RPC::Driver and WSDLDriver are merged). 'WSDLDriverFactory#create_driver' still creates WSDLDriver for compatibility but it warns that the method is deprecated. please use create_rpc_driver instead of create_driver. * allow to use an URI object as an endpoint_url even with net/http, not http-access2. === server side === * added mod_ruby support to SOAP::CGIStub. rename a CGI script server.cgi to server.rb and let mod_ruby's RubyHandler handles the script. CGIStub detects if it's running under mod_ruby environment or not. * added fcgi support to SOAP::CGIStub. see the sample at sample/soap/calc/server.fcgi. (almost same as server.cgi but has fcgi handler at the bottom.) * allow to return a SOAPFault object to respond customized SOAP fault. * added the interface 'generate_explicit_type' for server side (CGIStub, HTTPServer). call 'self.generate_explicit_type = true' if you want to return simplified XML even if it's rpc/encoded service. == WSDL == === WSDL definition === * improved XML Schema support such as extension, restriction, simpleType, complexType + simpleContent, ref, length, import, include. * reduced "unknown element/attribute" warnings (warn only 1 time for each QName). * importing XSD file at schemaLocation with xsd:import. === code generation from WSDL === * generator crashed when there's '-' in defined element/attribute name. * added ApacheMap WSDL definition. * sample/{soap,wsdl}: removed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
15b7d43988
commit
991d0c409c
181 changed files with 3183 additions and 9380 deletions
|
@ -1,5 +1,5 @@
|
|||
# WSDL4R - WSDL additional definitions for SOAP.
|
||||
# Copyright (C) 2002, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
|
||||
# Copyright (C) 2002-2005 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;
|
||||
|
@ -77,13 +77,13 @@ class Definitions < Info
|
|||
|
||||
def collect_faulttypes
|
||||
result = []
|
||||
collect_fault_messages.each do |message|
|
||||
parts = message(message).parts
|
||||
if parts.size != 1
|
||||
raise RuntimeError.new("Expecting fault message to have only 1 part.")
|
||||
collect_fault_messages.each do |name|
|
||||
faultparts = message(name).parts
|
||||
if faultparts.size != 1
|
||||
raise RuntimeError.new("expecting fault message to have only 1 part")
|
||||
end
|
||||
if result.index(parts[0].type).nil?
|
||||
result << parts[0].type
|
||||
if result.index(faultparts[0].type).nil?
|
||||
result << faultparts[0].type
|
||||
end
|
||||
end
|
||||
result
|
||||
|
@ -111,13 +111,13 @@ private
|
|||
if op_bind_rpc?(op_bind)
|
||||
operation = op_bind.find_operation
|
||||
if op_bind.input
|
||||
type = XMLSchema::ComplexType.new(operation_input_name(operation))
|
||||
type = XMLSchema::ComplexType.new(op_bind.soapoperation_name)
|
||||
message = messages[operation.input.message]
|
||||
type.sequence_elements = elements_from_message(message)
|
||||
types << type
|
||||
end
|
||||
if op_bind.output
|
||||
type = XMLSchema::ComplexType.new(operation_output_name(operation))
|
||||
type = XMLSchema::ComplexType.new(operation.outputname)
|
||||
message = messages[operation.output.message]
|
||||
type.sequence_elements = elements_from_message(message)
|
||||
types << type
|
||||
|
@ -127,23 +127,20 @@ private
|
|||
types
|
||||
end
|
||||
|
||||
def operation_input_name(operation)
|
||||
operation.input.name || operation.name
|
||||
end
|
||||
|
||||
def operation_output_name(operation)
|
||||
operation.output.name ||
|
||||
XSD::QName.new(operation.name.namespace, operation.name.name + "Response")
|
||||
end
|
||||
|
||||
def op_bind_rpc?(op_bind)
|
||||
op_bind.soapoperation and op_bind.soapoperation.operation_style == :rpc
|
||||
op_bind.soapoperation_style == :rpc
|
||||
end
|
||||
|
||||
def elements_from_message(message)
|
||||
message.parts.collect { |part|
|
||||
qname = XSD::QName.new(nil, part.name)
|
||||
XMLSchema::Element.new(qname, part.type)
|
||||
if part.element
|
||||
collect_elements[part.element]
|
||||
elsif part.name.nil? or part.type.nil?
|
||||
raise RuntimeError.new("part of a message must be an element or typed")
|
||||
else
|
||||
qname = XSD::QName.new(nil, part.name)
|
||||
XMLSchema::Element.new(qname, part.type)
|
||||
end
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue