soap4r 1.5.7 → 1.5.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (199) hide show
  1. data/bin/wsdl2ruby.rb +8 -2
  2. data/lib/soap/baseData.rb +93 -43
  3. data/lib/soap/element.rb +11 -8
  4. data/lib/soap/encodingstyle/handler.rb +15 -4
  5. data/lib/soap/encodingstyle/literalHandler.rb +18 -24
  6. data/lib/soap/encodingstyle/soapHandler.rb +34 -77
  7. data/lib/soap/generator.rb +74 -48
  8. data/lib/soap/header/handler.rb +1 -1
  9. data/lib/soap/header/mappinghandler.rb +47 -0
  10. data/lib/soap/mapping/encodedregistry.rb +19 -13
  11. data/lib/soap/mapping/factory.rb +19 -3
  12. data/lib/soap/mapping/literalregistry.rb +47 -35
  13. data/lib/soap/mapping/mapping.rb +92 -24
  14. data/lib/soap/mapping/registry.rb +34 -18
  15. data/lib/soap/mapping/schemadefinition.rb +8 -1
  16. data/lib/soap/mapping/typeMap.rb +18 -0
  17. data/lib/soap/mapping/wsdlencodedregistry.rb +8 -50
  18. data/lib/soap/mapping/wsdlliteralregistry.rb +45 -39
  19. data/lib/soap/nestedexception.rb +42 -0
  20. data/lib/soap/netHttpClient.rb +1 -0
  21. data/lib/soap/ns.rb +34 -0
  22. data/lib/soap/parser.rb +32 -29
  23. data/lib/soap/processor.rb +1 -1
  24. data/lib/soap/rpc/driver.rb +1 -0
  25. data/lib/soap/rpc/element.rb +18 -6
  26. data/lib/soap/rpc/httpserver.rb +38 -24
  27. data/lib/soap/rpc/proxy.rb +14 -11
  28. data/lib/soap/rpc/router.rb +4 -1
  29. data/lib/soap/soap.rb +7 -6
  30. data/lib/soap/wsdlDriver.rb +29 -8
  31. data/lib/tags +5690 -0
  32. data/lib/wsdl/definitions.rb +26 -40
  33. data/lib/wsdl/info.rb +11 -0
  34. data/lib/wsdl/parser.rb +2 -2
  35. data/lib/wsdl/soap/cgiStubCreator.rb +10 -5
  36. data/lib/wsdl/soap/classDefCreator.rb +140 -113
  37. data/lib/wsdl/soap/classDefCreatorSupport.rb +94 -12
  38. data/lib/wsdl/soap/classNameCreator.rb +54 -0
  39. data/lib/wsdl/soap/clientSkeltonCreator.rb +6 -5
  40. data/lib/wsdl/soap/complexType.rb +10 -1
  41. data/lib/wsdl/soap/definitions.rb +4 -0
  42. data/lib/wsdl/soap/driverCreator.rb +14 -6
  43. data/lib/wsdl/soap/element.rb +4 -0
  44. data/lib/wsdl/soap/encodedMappingRegistryCreator.rb +11 -55
  45. data/lib/wsdl/soap/literalMappingRegistryCreator.rb +28 -126
  46. data/lib/wsdl/soap/mappingRegistryCreator.rb +9 -3
  47. data/lib/wsdl/soap/mappingRegistryCreatorSupport.rb +209 -94
  48. data/lib/wsdl/soap/methodDefCreator.rb +12 -16
  49. data/lib/wsdl/soap/servantSkeltonCreator.rb +3 -2
  50. data/lib/wsdl/soap/servletStubCreator.rb +107 -0
  51. data/lib/wsdl/soap/standaloneServerStubCreator.rb +10 -5
  52. data/lib/wsdl/soap/wsdl2ruby.rb +28 -13
  53. data/lib/wsdl/wsdl.rb +2 -1
  54. data/lib/wsdl/xmlSchema/anyAttribute.rb +48 -0
  55. data/lib/wsdl/xmlSchema/attributeGroup.rb +86 -0
  56. data/lib/wsdl/xmlSchema/choice.rb +4 -1
  57. data/lib/wsdl/xmlSchema/complexContent.rb +1 -1
  58. data/lib/wsdl/xmlSchema/complexExtension.rb +9 -1
  59. data/lib/wsdl/xmlSchema/complexRestriction.rb +8 -0
  60. data/lib/wsdl/xmlSchema/complexType.rb +38 -5
  61. data/lib/wsdl/xmlSchema/data.rb +30 -7
  62. data/lib/wsdl/xmlSchema/element.rb +10 -2
  63. data/lib/wsdl/xmlSchema/fractiondigits.rb +37 -0
  64. data/lib/wsdl/xmlSchema/group.rb +118 -0
  65. data/lib/wsdl/xmlSchema/import.rb +11 -23
  66. data/lib/wsdl/xmlSchema/importHandler.rb +45 -0
  67. data/lib/wsdl/xmlSchema/include.rb +11 -17
  68. data/lib/wsdl/xmlSchema/length.rb +3 -1
  69. data/lib/wsdl/xmlSchema/maxexclusive.rb +37 -0
  70. data/lib/wsdl/xmlSchema/maxinclusive.rb +37 -0
  71. data/lib/wsdl/xmlSchema/maxlength.rb +3 -1
  72. data/lib/wsdl/xmlSchema/minexclusive.rb +37 -0
  73. data/lib/wsdl/xmlSchema/mininclusive.rb +37 -0
  74. data/lib/wsdl/xmlSchema/minlength.rb +3 -1
  75. data/lib/wsdl/xmlSchema/schema.rb +34 -0
  76. data/lib/wsdl/xmlSchema/sequence.rb +4 -1
  77. data/lib/wsdl/xmlSchema/simpleExtension.rb +8 -0
  78. data/lib/wsdl/xmlSchema/simpleRestriction.rb +49 -8
  79. data/lib/wsdl/xmlSchema/totaldigits.rb +37 -0
  80. data/lib/wsdl/xmlSchema/whitespace.rb +37 -0
  81. data/lib/wsdl/xmlSchema/xsd2ruby.rb +13 -4
  82. data/lib/xsd/charset.rb +8 -6
  83. data/lib/xsd/codegen/classdef.rb +5 -0
  84. data/lib/xsd/codegen/moduledef.rb +17 -0
  85. data/lib/xsd/datatypes.rb +165 -20
  86. data/lib/xsd/mapping.rb +13 -5
  87. data/lib/xsd/namedelements.rb +8 -0
  88. data/lib/xsd/ns.rb +50 -14
  89. data/lib/xsd/qname.rb +3 -2
  90. data/lib/xsd/xmlparser.rb +4 -3
  91. data/test/soap/asp.net/test_aspdotnet.rb +1 -1
  92. data/test/soap/auth/test_basic.rb +4 -3
  93. data/test/soap/auth/test_digest.rb +4 -3
  94. data/test/soap/calc/test_calc.rb +6 -4
  95. data/test/soap/calc/test_calc2.rb +6 -4
  96. data/test/soap/calc/test_calc_cgi.rb +6 -4
  97. data/test/soap/fault/test_customfault.rb +6 -4
  98. data/test/soap/fault/test_soaparray.rb +35 -0
  99. data/test/soap/filter/test_filter.rb +2 -2
  100. data/test/soap/header/test_authheader.rb +2 -2
  101. data/test/soap/header/test_authheader_cgi.rb +3 -3
  102. data/test/soap/header/test_simplehandler.rb +2 -2
  103. data/test/soap/helloworld/test_helloworld.rb +6 -4
  104. data/test/soap/ssl/test_ssl.rb +1 -1
  105. data/test/soap/struct/test_struct.rb +2 -2
  106. data/test/soap/swa/test_file.rb +6 -4
  107. data/test/soap/test_basetype.rb +4 -4
  108. data/test/soap/test_cookie.rb +2 -2
  109. data/test/soap/test_custom_ns.rb +50 -8
  110. data/test/soap/test_custommap.rb +6 -4
  111. data/test/soap/test_empty.rb +6 -4
  112. data/test/soap/test_envelopenamespace.rb +2 -2
  113. data/test/soap/test_extraattr.rb +6 -7
  114. data/test/soap/test_generator.rb +27 -0
  115. data/test/soap/test_mapping.rb +10 -0
  116. data/test/soap/test_nestedexception.rb +56 -0
  117. data/test/soap/test_nil.rb +6 -4
  118. data/test/soap/test_no_indent.rb +6 -4
  119. data/test/soap/test_response_as_xml.rb +2 -2
  120. data/test/soap/test_streamhandler.rb +6 -3
  121. data/test/soap/test_styleuse.rb +2 -2
  122. data/test/soap/wsdlDriver/test_calc.rb +2 -2
  123. data/test/soap/wsdlDriver/test_document.rb +2 -2
  124. data/test/soap/wsdlDriver/test_simpletype.rb +2 -2
  125. data/test/wsdl/abstract/test_abstract.rb +1 -1
  126. data/test/wsdl/anonymous/expectedClassDef.rb +128 -0
  127. data/test/wsdl/anonymous/expectedDriver.rb +59 -0
  128. data/test/wsdl/anonymous/expectedMappingRegistry.rb +176 -0
  129. data/test/wsdl/anonymous/lp.wsdl +147 -0
  130. data/test/wsdl/anonymous/test_anonymous.rb +130 -0
  131. data/test/wsdl/any/expectedDriver.rb +3 -2
  132. data/test/wsdl/any/expectedEcho.rb +22 -2
  133. data/test/wsdl/any/expectedMappingRegistry.rb +63 -0
  134. data/test/wsdl/any/expectedService.rb +3 -1
  135. data/test/wsdl/any/test_any.rb +2 -7
  136. data/test/wsdl/axisArray/axisArray.wsdl +31 -4
  137. data/test/wsdl/axisArray/test_axisarray.rb +58 -3
  138. data/test/wsdl/choice/choice.wsdl +39 -0
  139. data/test/wsdl/choice/test_choice.rb +134 -7
  140. data/test/wsdl/complexcontent/test_echo.rb +1 -1
  141. data/test/wsdl/datetime/test_datetime.rb +2 -2
  142. data/test/wsdl/document/array/double.wsdl +45 -6
  143. data/test/wsdl/document/array/test_array.rb +68 -1
  144. data/test/wsdl/document/document.wsdl +2 -0
  145. data/test/wsdl/document/test_nosoapaction.rb +1 -1
  146. data/test/wsdl/document/test_number.rb +1 -1
  147. data/test/wsdl/document/test_rpc.rb +78 -9
  148. data/test/wsdl/fault/test_fault.rb +1 -1
  149. data/test/wsdl/fault/test_multifault.rb +1 -1
  150. data/test/wsdl/group/expectedClassdef.rb +58 -0
  151. data/test/wsdl/group/expectedDriver.rb +51 -0
  152. data/test/wsdl/group/expectedMappingRegistry.rb +67 -0
  153. data/test/wsdl/group/group.wsdl +88 -0
  154. data/test/wsdl/group/test_rpc.rb +145 -0
  155. data/test/wsdl/list/test_list.rb +1 -1
  156. data/test/wsdl/map/test_map.rb +2 -2
  157. data/test/wsdl/marshal/person_org.rb +5 -0
  158. data/test/wsdl/multiplefault.wsdl +11 -4
  159. data/test/wsdl/oneway/test_oneway.rb +1 -1
  160. data/test/wsdl/overload/test_overload.rb +1 -1
  161. data/test/wsdl/qualified/test_qualified.rb +1 -1
  162. data/test/wsdl/qualified/test_unqualified.rb +1 -1
  163. data/test/wsdl/raa/RAAService.rb +62 -57
  164. data/test/wsdl/raa/expectedClassDef.rb +100 -0
  165. data/test/wsdl/raa/expectedDriver.rb +96 -0
  166. data/test/wsdl/raa/expectedMappingRegistry.rb +121 -0
  167. data/test/wsdl/raa/test_raa.rb +54 -19
  168. data/test/wsdl/ref/expectedDriver.rb +1 -1
  169. data/test/wsdl/ref/expectedProduct.rb +101 -16
  170. data/test/wsdl/ref/test_ref.rb +2 -1
  171. data/test/wsdl/rpc/test_rpc.rb +1 -2
  172. data/test/wsdl/rpc/test_rpc_lit.rb +13 -13
  173. data/test/wsdl/simplecontent/test_simplecontent.rb +5 -5
  174. data/test/wsdl/simpletype/rpc/expectedDriver.rb +3 -2
  175. data/test/wsdl/simpletype/rpc/expectedEchoVersion.rb +2 -0
  176. data/test/wsdl/simpletype/rpc/expectedMappingRegistry.rb +10 -17
  177. data/test/wsdl/simpletype/rpc/expectedService.rb +4 -2
  178. data/test/wsdl/simpletype/test_simpletype.rb +2 -2
  179. data/test/wsdl/soap/test_soapbodyparts.rb +2 -2
  180. data/test/wsdl/soap/wsdl2ruby/expectedClassdef.rb +2 -0
  181. data/test/wsdl/soap/wsdl2ruby/expectedDriver.rb +3 -2
  182. data/test/wsdl/soap/wsdl2ruby/expectedMappingRegistry.rb +5 -9
  183. data/test/wsdl/soap/wsdl2ruby/expectedService.cgi +4 -2
  184. data/test/wsdl/soap/wsdl2ruby/expectedService.rb +4 -2
  185. data/test/wsdl/soap/wsdl2ruby/section/expectedClassdef.rb +6 -0
  186. data/test/wsdl/soap/wsdl2ruby/soapenc/test_soapenc.rb +1 -1
  187. data/test/wsdl/soaptype/test_soaptype.rb +1 -1
  188. data/test/wsdl/test_multiplefault.rb +3 -1
  189. data/test/xsd/codegen/test_classdef.rb +30 -0
  190. data/test/xsd/test_ns.rb +21 -0
  191. data/test/xsd/test_xsd.rb +5 -4
  192. data/test/xsd/xsd2ruby/expected_mysample.rb +13 -2
  193. data/test/xsd/xsd2ruby/expected_mysample_mapping_registry.rb +5 -11
  194. data/test/xsd/xsd2ruby/section.xsd +8 -0
  195. metadata +40 -8
  196. data/test/wsdl/axisArray/itemList.rb +0 -14
  197. data/test/wsdl/raa/RAA.rb +0 -120
  198. data/test/wsdl/raa/RAAServant.rb +0 -107
  199. data/test/wsdl/raa/server.rb +0 -103
data/test/wsdl/ref/test_ref.rb CHANGED
@@ -63,7 +63,7 @@ class TestRef < Test::Unit::TestCase
63
63
  end
64
64
 
65
65
  def teardown
66
- teardown_server
66
+ teardown_server if @server
67
67
  unless $DEBUG
68
68
  File.unlink(pathname('product.rb'))
69
69
  File.unlink(pathname('productMappingRegistry.rb'))
@@ -111,6 +111,7 @@ class TestRef < Test::Unit::TestCase
111
111
  gen.location = pathname("product.wsdl")
112
112
  gen.basedir = DIR
113
113
  gen.logger.level = Logger::FATAL
114
+ gen.opt['module_path'] = self.class.to_s.sub(/::[^:]+$/, '')
114
115
  gen.opt['classdef'] = nil
115
116
  gen.opt['force'] = true
116
117
  TestUtil.silent do
data/test/wsdl/rpc/test_rpc.rb CHANGED
@@ -66,7 +66,7 @@ class TestRPC < Test::Unit::TestCase
66
66
  end
67
67
 
68
68
  def teardown
69
- teardown_server
69
+ teardown_server if @server
70
70
  unless $DEBUG
71
71
  File.unlink(pathname('echo.rb'))
72
72
  File.unlink(pathname('echoMappingRegistry.rb'))
@@ -165,7 +165,6 @@ class TestRPC < Test::Unit::TestCase
165
165
 
166
166
  def test_basetype_stub
167
167
  @client = Prefix::Echo_port_type.new("http://localhost:#{Port}/")
168
- @client.mapping_registry = Prefix::EchoMappingRegistry::EncodedRegistry
169
168
  @client.wiredump_dev = STDERR if $DEBUG
170
169
 
171
170
  ret = @client.echo_basetype(Time.now, 12345)
data/test/wsdl/rpc/test_rpc_lit.rb CHANGED
@@ -104,7 +104,7 @@ class TestRPCLIT < Test::Unit::TestCase
104
104
  end
105
105
 
106
106
  def teardown
107
- teardown_server
107
+ teardown_server if @server
108
108
  unless $DEBUG
109
109
  File.unlink(pathname('RPC-Literal-TestDefinitions.rb'))
110
110
  File.unlink(pathname('RPC-Literal-TestDefinitionsMappingRegistry.rb'))
@@ -159,11 +159,11 @@ class TestRPCLIT < Test::Unit::TestCase
159
159
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
160
160
  <env:Body>
161
161
  <n1:echoStringArray xmlns:n1="http://soapbuilders.org/rpc-lit-test">
162
- <n2:inputStringArray xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
162
+ <inputStringArray xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
163
163
  <n2:stringItem>a</n2:stringItem>
164
164
  <n2:stringItem>b</n2:stringItem>
165
165
  <n2:stringItem>c</n2:stringItem>
166
- </n2:inputStringArray>
166
+ </inputStringArray>
167
167
  </n1:echoStringArray>
168
168
  </env:Body>
169
169
  </env:Envelope>]
@@ -193,7 +193,7 @@ class TestRPCLIT < Test::Unit::TestCase
193
193
  [ECHO_STRING_ARRAY_REQUEST, parse_requestxml(str)].join("\n\n"))
194
194
  assert_equal(ECHO_STRING_ARRAY_RESPONSE, parse_responsexml(str),
195
195
  [ECHO_STRING_ARRAY_RESPONSE, parse_responsexml(str)].join("\n\n"))
196
- assert_equal(["a", "b", "c"], result.stringItem)
196
+ assert_equal(ArrayOfstring["a", "b", "c"], result)
197
197
  end
198
198
 
199
199
  ECHO_STRING_ARRAY_INLINE_REQUEST =
@@ -202,11 +202,11 @@ class TestRPCLIT < Test::Unit::TestCase
202
202
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
203
203
  <env:Body>
204
204
  <n1:echoStringArrayInline xmlns:n1="http://soapbuilders.org/rpc-lit-test">
205
- <n2:inputStringArray xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
205
+ <inputStringArray>
206
206
  <stringItem>a</stringItem>
207
207
  <stringItem>b</stringItem>
208
208
  <stringItem>c</stringItem>
209
- </n2:inputStringArray>
209
+ </inputStringArray>
210
210
  </n1:echoStringArrayInline>
211
211
  </env:Body>
212
212
  </env:Envelope>]
@@ -232,7 +232,7 @@ class TestRPCLIT < Test::Unit::TestCase
232
232
  drv.generate_explicit_type = false
233
233
  # response contains only 1 part.
234
234
  result = drv.echoStringArrayInline(ArrayOfstringInline["a", "b", "c"])[0]
235
- assert_equal(["a", "b", "c"], result.stringItem)
235
+ assert_equal(ArrayOfstring["a", "b", "c"], result)
236
236
  assert_equal(ECHO_STRING_ARRAY_INLINE_REQUEST, parse_requestxml(str),
237
237
  [ECHO_STRING_ARRAY_INLINE_REQUEST, parse_requestxml(str)].join("\n\n"))
238
238
  assert_equal(ECHO_STRING_ARRAY_INLINE_RESPONSE, parse_responsexml(str))
@@ -244,7 +244,7 @@ class TestRPCLIT < Test::Unit::TestCase
244
244
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
245
245
  <env:Body>
246
246
  <n1:echoNestedStruct xmlns:n1="http://soapbuilders.org/rpc-lit-test">
247
- <n2:inputStruct xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
247
+ <inputStruct xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
248
248
  <varString>str</varString>
249
249
  <varInt>1</varInt>
250
250
  <varFloat>+1</varFloat>
@@ -253,7 +253,7 @@ class TestRPCLIT < Test::Unit::TestCase
253
253
  <varInt>1</varInt>
254
254
  <varFloat>+1</varFloat>
255
255
  </n2:structItem>
256
- </n2:inputStruct>
256
+ </inputStruct>
257
257
  </n1:echoNestedStruct>
258
258
  </env:Body>
259
259
  </env:Envelope>]
@@ -303,7 +303,7 @@ class TestRPCLIT < Test::Unit::TestCase
303
303
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
304
304
  <env:Body>
305
305
  <n1:echoNestedStruct xmlns:n1="http://soapbuilders.org/rpc-lit-test">
306
- <n2:inputStruct xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
306
+ <inputStruct xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
307
307
  <varString>str</varString>
308
308
  <varFloat>+1</varFloat>
309
309
  <n2:structItem>
@@ -311,7 +311,7 @@ class TestRPCLIT < Test::Unit::TestCase
311
311
  <varInt xsi:nil="true"></varInt>
312
312
  <varFloat>+1</varFloat>
313
313
  </n2:structItem>
314
- </n2:inputStruct>
314
+ </inputStruct>
315
315
  </n1:echoNestedStruct>
316
316
  </env:Body>
317
317
  </env:Envelope>]
@@ -382,7 +382,7 @@ class TestRPCLIT < Test::Unit::TestCase
382
382
  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
383
383
  <env:Body>
384
384
  <n1:echoStructArray xmlns:n1="http://soapbuilders.org/rpc-lit-test">
385
- <n2:inputStructArray xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
385
+ <inputStructArray xmlns:n2="http://soapbuilders.org/rpc-lit-test/types">
386
386
  <n2:structItem>
387
387
  <varString>str</varString>
388
388
  <varInt>2</varInt>
@@ -393,7 +393,7 @@ class TestRPCLIT < Test::Unit::TestCase
393
393
  <varInt>2</varInt>
394
394
  <varFloat>+2.1</varFloat>
395
395
  </n2:structItem>
396
- </n2:inputStructArray>
396
+ </inputStructArray>
397
397
  </n1:echoStructArray>
398
398
  </env:Body>
399
399
  </env:Envelope>]
data/test/wsdl/simplecontent/test_simplecontent.rb CHANGED
@@ -36,7 +36,7 @@ class TestSimpleContent < Test::Unit::TestCase
36
36
  end
37
37
 
38
38
  def teardown
39
- teardown_server
39
+ teardown_server if @server
40
40
  unless $DEBUG
41
41
  File.unlink(pathname('simpleContent.rb'))
42
42
  File.unlink(pathname('simpleContentMappingRegistry.rb'))
@@ -81,9 +81,9 @@ class TestSimpleContent < Test::Unit::TestCase
81
81
 
82
82
  list = PhoneList.new
83
83
  list.xmlattr_default = "default"
84
- phone1 = PhoneNumber.new("12345")
84
+ phone1 = PhoneNumber.new("12<>345")
85
85
  phone1.xmlattr_type = PhoneNumberType::Fax
86
- phone2 = PhoneNumber.new("23456")
86
+ phone2 = PhoneNumber.new("234<>56")
87
87
  phone2.xmlattr_type = PhoneNumberType::Home
88
88
  list.phone << phone1 << phone2
89
89
  address = Address.new(list, "addr")
@@ -91,9 +91,9 @@ class TestSimpleContent < Test::Unit::TestCase
91
91
 
92
92
  assert_equal(address.blah, ret.blah)
93
93
  assert_equal(2, ret.list.phone.size)
94
- assert_equal("12345", ret.list.phone[0])
94
+ assert_equal("12<>345", ret.list.phone[0])
95
95
  assert_equal(PhoneNumberType::Fax, ret.list.phone[0].xmlattr_type)
96
- assert_equal("23456", ret.list.phone[1])
96
+ assert_equal("234<>56", ret.list.phone[1])
97
97
  assert_equal(PhoneNumberType::Home, ret.list.phone[1].xmlattr_type)
98
98
  end
99
99
  end
data/test/wsdl/simpletype/rpc/expectedDriver.rb CHANGED
@@ -4,9 +4,10 @@ require 'soap/rpc/driver'
4
4
 
5
5
  class Echo_version_port_type < ::SOAP::RPC::Driver
6
6
  DefaultEndpointUrl = "http://localhost:10080"
7
+ NsSimpletypeRpc = "urn:example.com:simpletype-rpc"
7
8
 
8
9
  Methods = [
9
- [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version"),
10
+ [ XSD::QName.new(NsSimpletypeRpc, "echo_version"),
10
11
  "urn:example.com:simpletype-rpc",
11
12
  "echo_version",
12
13
  [ ["in", "version", [nil, "urn:example.com:simpletype-rpc-type", "version"]],
@@ -15,7 +16,7 @@ class Echo_version_port_type < ::SOAP::RPC::Driver
15
16
  :response_style => :rpc, :response_use => :encoded,
16
17
  :faults => {} }
17
18
  ],
18
- [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version_r"),
19
+ [ XSD::QName.new(NsSimpletypeRpc, "echo_version_r"),
19
20
  "urn:example.com:simpletype-rpc",
20
21
  "echo_version_r",
21
22
  [ ["in", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]],
data/test/wsdl/simpletype/rpc/expectedEchoVersion.rb CHANGED
@@ -1,6 +1,8 @@
1
1
  require 'xsd/qname'
2
2
 
3
3
  # {urn:example.com:simpletype-rpc-type}version_struct
4
+ # version - Version
5
+ # msg - SOAP::SOAPString
4
6
  class Version_struct
5
7
  attr_accessor :version
6
8
  attr_accessor :msg
data/test/wsdl/simpletype/rpc/expectedMappingRegistry.rb CHANGED
@@ -4,11 +4,11 @@ require 'soap/mapping'
4
4
  module Echo_versionMappingRegistry
5
5
  EncodedRegistry = ::SOAP::Mapping::EncodedRegistry.new
6
6
  LiteralRegistry = ::SOAP::Mapping::LiteralRegistry.new
7
+ NsSimpletypeRpcType = "urn:example.com:simpletype-rpc-type"
7
8
 
8
9
  EncodedRegistry.register(
9
10
  :class => Version_struct,
10
- :schema_ns => "urn:example.com:simpletype-rpc-type",
11
- :schema_type => "version_struct",
11
+ :schema_type => XSD::QName.new(NsSimpletypeRpcType, "version_struct"),
12
12
  :schema_element => [
13
13
  ["version", ["Version", XSD::QName.new(nil, "version")]],
14
14
  ["msg", ["SOAP::SOAPString", XSD::QName.new(nil, "msg")]]
@@ -17,27 +17,22 @@ module Echo_versionMappingRegistry
17
17
 
18
18
  EncodedRegistry.register(
19
19
  :class => Version,
20
- :schema_ns => "urn:example.com:simpletype-rpc-type",
21
- :schema_type => "version"
20
+ :schema_type => XSD::QName.new(NsSimpletypeRpcType, "version")
22
21
  )
23
22
 
24
23
  EncodedRegistry.register(
25
24
  :class => StateType,
26
- :schema_ns => "urn:example.com:simpletype-rpc-type",
27
- :schema_type => "stateType"
25
+ :schema_type => XSD::QName.new(NsSimpletypeRpcType, "stateType")
28
26
  )
29
27
 
30
28
  EncodedRegistry.register(
31
29
  :class => ZipIntType,
32
- :schema_ns => "urn:example.com:simpletype-rpc-type",
33
- :schema_type => "zipIntType"
30
+ :schema_type => XSD::QName.new(NsSimpletypeRpcType, "zipIntType")
34
31
  )
35
32
 
36
33
  LiteralRegistry.register(
37
34
  :class => Version_struct,
38
- :schema_ns => "urn:example.com:simpletype-rpc-type",
39
- :schema_type => "version_struct",
40
- :schema_qualified => false,
35
+ :schema_type => XSD::QName.new(NsSimpletypeRpcType, "version_struct"),
41
36
  :schema_element => [
42
37
  ["version", ["Version", XSD::QName.new(nil, "version")]],
43
38
  ["msg", ["SOAP::SOAPString", XSD::QName.new(nil, "msg")]]
@@ -46,19 +41,17 @@ module Echo_versionMappingRegistry
46
41
 
47
42
  LiteralRegistry.register(
48
43
  :class => Version,
49
- :schema_ns => "urn:example.com:simpletype-rpc-type",
50
- :schema_type => "version"
44
+ :schema_type => XSD::QName.new(NsSimpletypeRpcType, "version")
51
45
  )
52
46
 
53
47
  LiteralRegistry.register(
54
48
  :class => StateType,
55
- :schema_ns => "urn:example.com:simpletype-rpc-type",
56
- :schema_type => "stateType"
49
+ :schema_type => XSD::QName.new(NsSimpletypeRpcType, "stateType")
57
50
  )
58
51
 
59
52
  LiteralRegistry.register(
60
53
  :class => ZipIntType,
61
- :schema_ns => "urn:example.com:simpletype-rpc-type",
62
- :schema_type => "zipIntType"
54
+ :schema_type => XSD::QName.new(NsSimpletypeRpcType, "zipIntType")
63
55
  )
56
+
64
57
  end
data/test/wsdl/simpletype/rpc/expectedService.rb CHANGED
@@ -4,8 +4,10 @@ require 'echo_versionMappingRegistry.rb'
4
4
  require 'soap/rpc/standaloneServer'
5
5
 
6
6
  class Echo_version_port_type
7
+ NsSimpletypeRpc = "urn:example.com:simpletype-rpc"
8
+
7
9
  Methods = [
8
- [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version"),
10
+ [ XSD::QName.new(NsSimpletypeRpc, "echo_version"),
9
11
  "urn:example.com:simpletype-rpc",
10
12
  "echo_version",
11
13
  [ ["in", "version", [nil, "urn:example.com:simpletype-rpc-type", "version"]],
@@ -14,7 +16,7 @@ class Echo_version_port_type
14
16
  :response_style => :rpc, :response_use => :encoded,
15
17
  :faults => {} }
16
18
  ],
17
- [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version_r"),
19
+ [ XSD::QName.new(NsSimpletypeRpc, "echo_version_r"),
18
20
  "urn:example.com:simpletype-rpc",
19
21
  "echo_version_r",
20
22
  [ ["in", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]],
data/test/wsdl/simpletype/test_simpletype.rb CHANGED
@@ -54,8 +54,8 @@ class TestSimpleType < Test::Unit::TestCase
54
54
  end
55
55
 
56
56
  def teardown
57
- teardown_server
58
- teardown_client
57
+ teardown_server if @server
58
+ teardown_client if @client
59
59
  end
60
60
 
61
61
  def teardown_server
data/test/wsdl/soap/test_soapbodyparts.rb CHANGED
@@ -52,8 +52,8 @@ class TestSOAPBodyParts < Test::Unit::TestCase
52
52
  end
53
53
 
54
54
  def teardown
55
- teardown_server
56
- teardown_client
55
+ teardown_server if @server
56
+ teardown_client if @client
57
57
  end
58
58
 
59
59
  def teardown_server
data/test/wsdl/soap/wsdl2ruby/expectedClassdef.rb CHANGED
@@ -1,6 +1,8 @@
1
1
  require 'xsd/qname'
2
2
 
3
3
  # {urn:example.com:simpletype-rpc-type}version_struct
4
+ # version - Version
5
+ # msg - SOAP::SOAPString
4
6
  class Version_struct
5
7
  attr_accessor :version
6
8
  attr_accessor :msg
data/test/wsdl/soap/wsdl2ruby/expectedDriver.rb CHANGED
@@ -4,9 +4,10 @@ require 'soap/rpc/driver'
4
4
 
5
5
  class Echo_version_port_type < ::SOAP::RPC::Driver
6
6
  DefaultEndpointUrl = "http://localhost:10080"
7
+ NsSimpletypeRpc = "urn:example.com:simpletype-rpc"
7
8
 
8
9
  Methods = [
9
- [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version"),
10
+ [ XSD::QName.new(NsSimpletypeRpc, "echo_version"),
10
11
  "urn:example.com:simpletype-rpc",
11
12
  "echo_version",
12
13
  [ ["in", "version", [nil, "urn:example.com:simpletype-rpc-type", "version"]],
@@ -15,7 +16,7 @@ class Echo_version_port_type < ::SOAP::RPC::Driver
15
16
  :response_style => :rpc, :response_use => :encoded,
16
17
  :faults => {} }
17
18
  ],
18
- [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version_r"),
19
+ [ XSD::QName.new(NsSimpletypeRpc, "echo_version_r"),
19
20
  "urn:example.com:simpletype-rpc",
20
21
  "echo_version_r",
21
22
  [ ["in", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]],
data/test/wsdl/soap/wsdl2ruby/expectedMappingRegistry.rb CHANGED
@@ -4,11 +4,11 @@ require 'soap/mapping'
4
4
  module Echo_versionMappingRegistry
5
5
  EncodedRegistry = ::SOAP::Mapping::EncodedRegistry.new
6
6
  LiteralRegistry = ::SOAP::Mapping::LiteralRegistry.new
7
+ NsSimpletypeRpcType = "urn:example.com:simpletype-rpc-type"
7
8
 
8
9
  EncodedRegistry.register(
9
10
  :class => Version_struct,
10
- :schema_ns => "urn:example.com:simpletype-rpc-type",
11
- :schema_type => "version_struct",
11
+ :schema_type => XSD::QName.new(NsSimpletypeRpcType, "version_struct"),
12
12
  :schema_element => [
13
13
  ["version", ["Version", XSD::QName.new(nil, "version")]],
14
14
  ["msg", ["SOAP::SOAPString", XSD::QName.new(nil, "msg")]]
@@ -17,15 +17,12 @@ module Echo_versionMappingRegistry
17
17
 
18
18
  EncodedRegistry.register(
19
19
  :class => Version,
20
- :schema_ns => "urn:example.com:simpletype-rpc-type",
21
- :schema_type => "version"
20
+ :schema_type => XSD::QName.new(NsSimpletypeRpcType, "version")
22
21
  )
23
22
 
24
23
  LiteralRegistry.register(
25
24
  :class => Version_struct,
26
- :schema_ns => "urn:example.com:simpletype-rpc-type",
27
- :schema_type => "version_struct",
28
- :schema_qualified => false,
25
+ :schema_type => XSD::QName.new(NsSimpletypeRpcType, "version_struct"),
29
26
  :schema_element => [
30
27
  ["version", ["Version", XSD::QName.new(nil, "version")]],
31
28
  ["msg", ["SOAP::SOAPString", XSD::QName.new(nil, "msg")]]
@@ -34,7 +31,6 @@ module Echo_versionMappingRegistry
34
31
 
35
32
  LiteralRegistry.register(
36
33
  :class => Version,
37
- :schema_ns => "urn:example.com:simpletype-rpc-type",
38
- :schema_type => "version"
34
+ :schema_type => XSD::QName.new(NsSimpletypeRpcType, "version")
39
35
  )
40
36
  end
data/test/wsdl/soap/wsdl2ruby/expectedService.cgi CHANGED
@@ -4,8 +4,10 @@ require 'echo_versionMappingRegistry.rb'
4
4
  require 'soap/rpc/cgistub'
5
5
 
6
6
  class Echo_version_port_type
7
+ NsSimpletypeRpc = "urn:example.com:simpletype-rpc"
8
+
7
9
  Methods = [
8
- [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version"),
10
+ [ XSD::QName.new(NsSimpletypeRpc, "echo_version"),
9
11
  "urn:example.com:simpletype-rpc",
10
12
  "echo_version",
11
13
  [ ["in", "version", [nil, "urn:example.com:simpletype-rpc-type", "version"]],
@@ -14,7 +16,7 @@ class Echo_version_port_type
14
16
  :response_style => :rpc, :response_use => :encoded,
15
17
  :faults => {} }
16
18
  ],
17
- [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version_r"),
19
+ [ XSD::QName.new(NsSimpletypeRpc, "echo_version_r"),
18
20
  "urn:example.com:simpletype-rpc",
19
21
  "echo_version_r",
20
22
  [ ["in", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]],
data/test/wsdl/soap/wsdl2ruby/expectedService.rb CHANGED
@@ -4,8 +4,10 @@ require 'echo_versionMappingRegistry.rb'
4
4
  require 'soap/rpc/standaloneServer'
5
5
 
6
6
  class Echo_version_port_type
7
+ NsSimpletypeRpc = "urn:example.com:simpletype-rpc"
8
+
7
9
  Methods = [
8
- [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version"),
10
+ [ XSD::QName.new(NsSimpletypeRpc, "echo_version"),
9
11
  "urn:example.com:simpletype-rpc",
10
12
  "echo_version",
11
13
  [ ["in", "version", [nil, "urn:example.com:simpletype-rpc-type", "version"]],
@@ -14,7 +16,7 @@ class Echo_version_port_type
14
16
  :response_style => :rpc, :response_use => :encoded,
15
17
  :faults => {} }
16
18
  ],
17
- [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version_r"),
19
+ [ XSD::QName.new(NsSimpletypeRpc, "echo_version_r"),
18
20
  "urn:example.com:simpletype-rpc",
19
21
  "echo_version_r",
20
22
  [ ["in", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]],
data/test/wsdl/soap/wsdl2ruby/section/expectedClassdef.rb CHANGED
@@ -1,6 +1,7 @@
1
1
  require 'xsd/qname'
2
2
 
3
3
  # {urn:mysample}question
4
+ # something - SOAP::SOAPString
4
5
  class Question
5
6
  attr_accessor :something
6
7
 
@@ -10,6 +11,11 @@ class Question
10
11
  end
11
12
 
12
13
  # {urn:mysample}section
14
+ # sectionID - SOAP::SOAPInt
15
+ # name - SOAP::SOAPString
16
+ # description - SOAP::SOAPString
17
+ # index - SOAP::SOAPInt
18
+ # firstQuestion - Question
13
19
  class Section
14
20
  attr_accessor :sectionID
15
21
  attr_accessor :name