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.5.
#nnn is a ticket number at http://dev.ctor.org/soap4r * SOAP * allow to configure an envelope namespace of SOAP request. (#124) TemporaryNamespace = 'http://www.w3.org/2003/05/soap-envelope' @client.options["soap.envelope.requestnamespace"] = TemporaryNamespace @client.options["soap.envelope.responsenamespace"] = TemporaryNamespace @client.do_proc(...) * let SOAP request XML indent space configuable. see "soap.envelope.no_indent" option. (#130) * let external CES configuable. ex. client["soap.mapping.external_ces"] = 'SJIS'. $KCODE is used by default. (#133) external CES ::= CES used in Ruby object of client and server internal CES ::= CES used in SOAP/OM * add iso-8859-1 external CES support. (#106) * fixed illegal 'qualified' handling of elements. it caused ASP.NET inteoperability problem. (#144) * added 'soap.envelope.use_numeric_character_reference' (boolean) option to let query XML use numeric character reference in XML, not plain UTF-8 character. !GoogleSearch server seems to not allow plain UTF-8 character since 2005-08-15 update. (#147) * SOAP::Header::SimpleHeader (de)serialization throws an exception on !SimpleHeader.on_(in|out)bound when header is a String. so we could not use a simple single element headerItem. fixed. thanks to emil. (#129) * out parameter of rpc operation did not work. (#132) * follow HTTP redirect only if using http-access2. (#125) (#145) * add a workaround for importing an WSDL whose path begins with drive letter. (#115) * WSDL * SOAP Data which is defined as a simpletype was not mapped correctly to Ruby obj when using wsdl2ruby.rb generated classdef file. (#123) * rpc/literal support. (#118) * re-implemented local element qualify/unqualify control. handles elementFormDefault and form in WSDL. (#119) * Array of an element which has simpleType causes a crash. (#128) * prarmeterOrder may not contain return part so it can be shorter than parts size. Thanks to Hugh. (#139) * Samples * added !BasicAuth client sample. (#117) * added Base64 client/server sample. * added Flickr SOAP interface client sample. (#122) * added !SalesForce client sample. (#135) * updated Thawte CA certificate for !GoogleAdWords sample. * updated a client script with the newer version made by Johan. thanks! * shortened long file names. (#120) * fixed typo in authheader sample. (#129) * updated deprecated method usage. (#138) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
caf6ad3a76
commit
533c24268e
54 changed files with 920 additions and 617 deletions
|
@ -57,7 +57,8 @@ private
|
|||
def dump_element
|
||||
@elements.collect { |ele|
|
||||
if ele.local_complextype
|
||||
dump_classdef(ele.name, ele.local_complextype)
|
||||
dump_classdef(ele.name, ele.local_complextype,
|
||||
ele.elementform == 'qualified')
|
||||
elsif ele.local_simpletype
|
||||
dump_simpletypedef(ele.name, ele.local_simpletype)
|
||||
else
|
||||
|
@ -117,7 +118,7 @@ private
|
|||
c.dump
|
||||
end
|
||||
|
||||
def dump_classdef(qname, typedef)
|
||||
def dump_classdef(qname, typedef, qualified = false)
|
||||
if @faulttypes and @faulttypes.index(qname)
|
||||
c = XSD::CodeGen::ClassDef.new(create_class_name(qname),
|
||||
'::StandardError')
|
||||
|
@ -127,6 +128,7 @@ private
|
|||
c.comment = "#{qname}"
|
||||
c.def_classvar('schema_type', ndq(qname.name))
|
||||
c.def_classvar('schema_ns', ndq(qname.namespace))
|
||||
c.def_classvar('schema_qualified', dq('true')) if qualified
|
||||
schema_element = []
|
||||
init_lines = ''
|
||||
params = []
|
||||
|
@ -158,7 +160,10 @@ private
|
|||
else
|
||||
params << "#{varname} = nil"
|
||||
end
|
||||
eleqname = (varname == name) ? nil : element.name
|
||||
# nil means @@schema_ns + varname
|
||||
eleqname =
|
||||
(varname == name && element.name.namespace == qname.namespace) ?
|
||||
nil : element.name
|
||||
schema_element << [varname, eleqname, type]
|
||||
end
|
||||
unless typedef.attributes.empty?
|
||||
|
@ -256,13 +261,50 @@ private
|
|||
raise RuntimeError.new("cannot define name of #{attribute}")
|
||||
end
|
||||
|
||||
DEFAULT_ITEM_NAME = XSD::QName.new(nil, 'item')
|
||||
|
||||
def dump_arraydef(complextype)
|
||||
qname = complextype.name
|
||||
c = XSD::CodeGen::ClassDef.new(create_class_name(qname), '::Array')
|
||||
c.comment = "#{qname}"
|
||||
type = complextype.child_type
|
||||
c.def_classvar('schema_type', ndq(type.name))
|
||||
c.def_classvar('schema_ns', ndq(type.namespace))
|
||||
child_type = complextype.child_type
|
||||
c.def_classvar('schema_type', ndq(child_type.name))
|
||||
c.def_classvar('schema_ns', ndq(child_type.namespace))
|
||||
child_element = complextype.find_aryelement
|
||||
schema_element = []
|
||||
if child_type == XSD::AnyTypeName
|
||||
type = nil
|
||||
elsif child_element and (klass = element_basetype(child_element))
|
||||
type = klass.name
|
||||
elsif child_type
|
||||
type = create_class_name(child_type)
|
||||
else
|
||||
type = nil
|
||||
end
|
||||
if child_element
|
||||
if child_element.map_as_array?
|
||||
type << '[]' if type
|
||||
end
|
||||
child_element_name = child_element.name
|
||||
else
|
||||
child_element_name = DEFAULT_ITEM_NAME
|
||||
end
|
||||
schema_element << [child_element_name.name, child_element_name, type]
|
||||
c.def_classvar('schema_element',
|
||||
'[' +
|
||||
schema_element.collect { |varname, name, type|
|
||||
'[' +
|
||||
(
|
||||
if name
|
||||
varname.dump + ', [' + ndq(type) + ', ' + dqname(name) + ']'
|
||||
else
|
||||
varname.dump + ', ' + ndq(type)
|
||||
end
|
||||
) +
|
||||
']'
|
||||
}.join(', ') +
|
||||
']'
|
||||
)
|
||||
c.dump
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue