Changeset 1698
- Timestamp:
- 08/06/06 23:30:04 (2 years ago)
- Files:
-
- trunk/lib/soap/mapping/factory.rb (modified) (1 diff)
- trunk/lib/soap/rpc/router.rb (modified) (1 diff)
- trunk/sample/wsdl/PayPalSvc/client.rb (modified) (1 diff)
- trunk/sample/wsdl/documentliteral/echo.wsdl (modified) (1 diff)
- trunk/sample/wsdl/documentliteral/servant.rb (modified) (1 diff)
- trunk/test/wsdl/ref/expectedProduct.rb (modified) (1 diff)
- trunk/test/wsdl/ref/product.wsdl (modified) (1 diff)
- trunk/test/wsdl/ref/test_ref.rb (modified) (3 diffs)
- trunk/test/wsdl/rpc/rpc.wsdl (modified) (1 diff)
- trunk/test/wsdl/rpc/test_rpc.rb (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/soap/mapping/factory.rb
r1696 r1698 59 59 child = Mapping.get_attribute(obj, eledef.varname) 60 60 if child.is_a?(XSD::NSDBase) 61 ele.add(eledef. varname, child)61 ele.add(eledef.elename.name, child) 62 62 else 63 63 klass = Mapping.class_from_name(eledef.type) 64 64 if klass && klass.ancestors.include?(::SOAP::SOAPBasetype) 65 ele.add(eledef. varname, klass.new(child))65 ele.add(eledef.elename.name, klass.new(child)) 66 66 else 67 67 # should check klass matches an actual object? 68 ele.add(eledef. varname, Mapping._obj2soap(child, map))68 ele.add(eledef.elename.name, Mapping._obj2soap(child, map)) 69 69 end 70 70 end trunk/lib/soap/rpc/router.rb
r1670 r1698 472 472 if @doc_response_qnames.size == 0 473 473 result = [] 474 elsif @doc_response_qnames.size == 1 and !result.is_a?(Array)474 elsif @doc_response_qnames.size == 1 475 475 result = [result] 476 476 end trunk/sample/wsdl/PayPalSvc/client.rb
r1665 r1698 23 23 24 24 endpoint_url = ARGV.shift 25 obj = PayPalAPI Interface.new(endpoint_url)25 obj = PayPalAPIAAInterface.new(endpoint_url) 26 26 obj.headerhandler << RequesterCredentialsHandler.new('NaHi', 'pass', 'authorizing_account_emailaddress') 27 obj.test_loopback_response << "" 28 obj.wiredump_dev = STDOUT 27 obj.wiredump_dev = STDOUT if $DEBUG 28 29 obj.test_loopback_response << File.read("response.xml") 30 payerInfo = obj.getExpressCheckoutDetails(nil).getExpressCheckoutDetailsResponseDetails.payerInfo 31 p payerInfo.payerName.firstName 32 p payerInfo.payerBusiness 33 exit 29 34 30 35 getTransactionDetailsRequest = nil trunk/sample/wsdl/documentliteral/echo.wsdl
r1680 r1698 9 9 <xsd:schema targetNamespace="urn:com.example:echo" 10 10 elementFormDefault="qualified"> 11 <xsd:complexType name="TestType"> 12 <xsd:sequence> 13 <xsd:any minOccurs="0" maxOccurs="*" /> 14 </xsd:sequence> 15 </xsd:complexType> 11 16 <xsd:element name="echoRequest"> 12 17 <xsd:complexType> trunk/sample/wsdl/documentliteral/servant.rb
r1611 r1698 4 4 def echo(parameters) 5 5 response = EchoResponse.new 6 response .sampleMultiValue<< parameters.xmlattr_sampleAttr7 response .sampleMultiValue<< parameters.sampleElement6 response << parameters.xmlattr_sampleAttr 7 response << parameters.sampleElement 8 8 response 9 9 end trunk/test/wsdl/ref/expectedProduct.rb
r1689 r1698 22 22 ["bag", ["Product[]", XSD::QName.new(nil, "bag")]], 23 23 ["rating", ["SOAP::SOAPString[]", XSD::QName.new("urn:ref", "Rating")]], 24 ["comment_1", ["[]", XSD::QName.new(nil, " comment_1")]],24 ["comment_1", ["[]", XSD::QName.new(nil, "Comment_1")]], 25 25 ["comment_2", ["Comment[]", XSD::QName.new(nil, "comment-2")]], 26 26 ["v___point", ["C__point", XSD::QName.new(nil, "__point")]] trunk/test/wsdl/ref/product.wsdl
r1689 r1698 64 64 <element name="bag" type="tns:Product" minOccurs="0" maxOccurs="unbounded"/> 65 65 <element ref="tns:Rating" minOccurs="0" maxOccurs="unbounded"/> 66 <element name=" comment_1" minOccurs="0" maxOccurs="unbounded">66 <element name="Comment_1" minOccurs="0" maxOccurs="unbounded"> 67 67 <complexType> 68 68 <simpleContent> trunk/test/wsdl/ref/test_ref.rb
r1685 r1698 157 157 r2 = e(q(Namespace, "Rating"), "+1") 158 158 r3 = e(q(Namespace, "Rating"), "-1") 159 c11 = e(" comment_1", "comment11")159 c11 = e("Comment_1", "comment11") 160 160 c11.extraattr["msgid"] = "msgid11" 161 c12 = e(" comment_1", "comment12")161 c12 = e("Comment_1", "comment12") 162 162 c12.extraattr["msgid"] = "msgid12" 163 163 c21 = e("comment-2", "comment21") … … 206 206 r2 = Rating::C_1 207 207 r3 = Rating::C_1_2 208 c11 = ::SOAP::SOAPElement.new(" comment_1", "comment11")208 c11 = ::SOAP::SOAPElement.new("Comment_1", "comment11") 209 209 c11.extraattr["msgid"] = "msgid11" 210 c12 = ::SOAP::SOAPElement.new(" comment_1", "comment12")210 c12 = ::SOAP::SOAPElement.new("Comment_1", "comment12") 211 211 c12.extraattr["msgid"] = "msgid12" 212 212 c21 = Comment.new("comment21") … … 244 244 r2 = Rating::C_1 245 245 r3 = Rating::C_1_2 246 c11 = ::SOAP::SOAPElement.new(" comment_1", "comment11")246 c11 = ::SOAP::SOAPElement.new("Comment_1", "comment11") 247 247 c11.extraattr["msgid"] = "msgid11" 248 c12 = ::SOAP::SOAPElement.new(" comment_1", "comment12")248 c12 = ::SOAP::SOAPElement.new("Comment_1", "comment12") 249 249 c12.extraattr["msgid"] = "msgid12" 250 250 c21 = Comment.new("comment21") trunk/test/wsdl/rpc/rpc.wsdl
r1679 r1698 12 12 <xsd:all> 13 13 <xsd:element name="family-name" type="xsd:string" /> 14 <xsd:element name=" given_name" type="xsd:string" />14 <xsd:element name="Given_name" type="xsd:string" /> 15 15 <xsd:element name="age" type="xsd:int" /> 16 16 <xsd:element name="gender" type="txd:gender" /> trunk/test/wsdl/rpc/test_rpc.rb
r1679 r1698 17 17 end 18 18 19 DummyPerson = Struct.new("family-name".intern, : given_name)19 DummyPerson = Struct.new("family-name".intern, :Given_name) 20 20 def echo(arg1, arg2) 21 21 case arg1.family_name … … 32 32 end 33 33 34 ErrPerson = Struct.new(: given_name, :no_such_element)34 ErrPerson = Struct.new(:Given_name, :no_such_element) 35 35 def echo_err(arg1, arg2) 36 36 ErrPerson.new(58, Time.now)
