mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
eb3f829be9
== 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/trunk@8500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
99 lines
2.3 KiB
Ruby
99 lines
2.3 KiB
Ruby
require 'test/unit'
|
|
require 'soap/rpc/httpserver'
|
|
require 'soap/wsdlDriver'
|
|
|
|
|
|
module WSDL
|
|
|
|
|
|
class TestMap < Test::Unit::TestCase
|
|
Port = 17171
|
|
DIR = File.dirname(File.expand_path(__FILE__))
|
|
|
|
class Server < ::SOAP::RPC::HTTPServer
|
|
def on_init
|
|
add_method(self, 'map')
|
|
add_method(self, 'map2', 'arg')
|
|
end
|
|
|
|
def map
|
|
{1 => "a", 2 => "b"}
|
|
end
|
|
|
|
def map2(arg)
|
|
arg
|
|
end
|
|
end
|
|
|
|
def setup
|
|
setup_server
|
|
setup_client
|
|
end
|
|
|
|
def setup_server
|
|
@server = Server.new(
|
|
:BindAddress => "0.0.0.0",
|
|
:Port => Port,
|
|
:AccessLog => [],
|
|
:SOAPDefaultNamespace => "urn:map"
|
|
)
|
|
@server.level = Logger::Severity::ERROR
|
|
@t = Thread.new {
|
|
Thread.current.abort_on_exception = true
|
|
@server.start
|
|
}
|
|
end
|
|
|
|
def setup_client
|
|
wsdl = File.join(DIR, 'map.wsdl')
|
|
@client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
|
|
@client.endpoint_url = "http://localhost:#{Port}/"
|
|
@client.generate_explicit_type = true
|
|
@client.wiredump_dev = STDOUT if $DEBUG
|
|
end
|
|
|
|
def teardown
|
|
teardown_server
|
|
teardown_client
|
|
end
|
|
|
|
def teardown_server
|
|
@server.shutdown
|
|
@t.kill
|
|
@t.join
|
|
end
|
|
|
|
def teardown_client
|
|
@client.reset_stream
|
|
end
|
|
|
|
def test_by_wsdl
|
|
dir = File.dirname(File.expand_path(__FILE__))
|
|
wsdlfile = File.join(dir, 'map.wsdl')
|
|
xml = File.open(File.join(dir, 'map.xml')) { |f| f.read }
|
|
wsdl = WSDL::Importer.import(wsdlfile)
|
|
service = wsdl.services[0]
|
|
port = service.ports[0]
|
|
wsdl_types = wsdl.collect_complextypes
|
|
rpc_decode_typemap = wsdl_types + wsdl.soap_rpc_complextypes(port.find_binding)
|
|
opt = {}
|
|
opt[:default_encodingstyle] = ::SOAP::EncodingNamespace
|
|
opt[:decode_typemap] = rpc_decode_typemap
|
|
header, body = ::SOAP::Processor.unmarshal(xml, opt)
|
|
map = ::SOAP::Mapping.soap2obj(body.response)
|
|
assert_equal(["a1"], map["a"]["a1"])
|
|
assert_equal(["a2"], map["a"]["a2"])
|
|
assert_equal(["b1"], map["b"]["b1"])
|
|
assert_equal(["b2"], map["b"]["b2"])
|
|
end
|
|
|
|
def test_wsdldriver
|
|
assert_equal({1 => "a", 2 => "b"}, @client.map)
|
|
assert_equal({1 => 2}, @client.map2({1 => 2}))
|
|
assert_equal({1 => {2 => 3}}, @client.map2({1 => {2 => 3}}))
|
|
assert_equal({["a", 2] => {2 => 3}}, @client.map2({["a", 2] => {2 => 3}}))
|
|
end
|
|
end
|
|
|
|
|
|
end
|