From ff1b89a96d0f103ff0c917c458ddd3e36e9b3718 Mon Sep 17 00:00:00 2001 From: nahi Date: Tue, 6 Jan 2004 02:20:51 +0000 Subject: * 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 --- lib/soap/mapping/factory.rb | 8 -------- lib/soap/mapping/mapping.rb | 4 +--- lib/soap/mapping/rubytypeFactory.rb | 6 ------ 3 files changed, 1 insertion(+), 17 deletions(-) (limited to 'lib/soap/mapping') diff --git a/lib/soap/mapping/factory.rb b/lib/soap/mapping/factory.rb index f181773687..bf68701229 100644 --- a/lib/soap/mapping/factory.rb +++ b/lib/soap/mapping/factory.rb @@ -87,14 +87,6 @@ class Factory Thread.current[:SOAPMarshalDataKey][node.id] = obj end - def name2typename(name) - capitalize(name) - end - - def capitalize(target) - target.gsub(/^([a-z])/) { $1.tr!('[a-z]', '[A-Z]') } - end - private def setiv2ary(obj, node, map) diff --git a/lib/soap/mapping/mapping.rb b/lib/soap/mapping/mapping.rb index 4b68b811fc..38a01bac07 100644 --- a/lib/soap/mapping/mapping.rb +++ b/lib/soap/mapping/mapping.rb @@ -98,9 +98,7 @@ module Mapping def self._obj2soap(obj, registry, type = nil) if referent = Thread.current[:SOAPMarshalDataKey][obj.__id__] - soap_obj = SOAPReference.new - soap_obj.__setobj__(referent) - soap_obj + SOAPReference.new(referent) else registry.obj2soap(obj.class, obj, type) end diff --git a/lib/soap/mapping/rubytypeFactory.rb b/lib/soap/mapping/rubytypeFactory.rb index 0b4af8b8e4..a447715add 100644 --- a/lib/soap/mapping/rubytypeFactory.rb +++ b/lib/soap/mapping/rubytypeFactory.rb @@ -343,9 +343,6 @@ private when TYPE_STRUCT typestr = Mapping.elename2name(node['type'].data) klass = Mapping.class_from_name(typestr) - if klass.nil? - klass = Mapping.class_from_name(name2typename(typestr)) - end if klass.nil? return false end @@ -400,9 +397,6 @@ private end typestr = Mapping.elename2name(node.type.name) klass = Mapping.class_from_name(typestr) - if klass.nil? - klass = Mapping.class_from_name(name2typename(typestr)) - end if klass.nil? return nil end -- cgit v1.2.3