wasabi 2.1.1 → 2.2.0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.2.0 (2012-06-06)
+
+* Improvement: [#5](https://github.com/rubiii/wasabi/pull/5) - Get input from message
+  element or portType input. See [rubiii/savon#277](https://github.com/rubiii/savon/pull/277)
+  to get the full picture on how this all works together, and enables you to pass a single
+  symbol into the `Savon::Client#request` method and get automatic namespace mapping, as well
+  as the proper operation name -> input message mapping.
+
 ## 2.1.1 (2012-05-18)
 
 * Fix: [issue 7](https://github.com/rubiii/wasabi/issues/7) - Performance regression.

data/lib/wasabi/parser.rb

@@ -82,8 +82,12 @@ module Wasabi
         if soap_action
           soap_action = soap_action.to_s
           action = soap_action.blank? ? name : soap_action
-          input = name.blank? ? action.split("/").last : name
-          @operations[input.snakecase.to_sym] = { :action => action, :input => input }
+
+          # There should be a matching portType for each binding, so we will lookup the input from there.
+          namespace_id, input = input_for(operation)
+
+          # Store namespace identifier so this operation can be mapped to the proper namespace.
+          @operations[name.snakecase.to_sym] = { :action => action, :input => input, :namespace_identifier => namespace_id }
         elsif !@operations[name.snakecase.to_sym]
           @operations[name.snakecase.to_sym] = { :action => name, :input => name }
         end
@@ -111,5 +115,27 @@ module Wasabi
       schema_namespace ? schema_namespace.to_s : @namespace
     end
 
+    def input_for(operation)
+      operation_name = operation.attribute("name")
+
+      # 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(':')
+
+      # Fall back to message name in portType input if no 'element' attribute in wsdl:message
+      if message_type
+        [message_ns_id, message_type]
+      else
+        [port_message_ns_id, port_message_type]
+      end
+    end
+
   end
 end

data/lib/wasabi/version.rb

@@ -1,5 +1,5 @@
 module Wasabi
 
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 
 end

data/spec/support/fixture.rb

@@ -1,13 +1,20 @@
 module Fixture
 
-  def fixture(file)
-    fixtures[file] ||= File.read File.expand_path("spec/fixtures/#{file}.xml")
+  def self.[](name)
+    fixtures[name]
   end
 
-private
+  def self.[]=(name, value)
+    fixtures[name] = value
+  end
 
-  def fixtures
+  def self.fixtures
     @fixtures ||= {}
   end
 
+  def fixture(file, ext = :wsdl)
+    filename = "#{file}.#{ext}"
+    Fixture[filename] ||= File.read File.expand_path("spec/fixtures/#{filename}")
+  end
+
 end

data/spec/wasabi/document/authentication_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Wasabi::Document do
-  context "with: authentication.xml" do
+  context "with: authentication.wsdl" do
 
     subject { Wasabi::Document.new fixture(:authentication) }
 
@@ -15,7 +15,7 @@ describe Wasabi::Document do
 
     its(:operations) do
       should == {
-        :authenticate => { :input => "authenticate", :action => "authenticate" }
+        :authenticate => { :input => "authenticate", :action => "authenticate", :namespace_identifier => "tns" }
       }
     end
 

data/spec/wasabi/document/geotrust_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Wasabi::Document do
-  context "with: geotrust.xml" do
+  context "with: geotrust.wsdl" do
 
     subject { Wasabi::Document.new fixture(:geotrust) }
 

data/spec/wasabi/document/multiple_namespaces_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Wasabi::Document do
-  context "with: multiple_namespaces.xml" do
+  context "with: multiple_namespaces.wsdl" do
 
     subject { Wasabi::Document.new fixture(:multiple_namespaces) }
 
@@ -14,7 +14,7 @@ describe Wasabi::Document do
     it { should have(1).operations }
 
     its(:operations) do
-      should == { :save => { :input => "Save", :action => "http://example.com/actions.Save" } }
+      should == { :save => { :input => "Save", :action => "http://example.com/actions.Save", :namespace_identifier => "actions" } }
     end
 
     its(:type_namespaces) do

data/spec/wasabi/document/namespaced_actions_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Wasabi::Document do
-  context "with: namespaced_actions.xml" do
+  context "with: namespaced_actions.wsdl" do
 
     subject { Wasabi::Document.new fixture(:namespaced_actions) }
 
@@ -15,9 +15,9 @@ describe Wasabi::Document do
 
     its(:operations) do
       should include(
-        { :delete_client => { :input => "DeleteClient", :action => "http://api.example.com/api/Client.Delete" } },
-        { :get_clients   => { :input => "GetClients", :action => "http://api.example.com/api/User.GetClients" } },
-        { :get_api_key   => { :input => "GetApiKey", :action => "http://api.example.com/api/User.GetApiKey" } }
+        { :delete_client => { :input => "Client.Delete", :action => "http://api.example.com/api/Client.Delete", :namespace_identifier => "tns" } },
+        { :get_clients   => { :input => "User.GetClients", :action => "http://api.example.com/api/User.GetClients", :namespace_identifier => "tns" } },
+        { :get_api_key   => { :input => "User.GetApiKey", :action => "http://api.example.com/api/User.GetApiKey", :namespace_identifier => "tns" } }
       )
     end
 

data/spec/wasabi/document/no_namespace_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Wasabi::Document do
-  context "with: no_namespace.xml" do
+  context "with: no_namespace.wsdl" do
 
     subject { Wasabi::Document.new fixture(:no_namespace) }
 
@@ -15,9 +15,9 @@ describe Wasabi::Document do
 
     its(:operations) do
       should include(
-        { :get_user_login_by_id => { :input => "GetUserLoginById", :action => "/api/api/GetUserLoginById" } },
-        { :get_all_contacts => { :input => "GetAllContacts", :action => "/api/api/GetAllContacts" } },
-        { :search_user => { :input => "SearchUser", :action => "/api/api/SearchUser" } }
+        { :get_user_login_by_id => { :input => "GetUserLoginById", :action => "/api/api/GetUserLoginById", :namespace_identifier => "typens" } },
+        { :get_all_contacts => { :input => "GetAllContacts", :action => "/api/api/GetAllContacts", :namespace_identifier => "typens" } },
+        { :search_user => { :input => "SearchUser", :action => "/api/api/SearchUser", :namespace_identifier => "typens" } }
       )
     end
 

data/spec/wasabi/document/soap12_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Wasabi::Document do
-  context "with: soap12.xml" do
+  context "with: soap12.wsdl" do
 
     subject { Wasabi::Document.new fixture(:soap12) }
 

data/spec/wasabi/document/two_bindings_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Wasabi::Document do
-  context "with: two_bindings.xml" do
+  context "with: two_bindings.wsdl" do
 
     subject { Wasabi::Document.new fixture(:two_bindings) }
 

data/spec/wasabi/parser/multiple_namespaces_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Wasabi::Parser do
-  context "with: multiple_namespaces.xml" do
+  context "with: multiple_namespaces.wsdl" do
 
     subject do
       parser = Wasabi::Parser.new Nokogiri::XML(xml)

data/spec/wasabi/parser/no_namespace_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Wasabi::Parser do
-  context "with: no_namespace.xml" do
+  context "with: no_namespace.wsdl" do
 
     subject do
       parser = Wasabi::Parser.new Nokogiri::XML(xml)

data/spec/wasabi/parser/symbolic_endpoint_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe Wasabi::Parser do
-  context "with: symbolic_endpoint.xml" do
+  context "with: symbolic_endpoint.wsdl" do
 
     subject do
       parser = Wasabi::Parser.new Nokogiri::XML(xml)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wasabi
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
-  - 1
-  version: 2.1.1
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-18 00:00:00 Z
+date: 2012-06-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -103,16 +103,16 @@ files:
 - lib/wasabi/parser.rb
 - lib/wasabi/version.rb
 - lib/wasabi/xpath_helper.rb
-- spec/fixtures/authentication.xml
-- spec/fixtures/geotrust.xml
-- spec/fixtures/lower_camel.xml
-- spec/fixtures/multiple_namespaces.xml
-- spec/fixtures/multiple_types.xml
-- spec/fixtures/namespaced_actions.xml
-- spec/fixtures/no_namespace.xml
-- spec/fixtures/soap12.xml
-- spec/fixtures/symbolic_endpoint.xml
-- spec/fixtures/two_bindings.xml
+- spec/fixtures/authentication.wsdl
+- spec/fixtures/geotrust.wsdl
+- spec/fixtures/lower_camel.wsdl
+- spec/fixtures/multiple_namespaces.wsdl
+- spec/fixtures/multiple_types.wsdl
+- spec/fixtures/namespaced_actions.wsdl
+- spec/fixtures/no_namespace.wsdl
+- spec/fixtures/soap12.wsdl
+- spec/fixtures/symbolic_endpoint.wsdl
+- spec/fixtures/two_bindings.wsdl
 - spec/spec_helper.rb
 - spec/support/fixture.rb
 - spec/wasabi/core_ext/object_spec.rb
@@ -165,16 +165,16 @@ signing_key:
 specification_version: 3
 summary: A simple WSDL parser
 test_files: 
-- spec/fixtures/authentication.xml
-- spec/fixtures/geotrust.xml
-- spec/fixtures/lower_camel.xml
-- spec/fixtures/multiple_namespaces.xml
-- spec/fixtures/multiple_types.xml
-- spec/fixtures/namespaced_actions.xml
-- spec/fixtures/no_namespace.xml
-- spec/fixtures/soap12.xml
-- spec/fixtures/symbolic_endpoint.xml
-- spec/fixtures/two_bindings.xml
+- spec/fixtures/authentication.wsdl
+- spec/fixtures/geotrust.wsdl
+- spec/fixtures/lower_camel.wsdl
+- spec/fixtures/multiple_namespaces.wsdl
+- spec/fixtures/multiple_types.wsdl
+- spec/fixtures/namespaced_actions.wsdl
+- spec/fixtures/no_namespace.wsdl
+- spec/fixtures/soap12.wsdl
+- spec/fixtures/symbolic_endpoint.wsdl
+- spec/fixtures/two_bindings.wsdl
 - spec/spec_helper.rb
 - spec/support/fixture.rb
 - spec/wasabi/core_ext/object_spec.rb