diff options
author | Leon Breedt <bitserf@gmail.com> | 2005-03-28 03:20:13 +0000 |
---|---|---|
committer | Leon Breedt <bitserf@gmail.com> | 2005-03-28 03:20:13 +0000 |
commit | 594063f23cf8e7cecd24329e801992784f420b55 (patch) | |
tree | d52e9a6fc0521d51fcc3875162adf0411ee6caa0 /actionwebservice/lib/action_web_service/client/xmlrpc_client.rb | |
parent | 439a216dcb65ac83d86ca04bb898e1797a87ce70 (diff) | |
download | rails-594063f23cf8e7cecd24329e801992784f420b55.tar.gz rails-594063f23cf8e7cecd24329e801992784f420b55.tar.bz2 rails-594063f23cf8e7cecd24329e801992784f420b55.zip |
generalize casting code to be used by both SOAP and XML-RPC (previously only XML-RPC). switch
to better model for API methods, and improve the ability to generate protocol requests/response,
will be required by upcoming scaffolding.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1030 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionwebservice/lib/action_web_service/client/xmlrpc_client.rb')
-rw-r--r-- | actionwebservice/lib/action_web_service/client/xmlrpc_client.rb | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/actionwebservice/lib/action_web_service/client/xmlrpc_client.rb b/actionwebservice/lib/action_web_service/client/xmlrpc_client.rb index 27fe537404..e0b7efc864 100644 --- a/actionwebservice/lib/action_web_service/client/xmlrpc_client.rb +++ b/actionwebservice/lib/action_web_service/client/xmlrpc_client.rb @@ -36,43 +36,17 @@ module ActionWebService # :nodoc: protected def perform_invocation(method_name, args) - args = transform_outgoing_method_params(method_name, args) + method = @api.api_methods[method_name.to_sym] + method.register_types(@marshaler) + if method.expects && method.expects.length != args.length + raise(ArgumentError, "#{method.public_name}: wrong number of arguments (#{args.length} for #{method.expects.length})") + end + args = method.cast_expects(@marshaler, args) ok, return_value = @client.call2(public_name(method_name), *args) - return transform_return_value(method_name, return_value) if ok + return method.cast_returns(@marshaler, return_value) if ok raise(ClientError, "#{return_value.faultCode}: #{return_value.faultString}") end - def transform_outgoing_method_params(method_name, params) - info = @api.api_methods[method_name.to_sym] - expects = info[:expects] - expects_length = expects.nil?? 0 : expects.length - if expects_length != params.length - raise(ClientError, "API declares #{public_name(method_name)} to accept " + - "#{expects_length} parameters, but #{params.length} parameters " + - "were supplied") - end - params = params.dup - if expects_length > 0 - i = 0 - expects.each do |spec| - type_binding = @marshaler.register_type(spec) - info = WS::ParamInfo.create(spec, type_binding, i) - params[i] = @marshaler.marshal(WS::Param.new(params[i], info)) - i += 1 - end - end - params - end - - def transform_return_value(method_name, return_value) - info = @api.api_methods[method_name.to_sym] - return true unless returns = info[:returns] - type_binding = @marshaler.register_type(returns[0]) - info = WS::ParamInfo.create(returns[0], type_binding, 0) - info.name = 'return' - @marshaler.transform_inbound(WS::Param.new(return_value, info)) - end - def public_name(method_name) public_name = @api.public_api_method_name(method_name) @handler_name ? "#{@handler_name}.#{public_name}" : public_name |