wasabi 3.2.3 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eea806b4cc6f040479a5800f3c6d7462ec2b477c
-  data.tar.gz: edff00a36860783bf18bd0454aaf60e6fe7970fb
+  metadata.gz: e1decaff87ba9c70512facbf036cb51ce14de471
+  data.tar.gz: fb1d53ef00af219bae14499bfb8ecc51b0924945
 SHA512:
-  metadata.gz: 8da7e4a1e8b83047a5e0d52283bb4ec07eb9787e4c177515038efdfb430171a11b7da59588ed1a95b2f88caf7a41a1237b8f5f3e6f5f1d4688c84c4de6634d3d
-  data.tar.gz: 138fef341e03976f62506503929dc01937d8cebb613e6df757c5be1cd04a20e1579438efb31847ab9418b308763fdb2f7cf40b5d49fe912036320c4c80311f90
+  metadata.gz: 24823fdbb179b5194940b4d9ee55a09a6e7086df3f983caec0cdb3f26fa559b3f8e749df2426cce84947a04a346eba097ca757da5ad6f070d215df077488db07
+  data.tar.gz: 8e186b92225fac1fa32c71103c2116e08fd2c613a12b4f9fbd800df241fa71950ce5c64ac05fca14c0ad2ec28e0bbce246b195c11e2a2c89aad75d6a125a28e2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 3.3.0 (2014-05-03)
+* Feature: [#44](https://github.com/savonrb/wasabi/pull/44) adds a feature to specify the HTTPI adapter you'd like to use.
+
 # 3.2.3 (2013-12-16)
 * Fix [#39](https://github.com/savonrb/wasabi/pull/39) fixes new regression in operation names. Huge thank you to #leoping for investigating this and issuing a pull request.
 

data/lib/wasabi/document.rb

@@ -21,11 +21,12 @@ module Wasabi
     end
 
     # Accepts a WSDL +document+ to parse.
-    def initialize(document = nil)
+    def initialize(document = nil, adapter = nil)
       self.document = document
+      self.adapter  = adapter
     end
 
-    attr_accessor :document, :request
+    attr_accessor :document, :request, :adapter
 
     attr_writer :xml
 
@@ -138,7 +139,7 @@ module Wasabi
     # Returns the raw WSDL document.
     # Can be used as a hook to extend the library.
     def xml
-      @xml ||= Resolver.new(document, request).resolve
+      @xml ||= Resolver.new(document, request, adapter).resolve
     end
 
     # Parses the WSDL document and returns the <tt>Wasabi::Parser</tt>.

data/lib/wasabi/parser.rb

@@ -257,13 +257,25 @@ module Wasabi
 
         message_ns_id, message_type = nil
 
-        # TODO: Support multiple 'part' elements in the message.
-        message = @messages[port_message_type]
-        port_message_part = message.element_children.find { |node| node.name == 'part' }
+        # When there is a parts attribute in soap:body element, we should use that value
+        # to look up the message part from messages array.
+        input_output_element = operation.element_children.find { |node| node.name == input_output }
+        if input_output_element
+          soap_body_element = input_output_element.element_children.find { |node| node.name == 'body' }
+          soap_body_parts = soap_body_element['parts'] if soap_body_element
+        end
 
-        if port_message_part
-          if (port_message_part_element = port_message_part.attribute('element'))
-            message_ns_id, message_type = port_message_part_element.to_s.split(':')
+        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)
+        end
+        
+        if port_message_part && port_element = port_message_part.attribute('element')
+          port_message_part = port_element.to_s
+          if port_message_part.include?(':')
+            message_ns_id, message_type = port_message_part.split(':')
+          else
+            message_type = port_message_part
           end
         end
 

data/lib/wasabi/resolver.rb

@@ -18,12 +18,13 @@ module Wasabi
     URL = /^http[s]?:/
     XML = /^</
 
-    def initialize(document, request = nil)
+    def initialize(document, request = nil, adapter = nil)
       @document = document
       @request  = request || HTTPI::Request.new
+      @adapter  = adapter
     end
 
-    attr_reader :document, :request
+    attr_reader :document, :request, :adapter
 
     def resolve
       raise ArgumentError, "Unable to resolve: #{document.inspect}" unless document
@@ -39,7 +40,7 @@ module Wasabi
 
     def load_from_remote
       request.url = document
-      response = HTTPI.get(request)
+      response = HTTPI.get(request, adapter)
 
       raise HTTPError.new("Error: #{response.code}", response) if response.error?
 

data/lib/wasabi/version.rb

@@ -1,3 +1,3 @@
 module Wasabi
-  VERSION = "3.2.3"
+  VERSION = "3.3.0"
 end

data/spec/fixtures/multiple_parts_in_message.wsdl

@@ -0,0 +1,66 @@
+<?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:actions="http://example.com/actions"
+  targetNamespace="http://example.com/topLevelNamespace">
+    <types>
+        <s:schema elementFormDefault="qualified" targetNamespace="http://example.com/actions">
+            <s:element name="SomeRequest">
+                <s:complexType>
+                    <s:sequence>
+                        <s:element name="status" type="s:string"/>
+                    </s:sequence>
+                </s:complexType>
+            </s:element>
+        </s:schema>
+    </types>
+    <message name="SomeInput">
+        <part name="parameters" element="actions:SomeRequest"/>
+        <part name="requestBody" element="actions:SomeRequestBody"/>
+    </message>
+    <message name="SomeOutput">
+        <part name="parameters" element="actions:SomeResponse"/>
+    </message>
+    <portType name="ExamplePortType">
+        <operation name="SomeOperation">
+            <input message="actions:SomeInput"/>
+            <output message="actions:SomeOutput"/>
+        </operation>
+        <operation name="OtherOperation">
+            <input message="actions:SomeInput"/>
+            <output message="actions:SomeOutput"/>
+        </operation>
+    </portType>
+    <binding name="ExampleBinding" type="actions:ExamplePortType">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <operation name="SomeOperation">
+            <soap:operation soapAction="http://example.com/actions.SomeOperation" style="document"/>
+            <input>
+                <soap:body parts="requestBody" use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+        <operation name="OtherOperation">
+            <soap:operation soapAction="http://example.com/actions.SomeOperation" style="document"/>
+            <input>
+                <soap:body use="literal"/>
+            </input>
+            <output>
+                <soap:body use="literal"/>
+            </output>
+        </operation>
+    </binding>
+    <service name="ExampleService">
+        <port name="ExamplePort" binding="actions:ExampleBinding">
+            <soap:address location="http://localhost/soapservice/execute?path=%2Fbase%2Fincludes%2FTest+Soap%2FReturn+Rows"/>
+        </port>
+    </service>
+</definitions>

data/spec/fixtures/no_message_parts.wsdl

@@ -1,59 +1,85 @@
 <?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>
+    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:element name="Delete">
+        <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>
+  <message name="DeleteSoapIn"/>
+  <message name="DeleteSoapOut">
+    <part name="parameters" element="DeleteResponse"/>
+  </message>
+
+  <portType name="ArticleSoap">
+    <operation name="Save">
+      <input message="actions:SaveSoapIn"/>
+      <output message="actions:SaveSoapOut"/>
+    </operation>
+    <operation name="Delete">
+      <input message="DeleteSoapIn"/>
+      <output message="DeleteSoapOut"/>
+    </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>
+    <operation name="Delete">
+      <soap:operation soapAction="http://example.com/actions.Delete" 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/support/adapter.rb

@@ -0,0 +1,18 @@
+class FakeAdapterForTest < HTTPI::Adapter::Base
+
+  register :fake_adapter_for_test
+
+  def initialize(request)
+    @@requests ||= []
+    @@requests.push request
+    @request = request
+  end
+
+  attr_reader :client
+
+  def request(method)
+    @@methods ||= []
+    @@methods.push method
+    HTTPI::Response.new(200, {}, 'wsdl_by_adapter')
+  end
+end

data/spec/wasabi/parser/multiple_parts_in_message_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe Wasabi::Parser do
+  context 'with: multiple_parts_in_message.wsdl' do
+
+    subject do
+      parser = Wasabi::Parser.new Nokogiri::XML(xml)
+      parser.parse
+      parser
+    end
+
+    let(:xml) { fixture(:multiple_parts_in_message).read }
+
+    context "with a parts attribute in soap:body element" do
+      it 'uses the part specified in parts attribute' do
+        request = subject.operations[:some_operation][:input]
+
+        request.should == "SomeRequestBody"
+      end
+    end
+    
+    context "with no parts attribute in soap:body element" do
+      it 'uses the first part element in message' do
+        request = subject.operations[:other_operation][:input]
+
+        request.should == "SomeRequest"
+      end
+    end
+    
+  end
+end

data/spec/wasabi/parser/no_message_parts_spec.rb

@@ -22,5 +22,11 @@ describe Wasabi::Parser do
     it 'falls back to using the namespace ID in the port element' do
       subject.operations[:save][:namespace_identifier].should == 'actions'
     end
+
+    it 'gracefully handles port messages without a colon' do
+      subject.operations[:delete][:input].should == 'Delete'
+      subject.operations[:delete][:output].should == 'DeleteResponse'
+      subject.operations[:delete][:namespace_identifier].should be_nil
+    end
   end
 end

data/spec/wasabi/resolver_spec.rb

@@ -9,6 +9,17 @@ describe Wasabi::Resolver do
       xml.should == "wsdl"
     end
 
+    it "resolves remote documents with custom adapter" do
+      prev_logging = HTTPI.instance_variable_get(:@log)
+      HTTPI.log = false # Don't pollute rspec output by request logging
+      xml = Wasabi::Resolver.new("http://example.com?wsdl", nil, :fake_adapter_for_test).resolve
+      xml.should == "wsdl_by_adapter"
+      expect(FakeAdapterForTest.class_variable_get(:@@requests).size).to eq(1)
+      expect(FakeAdapterForTest.class_variable_get(:@@requests).first.url).to eq(URI.parse("http://example.com?wsdl"))
+      expect(FakeAdapterForTest.class_variable_get(:@@methods)).to eq([:get])
+      HTTPI.log = prev_logging
+    end
+
     it "resolves local documents" do
       xml = Wasabi::Resolver.new(fixture(:authentication).path).resolve
       xml.should == fixture(:authentication).read

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wasabi
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.3.0
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpi
@@ -111,6 +111,7 @@ files:
 - spec/fixtures/lower_camel.wsdl
 - spec/fixtures/marketo.wsdl
 - spec/fixtures/multiple_namespaces.wsdl
+- spec/fixtures/multiple_parts_in_message.wsdl
 - spec/fixtures/multiple_types.wsdl
 - spec/fixtures/namespaced_actions.wsdl
 - spec/fixtures/no_message_parts.wsdl
@@ -121,6 +122,7 @@ files:
 - spec/fixtures/tradetracker.wsdl
 - spec/fixtures/two_bindings.wsdl
 - spec/spec_helper.rb
+- spec/support/adapter.rb
 - spec/support/fixture.rb
 - spec/support/profiling.rb
 - spec/wasabi/core_ext/string_spec.rb
@@ -141,6 +143,7 @@ files:
 - spec/wasabi/parser/juniper_spec.rb
 - spec/wasabi/parser/marketo_spec.rb
 - spec/wasabi/parser/multiple_namespaces_spec.rb
+- spec/wasabi/parser/multiple_parts_in_message_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
@@ -169,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: wasabi
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A simple WSDL parser
@@ -184,6 +187,7 @@ test_files:
 - spec/fixtures/lower_camel.wsdl
 - spec/fixtures/marketo.wsdl
 - spec/fixtures/multiple_namespaces.wsdl
+- spec/fixtures/multiple_parts_in_message.wsdl
 - spec/fixtures/multiple_types.wsdl
 - spec/fixtures/namespaced_actions.wsdl
 - spec/fixtures/no_message_parts.wsdl
@@ -194,6 +198,7 @@ test_files:
 - spec/fixtures/tradetracker.wsdl
 - spec/fixtures/two_bindings.wsdl
 - spec/spec_helper.rb
+- spec/support/adapter.rb
 - spec/support/fixture.rb
 - spec/support/profiling.rb
 - spec/wasabi/core_ext/string_spec.rb
@@ -214,6 +219,7 @@ test_files:
 - spec/wasabi/parser/juniper_spec.rb
 - spec/wasabi/parser/marketo_spec.rb
 - spec/wasabi/parser/multiple_namespaces_spec.rb
+- spec/wasabi/parser/multiple_parts_in_message_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