Changeset 1958

Timestamp:

09/13/07 21:06:56 (11 months ago)

Author:

nahi

Message:

• multi-refed basetype value was not be able to decode with generated EncodedRegistry?. closes #423.
  
• decode Array like element with EncodedRegistry? not by TypeArrayFactory?.
  

Files:

• trunk/lib/soap/baseData.rb (modified) (1 diff)
• trunk/lib/wsdl/soap/encodedMappingRegistryCreator.rb (modified) (2 diffs)
• trunk/lib/wsdl/soap/literalMappingRegistryCreator.rb (modified) (1 diff)
• trunk/lib/wsdl/soap/mappingRegistryCreatorSupport.rb (modified) (4 diffs)
• trunk/test/wsdl/anonymous/expectedMappingRegistry.rb (modified) (2 diffs)
• trunk/test/wsdl/axisArray/axisArray.wsdl (modified) (3 diffs)
• trunk/test/wsdl/axisArray/test_axisarray.rb (modified) (3 diffs)
• trunk/test/wsdl/raa/expectedMappingRegistry.rb (modified) (2 diffs)
• trunk/test/wsdl/rpc/test_rpc.rb (modified) (1 diff)

trunk/lib/soap/baseData.rb

@@ -159 +159 @@
-    else
-      nil
+    end
+  end
+
+  # for referenced base type such as a long value from Axis.
+  # base2obj requires a node to respond to :data
+  def data
+    if @obj.respond_to?(:data)
+      @obj.data
-    end
-  end

trunk/lib/wsdl/soap/encodedMappingRegistryCreator.rb

@@ -67 +67 @@
-      dump_struct_typemap(mpath, qname, typedef)
-    when :TYPE_ARRAY
-encoded_
+
-    when :TYPE_SIMPLE
-      dump_simple_typemap(mpath, qname, typedef)
@@ -78 +78 @@
-    end
-  end
-
-  def dump_encoded_array_typemap(mpath, qname, typedef)
-    arytype = typedef.find_arytype || XSD::AnyTypeName
-    type = XSD::QName.new(arytype.namespace, arytype.name.sub(/\[(?:,)*\]$/, ''))
-    assign_const(type.namespace, 'Ns')
-    return <<__EOD__
-#{@varname}.set(
-  #{mapped_class_name(qname, mpath)},
-  ::SOAP::SOAPArray,
-  ::SOAP::Mapping::EncodedRegistry::TypedArrayFactory,
-  { :type => #{dqname(type)} }
-)
-__EOD__
-  end
-end
-

trunk/lib/wsdl/soap/literalMappingRegistryCreator.rb

@@ -120 +120 @@
-    end
-  end
-
-  DEFAULT_ITEM_NAME = XSD::QName.new(nil, 'item')
-
-  def dump_array_typemap(mpath, qname, typedef)
-    @dump_struct_typemap_innerstruct = []
-    @dump_struct_typemap_innerstruct.unshift(
-      dump_literal_array_typemap(mpath, qname, typedef))
-    @dump_struct_typemap_innerstruct.join("\n")
-  end
-
-  def dump_literal_array_typemap(mpath, qname, typedef)
-    var = {}
-    var[:class] = mapped_class_name(qname, mpath)
-    schema_ns = qname.namespace
-    if typedef.name.nil?
-      # local complextype of a element
-      var[:schema_name] = qname
-    else
-      # named complextype
-      var[:schema_type] = qname
-    end
-    parsed_element =
-      parse_elements(typedef.elements, qname.namespace, var[:class], nil)
-    if parsed_element.empty?
-      parsed_element = [create_soapenc_array_element_definition(typedef, mpath)]
-    end
-    var[:schema_element] = dump_schema_element_definition(parsed_element, 2)
-    assign_const(schema_ns, 'Ns')
-    dump_entry(@varname, var)
-  end
-
-  def create_soapenc_array_element_definition(typedef, mpath)
-    child_type = typedef.child_type
-    child_element = typedef.find_aryelement
-    if child_type == XSD::AnyTypeName
-      type = nil
-    elsif child_element
-      if klass = element_basetype(child_element)
-        type = klass.name
-      else
-        typename = child_element.type || child_element.name
-        type = mapped_class_name(typename, mpath)
-      end
-    elsif child_type
-      type = mapped_class_name(child_type, mpath)
-    else
-      type = nil
-    end
-    occurrence = [0, nil]
-    if child_element and child_element.name
-      if child_element.map_as_array?
-        type << '[]' if type
-        occurrence = [child_element.minoccurs, child_element.maxoccurs]
-      end
-      child_element_name = child_element.name
-    else
-      child_element_name = DEFAULT_ITEM_NAME
-    end
-    [child_element_name.name, child_element_name, type, occurrence]
-  end
-end
-

trunk/lib/wsdl/soap/mappingRegistryCreatorSupport.rb

@@ -14 +14 @@
-
-
-struct_typemap_innerstruct
+with_inner
-module MappingRegistryCreatorSupport
-  include ClassDefCreatorSupport
@@ -20 +20 @@
-
-  def dump_struct_typemap(mpath, qname, typedef, as_element = nil, qualified = nil)
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  end
-
@@ -141 +152 @@
-        typebase = @modulepath
-        if element.anonymous_type?
-struct_typemap_innerstruct << dump_complex_typemap(
-  mpath, element.name, 
+with_inner << dump_complex_typemap(mpath, element.name,
+
-          typebase = mpath
-        end
@@ -290 +301 @@
-    nil
-  end
+
+  DEFAULT_ITEM_NAME = XSD::QName.new(nil, 'item')
+
+  def dump_literal_array_typemap(mpath, qname, typedef)
+    var = {}
+    var[:class] = mapped_class_name(qname, mpath)
+    schema_ns = qname.namespace
+    if typedef.name.nil?
+      # local complextype of a element
+      var[:schema_name] = qname
+    else
+      # named complextype
+      var[:schema_type] = qname
+    end
+    parsed_element =
+      parse_elements(typedef.elements, qname.namespace, var[:class], nil)
+    if parsed_element.empty?
+      parsed_element = [create_soapenc_array_element_definition(typedef, mpath)]
+    end
+    var[:schema_element] = dump_schema_element_definition(parsed_element, 2)
+    assign_const(schema_ns, 'Ns')
+    dump_entry(@varname, var)
+  end
+
+  def create_soapenc_array_element_definition(typedef, mpath)
+    child_type = typedef.child_type
+    child_element = typedef.find_aryelement
+    if child_type == XSD::AnyTypeName
+      type = nil
+    elsif child_element
+      if klass = element_basetype(child_element)
+        type = klass.name
+      else
+        typename = child_element.type || child_element.name
+        type = mapped_class_name(typename, mpath)
+      end
+    elsif child_type
+      type = mapped_class_name(child_type, mpath)
+    else
+      type = nil
+    end
+    occurrence = [0, nil]
+    if child_element and child_element.name
+      if child_element.map_as_array?
+        type << '[]' if type
+        occurrence = [child_element.minoccurs, child_element.maxoccurs]
+      end
+      child_element_name = child_element.name
+    else
+      child_element_name = DEFAULT_ITEM_NAME
+    end
+    [child_element_name.name, child_element_name, type, occurrence]
+  end
-end
-

trunk/test/wsdl/anonymous/expectedMappingRegistry.rb

@@ -8 +8 @@
-  LiteralRegistry = ::SOAP::Mapping::LiteralRegistry.new
-  NsLp = "urn:lp"
-  NsXMLSchema = "http://www.w3.org/2001/XMLSchema"
-
-  EncodedRegistry.register(
@@ -18 +17 @@
-  )
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  )
-

trunk/test/wsdl/axisArray/axisArray.wsdl

@@ -22 +22 @@
-        </sequence>
-      </complexType>
+
+      <complexType name="MeetingInfo">
+        <sequence>
+          <element name="meetingId" type="xsd:long"/>
+        </sequence>
+      </complexType>
-    </schema>
-  </wsdl:types>
@@ -31 +37 @@
-  </wsdl:message>
-
+  <wsdl:message name="getMeetingInfoRequest"/>
+
+  <wsdl:message name="getMeetingInfoResponse">
+    <wsdl:part name="getMeetingInfoReturn" type="typens:MeetingInfo"/>
+  </wsdl:message>
+
-  <wsdl:portType name="ItemListPortType">
-    <wsdl:operation name="listItem">
-      <wsdl:input message="tns:listItemRequest" name="listItemRequest"/>
-      <wsdl:output message="tns:listItemResponse" name="listItemResponse"/>
+    </wsdl:operation>
+    <wsdl:operation name="getMeetingInfo">
+      <wsdl:input name="getMeetingInfoRequest" message="tns:getMeetingInfoRequest"/>
+      <wsdl:output name="getMeetingInfoResponse" message="tns:getMeetingInfoResponse"/>
-    </wsdl:operation>
-  </wsdl:portType>
@@ -43 +59 @@
-      <soap:operation soapAction=""/>
-      <wsdl:input name="listItemRequest">
-       
-       
+        
+      
-      </wsdl:input>
-      <wsdl:output name="listItemResponse">
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-      </wsdl:output>
-    </wsdl:operation>

trunk/test/wsdl/axisArray/test_axisarray.rb

@@ -4 +4 @@
-require 'soap/rpc/element'
-require 'wsdl/importer'
-
+
+
-
-
-module WSDL
+module AxisArray
-
-
-class TestAxisArray < Test::Unit::TestCase
+  DIR = File.dirname(File.expand_path(__FILE__))
+
-  def setup
-    @xml =<<__EOX__
@@ -36 +40 @@
-</soapenv:Envelope>
-__EOX__
+    setup_classdef
+  end
+
+  def teardown
+    unless $DEBUG
+      File.unlink(pathname('itemList.rb'))
+      File.unlink(pathname('itemListMappingRegistry.rb'))
+      File.unlink(pathname('itemListDriver.rb'))
+    end
+  end
+
+  def setup_classdef
+    gen = WSDL::SOAP::WSDL2Ruby.new
+    gen.location = pathname("axisArray.wsdl")
+    gen.basedir = DIR
+    gen.logger.level = Logger::FATAL
+    gen.opt['classdef'] = nil
+    gen.opt['mapping_registry'] = nil
+    gen.opt['module_path'] = self.class.to_s.sub(/::[^:]+$/, '')
+    gen.opt['driver'] = nil
+    gen.opt['force'] = true
+    gen.run
+    TestUtil.require(DIR, 'itemListDriver.rb', 'itemList.rb', 'itemListMappingRegistry.rb')
-  end
-
-  def test_by_stub
-
-
+
+
+
-    assert_equal(3, ary.size)
-    assert_equal("name1", ary[0].name)
@@ -64 +92 @@
-    assert_equal("name3", ary[2].name)
-  end
+
+XML_LONG = <<__XML__
+<?xml version="1.0" encoding="utf-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <soapenv:Body>
+    <ns1:getMeetingInfoResponse soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:ns1="urn:jp.gr.jin.rrr.example.itemList">
+      <getMeetingInfoReturn href="#id0"/>
+    </ns1:getMeetingInfoResponse>
+    <multiRef id="id0" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="ns2:MeetingInfo" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:ns2="urn:long">
+      <meetingId href="#id11"/>
+    </multiRef>
+    <multiRef id="id11" soapenc:root="0" soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xsi:type="xsd:long" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/">105759347</multiRef>
+  </soapenv:Body>
+</soapenv:Envelope>
+__XML__
+
+  def test_multiref_long
+    driver = ItemListPortType.new
+    driver.test_loopback_response << XML_LONG
+    ret = driver.getMeetingInfo
+    assert_equal(105759347, ret.meetingId)
+  end
+
+  def pathname(filename)
+    File.join(DIR, filename)
+  end
-end
-
-
-end
+end

trunk/test/wsdl/raa/expectedMappingRegistry.rb

@@ -8 +8 @@
-  LiteralRegistry = ::SOAP::Mapping::LiteralRegistry.new
-  NsC_002 = "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"
-  NsXMLSchema = "http://www.w3.org/2001/XMLSchema"
-
-  EncodedRegistry.register(
@@ -57 +56 @@
-  )
-
-
-
-
-
-
+
+
+
+
+
+
-  )
-
-
-
-
-
-
+
+
+
+
+
+
-  )
-

trunk/test/wsdl/rpc/test_rpc.rb

@@ -166 +166 @@
-  def test_basetype_stub
-    @client = Prefix::Echo_port_type.new("http://localhost:#{Port}/")
-    @client.mapping_registry = Prefix::EchoMappingRegistry::EncodedRegistry
-    @client.wiredump_dev = STDERR if $DEBUG
-