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
118 lines
2.8 KiB
Ruby
118 lines
2.8 KiB
Ruby
require 'test/unit'
|
|
require 'wsdl/parser'
|
|
require 'wsdl/soap/wsdl2ruby'
|
|
require 'soap/rpc/standaloneServer'
|
|
require 'soap/wsdlDriver'
|
|
|
|
|
|
module WSDL; module RPC
|
|
|
|
|
|
class TestRPC < Test::Unit::TestCase
|
|
class Server < ::SOAP::RPC::StandaloneServer
|
|
def on_init
|
|
self.generate_explicit_type = false
|
|
add_rpc_method(self, 'echo', 'arg1', 'arg2')
|
|
add_rpc_method(self, 'echo_err', 'arg1', 'arg2')
|
|
end
|
|
|
|
DummyPerson = Struct.new("family-name".intern, :given_name)
|
|
def echo(arg1, arg2)
|
|
case arg1.family_name
|
|
when 'normal'
|
|
arg1.family_name = arg2.family_name
|
|
arg1.given_name = arg2.given_name
|
|
arg1.age = arg2.age
|
|
arg1
|
|
when 'dummy'
|
|
DummyPerson.new("family-name", "given_name")
|
|
else
|
|
raise
|
|
end
|
|
end
|
|
|
|
ErrPerson = Struct.new(:given_name, :no_such_element)
|
|
def echo_err(arg1, arg2)
|
|
ErrPerson.new(58, Time.now)
|
|
end
|
|
end
|
|
|
|
DIR = File.dirname(File.expand_path(__FILE__))
|
|
|
|
Port = 17171
|
|
|
|
def setup
|
|
setup_server
|
|
setup_classdef
|
|
@client = nil
|
|
end
|
|
|
|
def teardown
|
|
teardown_server
|
|
File.unlink(pathname('echo.rb'))
|
|
@client.reset_stream if @client
|
|
end
|
|
|
|
def setup_server
|
|
@server = Server.new('Test', "urn:rpc", '0.0.0.0', Port)
|
|
@server.level = Logger::Severity::ERROR
|
|
@server_thread = start_server_thread(@server)
|
|
end
|
|
|
|
def setup_classdef
|
|
gen = WSDL::SOAP::WSDL2Ruby.new
|
|
gen.location = pathname("rpc.wsdl")
|
|
gen.basedir = DIR
|
|
gen.logger.level = Logger::FATAL
|
|
gen.opt['classdef'] = nil
|
|
gen.opt['force'] = true
|
|
gen.run
|
|
require pathname('echo')
|
|
end
|
|
|
|
def teardown_server
|
|
@server.shutdown
|
|
@server_thread.kill
|
|
@server_thread.join
|
|
end
|
|
|
|
def start_server_thread(server)
|
|
t = Thread.new {
|
|
Thread.current.abort_on_exception = true
|
|
server.start
|
|
}
|
|
t
|
|
end
|
|
|
|
def pathname(filename)
|
|
File.join(DIR, filename)
|
|
end
|
|
|
|
def test_wsdl
|
|
wsdl = File.join(DIR, 'rpc.wsdl')
|
|
@client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
|
|
@client.endpoint_url = "http://localhost:#{Port}/"
|
|
@client.wiredump_dev = STDOUT if $DEBUG
|
|
|
|
ret = @client.echo(Person.new("normal", "", 12), Person.new("Hi", "Na", 21))
|
|
assert_equal(Person, ret.class)
|
|
assert_equal("Hi", ret.family_name)
|
|
assert_equal("Na", ret.given_name)
|
|
assert_equal(21, ret.age)
|
|
|
|
ret = @client.echo(Person.new("dummy", "", 12), Person.new("Hi", "Na", 21))
|
|
assert_equal(Person, ret.class)
|
|
assert_equal("family-name", ret.family_name)
|
|
assert_equal("given_name", ret.given_name)
|
|
assert_equal(nil, ret.age)
|
|
|
|
ret = @client.echo_err(Person.new("Na", "Hi"), Person.new("Hi", "Na"))
|
|
assert_equal(Person, ret.class)
|
|
assert_equal("58", ret.given_name)
|
|
assert_equal(nil, ret.family_name)
|
|
assert_equal(nil, ret.age)
|
|
end
|
|
end
|
|
|
|
|
|
end; end
|