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 - SOAP EncodingStyle handler library
|
||||
# Copyright (C) 2001, 2003 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;
|
||||
|
|
@ -33,7 +33,7 @@ class SOAPHandler < Handler
|
|||
attrs = encode_attrs(generator, ns, data, parent)
|
||||
|
||||
if parent && parent.is_a?(SOAPArray) && parent.position
|
||||
attrs[ns.name(AttrPositionName)] = "[#{ parent.position.join(',') }]"
|
||||
attrs[ns.name(AttrPositionName)] = "[#{parent.position.join(',')}]"
|
||||
end
|
||||
|
||||
name = nil
|
||||
|
|
@ -75,7 +75,7 @@ class SOAPHandler < Handler
|
|||
end
|
||||
else
|
||||
raise EncodingStyleError.new(
|
||||
"Unknown object:#{ data } in this encodingStyle.")
|
||||
"unknown object:#{data} in this encodingStyle")
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -156,7 +156,6 @@ class SOAPHandler < Handler
|
|||
end
|
||||
|
||||
def decode_tag(ns, elename, attrs, parent)
|
||||
# ToDo: check if @textbuf is empty...
|
||||
@textbuf = ''
|
||||
is_nil, type, arytype, root, offset, position, href, id, extraattr =
|
||||
decode_attrs(ns, attrs)
|
||||
|
|
@ -227,6 +226,7 @@ class SOAPHandler < Handler
|
|||
end
|
||||
|
||||
def decode_parent(parent, node)
|
||||
return unless parent.node
|
||||
case parent.node
|
||||
when SOAPUnknown
|
||||
newparent = parent.node.as_struct
|
||||
|
|
@ -247,10 +247,8 @@ class SOAPHandler < Handler
|
|||
parent.node.add(node)
|
||||
end
|
||||
node.parent = parent.node
|
||||
when SOAPBasetype
|
||||
raise EncodingStyleError.new("SOAP base type must not have a child.")
|
||||
else
|
||||
raise EncodingStyleError.new("Illegal parent: #{ parent.node }.")
|
||||
raise EncodingStyleError.new("illegal parent: #{parent.node}")
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -266,7 +264,7 @@ private
|
|||
|
||||
def create_arytype(ns, data)
|
||||
XSD::QName.new(data.arytype.namespace,
|
||||
content_typename(data.arytype.name) + "[#{ data.size.join(',') }]")
|
||||
content_typename(data.arytype.name) + "[#{data.size.join(',')}]")
|
||||
end
|
||||
|
||||
def encode_attrs(generator, ns, data, parent)
|
||||
|
|
@ -383,7 +381,7 @@ private
|
|||
|
||||
def decode_definedtype(elename, typename, typedef, arytypestr)
|
||||
unless typedef
|
||||
raise EncodingStyleError.new("Unknown type '#{ typename }'.")
|
||||
raise EncodingStyleError.new("unknown type '#{typename}'")
|
||||
end
|
||||
if typedef.is_a?(::WSDL::XMLSchema::SimpleType)
|
||||
decode_defined_simpletype(elename, typename, typedef, arytypestr)
|
||||
|
|
@ -421,6 +419,10 @@ private
|
|||
end
|
||||
o.definedtype = typedef
|
||||
return o
|
||||
when :TYPE_EMPTY
|
||||
o = SOAPNil.decode(elename)
|
||||
o.definedtype = typedef
|
||||
return o
|
||||
else
|
||||
raise RuntimeError.new(
|
||||
"Unknown kind of complexType: #{typedef.compoundtype}")
|
||||
|
|
@ -509,7 +511,7 @@ private
|
|||
case qname.name
|
||||
when XSD::NilLiteral
|
||||
is_nil = NilLiteralMap[value] or
|
||||
raise EncodingStyleError.new("Cannot accept attribute value: #{ value } as the value of xsi:#{ XSD::NilLiteral } (expected 'true', 'false', '1', or '0').")
|
||||
raise EncodingStyleError.new("cannot accept attribute value: #{value} as the value of xsi:#{XSD::NilLiteral} (expected 'true', 'false', '1', or '0')")
|
||||
next
|
||||
when XSD::AttrType
|
||||
type = value
|
||||
|
|
@ -523,7 +525,7 @@ private
|
|||
when AttrRoot
|
||||
root = RootLiteralMap[value] or
|
||||
raise EncodingStyleError.new(
|
||||
"Illegal root attribute value: #{ value }.")
|
||||
"illegal root attribute value: #{value}")
|
||||
next
|
||||
when AttrOffset
|
||||
offset = value
|
||||
|
|
@ -578,7 +580,7 @@ private
|
|||
ref.__setobj__(o)
|
||||
false
|
||||
else
|
||||
raise EncodingStyleError.new("Unresolved reference: #{ ref.refid }.")
|
||||
raise EncodingStyleError.new("unresolved reference: #{ref.refid}")
|
||||
end
|
||||
}
|
||||
count -= 1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue