mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/soap/generator.rb: better XML pretty printing.
* lib/soap/encodingstyle/soapHandler.rb: remove unnecessary namespace assignment in the element which has "encodingStyle" attribute, and add necessary namespace assignment for "arrayType" attribute. * test/soap/calc/test_calc_cgi.rb: take over $DEBUG to ruby process through CGI. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4871 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
1a4c78d7c1
commit
7eb52a8cd5
4 changed files with 24 additions and 9 deletions
|
@ -293,7 +293,6 @@ private
|
|||
if !parent || parent.encodingstyle != EncodingNamespace
|
||||
if @generate_explicit_type
|
||||
SOAPGenerator.assign_ns(attrs, ns, EnvelopeNamespace)
|
||||
SOAPGenerator.assign_ns(attrs, ns, EncodingNamespace)
|
||||
attrs[ns.name(AttrEncodingStyleName)] = EncodingNamespace
|
||||
end
|
||||
data.encodingstyle = EncodingNamespace
|
||||
|
@ -309,6 +308,7 @@ private
|
|||
if data.arytype.namespace
|
||||
SOAPGenerator.assign_ns(attrs, ns, data.arytype.namespace)
|
||||
end
|
||||
SOAPGenerator.assign_ns(attrs, ns, EncodingNamespace)
|
||||
attrs[ns.name(AttrArrayTypeName)] = ns.name(create_arytype(ns, data))
|
||||
if data.type.name
|
||||
attrs[ns.name(XSD::AttrTypeName)] = ns.name(data.type)
|
||||
|
|
|
@ -145,14 +145,17 @@ public
|
|||
end
|
||||
|
||||
def encode_tag(elename, attrs = nil)
|
||||
if attrs
|
||||
@buf << "\n#{ @indent }<#{ elename }" <<
|
||||
attrs.collect { |key, value|
|
||||
%Q[ #{ key }="#{ value }"]
|
||||
}.join <<
|
||||
'>'
|
||||
else
|
||||
if !attrs or attrs.empty?
|
||||
@buf << "\n#{ @indent }<#{ elename }>"
|
||||
elsif attrs.size == 1
|
||||
key, value = attrs.shift
|
||||
@buf << %Q[\n#{ @indent }<#{ elename } #{ key }="#{ value }">]
|
||||
else
|
||||
@buf << "\n#{ @indent }<#{ elename } " <<
|
||||
attrs.collect { |key, value|
|
||||
%Q[#{ key }="#{ value }"]
|
||||
}.join("\n#{ @indent } ") <<
|
||||
'>'
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue