Changeset 1915

Timestamp:

08/05/07 23:25:19 (10 months ago)

Author:

nahi

Message:

• added support for anonymous type. anonymous type is mapped to inner class. closes #355.
  

Files:

• trunk/lib/wsdl/soap/classDefCreator.rb (modified) (6 diffs)
• trunk/lib/wsdl/soap/classDefCreatorSupport.rb (modified) (2 diffs)
• trunk/lib/wsdl/soap/element.rb (modified) (1 diff)
• trunk/lib/wsdl/soap/encodedMappingRegistryCreator.rb (modified) (2 diffs)
• trunk/lib/wsdl/soap/literalMappingRegistryCreator.rb (modified) (2 diffs)
• trunk/lib/wsdl/soap/mappingRegistryCreatorSupport.rb (modified) (5 diffs)
• trunk/lib/xsd/codegen/classdef.rb (modified) (1 diff)
• trunk/lib/xsd/codegen/moduledef.rb (modified) (4 diffs)
• trunk/test/wsdl/anonymous (added)
• trunk/test/wsdl/anonymous/expectedClassDef.rb (added)
• trunk/test/wsdl/anonymous/expectedDriver.rb (added)
• trunk/test/wsdl/anonymous/expectedMappingRegistry.rb (added)
• trunk/test/wsdl/anonymous/lp.wsdl (added)
• trunk/test/wsdl/anonymous/test_anonymous.rb (added)
• trunk/test/wsdl/any/expectedEcho.rb (modified) (1 diff)
• trunk/test/wsdl/any/expectedMappingRegistry.rb (modified) (1 diff)
• trunk/test/wsdl/ref/expectedProduct.rb (modified) (2 diffs)
• trunk/test/xsd/codegen/test_classdef.rb (modified) (1 diff)

trunk/lib/wsdl/soap/classDefCreator.rb

@@ -245 +245 @@
-
-  def dump_classdef(qname, typedef, qualified = false)
+    create_classdef(qname, typedef, qualified).dump
+  end
+
+  def create_classdef(qname, typedef, qualified = false)
-    classname = create_class_name(qname)
-    check_classname(classname)
@@ -261 +265 @@
-    c.comment << "\nabstract" if typedef.abstract
-    init_lines, init_params =
-
+, classname
-    unless typedef.attributes.empty?
-      define_attribute(c, typedef.attributes)
@@ -269 +273 @@
-      init_lines.join("\n")
-    end
-.dump
-
-
-
+
+
+
+, parentmodule
-    init_lines = []
-    init_params = []
@@ -291 +295 @@
-        next if element.ref == SchemaName
-        name = name_element(element).name
+        typebase = @modulepath
+        if element.anonymous_type?
+          inner = create_classdef(element.name, element.local_complextype)
+          inner.comment = "inner class for member: #{name}\n" + inner.comment
+          c.innermodule << inner
+          typebase = parentmodule
+        end
-        attrname = safemethodname(name)
-        varname = safevarname(name)
@@ -300 +311 @@
-          init_params << "#{varname} = nil"
-        end
-
+, typebase
-      when WSDL::XMLSchema::Sequence
-        child_init_lines, child_init_params =
-
+, parentmodule
-        init_lines.concat(child_init_lines)
-        init_params.concat(child_init_params)
-      when WSDL::XMLSchema::Choice
-        child_init_lines, child_init_params =
-
+, parentmodule
-        init_lines.concat(child_init_lines)
-        init_params.concat(child_init_params)
@@ -317 +328 @@
-        end
-        child_init_lines, child_init_params =
-
+, parentmodule
-        init_lines.concat(child_init_lines)
-        init_params.concat(child_init_params)

trunk/lib/wsdl/soap/classDefCreatorSupport.rb

@@ -105 +105 @@
-  end
-
-
+, modulepath = @modulepath
-    if element.type == XSD::AnyTypeName
+      # nil means anyType.
-      nil
-    elsif simpletype = @simpletypes[element.type]
-      if simpletype.restriction and simpletype.restriction.enumeration?
-@
+
-      else
-        nil
@@ -117 +118 @@
-      klass.name
-    elsif element.type
-@
+
-    elsif element.ref
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    end
-  end

trunk/lib/wsdl/soap/element.rb

@@ -20 +20 @@
-  end
-
+  def anonymous_type?
+    !@ref and @name and @local_complextype
+  end
+
-  def attributes
-    @local_complextype.attributes

trunk/lib/wsdl/soap/encodedMappingRegistryCreator.rb

@@ -76 +76 @@
-  end
-
-  def dump_struct_typemap(qname, typedef)
-    var = {}
-    var[:class] = create_class_name(qname, @modulepath)
-    var[:schema_ns] = qname.namespace
-    if typedef.name.nil?
-      # local complextype of a element
-      var[:schema_name] = qname.name
-    else
-      # named complextype
-      var[:schema_type] = qname.name
-    end
-    parsed_element = parse_elements(typedef.elements, qname.namespace)
-    var[:schema_element] = dump_schema_element_definition(parsed_element, 2)
-    assign_const(var[:schema_ns], 'Ns')
-    dump_entry(@varname, var)
-  end
-
-  def dump_array_typemap(qname, typedef)
-    arytype = typedef.find_arytype || XSD::AnyTypeName
@@ -106 +89 @@
-__EOD__
-  end
-
-  def dump_simple_typemap(qname, typedef)
-    var = {}
-    var[:class] = create_class_name(qname, @modulepath)
-    var[:schema_ns] = qname.namespace
-    var[:schema_type] = qname.name
-    assign_const(var[:schema_ns], 'Ns')
-    dump_entry(@varname, var)
-  end
-end
-

trunk/lib/wsdl/soap/literalMappingRegistryCreator.rb

@@ -119 +119 @@
-  end
-
-  def dump_struct_typemap(qname, typedef, as_element = nil, qualified = false)
-    var = {}
-    var[:class] = create_class_name(qname, @modulepath)
-    if as_element
-      var[:schema_name] = as_element.name
-      var[:schema_ns] = as_element.namespace
-    elsif typedef.name.nil?
-      var[:schema_name] = qname.name
-      var[:schema_ns] = qname.namespace
-    else
-      var[:schema_type] = qname.name
-      var[:schema_ns] = qname.namespace
-    end
-    var[:schema_qualified] = qualified.to_s
-
-    parsed_element = parse_elements(typedef.elements, qname.namespace)
-    if typedef.choice?
-      parsed_element.unshift(:choice)
-    end
-    var[:schema_element] = dump_schema_element_definition(parsed_element, 2)
-    unless typedef.attributes.empty?
-      var[:schema_attribute] = define_attribute(typedef.attributes)
-    end
-    assign_const(var[:schema_ns], 'Ns')
-    dump_entry(@varname, var)
-  end
-
-  DEFAULT_ITEM_NAME = XSD::QName.new(nil, 'item')
-
@@ -191 +164 @@
-    dump_entry(@varname, var)
-  end
-
-  def dump_simple_typemap(qname, type_or_element, as_element, qualified)
-    var = {}
-    var[:class] = create_class_name(qname, @modulepath)
-    if as_element
-      var[:schema_name] = as_element.name
-      var[:schema_ns] = as_element.namespace
-    elsif type_or_element.name.nil?
-      var[:schema_name] = qname.name
-      var[:schema_ns] = qname.namespace
-    else
-      var[:schema_type] = qname.name
-      var[:schema_ns] = qname.namespace
-    end
-    unless type_or_element.attributes.empty?
-      var[:schema_attribute] = define_attribute(type_or_element.attributes)
-    end
-    assign_const(var[:schema_ns], 'Ns')
-    dump_entry(@varname, var)
-  end
-end
-

trunk/lib/wsdl/soap/mappingRegistryCreatorSupport.rb

@@ -14 +14 @@
-
-
-
+, @dump_struct_typemap_innerstruct
-module MappingRegistryCreatorSupport
-  include ClassDefCreatorSupport
-  include XSD::CodeGen
+
+  def dump_struct_typemap(qname, typedef, as_element = nil, qualified = nil)
+    @dump_struct_typemap_innerstruct = []
+    @dump_struct_typemap_innerstruct.unshift(
+      dump_complex_typemap(qname, typedef, @modulepath, as_element, qualified))
+    @dump_struct_typemap_innerstruct.join("\n")
+  end
+
+  def dump_complex_typemap(qname, typedef, parentmodule, as_element = nil, qualified = nil)
+    var = {}
+    var[:class] = create_class_name(qname, parentmodule)
+    if as_element
+      var[:schema_name] = as_element.name
+      var[:schema_ns] = as_element.namespace
+    elsif typedef.name.nil?
+      var[:schema_name] = qname.name
+      var[:schema_ns] = qname.namespace
+    else
+      var[:schema_type] = qname.name
+      var[:schema_ns] = qname.namespace
+    end
+    # true, false, or nil
+    unless qualified.nil?
+      var[:schema_qualified] = qualified.to_s
+    end
+    parentmodule = var[:class]
+    parsed_element = parse_elements(typedef.elements, qname.namespace,
+      parentmodule, qualified)
+    if typedef.choice?
+      parsed_element.unshift(:choice)
+    end
+    var[:schema_element] = dump_schema_element_definition(parsed_element, 2)
+    unless typedef.attributes.empty?
+      var[:schema_attribute] = define_attribute(typedef.attributes)
+    end
+    assign_const(var[:schema_ns], 'Ns')
+    dump_entry(@varname, var)
+  end
+
+  def dump_simple_typemap(qname, typedef, as_element = nil, qualified = nil)
+    var = {}
+    var[:class] = create_class_name(qname, @modulepath)
+    if as_element
+      var[:schema_name] = as_element.name
+      var[:schema_ns] = as_element.namespace
+    elsif typedef.name.nil?
+      var[:schema_name] = qname.name
+      var[:schema_ns] = qname.namespace
+    else
+      var[:schema_type] = qname.name
+      var[:schema_ns] = qname.namespace
+    end
+    unless typedef.attributes.empty?
+      var[:schema_attribute] = define_attribute(typedef.attributes)
+    end
+    assign_const(var[:schema_ns], 'Ns')
+    dump_entry(@varname, var)
+  end
-
-  def dump_schema_element_definition(definition, indent = 0)
@@ -64 +122 @@
-  end
-
-
+, parentmodule, qualified = false
-    schema_element = []
-    any = false
@@ -80 +138 @@
-      when XMLSchema::Element
-        next if element.ref == SchemaName
-
+
+
+
+
+
+
+
+
-        name = name_element(element).name
-        varname = safevarname(name)
@@ -98 +163 @@
-        schema_element << [varname, eleqname, type, occurrence]
-      when WSDL::XMLSchema::Sequence
-
+
+
-        schema_element << child_schema_element
-      when WSDL::XMLSchema::Choice
-
+
+
-        child_schema_element.unshift(:choice)
-        schema_element << child_schema_element
@@ -109 +176 @@
-          next
-        end
-
+
+
-        schema_element.concat(child_schema_element)
-      else

trunk/lib/xsd/codegen/classdef.rb

@@ -60 +60 @@
-      spacer = true
-      buf << dump_const
+    end
+    unless @innermodule.empty?
+      buf << dump_emptyline # always add 1 empty line
+      spacer = true
+      buf << dump_innermodule
-    end
-    unless @code.empty?

trunk/lib/xsd/codegen/moduledef.rb

@@ -19 +19 @@
-  include GenSupport
-  include CommentDef
+
+  attr_reader :innermodule
-
-  def initialize(name)
@@ -27 +29 @@
-    @requirepath = []
-    @methoddef = []
+    @innermodule = []
-  end
-
@@ -78 +81 @@
-      buf << dump_const
-    end
+    unless @innermodule.empty?
+      buf << dump_emptyline # always add 1 empty line
+      spacer = true
+      buf << dump_innermodule
+    end
-    unless @code.empty?
-      buf << dump_emptyline if spacer
@@ -107 +115 @@
-      @const.sort.collect { |var, value|
-        %Q(#{var} = #{dump_value(value)})
+      }.join("\n")
+    )
+  end
+
+  def dump_innermodule
+    dump_static(
+      @innermodule.collect { |moduledef|
+        moduledef.dump
-      }.join("\n")
-    )

trunk/test/wsdl/any/expectedEcho.rb

@@ -25 +25 @@
-# {urn:example.com:echo-type}setOutputAndCompleteRequest
-#   taskId - SOAP::SOAPString
-(any)
+SetOutputAndCompleteRequest::C_Data
-#   participantToken - SOAP::SOAPString
-class SetOutputAndCompleteRequest
+
+  # inner class for member: data
+  # {}data
+  class C_Data
+    attr_reader :__xmlele_any
+
+    def set_any(elements)
+      @__xmlele_any = elements
+    end
+
+    def initialize
+      @__xmlele_any = nil
+    end
+  end
+
-  attr_accessor :taskId
-  attr_accessor :data

trunk/test/wsdl/any/expectedMappingRegistry.rb

@@ -52 +52 @@
-    :schema_element => [
-      ["taskId", ["SOAP::SOAPString", XSD::QName.new(nil, "taskId")]],
-nil
+"WSDL::Any::SetOutputAndCompleteRequest::C_Data"
-      ["participantToken", ["SOAP::SOAPString", XSD::QName.new(nil, "participantToken")]]
+    ]
+  )
+
+  LiteralRegistry.register(
+    :class => WSDL::Any::SetOutputAndCompleteRequest::C_Data,
+    :schema_ns => nil,
+    :schema_name => "data",
+    :schema_qualified => true,
+    :schema_element => [
+      ["any", [nil, XSD::QName.new(NsXMLSchema, "anyType")]]
-    ]
-  )

trunk/test/wsdl/ref/expectedProduct.rb

@@ -135 +135 @@
-#   bag - WSDL::Ref::Product
-#   rating - SOAP::SOAPString
-(any)
+ProductBag::Comment_1
-#   comment_2 - WSDL::Ref::Comment
-#   m___point - WSDL::Ref::C__point
@@ -144 +144 @@
-  AttrYesno = XSD::QName.new("urn:ref", "yesno")
-
+  # inner class for member: Comment_1
+  # {}Comment_1
+  #   xmlattr_msgid - SOAP::SOAPString
+  class Comment_1
+    AttrMsgid = XSD::QName.new(nil, "msgid")
+
+    def __xmlattr
+      @__xmlattr ||= {}
+    end
+
+    def xmlattr_msgid
+      __xmlattr[AttrMsgid]
+    end
+
+    def xmlattr_msgid=(value)
+      __xmlattr[AttrMsgid] = value
+    end
+
+    def initialize
+      @__xmlattr = {}
+    end
+  end
+
-  attr_accessor :bag
-  attr_accessor :rating

trunk/test/xsd/codegen/test_classdef.rb

@@ -87 +87 @@
-
-        def bar
+        end
+      end
+    EOD
+  end
+
+  def test_innermodule
+    c = ClassDef.new("Foo")
+    c.def_const("BAR", 1)
+    c.def_method('baz') { "Qux.new.quxx" }
+    c2 = ClassDef.new("Qux")
+    c2.def_method('quxx') { "Quxx::QUXXX" }
+    m3 = ModuleDef.new("Quxx")
+    m3.def_const("QUXXX", 2)
+    c.innermodule << c2 << m3
+    assert_equal(format(<<-EOD), c.dump)
+      class Foo
+        BAR = 1
+
+        class Qux
+          def quxx
+            Quxx::QUXXX
+          end
+        end
+
+        module Quxx
+          QUXXX = 2
+        end
+
+        def baz
+          Qux.new.quxx
-        end
-      end