wasabi 2.4.0 → 2.4.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.4.1 (2012-06-18)
+
+* Fix: [rubiii/savon#296](https://github.com/rubiii/savon/issues/296) fixes an issue where
+  the WSDL message element doesn't have part element.
+
 ## 2.4.0 (2012-06-08)
 
 * Feature: `Wasabi::Document` now accepts either a URL of a remote document,

data/lib/wasabi/parser.rb

@@ -150,14 +150,19 @@ module Wasabi
 
       # Look up the input by walking up to portType, then up to the message.
 
-      binding_input = at_xpath(operation, ".//wsdl:input/@name")
       binding_type = at_xpath(operation, "../@type").to_s.split(':').last
       port_type_input = at_xpath(operation, "../../wsdl:portType[@name='#{binding_type}']/wsdl:operation[@name='#{operation_name}']/wsdl:input")
 
       port_message_ns_id, port_message_type = port_type_input.attribute("message").to_s.split(':')
 
-      # Kinda hackey maybe?  This assumes there is ever only one 'part' element in the message.
-      message_ns_id, message_type = at_xpath(port_type_input, "../../../wsdl:message[@name='#{port_message_type}']/wsdl:part[1]").attribute("element").to_s.split(':')
+      message_ns_id, message_type = nil
+
+      # TODO: Support multiple 'part' elements in the message.
+      if (port_message_part = at_xpath(port_type_input, "../../../wsdl:message[@name='#{port_message_type}']/wsdl:part[1]"))
+        if (port_message_part_element = port_message_part.attribute("element"))
+          message_ns_id, message_type = port_message_part_element.to_s.split(':')
+        end
+      end
 
       # Fall back to message name in portType input if no 'element' attribute in wsdl:message
       if message_type

data/lib/wasabi/version.rb

@@ -1,5 +1,5 @@
 module Wasabi
 
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 
 end

data/spec/fixtures/no_message_parts.wsdl

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions
+  xmlns="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
+  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:s="http://www.w3.org/2001/XMLSchema"
+  xmlns:article="http://example.com/article"
+  xmlns:actions="http://example.com/actions"
+  targetNamespace="http://example.com/actions">
+    <types>
+        <s:schema elementFormDefault="qualified" targetNamespace="http://example.com/actions">
+            <s:element name="Save">
+                <s:complexType>
+                    <s:sequence>
+                        <s:element name="article" type="article:Article"/>
+                    </s:sequence>
+                </s:complexType>
+            </s:element>
+        </s:schema>
+        <s:schema elementFormDefault="qualified" targetNamespace="http://example.com/article">
+            <s:complexType name="Article">
+                <s:sequence>
+                    <s:element minOccurs="0" name="Author" type="s:string"/>
+                    <s:element minOccurs="0" name="Title" type="s:string"/>
+                </s:sequence>
+            </s:complexType>
+        </s:schema>
+    </types>
+    <message name="SaveSoapIn"/>
+    <message name="SaveSoapOut">
+        <part name="parameters" element="actions:SaveResponse"/>
+    </message>
+    <portType name="ArticleSoap">
+        <operation name="Save">
+            <input message="actions:SaveSoapIn"/>
+            <output message="actions:SaveSoapOut"/>
+        </operation>
+    </portType>
+    <binding name="ArticleSoap" type="actions:ArticleSoap">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <operation name="Save">
+            <soap:operation soapAction="http://example.com/actions.Save" style="document"/>
+            <input>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+    </binding>
+    <service name="StudyMDL">
+        <port name="StudyMDLSoap" binding="actions:StudyMDLSoap">
+            <soap:address location="http://example.com:1234/soap"/>
+        </port>
+    </service>
+</definitions>

data/spec/wasabi/parser/no_message_parts_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+describe Wasabi::Parser do
+  context "with: no_message_parts.wsdl" do
+
+    subject do
+      parser = Wasabi::Parser.new Nokogiri::XML(xml)
+      parser.parse
+      parser
+    end
+
+    let(:xml) { fixture(:no_message_parts).read }
+
+    it "falls back to using the message type in the port element" do
+      subject.operations[:save][:input].should == "SaveSoapIn"
+    end
+
+    it "falls back to using the namespace ID in the port element" do
+      subject.operations[:save][:namespace_identifier].should == "actions"
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wasabi
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 2
   - 4
-  - 0
-  version: 2.4.0
+  - 1
+  version: 2.4.1
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-08 00:00:00 Z
+date: 2012-06-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -126,6 +126,7 @@ files:
 - spec/fixtures/multiple_namespaces.wsdl
 - spec/fixtures/multiple_types.wsdl
 - spec/fixtures/namespaced_actions.wsdl
+- spec/fixtures/no_message_parts.wsdl
 - spec/fixtures/no_namespace.wsdl
 - spec/fixtures/soap12.wsdl
 - spec/fixtures/symbolic_endpoint.wsdl
@@ -144,6 +145,7 @@ files:
 - spec/wasabi/document/two_bindings_spec.rb
 - spec/wasabi/document_spec.rb
 - spec/wasabi/parser/multiple_namespaces_spec.rb
+- spec/wasabi/parser/no_message_parts_spec.rb
 - spec/wasabi/parser/no_namespace_spec.rb
 - spec/wasabi/parser/no_target_namespace_spec.rb
 - spec/wasabi/parser/symbolic_endpoint_spec.rb
@@ -191,6 +193,7 @@ test_files:
 - spec/fixtures/multiple_namespaces.wsdl
 - spec/fixtures/multiple_types.wsdl
 - spec/fixtures/namespaced_actions.wsdl
+- spec/fixtures/no_message_parts.wsdl
 - spec/fixtures/no_namespace.wsdl
 - spec/fixtures/soap12.wsdl
 - spec/fixtures/symbolic_endpoint.wsdl
@@ -209,6 +212,7 @@ test_files:
 - spec/wasabi/document/two_bindings_spec.rb
 - spec/wasabi/document_spec.rb
 - spec/wasabi/parser/multiple_namespaces_spec.rb
+- spec/wasabi/parser/no_message_parts_spec.rb
 - spec/wasabi/parser/no_namespace_spec.rb
 - spec/wasabi/parser/no_target_namespace_spec.rb
 - spec/wasabi/parser/symbolic_endpoint_spec.rb