* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-25 02:31:33 -05:00
|
|
|
# SOAP4R - SOAP EncodingStyle handler library
|
|
|
|
# Copyright (C) 2001, 2003 NAKAMURA, Hiroshi <nahi@ruby-lang.org>.
|
2003-09-24 11:18:44 -04:00
|
|
|
|
* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-25 02:31:33 -05:00
|
|
|
# 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;
|
|
|
|
# either the dual license version in 2003, or any later version.
|
2003-09-24 11:18:44 -04:00
|
|
|
|
|
|
|
|
|
|
|
require 'soap/encodingstyle/handler'
|
|
|
|
|
|
|
|
|
|
|
|
module SOAP
|
|
|
|
module EncodingStyle
|
|
|
|
|
|
|
|
|
|
|
|
class SOAPHandler < Handler
|
|
|
|
Namespace = SOAP::EncodingNamespace
|
|
|
|
add_handler
|
|
|
|
|
|
|
|
def initialize(charset = nil)
|
|
|
|
super(charset)
|
|
|
|
@refpool = []
|
|
|
|
@idpool = []
|
|
|
|
@textbuf = ''
|
|
|
|
@is_first_top_ele = true
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
###
|
|
|
|
## encode interface.
|
|
|
|
#
|
2003-10-14 11:14:02 -04:00
|
|
|
def encode_data(generator, ns, qualified, data, parent)
|
|
|
|
attrs = encode_attrs(generator, ns, data, parent)
|
2003-09-24 11:18:44 -04:00
|
|
|
|
|
|
|
if parent && parent.is_a?(SOAPArray) && parent.position
|
2004-07-03 09:33:20 -04:00
|
|
|
attrs[ns.name(AttrPositionName)] = "[#{ parent.position.join(',') }]"
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
name = nil
|
|
|
|
if qualified and data.elename.namespace
|
|
|
|
SOAPGenerator.assign_ns(attrs, ns, data.elename.namespace)
|
|
|
|
name = ns.name(data.elename)
|
|
|
|
else
|
|
|
|
name = data.elename.name
|
|
|
|
end
|
|
|
|
|
|
|
|
case data
|
|
|
|
when SOAPReference
|
* import soap4r/1.5.2;
* lib/soap/{attachment.rb,baseData.rb,encodingstyle/soapHandler.rb}:
introduce SOAPExternalReference class as a referenct to SOAPEnvelope
external content.
* lib/soap/{attachment.rb,mimemessage.rb}: great SwA (SOAP messages
with Attachments) support code by Jamie Herre.
* lib/soap/{element.rb,marshal.rb,parser.rb,processor.rb,
streamHandler.rb,wsdlDriver.rb}: SwA support.
* lib/soap/rpc/{cgistub.rb,driver.rb,element.rb,proxy.rb,router.rb,
soaplet.rb}: SwA support and refactoring.
* lib/soap/generator.rb, lib/soap/mapping/mapping.rb: follow
SOAPReference#initialize signature change.
* lib/soap/mapping/factory.rb: deleted unused methods.
* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
string <-> Ruby class name matching.
* lib/xsd/datatypes.rb: check the smallest positive non-zero
single-precision float exactly instead of packing with "f".
[ruby-talk:88822]
* test/soap/test_basetype.rb, test/xsd/test_xsd.rb: use 1.402e-45, not
1.4e-45. 1.4e-45 is smaller than 2 ** -149...
* test/soap/test_basetype.rb, test/soap/marshal/test_marshal.rb,
test/xsd/test_xsd.rb: use "(-1.0 / (1.0 / 0.0))" instead of "-0.0".
* test/soap/test_streamhandler.rb: revert to the previous test that
warns "basic_auth unsupported under net/http".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-01-05 21:20:51 -05:00
|
|
|
attrs['href'] = data.refidstr
|
|
|
|
generator.encode_tag(name, attrs)
|
|
|
|
when SOAPExternalReference
|
|
|
|
data.referred
|
|
|
|
attrs['href'] = data.refidstr
|
2003-10-14 11:14:02 -04:00
|
|
|
generator.encode_tag(name, attrs)
|
2003-09-24 11:18:44 -04:00
|
|
|
when SOAPRawString
|
2003-10-14 11:14:02 -04:00
|
|
|
generator.encode_tag(name, attrs)
|
|
|
|
generator.encode_rawstring(data.to_s)
|
2003-09-24 11:18:44 -04:00
|
|
|
when XSD::XSDString
|
2003-10-14 11:14:02 -04:00
|
|
|
generator.encode_tag(name, attrs)
|
* import soap4r/1.5.2;
* lib/soap/{attachment.rb,baseData.rb,encodingstyle/soapHandler.rb}:
introduce SOAPExternalReference class as a referenct to SOAPEnvelope
external content.
* lib/soap/{attachment.rb,mimemessage.rb}: great SwA (SOAP messages
with Attachments) support code by Jamie Herre.
* lib/soap/{element.rb,marshal.rb,parser.rb,processor.rb,
streamHandler.rb,wsdlDriver.rb}: SwA support.
* lib/soap/rpc/{cgistub.rb,driver.rb,element.rb,proxy.rb,router.rb,
soaplet.rb}: SwA support and refactoring.
* lib/soap/generator.rb, lib/soap/mapping/mapping.rb: follow
SOAPReference#initialize signature change.
* lib/soap/mapping/factory.rb: deleted unused methods.
* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
string <-> Ruby class name matching.
* lib/xsd/datatypes.rb: check the smallest positive non-zero
single-precision float exactly instead of packing with "f".
[ruby-talk:88822]
* test/soap/test_basetype.rb, test/xsd/test_xsd.rb: use 1.402e-45, not
1.4e-45. 1.4e-45 is smaller than 2 ** -149...
* test/soap/test_basetype.rb, test/soap/marshal/test_marshal.rb,
test/xsd/test_xsd.rb: use "(-1.0 / (1.0 / 0.0))" instead of "-0.0".
* test/soap/test_streamhandler.rb: revert to the previous test that
warns "basic_auth unsupported under net/http".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-01-05 21:20:51 -05:00
|
|
|
generator.encode_string(@charset ?
|
|
|
|
XSD::Charset.encoding_to_xml(data.to_s, @charset) : data.to_s)
|
2003-09-24 11:18:44 -04:00
|
|
|
when XSD::XSDAnySimpleType
|
2003-10-14 11:14:02 -04:00
|
|
|
generator.encode_tag(name, attrs)
|
|
|
|
generator.encode_string(data.to_s)
|
2003-09-24 11:18:44 -04:00
|
|
|
when SOAPStruct
|
2003-10-14 11:14:02 -04:00
|
|
|
generator.encode_tag(name, attrs)
|
2003-09-24 11:18:44 -04:00
|
|
|
data.each do |key, value|
|
|
|
|
yield(value, false)
|
|
|
|
end
|
|
|
|
when SOAPArray
|
2003-10-14 11:14:02 -04:00
|
|
|
generator.encode_tag(name, attrs)
|
2003-09-24 11:18:44 -04:00
|
|
|
data.traverse do |child, *rank|
|
|
|
|
data.position = data.sparse ? rank : nil
|
|
|
|
yield(child, false)
|
|
|
|
end
|
|
|
|
else
|
|
|
|
raise EncodingStyleError.new(
|
|
|
|
"Unknown object:#{ data } in this encodingStyle.")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2003-10-14 11:14:02 -04:00
|
|
|
def encode_data_end(generator, ns, qualified, data, parent)
|
2003-09-24 11:18:44 -04:00
|
|
|
name = if qualified and data.elename.namespace
|
|
|
|
ns.name(data.elename)
|
|
|
|
else
|
|
|
|
data.elename.name
|
|
|
|
end
|
|
|
|
cr = data.is_a?(SOAPCompoundtype)
|
2003-10-14 11:14:02 -04:00
|
|
|
generator.encode_tag_end(name, cr)
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
###
|
|
|
|
## decode interface.
|
|
|
|
#
|
|
|
|
class SOAPTemporalObject
|
|
|
|
attr_accessor :parent
|
|
|
|
attr_accessor :position
|
|
|
|
attr_accessor :id
|
|
|
|
attr_accessor :root
|
|
|
|
|
|
|
|
def initialize
|
|
|
|
@parent = nil
|
|
|
|
@position = nil
|
|
|
|
@id = nil
|
|
|
|
@root = nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
class SOAPUnknown < SOAPTemporalObject
|
|
|
|
attr_reader :type
|
|
|
|
attr_accessor :definedtype
|
|
|
|
attr_reader :extraattr
|
|
|
|
|
|
|
|
def initialize(handler, elename, type, extraattr)
|
|
|
|
super()
|
|
|
|
@handler = handler
|
|
|
|
@elename = elename
|
|
|
|
@type = type
|
|
|
|
@extraattr = extraattr
|
|
|
|
@definedtype = nil
|
|
|
|
end
|
|
|
|
|
|
|
|
def as_struct
|
|
|
|
o = SOAPStruct.decode(@elename, @type)
|
|
|
|
o.id = @id
|
|
|
|
o.root = @root
|
|
|
|
o.parent = @parent
|
|
|
|
o.position = @position
|
|
|
|
o.extraattr.update(@extraattr)
|
|
|
|
@handler.decode_parent(@parent, o)
|
|
|
|
o
|
|
|
|
end
|
|
|
|
|
|
|
|
def as_string
|
|
|
|
o = SOAPString.decode(@elename)
|
|
|
|
o.id = @id
|
|
|
|
o.root = @root
|
|
|
|
o.parent = @parent
|
|
|
|
o.position = @position
|
|
|
|
o.extraattr.update(@extraattr)
|
|
|
|
@handler.decode_parent(@parent, o)
|
|
|
|
o
|
|
|
|
end
|
|
|
|
|
|
|
|
def as_nil
|
|
|
|
o = SOAPNil.decode(@elename)
|
|
|
|
o.id = @id
|
|
|
|
o.root = @root
|
|
|
|
o.parent = @parent
|
|
|
|
o.position = @position
|
|
|
|
o.extraattr.update(@extraattr)
|
|
|
|
@handler.decode_parent(@parent, o)
|
|
|
|
o
|
|
|
|
end
|
|
|
|
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)
|
|
|
|
o = nil
|
|
|
|
if is_nil
|
|
|
|
o = SOAPNil.decode(elename)
|
|
|
|
elsif href
|
|
|
|
o = SOAPReference.decode(elename, href)
|
|
|
|
@refpool << o
|
* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-25 02:31:33 -05:00
|
|
|
elsif @decode_typemap
|
2003-09-24 11:18:44 -04:00
|
|
|
o = decode_tag_by_wsdl(ns, elename, type, parent.node, arytype, extraattr)
|
|
|
|
else
|
|
|
|
o = decode_tag_by_type(ns, elename, type, parent.node, arytype, extraattr)
|
|
|
|
end
|
|
|
|
|
|
|
|
if o.is_a?(SOAPArray)
|
|
|
|
if offset
|
|
|
|
o.offset = decode_arypos(offset)
|
|
|
|
o.sparse = true
|
|
|
|
else
|
|
|
|
o.sparse = false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
o.parent = parent
|
|
|
|
o.id = id
|
|
|
|
o.root = root
|
|
|
|
o.position = position
|
|
|
|
|
|
|
|
unless o.is_a?(SOAPTemporalObject)
|
|
|
|
@idpool << o if o.id
|
|
|
|
decode_parent(parent, o)
|
|
|
|
end
|
|
|
|
o
|
|
|
|
end
|
|
|
|
|
|
|
|
def decode_tag_end(ns, node)
|
|
|
|
o = node.node
|
|
|
|
if o.is_a?(SOAPUnknown)
|
|
|
|
newnode = if /\A\s*\z/ =~ @textbuf
|
|
|
|
o.as_struct
|
|
|
|
else
|
|
|
|
o.as_string
|
|
|
|
end
|
|
|
|
if newnode.id
|
|
|
|
@idpool << newnode
|
|
|
|
end
|
|
|
|
node.replace_node(newnode)
|
|
|
|
o = node.node
|
|
|
|
end
|
|
|
|
decode_textbuf(o)
|
2004-07-03 09:33:20 -04:00
|
|
|
# unlink definedtype
|
|
|
|
o.definedtype = nil
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def decode_text(ns, text)
|
|
|
|
@textbuf << text
|
|
|
|
end
|
|
|
|
|
|
|
|
def decode_prologue
|
|
|
|
@refpool.clear
|
|
|
|
@idpool.clear
|
|
|
|
@is_first_top_ele = true
|
|
|
|
end
|
|
|
|
|
|
|
|
def decode_epilogue
|
|
|
|
decode_resolve_id
|
|
|
|
end
|
|
|
|
|
|
|
|
def decode_parent(parent, node)
|
|
|
|
case parent.node
|
|
|
|
when SOAPUnknown
|
|
|
|
newparent = parent.node.as_struct
|
|
|
|
node.parent = newparent
|
|
|
|
if newparent.id
|
|
|
|
@idpool << newparent
|
|
|
|
end
|
|
|
|
parent.replace_node(newparent)
|
|
|
|
decode_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
|
|
|
|
parent.node.sparse = true
|
|
|
|
else
|
|
|
|
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 }.")
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
private
|
|
|
|
|
|
|
|
def content_ranksize(typename)
|
|
|
|
typename.scan(/\[[\d,]*\]$/)[0]
|
|
|
|
end
|
|
|
|
|
|
|
|
def content_typename(typename)
|
|
|
|
typename.sub(/\[,*\]$/, '')
|
|
|
|
end
|
|
|
|
|
|
|
|
def create_arytype(ns, data)
|
|
|
|
XSD::QName.new(data.arytype.namespace,
|
2004-07-03 09:33:20 -04:00
|
|
|
content_typename(data.arytype.name) + "[#{ data.size.join(',') }]")
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
2003-10-14 11:14:02 -04:00
|
|
|
def encode_attrs(generator, ns, data, parent)
|
2003-09-24 11:18:44 -04:00
|
|
|
return {} if data.is_a?(SOAPReference)
|
|
|
|
attrs = {}
|
|
|
|
|
|
|
|
if !parent || parent.encodingstyle != EncodingNamespace
|
|
|
|
if @generate_explicit_type
|
|
|
|
SOAPGenerator.assign_ns(attrs, ns, EnvelopeNamespace)
|
|
|
|
attrs[ns.name(AttrEncodingStyleName)] = EncodingNamespace
|
|
|
|
end
|
|
|
|
data.encodingstyle = EncodingNamespace
|
|
|
|
end
|
|
|
|
|
|
|
|
if data.is_a?(SOAPNil)
|
|
|
|
attrs[ns.name(XSD::AttrNilName)] = XSD::NilValue
|
|
|
|
elsif @generate_explicit_type
|
|
|
|
if data.type.namespace
|
|
|
|
SOAPGenerator.assign_ns(attrs, ns, data.type.namespace)
|
|
|
|
end
|
|
|
|
if data.is_a?(SOAPArray)
|
|
|
|
if data.arytype.namespace
|
|
|
|
SOAPGenerator.assign_ns(attrs, ns, data.arytype.namespace)
|
|
|
|
end
|
2003-10-30 09:25:21 -05:00
|
|
|
SOAPGenerator.assign_ns(attrs, ns, EncodingNamespace)
|
2003-09-24 11:18:44 -04:00
|
|
|
attrs[ns.name(AttrArrayTypeName)] = ns.name(create_arytype(ns, data))
|
|
|
|
if data.type.name
|
|
|
|
attrs[ns.name(XSD::AttrTypeName)] = ns.name(data.type)
|
|
|
|
end
|
|
|
|
elsif parent && parent.is_a?(SOAPArray) && (parent.arytype == data.type)
|
|
|
|
# No need to add.
|
|
|
|
elsif !data.type.namespace
|
|
|
|
# No need to add.
|
|
|
|
else
|
|
|
|
attrs[ns.name(XSD::AttrTypeName)] = ns.name(data.type)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
data.extraattr.each do |key, value|
|
|
|
|
SOAPGenerator.assign_ns(attrs, ns, key.namespace)
|
2003-10-14 11:14:02 -04:00
|
|
|
attrs[ns.name(key)] = encode_attr_value(generator, ns, key, value)
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
if data.id
|
|
|
|
attrs['id'] = data.id
|
|
|
|
end
|
|
|
|
attrs
|
|
|
|
end
|
|
|
|
|
2003-10-14 11:14:02 -04:00
|
|
|
def encode_attr_value(generator, ns, qname, value)
|
|
|
|
if value.is_a?(SOAPType)
|
* import soap4r/1.5.2;
* lib/soap/{attachment.rb,baseData.rb,encodingstyle/soapHandler.rb}:
introduce SOAPExternalReference class as a referenct to SOAPEnvelope
external content.
* lib/soap/{attachment.rb,mimemessage.rb}: great SwA (SOAP messages
with Attachments) support code by Jamie Herre.
* lib/soap/{element.rb,marshal.rb,parser.rb,processor.rb,
streamHandler.rb,wsdlDriver.rb}: SwA support.
* lib/soap/rpc/{cgistub.rb,driver.rb,element.rb,proxy.rb,router.rb,
soaplet.rb}: SwA support and refactoring.
* lib/soap/generator.rb, lib/soap/mapping/mapping.rb: follow
SOAPReference#initialize signature change.
* lib/soap/mapping/factory.rb: deleted unused methods.
* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
string <-> Ruby class name matching.
* lib/xsd/datatypes.rb: check the smallest positive non-zero
single-precision float exactly instead of packing with "f".
[ruby-talk:88822]
* test/soap/test_basetype.rb, test/xsd/test_xsd.rb: use 1.402e-45, not
1.4e-45. 1.4e-45 is smaller than 2 ** -149...
* test/soap/test_basetype.rb, test/soap/marshal/test_marshal.rb,
test/xsd/test_xsd.rb: use "(-1.0 / (1.0 / 0.0))" instead of "-0.0".
* test/soap/test_streamhandler.rb: revert to the previous test that
warns "basic_auth unsupported under net/http".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-01-05 21:20:51 -05:00
|
|
|
ref = SOAPReference.new(value)
|
2003-10-14 11:14:02 -04:00
|
|
|
generator.add_reftarget(qname.name, value)
|
* import soap4r/1.5.2;
* lib/soap/{attachment.rb,baseData.rb,encodingstyle/soapHandler.rb}:
introduce SOAPExternalReference class as a referenct to SOAPEnvelope
external content.
* lib/soap/{attachment.rb,mimemessage.rb}: great SwA (SOAP messages
with Attachments) support code by Jamie Herre.
* lib/soap/{element.rb,marshal.rb,parser.rb,processor.rb,
streamHandler.rb,wsdlDriver.rb}: SwA support.
* lib/soap/rpc/{cgistub.rb,driver.rb,element.rb,proxy.rb,router.rb,
soaplet.rb}: SwA support and refactoring.
* lib/soap/generator.rb, lib/soap/mapping/mapping.rb: follow
SOAPReference#initialize signature change.
* lib/soap/mapping/factory.rb: deleted unused methods.
* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
string <-> Ruby class name matching.
* lib/xsd/datatypes.rb: check the smallest positive non-zero
single-precision float exactly instead of packing with "f".
[ruby-talk:88822]
* test/soap/test_basetype.rb, test/xsd/test_xsd.rb: use 1.402e-45, not
1.4e-45. 1.4e-45 is smaller than 2 ** -149...
* test/soap/test_basetype.rb, test/soap/marshal/test_marshal.rb,
test/xsd/test_xsd.rb: use "(-1.0 / (1.0 / 0.0))" instead of "-0.0".
* test/soap/test_streamhandler.rb: revert to the previous test that
warns "basic_auth unsupported under net/http".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-01-05 21:20:51 -05:00
|
|
|
ref.refidstr
|
2003-10-14 11:14:02 -04:00
|
|
|
else
|
|
|
|
value.to_s
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2003-09-24 11:18:44 -04:00
|
|
|
def decode_tag_by_wsdl(ns, elename, typestr, parent, arytypestr, extraattr)
|
* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-25 02:31:33 -05:00
|
|
|
o = nil
|
2003-09-24 11:18:44 -04:00
|
|
|
if parent.class == SOAPBody
|
2003-11-29 23:33:02 -05:00
|
|
|
# root element: should branch by root attribute?
|
* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-25 02:31:33 -05:00
|
|
|
if @is_first_top_ele
|
|
|
|
# Unqualified name is allowed here.
|
|
|
|
@is_first_top_ele = false
|
|
|
|
type = @decode_typemap[elename] ||
|
|
|
|
@decode_typemap.find_name(elename.name)
|
2003-11-29 23:33:02 -05:00
|
|
|
if type
|
|
|
|
o = SOAPStruct.new(elename)
|
|
|
|
o.definedtype = type
|
|
|
|
return o
|
* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-25 02:31:33 -05:00
|
|
|
end
|
2003-11-29 23:33:02 -05:00
|
|
|
end
|
|
|
|
# multi-ref element.
|
|
|
|
if typestr
|
* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-25 02:31:33 -05:00
|
|
|
typename = ns.parse(typestr)
|
|
|
|
typedef = @decode_typemap[typename]
|
2003-11-29 23:33:02 -05:00
|
|
|
if typedef
|
2004-07-03 09:33:20 -04:00
|
|
|
return decode_definedtype(elename, typename, typedef, arytypestr)
|
2003-11-29 23:33:02 -05:00
|
|
|
end
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
2003-11-29 23:33:02 -05:00
|
|
|
return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
|
|
|
|
extraattr)
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
if parent.type == XSD::AnyTypeName
|
|
|
|
return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
|
|
|
|
extraattr)
|
|
|
|
end
|
|
|
|
|
2003-11-28 00:53:16 -05:00
|
|
|
# parent.definedtype == nil means the parent is SOAPUnknown. SOAPUnknown
|
|
|
|
# is generated by decode_tag_by_type when its type is anyType.
|
2003-09-24 11:18:44 -04:00
|
|
|
parenttype = parent.definedtype || @decode_typemap[parent.type]
|
|
|
|
unless parenttype
|
2003-11-28 00:53:16 -05:00
|
|
|
return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
|
|
|
|
extraattr)
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-25 02:31:33 -05:00
|
|
|
|
|
|
|
definedtype_name = parenttype.child_type(elename)
|
|
|
|
if definedtype_name and (klass = TypeMap[definedtype_name])
|
2004-07-03 09:33:20 -04:00
|
|
|
return decode_basetype(klass, elename)
|
* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-25 02:31:33 -05:00
|
|
|
elsif definedtype_name == XSD::AnyTypeName
|
|
|
|
return decode_tag_by_type(ns, elename, typestr, parent, arytypestr,
|
|
|
|
extraattr)
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
2004-07-03 09:33:20 -04:00
|
|
|
if definedtype_name
|
|
|
|
typedef = @decode_typemap[definedtype_name]
|
|
|
|
else
|
|
|
|
typedef = parenttype.child_defined_complextype(elename)
|
|
|
|
end
|
|
|
|
decode_definedtype(elename, definedtype_name, typedef, arytypestr)
|
* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-25 02:31:33 -05:00
|
|
|
end
|
|
|
|
|
2004-07-03 09:33:20 -04:00
|
|
|
def decode_definedtype(elename, typename, typedef, arytypestr)
|
* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-25 02:31:33 -05:00
|
|
|
unless typedef
|
2003-09-24 11:18:44 -04:00
|
|
|
raise EncodingStyleError.new("Unknown type '#{ typename }'.")
|
|
|
|
end
|
2004-07-03 09:33:20 -04:00
|
|
|
if typedef.is_a?(::WSDL::XMLSchema::SimpleType)
|
|
|
|
decode_defined_simpletype(elename, typename, typedef, arytypestr)
|
|
|
|
else
|
|
|
|
decode_defined_complextype(elename, typename, typedef, arytypestr)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def decode_basetype(klass, elename)
|
|
|
|
klass.decode(elename)
|
|
|
|
end
|
|
|
|
|
|
|
|
def decode_defined_simpletype(elename, typename, typedef, arytypestr)
|
|
|
|
o = decode_basetype(TypeMap[typedef.base], elename)
|
|
|
|
o.definedtype = typedef
|
|
|
|
o
|
|
|
|
end
|
|
|
|
|
|
|
|
def decode_defined_complextype(elename, typename, typedef, arytypestr)
|
* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-25 02:31:33 -05:00
|
|
|
case typedef.compoundtype
|
2004-12-20 08:50:15 -05:00
|
|
|
when :TYPE_STRUCT, :TYPE_MAP
|
2003-09-24 11:18:44 -04:00
|
|
|
o = SOAPStruct.decode(elename, typename)
|
* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-25 02:31:33 -05:00
|
|
|
o.definedtype = typedef
|
2003-09-24 11:18:44 -04:00
|
|
|
return o
|
|
|
|
when :TYPE_ARRAY
|
* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license; GPL2 -> Ruby's.
* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb, lib/soap/streamHandler.rb: add interface to streamhandler.
* lib/soap/marshal.rb: raise error if parse fails.
* lib/soap/netHttpClient.rb: add https support. Patched by Oliver M. Bolzer.
* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb, lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce using charset for parsing response from buggy server.
* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half typed multi-ref array.
* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map SOAPStruct which has multi-accessors which name are the same, to an array.
* lib/soap/rpc/element.rb: fixed illegal parameter order.
* lib/soap/rpc/element.rb: element name of response message could have the name other than 'return'.
* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb, lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb, lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural fault definition in a operation. [ruby-talk:84948]
* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add test for above fix.
* lib/wsdl/soap/complexType.rb: support WSDL array definition with maxOccures="unbound".
* lib/xsd/charset.rb: use cp932 under emx. Patched by Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
* lib/xsd/xmlparser/parser.rb: set @charset nil by default. Nil means 'follow encoding declaration in XML'.
* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb, sample/wsdl/googleSearch/sampleClient.rb, sample/wsdl/googleSearch/wsdlDriver.rb, test/wsdl/test_emptycomplextype.rb, test/wsdl/marshal/test_wsdlmarshal.rb, test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read } instead of File.open(...).read. [ruby-dev:21964]
* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb: simplify the test case.
* test/wsdl/axisArray/*: add tests for axis's array encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-25 02:31:33 -05:00
|
|
|
expected_arytype = typedef.find_arytype
|
|
|
|
if arytypestr
|
|
|
|
actual_arytype = XSD::QName.new(expected_arytype.namespace,
|
|
|
|
content_typename(expected_arytype.name) <<
|
|
|
|
content_ranksize(arytypestr))
|
|
|
|
o = SOAPArray.decode(elename, typename, actual_arytype)
|
|
|
|
else
|
|
|
|
o = SOAPArray.new(typename, 1, expected_arytype)
|
|
|
|
o.elename = elename
|
|
|
|
end
|
|
|
|
o.definedtype = typedef
|
2003-09-24 11:18:44 -04:00
|
|
|
return o
|
2004-12-20 08:50:15 -05:00
|
|
|
else
|
|
|
|
raise RuntimeError.new(
|
|
|
|
"Unknown kind of complexType: #{typedef.compoundtype}")
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
2004-07-03 09:33:20 -04:00
|
|
|
nil
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def decode_tag_by_type(ns, elename, typestr, parent, arytypestr, extraattr)
|
|
|
|
if arytypestr
|
|
|
|
type = typestr ? ns.parse(typestr) : ValueArrayName
|
|
|
|
node = SOAPArray.decode(elename, type, ns.parse(arytypestr))
|
|
|
|
node.extraattr.update(extraattr)
|
|
|
|
return node
|
|
|
|
end
|
|
|
|
|
|
|
|
type = nil
|
|
|
|
if typestr
|
|
|
|
type = ns.parse(typestr)
|
|
|
|
elsif parent.is_a?(SOAPArray)
|
|
|
|
type = parent.arytype
|
|
|
|
else
|
|
|
|
# Since it's in dynamic(without any type) encoding process,
|
|
|
|
# assumes entity as its type itself.
|
|
|
|
# <SOAP-ENC:Array ...> => type Array in SOAP-ENC.
|
|
|
|
# <Country xmlns="foo"> => type Country in foo.
|
|
|
|
type = elename
|
|
|
|
end
|
|
|
|
|
|
|
|
if (klass = TypeMap[type])
|
2004-07-03 09:33:20 -04:00
|
|
|
node = decode_basetype(klass, elename)
|
2003-10-14 11:14:02 -04:00
|
|
|
node.extraattr.update(extraattr)
|
|
|
|
return node
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
2003-10-14 11:14:02 -04:00
|
|
|
|
|
|
|
# Unknown type... Struct or String
|
|
|
|
SOAPUnknown.new(self, elename, type, extraattr)
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def decode_textbuf(node)
|
|
|
|
case node
|
|
|
|
when XSD::XSDHexBinary, XSD::XSDBase64Binary
|
|
|
|
node.set_encoded(@textbuf)
|
|
|
|
when XSD::XSDString
|
|
|
|
if @charset
|
2004-07-03 09:33:20 -04:00
|
|
|
@textbuf = XSD::Charset.encoding_from_xml(@textbuf, @charset)
|
|
|
|
end
|
|
|
|
if node.definedtype
|
|
|
|
node.definedtype.check_lexical_format(@textbuf)
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
2004-07-03 09:33:20 -04:00
|
|
|
node.set(@textbuf)
|
2003-09-24 11:18:44 -04:00
|
|
|
when SOAPNil
|
|
|
|
# Nothing to do.
|
|
|
|
when SOAPBasetype
|
|
|
|
node.set(@textbuf)
|
|
|
|
else
|
|
|
|
# Nothing to do...
|
|
|
|
end
|
2004-07-03 09:33:20 -04:00
|
|
|
@textbuf = ''
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
NilLiteralMap = {
|
|
|
|
'true' => true,
|
|
|
|
'1' => true,
|
|
|
|
'false' => false,
|
|
|
|
'0' => false
|
|
|
|
}
|
|
|
|
RootLiteralMap = {
|
|
|
|
'1' => 1,
|
|
|
|
'0' => 0
|
|
|
|
}
|
|
|
|
def decode_attrs(ns, attrs)
|
|
|
|
is_nil = false
|
|
|
|
type = nil
|
|
|
|
arytype = nil
|
|
|
|
root = nil
|
|
|
|
offset = nil
|
|
|
|
position = nil
|
|
|
|
href = nil
|
|
|
|
id = nil
|
|
|
|
extraattr = {}
|
|
|
|
|
|
|
|
attrs.each do |key, value|
|
|
|
|
qname = ns.parse(key)
|
|
|
|
case qname.namespace
|
|
|
|
when XSD::InstanceNamespace
|
|
|
|
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').")
|
|
|
|
next
|
|
|
|
when XSD::AttrType
|
|
|
|
type = value
|
|
|
|
next
|
|
|
|
end
|
|
|
|
when EncodingNamespace
|
|
|
|
case qname.name
|
|
|
|
when AttrArrayType
|
|
|
|
arytype = value
|
|
|
|
next
|
|
|
|
when AttrRoot
|
|
|
|
root = RootLiteralMap[value] or
|
|
|
|
raise EncodingStyleError.new(
|
|
|
|
"Illegal root attribute value: #{ value }.")
|
|
|
|
next
|
|
|
|
when AttrOffset
|
|
|
|
offset = value
|
|
|
|
next
|
|
|
|
when AttrPosition
|
|
|
|
position = value
|
|
|
|
next
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if key == 'href'
|
|
|
|
href = value
|
|
|
|
next
|
|
|
|
elsif key == 'id'
|
|
|
|
id = value
|
|
|
|
next
|
|
|
|
end
|
2004-12-20 08:50:15 -05:00
|
|
|
qname = ns.parse_local(key)
|
2003-10-14 11:14:02 -04:00
|
|
|
extraattr[qname] = decode_attr_value(ns, qname, value)
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
return is_nil, type, arytype, root, offset, position, href, id, extraattr
|
|
|
|
end
|
|
|
|
|
2003-10-14 11:14:02 -04:00
|
|
|
def decode_attr_value(ns, qname, value)
|
|
|
|
if /\A#/ =~ value
|
* import soap4r/1.5.2;
* lib/soap/{attachment.rb,baseData.rb,encodingstyle/soapHandler.rb}:
introduce SOAPExternalReference class as a referenct to SOAPEnvelope
external content.
* lib/soap/{attachment.rb,mimemessage.rb}: great SwA (SOAP messages
with Attachments) support code by Jamie Herre.
* lib/soap/{element.rb,marshal.rb,parser.rb,processor.rb,
streamHandler.rb,wsdlDriver.rb}: SwA support.
* lib/soap/rpc/{cgistub.rb,driver.rb,element.rb,proxy.rb,router.rb,
soaplet.rb}: SwA support and refactoring.
* lib/soap/generator.rb, lib/soap/mapping/mapping.rb: follow
SOAPReference#initialize signature change.
* lib/soap/mapping/factory.rb: deleted unused methods.
* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
string <-> Ruby class name matching.
* lib/xsd/datatypes.rb: check the smallest positive non-zero
single-precision float exactly instead of packing with "f".
[ruby-talk:88822]
* test/soap/test_basetype.rb, test/xsd/test_xsd.rb: use 1.402e-45, not
1.4e-45. 1.4e-45 is smaller than 2 ** -149...
* test/soap/test_basetype.rb, test/soap/marshal/test_marshal.rb,
test/xsd/test_xsd.rb: use "(-1.0 / (1.0 / 0.0))" instead of "-0.0".
* test/soap/test_streamhandler.rb: revert to the previous test that
warns "basic_auth unsupported under net/http".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-01-05 21:20:51 -05:00
|
|
|
o = SOAPReference.decode(nil, value)
|
2003-10-14 11:14:02 -04:00
|
|
|
@refpool << o
|
|
|
|
o
|
|
|
|
else
|
|
|
|
value
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2003-09-24 11:18:44 -04:00
|
|
|
def decode_arypos(position)
|
|
|
|
/^\[(.+)\]$/ =~ position
|
|
|
|
$1.split(',').collect { |s| s.to_i }
|
|
|
|
end
|
|
|
|
|
|
|
|
def decode_resolve_id
|
|
|
|
count = @refpool.length # To avoid infinite loop
|
|
|
|
while !@refpool.empty? && count > 0
|
|
|
|
@refpool = @refpool.find_all { |ref|
|
|
|
|
o = @idpool.find { |item|
|
* import soap4r/1.5.2;
* lib/soap/{attachment.rb,baseData.rb,encodingstyle/soapHandler.rb}:
introduce SOAPExternalReference class as a referenct to SOAPEnvelope
external content.
* lib/soap/{attachment.rb,mimemessage.rb}: great SwA (SOAP messages
with Attachments) support code by Jamie Herre.
* lib/soap/{element.rb,marshal.rb,parser.rb,processor.rb,
streamHandler.rb,wsdlDriver.rb}: SwA support.
* lib/soap/rpc/{cgistub.rb,driver.rb,element.rb,proxy.rb,router.rb,
soaplet.rb}: SwA support and refactoring.
* lib/soap/generator.rb, lib/soap/mapping/mapping.rb: follow
SOAPReference#initialize signature change.
* lib/soap/mapping/factory.rb: deleted unused methods.
* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
string <-> Ruby class name matching.
* lib/xsd/datatypes.rb: check the smallest positive non-zero
single-precision float exactly instead of packing with "f".
[ruby-talk:88822]
* test/soap/test_basetype.rb, test/xsd/test_xsd.rb: use 1.402e-45, not
1.4e-45. 1.4e-45 is smaller than 2 ** -149...
* test/soap/test_basetype.rb, test/soap/marshal/test_marshal.rb,
test/xsd/test_xsd.rb: use "(-1.0 / (1.0 / 0.0))" instead of "-0.0".
* test/soap/test_streamhandler.rb: revert to the previous test that
warns "basic_auth unsupported under net/http".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-01-05 21:20:51 -05:00
|
|
|
item.id == ref.refid
|
2003-09-24 11:18:44 -04:00
|
|
|
}
|
|
|
|
if o.is_a?(SOAPReference)
|
* import soap4r/1.5.2;
* lib/soap/{attachment.rb,baseData.rb,encodingstyle/soapHandler.rb}:
introduce SOAPExternalReference class as a referenct to SOAPEnvelope
external content.
* lib/soap/{attachment.rb,mimemessage.rb}: great SwA (SOAP messages
with Attachments) support code by Jamie Herre.
* lib/soap/{element.rb,marshal.rb,parser.rb,processor.rb,
streamHandler.rb,wsdlDriver.rb}: SwA support.
* lib/soap/rpc/{cgistub.rb,driver.rb,element.rb,proxy.rb,router.rb,
soaplet.rb}: SwA support and refactoring.
* lib/soap/generator.rb, lib/soap/mapping/mapping.rb: follow
SOAPReference#initialize signature change.
* lib/soap/mapping/factory.rb: deleted unused methods.
* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
string <-> Ruby class name matching.
* lib/xsd/datatypes.rb: check the smallest positive non-zero
single-precision float exactly instead of packing with "f".
[ruby-talk:88822]
* test/soap/test_basetype.rb, test/xsd/test_xsd.rb: use 1.402e-45, not
1.4e-45. 1.4e-45 is smaller than 2 ** -149...
* test/soap/test_basetype.rb, test/soap/marshal/test_marshal.rb,
test/xsd/test_xsd.rb: use "(-1.0 / (1.0 / 0.0))" instead of "-0.0".
* test/soap/test_streamhandler.rb: revert to the previous test that
warns "basic_auth unsupported under net/http".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-01-05 21:20:51 -05:00
|
|
|
true # link of link.
|
|
|
|
elsif o
|
2003-09-24 11:18:44 -04:00
|
|
|
ref.__setobj__(o)
|
|
|
|
false
|
* import soap4r/1.5.2;
* lib/soap/{attachment.rb,baseData.rb,encodingstyle/soapHandler.rb}:
introduce SOAPExternalReference class as a referenct to SOAPEnvelope
external content.
* lib/soap/{attachment.rb,mimemessage.rb}: great SwA (SOAP messages
with Attachments) support code by Jamie Herre.
* lib/soap/{element.rb,marshal.rb,parser.rb,processor.rb,
streamHandler.rb,wsdlDriver.rb}: SwA support.
* lib/soap/rpc/{cgistub.rb,driver.rb,element.rb,proxy.rb,router.rb,
soaplet.rb}: SwA support and refactoring.
* lib/soap/generator.rb, lib/soap/mapping/mapping.rb: follow
SOAPReference#initialize signature change.
* lib/soap/mapping/factory.rb: deleted unused methods.
* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
string <-> Ruby class name matching.
* lib/xsd/datatypes.rb: check the smallest positive non-zero
single-precision float exactly instead of packing with "f".
[ruby-talk:88822]
* test/soap/test_basetype.rb, test/xsd/test_xsd.rb: use 1.402e-45, not
1.4e-45. 1.4e-45 is smaller than 2 ** -149...
* test/soap/test_basetype.rb, test/soap/marshal/test_marshal.rb,
test/xsd/test_xsd.rb: use "(-1.0 / (1.0 / 0.0))" instead of "-0.0".
* test/soap/test_streamhandler.rb: revert to the previous test that
warns "basic_auth unsupported under net/http".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-01-05 21:20:51 -05:00
|
|
|
elsif o = ref.rootnode.external_content[ref.refid]
|
|
|
|
ref.__setobj__(o)
|
|
|
|
false
|
|
|
|
else
|
|
|
|
raise EncodingStyleError.new("Unresolved reference: #{ ref.refid }.")
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
}
|
|
|
|
count -= 1
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
SOAPHandler.new
|
|
|
|
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|