Changeset 1873

Timestamp:

07/02/07 23:45:06 (11 months ago)

Author:

nahi

Message:

• try to call klass.soap_marshallable before mapping an XML element to the klass while unmarshalling. to avoid auto-mapping from element name, define klass.soap_marshallable method let it return false. closes #223.
  

Files:

• trunk/lib/soap/mapping/rubytypeFactory.rb (modified) (1 diff)
• trunk/test/soap/test_mapping.rb (modified) (2 diffs)

trunk/lib/soap/mapping/rubytypeFactory.rb

@@ -421 +421 @@
-    typestr = Mapping.elename2name(node.type.name)
-    klass = Mapping.class_from_name(typestr)
+    if klass.respond_to?(:soap_marshallable) and !klass.soap_marshallable
+      return nil
+    end
-    if klass.nil? and @allow_untyped_struct
-      klass = Mapping.class_from_name(typestr, true)    # lenient

trunk/test/soap/test_mapping.rb

@@ -1 +1 @@
-require 'test/unit'
-require 'soap/mapping'
+require 'soap/marshal'
-
-
@@ -7 +8 @@
-
-class TestMapping < Test::Unit::TestCase
+
+  class MappablePerson
+    attr_reader :name
+    attr_reader :age
+
+    def initialize(name, age)
+      @name, @age = name, age
+    end
+
+    def self.soap_marshallable
+      true
+    end
+  end
+
+  class UnmappablePerson
+    attr_reader :name
+    attr_reader :age
+
+    def initialize(name, age)
+      @name, @age = name, age
+    end
+
+    def self.soap_marshallable
+      false
+    end
+  end
+
+  def test_mappable
+    xml = <<__XML__
+<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <SOAP..TestMapping..MappablePerson env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+      <name>nahi</name>
+      <age>37</age>
+    </SOAP..TestMapping..MappablePerson>
+  </env:Body>
+</env:Envelope>
+__XML__
+    obj = SOAP::Marshal.load(xml)
+    assert_equal(SOAP::TestMapping::MappablePerson, obj.class)
+    #
+    xml = <<__XML__
+<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <SOAP..TestMapping..UnmappablePerson env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+      <name>nahi</name>
+      <age>37</age>
+    </SOAP..TestMapping..UnmappablePerson>
+  </env:Body>
+</env:Envelope>
+__XML__
+    obj = SOAP::Marshal.load(xml)
+    assert_equal(SOAP::Mapping::Object, obj.class)
+  end
+
-  def test_date
-    targets = [