From 6a09e1d9664f86b7deb576fb0dfe57e10503bb85 Mon Sep 17 00:00:00 2001 From: nahi Date: Tue, 25 Nov 2003 07:31:33 +0000 Subject: * 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 --- lib/soap/mapping/factory.rb | 45 ++++++++++++++++++++----------------- lib/soap/mapping/mapping.rb | 23 +++++-------------- lib/soap/mapping/registry.rb | 31 +++++++++---------------- lib/soap/mapping/rubytypeFactory.rb | 21 +++++------------ lib/soap/mapping/typeMap.rb | 23 +++++-------------- lib/soap/mapping/wsdlRegistry.rb | 23 +++++-------------- 6 files changed, 58 insertions(+), 108 deletions(-) (limited to 'lib/soap/mapping') diff --git a/lib/soap/mapping/factory.rb b/lib/soap/mapping/factory.rb index 631c161134..509fe369c4 100644 --- a/lib/soap/mapping/factory.rb +++ b/lib/soap/mapping/factory.rb @@ -1,20 +1,9 @@ -=begin -SOAP4R - Mapping factory. -Copyright (C) 2000, 2001, 2002, 2003 NAKAMURA, Hiroshi. +# SOAP4R - Mapping factory. +# Copyright (C) 2000, 2001, 2002, 2003 NAKAMURA, Hiroshi . -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; either version 2 of the License, or (at your option) any later -version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PRATICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 675 Mass -Ave, Cambridge, MA 02139, USA. -=end +# 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. module SOAP @@ -73,11 +62,11 @@ class Factory def setiv2obj(obj, node, map) return if node.nil? - vars = {} - node.each do |name, value| - vars[Mapping.elename2name(name)] = Mapping._soap2obj(value, map) + if obj.is_a?(Array) + setiv2ary(obj, node, map) + else + setiv2struct(obj, node, map) end - Mapping.set_instance_vars(obj, vars) end def setiv2soap(node, obj, map) @@ -105,6 +94,22 @@ class Factory def capitalize(target) target.gsub(/^([a-z])/) { $1.tr!('[a-z]', '[A-Z]') } end + +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 + Mapping.set_instance_vars(obj, vars) + end end class StringFactory_ < Factory diff --git a/lib/soap/mapping/mapping.rb b/lib/soap/mapping/mapping.rb index f660c2c63f..32be9839c8 100644 --- a/lib/soap/mapping/mapping.rb +++ b/lib/soap/mapping/mapping.rb @@ -1,20 +1,9 @@ -=begin -SOAP4R - Ruby type mapping utility. -Copyright (C) 2000, 2001, 2003 NAKAMURA Hiroshi. - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; either version 2 of the License, or (at your option) any later -version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PRATICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 675 Mass -Ave, Cambridge, MA 02139, USA. -=end +# SOAP4R - Ruby type mapping utility. +# Copyright (C) 2000, 2001, 2003 NAKAMURA Hiroshi . + +# 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. module SOAP diff --git a/lib/soap/mapping/registry.rb b/lib/soap/mapping/registry.rb index e98c98a6d4..51ad939d99 100644 --- a/lib/soap/mapping/registry.rb +++ b/lib/soap/mapping/registry.rb @@ -1,20 +1,9 @@ -=begin -SOAP4R - Mapping registry. -Copyright (C) 2000, 2001, 2002, 2003 NAKAMURA, Hiroshi. +# SOAP4R - Mapping registry. +# Copyright (C) 2000, 2001, 2002, 2003 NAKAMURA, Hiroshi . -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; either version 2 of the License, or (at your option) any later -version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PRATICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 675 Mass -Ave, Cambridge, MA 02139, USA. -=end +# 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. require 'soap/baseData' @@ -145,7 +134,7 @@ class Registry @registry = registry end - def obj2soap(klass, obj) + def obj2soap(klass, obj, type_qname = nil) @map.each do |obj_class, soap_class, factory, info| if klass == obj_class or (info[:derived_class] and klass <= obj_class) @@ -330,8 +319,8 @@ class Registry alias :set :add # This mapping registry ignores type hint. - def obj2soap(klass, obj, type = nil) - soap = _obj2soap(klass, obj, type) + def obj2soap(klass, obj, type_qname = nil) + soap = _obj2soap(klass, obj, type_qname) if @allow_original_mapping addextend2soap(soap, obj) end @@ -369,7 +358,7 @@ class Registry private - def _obj2soap(klass, obj, type) + def _obj2soap(klass, obj, type_qname) ret = nil if obj.is_a?(SOAPStruct) or obj.is_a?(SOAPArray) obj.replace do |ele| @@ -380,7 +369,7 @@ private return obj end begin - ret = @map.obj2soap(klass, obj) || + ret = @map.obj2soap(klass, obj, type_qname) || @default_factory.obj2soap(klass, obj, nil, self) rescue MappingError end diff --git a/lib/soap/mapping/rubytypeFactory.rb b/lib/soap/mapping/rubytypeFactory.rb index 3ebb799220..0b4af8b8e4 100644 --- a/lib/soap/mapping/rubytypeFactory.rb +++ b/lib/soap/mapping/rubytypeFactory.rb @@ -1,20 +1,9 @@ -=begin -SOAP4R - Ruby type mapping factory. -Copyright (C) 2000, 2001, 2002, 2003 NAKAMURA, Hiroshi. +# SOAP4R - Ruby type mapping factory. +# Copyright (C) 2000, 2001, 2002, 2003 NAKAMURA, Hiroshi . -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; either version 2 of the License, or (at your option) any later -version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PRATICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 675 Mass -Ave, Cambridge, MA 02139, USA. -=end +# 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. module SOAP diff --git a/lib/soap/mapping/typeMap.rb b/lib/soap/mapping/typeMap.rb index c62f1482c1..93f24b4bd8 100644 --- a/lib/soap/mapping/typeMap.rb +++ b/lib/soap/mapping/typeMap.rb @@ -1,20 +1,9 @@ -=begin -SOAP4R - Base type mapping definition -Copyright (C) 2000, 2001, 2002, 2003 NAKAMURA, Hiroshi. - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; either version 2 of the License, or (at your option) any later -version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PRATICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 675 Mass -Ave, Cambridge, MA 02139, USA. -=end +# SOAP4R - Base type mapping definition +# Copyright (C) 2000, 2001, 2002, 2003 NAKAMURA, Hiroshi . + +# 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. module SOAP diff --git a/lib/soap/mapping/wsdlRegistry.rb b/lib/soap/mapping/wsdlRegistry.rb index 4b5beabe72..66d16c6f90 100644 --- a/lib/soap/mapping/wsdlRegistry.rb +++ b/lib/soap/mapping/wsdlRegistry.rb @@ -1,20 +1,9 @@ -=begin -SOAP4R - WSDL mapping registry. -Copyright (C) 2000, 2001, 2002, 2003 NAKAMURA, Hiroshi. - -This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free Software -Foundation; either version 2 of the License, or (at your option) any later -version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A -PRATICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., 675 Mass -Ave, Cambridge, MA 02139, USA. -=end +# SOAP4R - WSDL mapping registry. +# Copyright (C) 2000, 2001, 2002, 2003 NAKAMURA, Hiroshi . + +# 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. require 'soap/baseData' -- cgit v1.2.3