* 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 - Mapping factory.
|
|
|
|
# Copyright (C) 2000, 2001, 2002, 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
|
|
|
|
|
|
|
|
|
|
|
module SOAP
|
|
|
|
module Mapping
|
|
|
|
|
|
|
|
|
|
|
|
class Factory
|
|
|
|
include TraverseSupport
|
|
|
|
|
2003-10-14 11:14:02 -04:00
|
|
|
def initialize
|
|
|
|
# nothing to do
|
|
|
|
end
|
|
|
|
|
2003-09-24 11:18:44 -04:00
|
|
|
def obj2soap(soap_class, obj, info, map)
|
|
|
|
raise NotImplementError.new
|
|
|
|
# return soap_obj
|
|
|
|
end
|
|
|
|
|
|
|
|
def soap2obj(obj_class, node, info, map)
|
|
|
|
raise NotImplementError.new
|
|
|
|
# return convert_succeeded_or_not, obj
|
|
|
|
end
|
|
|
|
|
|
|
|
def setiv2obj(obj, node, map)
|
|
|
|
return if node.nil?
|
* 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 obj.is_a?(Array)
|
|
|
|
setiv2ary(obj, node, map)
|
|
|
|
else
|
|
|
|
setiv2struct(obj, node, map)
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def setiv2soap(node, obj, map)
|
* 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/trunk@8500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-05-22 09:03:38 -04:00
|
|
|
if obj.class.class_variables.include?('@@schema_element')
|
|
|
|
obj.class.class_eval('@@schema_element').each do |name, info|
|
|
|
|
type, qname = info
|
|
|
|
if qname
|
|
|
|
elename = qname.name
|
|
|
|
else
|
|
|
|
elename = Mapping.name2elename(name)
|
|
|
|
end
|
|
|
|
node.add(elename,
|
|
|
|
Mapping._obj2soap(obj.instance_variable_get('@' + name), map))
|
|
|
|
end
|
|
|
|
else
|
|
|
|
# should we sort instance_variables?
|
|
|
|
obj.instance_variables.each do |var|
|
|
|
|
name = var.sub(/^@/, '')
|
|
|
|
elename = Mapping.name2elename(name)
|
|
|
|
node.add(elename,
|
|
|
|
Mapping._obj2soap(obj.instance_variable_get(var), map))
|
|
|
|
end
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
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
|
|
|
private
|
|
|
|
|
|
|
|
def setiv2ary(obj, node, map)
|
|
|
|
node.each do |name, value|
|
|
|
|
Array.instance_method(:<<).bind(obj).call(Mapping._soap2obj(value, map))
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
def setiv2struct(obj, node, map)
|
|
|
|
vars = {}
|
|
|
|
node.each do |name, value|
|
|
|
|
vars[Mapping.elename2name(name)] = Mapping._soap2obj(value, map)
|
|
|
|
end
|
* 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/trunk@8500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-05-22 09:03:38 -04:00
|
|
|
Mapping.set_attributes(obj, vars)
|
* 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-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
class StringFactory_ < Factory
|
2003-10-14 11:14:02 -04:00
|
|
|
def initialize(allow_original_mapping = false)
|
|
|
|
super()
|
|
|
|
@allow_original_mapping = allow_original_mapping
|
|
|
|
end
|
|
|
|
|
2003-09-24 11:18:44 -04:00
|
|
|
def obj2soap(soap_class, obj, info, map)
|
2003-10-14 11:14:02 -04:00
|
|
|
if !@allow_original_mapping and !obj.instance_variables.empty?
|
|
|
|
return nil
|
|
|
|
end
|
2003-09-24 11:18:44 -04:00
|
|
|
begin
|
2005-09-15 10:33:53 -04:00
|
|
|
unless XSD::Charset.is_ces(obj, Thread.current[:SOAPExternalCES])
|
|
|
|
return nil
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
2005-09-15 10:33:53 -04:00
|
|
|
encoded = XSD::Charset.encoding_conv(obj,
|
|
|
|
Thread.current[:SOAPExternalCES], XSD::Charset.encoding)
|
2003-10-14 11:14:02 -04:00
|
|
|
soap_obj = soap_class.new(encoded)
|
2003-09-24 11:18:44 -04:00
|
|
|
rescue XSD::ValueSpaceError
|
|
|
|
return nil
|
|
|
|
end
|
|
|
|
mark_marshalled_obj(obj, soap_obj)
|
|
|
|
soap_obj
|
|
|
|
end
|
|
|
|
|
|
|
|
def soap2obj(obj_class, node, info, map)
|
2004-12-20 08:50:15 -05:00
|
|
|
obj = Mapping.create_empty_object(obj_class)
|
2005-09-15 10:33:53 -04:00
|
|
|
decoded = XSD::Charset.encoding_conv(node.data, XSD::Charset.encoding,
|
|
|
|
Thread.current[:SOAPExternalCES])
|
2003-10-14 11:14:02 -04:00
|
|
|
obj.replace(decoded)
|
2003-09-24 11:18:44 -04:00
|
|
|
mark_unmarshalled_obj(node, obj)
|
|
|
|
return true, obj
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
class BasetypeFactory_ < Factory
|
2003-10-14 11:14:02 -04:00
|
|
|
def initialize(allow_original_mapping = false)
|
|
|
|
super()
|
|
|
|
@allow_original_mapping = allow_original_mapping
|
|
|
|
end
|
|
|
|
|
2003-09-24 11:18:44 -04:00
|
|
|
def obj2soap(soap_class, obj, info, map)
|
2003-10-14 11:14:02 -04:00
|
|
|
if !@allow_original_mapping and !obj.instance_variables.empty?
|
|
|
|
return nil
|
|
|
|
end
|
2003-09-24 11:18:44 -04:00
|
|
|
soap_obj = nil
|
|
|
|
begin
|
|
|
|
soap_obj = soap_class.new(obj)
|
|
|
|
rescue XSD::ValueSpaceError
|
|
|
|
return nil
|
|
|
|
end
|
2003-10-31 11:50:27 -05:00
|
|
|
if @allow_original_mapping
|
|
|
|
# Basetype except String should not be multiref-ed in SOAP/1.1.
|
|
|
|
mark_marshalled_obj(obj, soap_obj)
|
|
|
|
end
|
2003-09-24 11:18:44 -04:00
|
|
|
soap_obj
|
|
|
|
end
|
|
|
|
|
|
|
|
def soap2obj(obj_class, node, info, map)
|
|
|
|
obj = node.data
|
|
|
|
mark_unmarshalled_obj(node, obj)
|
|
|
|
return true, obj
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
class DateTimeFactory_ < Factory
|
2003-10-14 11:14:02 -04:00
|
|
|
def initialize(allow_original_mapping = false)
|
|
|
|
super()
|
|
|
|
@allow_original_mapping = allow_original_mapping
|
|
|
|
end
|
|
|
|
|
2003-09-24 11:18:44 -04:00
|
|
|
def obj2soap(soap_class, obj, info, map)
|
2003-10-14 11:14:02 -04:00
|
|
|
if !@allow_original_mapping and
|
|
|
|
Time === obj and !obj.instance_variables.empty?
|
|
|
|
return nil
|
|
|
|
end
|
2003-09-24 11:18:44 -04:00
|
|
|
soap_obj = nil
|
|
|
|
begin
|
|
|
|
soap_obj = soap_class.new(obj)
|
|
|
|
rescue XSD::ValueSpaceError
|
|
|
|
return nil
|
|
|
|
end
|
|
|
|
mark_marshalled_obj(obj, soap_obj)
|
|
|
|
soap_obj
|
|
|
|
end
|
|
|
|
|
|
|
|
def soap2obj(obj_class, node, info, map)
|
* 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/trunk@8500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-05-22 09:03:38 -04:00
|
|
|
if node.respond_to?(:to_obj)
|
|
|
|
obj = node.to_obj(obj_class)
|
|
|
|
return false if obj.nil?
|
|
|
|
mark_unmarshalled_obj(node, obj)
|
|
|
|
return true, obj
|
2003-09-24 11:18:44 -04:00
|
|
|
else
|
|
|
|
return false
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
class Base64Factory_ < Factory
|
|
|
|
def obj2soap(soap_class, obj, info, map)
|
2003-10-14 11:14:02 -04:00
|
|
|
return nil unless obj.instance_variables.empty?
|
2003-09-24 11:18:44 -04:00
|
|
|
soap_obj = soap_class.new(obj)
|
|
|
|
mark_marshalled_obj(obj, soap_obj) if soap_obj
|
|
|
|
soap_obj
|
|
|
|
end
|
|
|
|
|
|
|
|
def soap2obj(obj_class, node, info, map)
|
|
|
|
obj = node.string
|
|
|
|
mark_unmarshalled_obj(node, obj)
|
|
|
|
return true, obj
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2004-04-01 05:58:17 -05:00
|
|
|
class URIFactory_ < Factory
|
|
|
|
def obj2soap(soap_class, obj, info, map)
|
|
|
|
soap_obj = soap_class.new(obj)
|
|
|
|
mark_marshalled_obj(obj, soap_obj) if soap_obj
|
|
|
|
soap_obj
|
|
|
|
end
|
|
|
|
|
|
|
|
def soap2obj(obj_class, node, info, map)
|
|
|
|
obj = node.data
|
|
|
|
mark_unmarshalled_obj(node, obj)
|
|
|
|
return true, obj
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2003-09-24 11:18:44 -04:00
|
|
|
class ArrayFactory_ < Factory
|
2003-10-14 11:14:02 -04:00
|
|
|
def initialize(allow_original_mapping = false)
|
|
|
|
super()
|
|
|
|
@allow_original_mapping = allow_original_mapping
|
|
|
|
end
|
|
|
|
|
2003-09-24 11:18:44 -04:00
|
|
|
# [[1], [2]] is converted to Array of Array, not 2-D Array.
|
|
|
|
# To create M-D Array, you must call Mapping.ary2md.
|
|
|
|
def obj2soap(soap_class, obj, info, map)
|
2003-10-14 11:14:02 -04:00
|
|
|
if !@allow_original_mapping and !obj.instance_variables.empty?
|
|
|
|
return nil
|
|
|
|
end
|
2003-09-24 11:18:44 -04:00
|
|
|
arytype = Mapping.obj2element(obj)
|
|
|
|
if arytype.name
|
|
|
|
arytype.namespace ||= RubyTypeNamespace
|
|
|
|
else
|
|
|
|
arytype = XSD::AnyTypeName
|
|
|
|
end
|
2004-12-20 08:50:15 -05:00
|
|
|
soap_obj = SOAPArray.new(ValueArrayName, 1, arytype)
|
|
|
|
mark_marshalled_obj(obj, soap_obj)
|
|
|
|
obj.each do |item|
|
|
|
|
soap_obj.add(Mapping._obj2soap(item, map))
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
2004-12-20 08:50:15 -05:00
|
|
|
soap_obj
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def soap2obj(obj_class, node, info, map)
|
2004-12-20 08:50:15 -05:00
|
|
|
obj = Mapping.create_empty_object(obj_class)
|
2003-09-24 11:18:44 -04:00
|
|
|
mark_unmarshalled_obj(node, obj)
|
|
|
|
node.soap2array(obj) do |elem|
|
|
|
|
elem ? Mapping._soap2obj(elem, map) : nil
|
|
|
|
end
|
|
|
|
return true, obj
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
class TypedArrayFactory_ < Factory
|
2003-10-14 11:14:02 -04:00
|
|
|
def initialize(allow_original_mapping = false)
|
|
|
|
super()
|
|
|
|
@allow_original_mapping = allow_original_mapping
|
|
|
|
end
|
|
|
|
|
2003-09-24 11:18:44 -04:00
|
|
|
def obj2soap(soap_class, obj, info, map)
|
2003-10-14 11:14:02 -04:00
|
|
|
if !@allow_original_mapping and !obj.instance_variables.empty?
|
|
|
|
return nil
|
|
|
|
end
|
2003-09-24 11:18:44 -04:00
|
|
|
arytype = info[:type] || info[0]
|
2004-12-20 08:50:15 -05:00
|
|
|
soap_obj = SOAPArray.new(ValueArrayName, 1, arytype)
|
|
|
|
mark_marshalled_obj(obj, soap_obj)
|
2003-09-24 11:18:44 -04:00
|
|
|
obj.each do |var|
|
2004-12-20 08:50:15 -05:00
|
|
|
soap_obj.add(Mapping._obj2soap(var, map))
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
2004-12-20 08:50:15 -05:00
|
|
|
soap_obj
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def soap2obj(obj_class, node, info, map)
|
|
|
|
if node.rank > 1
|
|
|
|
return false
|
|
|
|
end
|
|
|
|
arytype = info[:type] || info[0]
|
|
|
|
unless node.arytype == arytype
|
|
|
|
return false
|
|
|
|
end
|
2004-12-20 08:50:15 -05:00
|
|
|
obj = Mapping.create_empty_object(obj_class)
|
2003-09-24 11:18:44 -04:00
|
|
|
mark_unmarshalled_obj(node, obj)
|
|
|
|
node.soap2array(obj) do |elem|
|
|
|
|
elem ? Mapping._soap2obj(elem, map) : nil
|
|
|
|
end
|
|
|
|
return true, obj
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
class TypedStructFactory_ < Factory
|
|
|
|
def obj2soap(soap_class, obj, info, map)
|
|
|
|
type = info[:type] || info[0]
|
2004-12-20 08:50:15 -05:00
|
|
|
soap_obj = soap_class.new(type)
|
|
|
|
mark_marshalled_obj(obj, soap_obj)
|
2003-09-24 11:18:44 -04:00
|
|
|
if obj.class <= SOAP::Marshallable
|
2004-12-20 08:50:15 -05:00
|
|
|
setiv2soap(soap_obj, obj, map)
|
2003-09-24 11:18:44 -04:00
|
|
|
else
|
2004-12-20 08:50:15 -05:00
|
|
|
setiv2soap(soap_obj, obj, map)
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
2004-12-20 08:50:15 -05:00
|
|
|
soap_obj
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def soap2obj(obj_class, node, info, map)
|
|
|
|
type = info[:type] || info[0]
|
|
|
|
unless node.type == type
|
|
|
|
return false
|
|
|
|
end
|
2004-12-20 08:50:15 -05:00
|
|
|
obj = Mapping.create_empty_object(obj_class)
|
2003-09-24 11:18:44 -04:00
|
|
|
mark_unmarshalled_obj(node, obj)
|
|
|
|
setiv2obj(obj, node, map)
|
|
|
|
return true, obj
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
MapQName = XSD::QName.new(ApacheSOAPTypeNamespace, 'Map')
|
|
|
|
class HashFactory_ < Factory
|
2003-10-14 11:14:02 -04:00
|
|
|
def initialize(allow_original_mapping = false)
|
|
|
|
super()
|
|
|
|
@allow_original_mapping = allow_original_mapping
|
|
|
|
end
|
|
|
|
|
2003-09-24 11:18:44 -04:00
|
|
|
def obj2soap(soap_class, obj, info, map)
|
2003-10-14 11:14:02 -04:00
|
|
|
if !@allow_original_mapping and !obj.instance_variables.empty?
|
|
|
|
return nil
|
|
|
|
end
|
|
|
|
if !obj.default.nil? or
|
|
|
|
(obj.respond_to?(:default_proc) and obj.default_proc)
|
2003-09-24 11:18:44 -04:00
|
|
|
return nil
|
|
|
|
end
|
2004-12-20 08:50:15 -05:00
|
|
|
soap_obj = SOAPStruct.new(MapQName)
|
|
|
|
mark_marshalled_obj(obj, soap_obj)
|
2003-09-24 11:18:44 -04:00
|
|
|
obj.each do |key, value|
|
|
|
|
elem = SOAPStruct.new
|
|
|
|
elem.add("key", Mapping._obj2soap(key, map))
|
|
|
|
elem.add("value", Mapping._obj2soap(value, map))
|
|
|
|
# ApacheAxis allows only 'item' here.
|
2004-12-20 08:50:15 -05:00
|
|
|
soap_obj.add("item", elem)
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
2004-12-20 08:50:15 -05:00
|
|
|
soap_obj
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
def soap2obj(obj_class, node, info, map)
|
|
|
|
unless node.type == MapQName
|
|
|
|
return false
|
|
|
|
end
|
2003-11-28 00:53:16 -05:00
|
|
|
if node.class == SOAPStruct and node.key?('default')
|
2003-09-24 11:18:44 -04:00
|
|
|
return false
|
|
|
|
end
|
2004-12-20 08:50:15 -05:00
|
|
|
obj = Mapping.create_empty_object(obj_class)
|
2003-09-24 11:18:44 -04:00
|
|
|
mark_unmarshalled_obj(node, obj)
|
2003-11-28 00:53:16 -05:00
|
|
|
if node.class == SOAPStruct
|
|
|
|
node.each do |key, value|
|
|
|
|
obj[Mapping._soap2obj(value['key'], map)] =
|
|
|
|
Mapping._soap2obj(value['value'], map)
|
|
|
|
end
|
|
|
|
else
|
|
|
|
node.each do |value|
|
|
|
|
obj[Mapping._soap2obj(value['key'], map)] =
|
|
|
|
Mapping._soap2obj(value['value'], map)
|
|
|
|
end
|
2003-09-24 11:18:44 -04:00
|
|
|
end
|
|
|
|
return true, obj
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|