Parse Input/Output When Operation Style is Document (#114)

Author: mattpolito

lib/wasabi/parser.rb

@@ -144,8 +144,9 @@ def parse_operations
         # TODO: check for soap namespace?
         soap_operation = operation.element_children.find { |node| node.name == 'operation' }
         soap_action = soap_operation['soapAction'] if soap_operation
+        soap_document = soap_operation["style"] if soap_operation
 
-        if soap_action
+        if soap_action || soap_document
           soap_action = soap_action.to_s
           action = soap_action && !soap_action.empty? ? soap_action : name
 
@@ -247,8 +248,7 @@ def input_output_for(operation, input_output)
         port_type_operation = @port_type_operations[binding_type][operation_name]
       end
 
-      port_type_input_output = port_type_operation &&
-        port_type_operation.element_children.find { |node| node.name == input_output }
+      port_type_input_output = port_type_operation&.element_children&.find { |node| node.name == input_output }
 
       # TODO: Stupid fix for missing support for imports.
       # Sometimes portTypes are actually included in a separate WSDL.
@@ -260,6 +260,8 @@ def input_output_for(operation, input_output)
         end
 
         message_ns_id, message_type = nil
+        message_ns_id = port_message_ns_id
+        message_type = port_message_type
 
         # When there is a parts attribute in soap:body element, we should use that value
         # to look up the message part from messages array.
@@ -270,8 +272,8 @@ def input_output_for(operation, input_output)
         end
 
         message = @messages[port_message_type]
-        port_message_part = message.element_children.find do |node|
-          soap_body_parts.nil? ? (node.name == 'part') : ( node.name == 'part' && node['name'] == soap_body_parts)
+        port_message_part = message&.element_children&.find do |node|
+          soap_body_parts.nil? ? (node.name == "part") : (node.name == "part" && node["name"] == soap_body_parts)
         end
 
         if port_message_part && port_element = port_message_part.attribute('element')

spec/fixtures/workday.wsdl

@@ -30,9 +30,35 @@
       subject { super().operations }
       it do
         should include(
-          { :get_quick_approver_list => { :input => "GetQuickApproverList", :action => "GetQuickApproverList", :parameters=>{:Request=>{:name=>"Request", :type=>"GetQuickApproverListInput"}}}},
-          { :hello => { :input => "hello", :action => "hello", :parameters=>{:Input=>{:name=>"Input", :type=>"string"}} } }
-          )
+          {
+            get_quick_approver_list: {
+              input: "GetQuickApproverList",
+              output: "GetQuickApproverListResponse",
+              action: "GetQuickApproverList",
+              namespace_identifier: "s1",
+              parameters: {
+                Request: {
+                  name: "Request",
+                  type: "GetQuickApproverListInput"
+                }
+              }
+            }
+          },
+          {
+            hello: {
+              input: "hello",
+              output: "helloResponse",
+              action: "hello",
+              namespace_identifier: "s1",
+              parameters: {
+                Input: {
+                  name: "Input",
+                  type: "string"
+                }
+              }
+            }
+          }
+        )
       end
     end
 

spec/wasabi/document/geotrust_spec.rb

@@ -29,12 +29,33 @@
     describe '#operations' do
       subject { super().operations }
       it do
-      should include(
-        { :delete_client => { :input => "Client.Delete", :output => "Client.DeleteResponse", :action => "http://api.example.com/api/Client.Delete", :namespace_identifier => "tns" } },
-        { :get_clients   => { :input => "User.GetClients", :output => "User.GetClientsResponse", :action => "http://api.example.com/api/User.GetClients", :namespace_identifier => "tns" } },
-        { :get_api_key   => { :input => "User.GetApiKey", :output => "User.GetApiKeyResponse", :action => "http://api.example.com/api/User.GetApiKey", :namespace_identifier => "tns" } }
-      )
-    end
+        should include(
+          {
+            delete_client: {
+              input: "Client.Delete",
+              output: "Client.DeleteResponse",
+              action: "http://api.example.com/api/Client.Delete",
+              namespace_identifier: "tns"
+            }
+          },
+          {
+            get_clients: {
+              input: "User.GetClients",
+              output: "User.GetClientsResponse",
+              action: "http://api.example.com/api/User.GetClients",
+              namespace_identifier: "tns"
+            }
+          },
+          {
+            get_api_key: {
+              input: "User.GetApiKey",
+              output: "User.GetApiKeyResponse",
+              action: "http://api.example.com/api/User.GetApiKey",
+              namespace_identifier: "tns"
+            }
+          }
+        )
+      end
     end
 
   end

spec/wasabi/document/namespaced_actions_spec.rb

@@ -29,12 +29,33 @@
     describe '#operations' do
       subject { super().operations }
       it do
-      should include(
-        { :get_user_login_by_id => { :input => "GetUserLoginById", :output => "GetUserLoginById", :action => "/api/api/GetUserLoginById", :namespace_identifier => "typens" } },
-        { :get_all_contacts => { :input => "GetAllContacts", :output =>"GetAllContacts", :action => "/api/api/GetAllContacts", :namespace_identifier => "typens" } },
-        { :search_user => { :input => "SearchUser", :output =>"SearchUser", :action => "/api/api/SearchUser", :namespace_identifier => nil } }
-      )
-    end
+        should include(
+          {
+            get_user_login_by_id: {
+              input: "GetUserLoginById",
+              output: "GetUserLoginByIdResponse",
+              action: "/api/api/GetUserLoginById",
+              namespace_identifier: "typens"
+            }
+          },
+          {
+            get_all_contacts: {
+              input: "GetAllContacts",
+              output: "GetAllContactsResponse",
+              action: "/api/api/GetAllContacts",
+              namespace_identifier: "typens"
+            }
+          },
+          {
+            search_user: {
+              input: "SearchUser",
+              output: "SearchUserResponse",
+              action: "/api/api/SearchUser",
+              namespace_identifier: nil
+            }
+          }
+        )
+      end
     end
 
   end

spec/wasabi/document/no_namespace_spec.rb

@@ -11,7 +11,14 @@
       subject { super().operations }
       it do
       should include(
-        { :sendsms => { :input => "sendsms", :output => "sendsms", :action => "sendsms", :namespace_identifier => "tns" } }
+          {
+            sendsms: {
+              input: "sendsmsRequest",
+              output: "sendsmsResponse",
+              action: "sendsms",
+              namespace_identifier: "tns"
+            }
+          }
       )
     end
     end

spec/wasabi/document/savon295_spec.rb

@@ -15,7 +15,7 @@
 
     it 'falls back to using the message type in the port element' do
       # Operation's input has no part element in the message, so using the message type.
-      expect(subject.operations[:save][:input]).to eq('Save')
+      expect(subject.operations[:save][:input]).to eq("SaveSoapIn")
 
       # Operation's output has part element in the message, so using part element's type.
       expect(subject.operations[:save][:output]).to eq('SaveResponse')
@@ -26,7 +26,7 @@
     end
 
     it 'gracefully handles port messages without a colon' do
-      expect(subject.operations[:delete][:input]).to eq('Delete')
+      expect(subject.operations[:delete][:input]).to eq("DeleteSoapIn")
       expect(subject.operations[:delete][:output]).to eq('DeleteResponse')
       expect(subject.operations[:delete][:namespace_identifier]).to be_nil
     end

spec/wasabi/parser/no_message_parts_spec.rb

@@ -13,7 +13,7 @@
     let(:xml) { fixture(:tradetracker).read }
 
     it 'parses the operations' do
-      expect(subject.operations[:get_feeds][:input]).to eq('getFeeds')
+      expect(subject.operations[:get_feeds][:input]).to eq("GetFeedsMessage")
     end
   end
 end

spec/wasabi/parser/tradetracker_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe Wasabi::Parser do
+  context "with: workday.wsdl" do
+    subject do
+      parser = Wasabi::Parser.new Nokogiri::XML(xml)
+      parser.parse
+      parser
+    end
+
+    let(:xml) { fixture(:workday).read }
+
+    it "parses the operations" do
+      expect(subject.operations[:get_customer_invoices][:input]).to eq("Get_Customer_Invoices_Request")
+    end
+  end
+end