Changeset 1486
- Timestamp:
- 04/16/05 19:19:34 (4 years ago)
- Files:
-
- trunk/lib/wsdl/soap/classDefCreator.rb (modified) (6 diffs)
- trunk/test/wsdl/any/expectedEcho.rb (modified) (1 diff)
- trunk/test/wsdl/marshal/person_org.rb (modified) (1 diff)
- trunk/test/wsdl/ref/expectedProduct.rb (modified) (5 diffs)
- trunk/test/wsdl/simpletype/rpc/expectedEchoVersion.rb (modified) (2 diffs)
- trunk/test/wsdl/soap/wsdl2ruby/expectedClassdef.rb (modified) (2 diffs)
- trunk/test/wsdl/soap/wsdl2ruby/section/expectedClassdef.rb (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/wsdl/soap/classDefCreator.rb
r1484 r1486 23 23 @simpletypes = definitions.collect_simpletypes 24 24 @complextypes = definitions.collect_complextypes 25 @faulttypes = definitions.collect_faulttypes if definitions.respond_to?(:collect_faulttypes) 25 @faulttypes = nil 26 if definitions.respond_to?(:collect_faulttypes) 27 @faulttypes = definitions.collect_faulttypes 28 end 26 29 end 27 30 … … 94 97 end 95 98 c = XSD::CodeGen::ModuleDef.new(create_class_name(qname)) 96 c.comment = "#{qname .namespace}"99 c.comment = "#{qname}" 97 100 const = {} 98 101 simpletype.restriction.enumeration.each do |value| … … 102 105 constname += "_#{const[constname]}" 103 106 end 104 c.def_const(constname, value.dump)107 c.def_const(constname, ndq(value)) 105 108 end 106 109 c.dump … … 111 114 base = create_class_name(type_or_element.simplecontent.base) 112 115 c = XSD::CodeGen::ClassDef.new(create_class_name(qname), base) 113 c.comment = "#{qname .namespace}"116 c.comment = "#{qname}" 114 117 c.dump 115 118 end … … 122 125 c = XSD::CodeGen::ClassDef.new(create_class_name(qname)) 123 126 end 124 c.comment = "#{qname .namespace}"125 c.def_classvar('schema_type', qname.name.dump)126 c.def_classvar('schema_ns', qname.namespace.dump)127 c.comment = "#{qname}" 128 c.def_classvar('schema_type', ndq(qname.name)) 129 c.def_classvar('schema_ns', ndq(qname.namespace)) 127 130 schema_element = [] 128 131 init_lines = '' … … 256 259 qname = complextype.name 257 260 c = XSD::CodeGen::ClassDef.new(create_class_name(qname), '::Array') 258 c.comment = "#{qname .namespace}"261 c.comment = "#{qname}" 259 262 type = complextype.child_type 260 c.def_classvar('schema_type', type.name.dump)261 c.def_classvar('schema_ns', type.namespace.dump)263 c.def_classvar('schema_type', ndq(type.name)) 264 c.def_classvar('schema_ns', ndq(type.namespace)) 262 265 c.dump 263 266 end trunk/test/wsdl/any/expectedEcho.rb
r1477 r1486 1 1 require 'xsd/qname' 2 2 3 # urn:example.com:echo-type3 # {urn:example.com:echo-type}foo.bar 4 4 class FooBar 5 5 @@schema_type = "foo.bar" trunk/test/wsdl/marshal/person_org.rb
r1477 r1486 1 1 require 'xsd/qname' 2 2 3 # http://www.jin.gr.jp/~nahi/xmlns/sample/Person3 # {http://www.jin.gr.jp/~nahi/xmlns/sample/Person}Person 4 4 class Person 5 5 @@schema_type = "Person" trunk/test/wsdl/ref/expectedProduct.rb
r1477 r1486 1 1 require 'xsd/qname' 2 2 3 # urn:product3 # {urn:product}Rating 4 4 module Rating 5 5 C_0 = "0" … … 8 8 end 9 9 10 # urn:product10 # {urn:product}Product-Bag 11 11 class ProductBag 12 12 @@schema_type = "Product-Bag" … … 54 54 end 55 55 56 # urn:product56 # {urn:product}Creator 57 57 class Creator 58 58 @@schema_type = "Creator" … … 64 64 end 65 65 66 # urn:product66 # {urn:product}Product 67 67 class Product 68 68 @@schema_type = "Product" … … 86 86 end 87 87 88 # urn:product88 # {urn:product}Comment 89 89 class Comment < String 90 90 end trunk/test/wsdl/simpletype/rpc/expectedEchoVersion.rb
r1477 r1486 1 1 require 'xsd/qname' 2 2 3 # urn:example.com:simpletype-rpc-type3 # {urn:example.com:simpletype-rpc-type}version_struct 4 4 class Version_struct 5 5 @@schema_type = "version_struct" … … 16 16 end 17 17 18 # urn:example.com:simpletype-rpc-type18 # {urn:example.com:simpletype-rpc-type}version 19 19 module Version 20 20 C_16 = "1.6" trunk/test/wsdl/soap/wsdl2ruby/expectedClassdef.rb
r1477 r1486 1 1 require 'xsd/qname' 2 2 3 # urn:example.com:simpletype-rpc-type3 # {urn:example.com:simpletype-rpc-type}version_struct 4 4 class Version_struct 5 5 @@schema_type = "version_struct" … … 16 16 end 17 17 18 # urn:example.com:simpletype-rpc-type18 # {urn:example.com:simpletype-rpc-type}version 19 19 module Version 20 20 C_16 = "1.6" trunk/test/wsdl/soap/wsdl2ruby/section/expectedClassdef.rb
r1477 r1486 1 1 require 'xsd/qname' 2 2 3 # urn:mysample3 # {urn:mysample}question 4 4 class Question 5 5 @@schema_type = "question" … … 14 14 end 15 15 16 # urn:mysample16 # {urn:mysample}section 17 17 class Section 18 18 @@schema_type = "section" … … 35 35 end 36 36 37 # urn:mysample37 # {urn:mysample}sectionArray 38 38 class SectionArray < ::Array 39 39 @@schema_type = "section"
