* 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

1 files changed, 77 insertions, 10 deletions

diff --git a/lib/soap/baseData.rb b/lib/soap/baseData.rb
index 91f5a0433f..30963f1d64 100644
--- a/lib/soap/baseData.rb
+++ b/lib/soap/baseData.rb
@@ -64,6 +64,14 @@ public
     @position = nil
     @extraattr = {}
   end
+
+  def rootnode
+    node = self
+    while node = node.parent
+      break if SOAPEnvelope === node
+    end
+    node
+  end
 end
 
 
@@ -117,7 +125,7 @@ public
   attr_accessor :elename
 
   # Override the definition in SOAPBasetype.
-  def initialize(refid = nil)
+  def initialize(obj = nil)
     super()
     @type = XSD::QName.new
     @encodingstyle = nil
@@ -126,8 +134,9 @@ public
     @precedents = []
     @root = false
     @parent = nil
-    @refid = refid
+    @refid = nil
     @obj = nil
+    __setobj__(obj) if obj
   end
 
   def __getobj__
@@ -136,7 +145,7 @@ public
 
   def __setobj__(obj)
     @obj = obj
-    @refid = SOAPReference.create_refid(@obj)
+    @refid = @obj.id || SOAPReference.create_refid(@obj)
     @obj.id = @refid unless @obj.id
     @obj.precedents << self
     # Copies NSDBase information
@@ -159,17 +168,59 @@ public
     end
   end
 
-  def self.decode(elename, refid)
+  def refidstr
+    '#' + @refid
+  end
+
+  def self.create_refid(obj)
+    'id' + obj.__id__.to_s
+  end
+
+  def self.decode(elename, refidstr)
+    if /\A#(.*)\z/ =~ refidstr
+      refid = $1
+    elsif /\Acid:(.*)\z/ =~ refidstr
+      refid = $1
+    else
+      raise ArgumentError.new("illegal refid #{refidstr}")
+    end
     d = super(elename)
     d.refid = refid
     d
   end
+end
 
-  def self.create_refid(obj)
-    'id' << obj.__id__.to_s
+
+class SOAPExternalReference < XSD::NSDBase
+  include SOAPBasetype
+  extend SOAPModuleUtils
+
+  def initialize
+    super()
+    @type = XSD::QName.new
+    @encodingstyle = nil
+    @elename = XSD::QName.new
+    @precedents = []
+    @root = false
+    @parent = nil
+  end
+
+  def referred
+    rootnode.external_content[external_contentid] = self
+  end
+
+  def refidstr
+    'cid:' + external_contentid
+  end
+
+private
+
+  def external_contentid
+    raise NotImplementedError.new
   end
 end
 
+
 class SOAPNil < XSD::XSDNil
   include SOAPBasetype
   extend SOAPModuleUtils
@@ -362,6 +413,7 @@ public
 
   def []=(idx, data)
     if @array.include?(idx)
+      data.parent = self if data.respond_to?(:parent=)
       @data[@array.index(idx)] = data
     else
       add(idx, data)
@@ -401,6 +453,8 @@ private
     @array.push(name)
     value.elename = value.elename.dup_name(name)
     @data.push(value)
+    value.parent = self if value.respond_to?(:parent=)
+    value
   end
 end
 
@@ -410,22 +464,31 @@ class SOAPElement
   include Enumerable
 
   attr_accessor :encodingstyle
-  attr_accessor :extraattr
+
+  attr_accessor :elename
+  attr_accessor :id
   attr_reader :precedents
+  attr_accessor :root
+  attr_accessor :parent
+  attr_accessor :position
+  attr_accessor :extraattr
 
   attr_accessor :qualified
-  attr_accessor :elename
 
   def initialize(elename, text = nil)
     if !elename.is_a?(XSD::QName)
       elename = XSD::QName.new(nil, elename)
     end
     @encodingstyle = LiteralNamespace
-    @extraattr = {}
+    @elename = elename
+    @id = nil
     @precedents = []
+    @root = false
+    @parent = nil
+    @position = nil
+    @extraattr = {}
 
     @qualified = false
-    @elename = elename
 
     @array = []
     @data = []
@@ -450,6 +513,7 @@ class SOAPElement
 
   def []=(idx, data)
     if @array.include?(idx)
+      data.parent = self if data.respond_to?(:parent=)
       @data[@array.index(idx)] = data
     else
       add(data)
@@ -508,6 +572,8 @@ private
     add_accessor(name)
     @array.push(name)
     @data.push(value)
+    value.parent = self if value.respond_to?(:parent=)
+    value
   end
 
   def add_accessor(name)
@@ -609,6 +675,7 @@ public
     end
 
     @offset = idxary
+    value.parent = self if value.respond_to?(:parent=)
     offsetnext
   end