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 @@
|
|||
# SOAP4R - XML Literal EncodingStyle handler library
|
||||
# Copyright (C) 2001, 2003, 2004 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
|
||||
# Copyright (C) 2001, 2003-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;
|
||||
|
|
@ -29,11 +29,22 @@ class LiteralHandler < Handler
|
|||
def encode_data(generator, ns, qualified, data, parent)
|
||||
attrs = {}
|
||||
name = if qualified and data.elename.namespace
|
||||
SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace)
|
||||
SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace, '')
|
||||
ns.name(data.elename)
|
||||
else
|
||||
data.elename.name
|
||||
end
|
||||
data.extraattr.each do |k, v|
|
||||
if k.is_a?(XSD::QName)
|
||||
if k.namespace
|
||||
SOAPGenerator.assign_ns(attrs, ns, k.namespace)
|
||||
k = ns.name(k)
|
||||
else
|
||||
k = k.name
|
||||
end
|
||||
end
|
||||
attrs[k] = v
|
||||
end
|
||||
|
||||
case data
|
||||
when SOAPRawString
|
||||
|
|
@ -62,13 +73,14 @@ class LiteralHandler < Handler
|
|||
yield(child, true)
|
||||
end
|
||||
when SOAPElement
|
||||
generator.encode_tag(name, attrs.update(data.extraattr))
|
||||
generator.encode_tag(name, attrs)
|
||||
generator.encode_rawstring(data.text) if data.text
|
||||
data.each do |key, value|
|
||||
yield(value, qualified)
|
||||
end
|
||||
else
|
||||
raise EncodingStyleError.new("Unknown object:#{ data } in this encodingStyle.")
|
||||
raise EncodingStyleError.new(
|
||||
"unknown object:#{data} in this encodingStyle")
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -78,7 +90,8 @@ class LiteralHandler < Handler
|
|||
else
|
||||
data.elename.name
|
||||
end
|
||||
cr = data.is_a?(SOAPElement) && !data.text
|
||||
cr = (data.is_a?(SOAPCompoundtype) or
|
||||
(data.is_a?(SOAPElement) and !data.text))
|
||||
generator.encode_tag_end(name, cr)
|
||||
end
|
||||
|
||||
|
|
@ -128,7 +141,6 @@ class LiteralHandler < Handler
|
|||
end
|
||||
|
||||
def decode_tag(ns, elename, attrs, parent)
|
||||
# ToDo: check if @textbuf is empty...
|
||||
@textbuf = ''
|
||||
o = SOAPUnknown.new(self, elename, decode_attrs(ns, attrs))
|
||||
o.parent = parent
|
||||
|
|
@ -172,21 +184,19 @@ class LiteralHandler < Handler
|
|||
end
|
||||
|
||||
def decode_parent(parent, node)
|
||||
return unless parent.node
|
||||
case parent.node
|
||||
when SOAPUnknown
|
||||
newparent = parent.node.as_element
|
||||
node.parent = newparent
|
||||
parent.replace_node(newparent)
|
||||
decode_parent(parent, node)
|
||||
|
||||
when SOAPElement
|
||||
parent.node.add(node)
|
||||
node.parent = parent.node
|
||||
|
||||
when SOAPStruct
|
||||
parent.node.add(node.elename.name, node)
|
||||
node.parent = parent.node
|
||||
|
||||
when SOAPArray
|
||||
if node.position
|
||||
parent.node[*(decode_arypos(node.position))] = node
|
||||
|
|
@ -195,13 +205,8 @@ class LiteralHandler < Handler
|
|||
parent.node.add(node)
|
||||
end
|
||||
node.parent = parent.node
|
||||
|
||||
when SOAPBasetype
|
||||
raise EncodingStyleError.new("SOAP base type must not have a child.")
|
||||
|
||||
else
|
||||
# SOAPUnknown does not have parent.
|
||||
raise EncodingStyleError.new("Illegal parent: #{ parent }.")
|
||||
raise EncodingStyleError.new("illegal parent: #{parent.node}")
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue