wasabi 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f06aeea996211efa89a8230086c61177c28b4fa
-  data.tar.gz: c1e5bcaacd35bfe0122f4bd5b522dd1fad86abe0
+  metadata.gz: 15e2f65da4e86bbb4c50c5276f475a86d6d6a149
+  data.tar.gz: 18762d7946965501f5eb64a0294aac13c151aaaf
 SHA512:
-  metadata.gz: 4b933663d3edb5ceed9a492cf25189f8d838758f58fd6f88d7353018813267006981b05ede2a8d3057e0e5b1f5696e4636f2aa6778137a0b0f493795565b43a0
-  data.tar.gz: 03cfffac4886354d15a5d69aab5f444356e5ec69c5b4109ec5735e5138fa37775f463c7b75acda2fe001ca96d1762f15b1b7624e4e334180c26c9fbafc1b815a
+  metadata.gz: 3bcbf70c7681e5bf8dd07518f562c6715fe7fff2ba613f3186027e51359479f347f82241bc5f753b3fc666fd31b4330edaf610d948f2c36aa40e578ea3e6d42d
+  data.tar.gz: ae4b73c2cb9b53cb53f6df356e351d75438b335d6b44dc28374ce57162dba64d79d357c70012bf3c92e83c9eadad82ed05f9de6b516156df521226add6ca4437

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 3.2.2 (2013-12-09)
+
+* Fix: [#32](https://github.com/savonrb/wasabi/issues/32) fixes a regression in operation names that was adversely affecting Savon: https://github.com/savonrb/savon/issues/520
+
+# 3.2.1 (2013-12-05)
+
+* Feature: Drops requirement for Nokogiri <= 1.6 for modern rubies. This was in place for ruby 1.8 but since support for that is going away, we shouldn't prevent users from using newer versions of Nokogiri.
+
 ## 3.2.0 (2013-07-26)
 
 * Feature: [#20](https://github.com/savonrb/wasabi/issues/20) Limited support for listing an

data/lib/wasabi/parser.rb

@@ -1,5 +1,5 @@
-require "uri"
-require "wasabi/core_ext/string"
+require 'uri'
+require 'wasabi/core_ext/string'
 
 module Wasabi
 
@@ -8,10 +8,10 @@ module Wasabi
   # Parses WSDL documents and remembers their important parts.
   class Parser
 
-    XSD      = "http://www.w3.org/2001/XMLSchema"
-    WSDL     = "http://schemas.xmlsoap.org/wsdl/"
-    SOAP_1_1 = "http://schemas.xmlsoap.org/wsdl/soap/"
-    SOAP_1_2 = "http://schemas.xmlsoap.org/wsdl/soap12/"
+    XSD      = 'http://www.w3.org/2001/XMLSchema'
+    WSDL     = 'http://schemas.xmlsoap.org/wsdl/'
+    SOAP_1_1 = 'http://schemas.xmlsoap.org/wsdl/soap/'
+    SOAP_1_2 = 'http://schemas.xmlsoap.org/wsdl/soap12/'
 
     def initialize(document)
       self.document = document
@@ -71,15 +71,15 @@ module Wasabi
       @namespace = namespace.to_s if namespace
 
       @namespaces = @document.namespaces.inject({}) do |memo, (key, value)|
-        memo[key.sub("xmlns:", "")] = value
+        memo[key.sub('xmlns:', '')] = value
         memo
       end
     end
 
     def parse_endpoint
       if service_node = service
-        endpoint = service_node.at_xpath(".//soap11:address/@location", 'soap11' => SOAP_1_1)
-        endpoint ||= service_node.at_xpath(service_node, ".//soap12:address/@location", 'soap12' => SOAP_1_2)
+        endpoint = service_node.at_xpath('.//soap11:address/@location', 'soap11' => SOAP_1_1)
+        endpoint ||= service_node.at_xpath(service_node, './/soap12:address/@location', 'soap12' => SOAP_1_2)
       end
 
       @endpoint = parse_url(endpoint) if endpoint
@@ -118,12 +118,12 @@ module Wasabi
 
     def parse_operations_parameters
       root_elements = document.xpath("wsdl:definitions/wsdl:types/*[local-name()='schema']/*[local-name()='element']", 'wsdl' => WSDL).each do |element|
-        name = element.attribute("name").to_s.snakecase.to_sym
+        name = element.attribute('name').to_s.snakecase.to_sym
 
         if operation = @operations[name]
           element.xpath("*[local-name() ='complexType']/*[local-name() ='sequence']/*[local-name() ='element']").each do |child_element|
-            attr_name = child_element.attribute("name").to_s
-            attr_type = (attr_type = child_element.attribute("type").to_s.split(":")).size > 1 ? attr_type[1] : attr_type[0]
+            attr_name = child_element.attribute('name').to_s
+            attr_type = (attr_type = child_element.attribute('type').to_s.split(':')).size > 1 ? attr_type[1] : attr_type[0]
 
             operation[:parameters] ||= {}
             operation[:parameters][attr_name.to_sym] = { :name => attr_name, :type => attr_type }
@@ -133,9 +133,9 @@ module Wasabi
     end
 
     def parse_operations
-      operations = document.xpath("wsdl:definitions/wsdl:binding/wsdl:operation", 'wsdl' => WSDL)
+      operations = document.xpath('wsdl:definitions/wsdl:binding/wsdl:operation', 'wsdl' => WSDL)
       operations.each do |operation|
-        name = operation.attribute("name").to_s
+        name = operation.attribute('name').to_s
 
         # TODO: check for soap namespace?
         soap_operation = operation.element_children.find { |node| node.name == 'operation' }
@@ -179,20 +179,20 @@ module Wasabi
       @types[name] ||= { :namespace => namespace }
       @types[name][:order!] = []
 
-      type.xpath("./xs:sequence/xs:element", 'xs' => XSD).each do |inner|
-        element_name = inner.attribute("name").to_s
-        @types[name][element_name] = { :type => inner.attribute("type").to_s }
+      type.xpath('./xs:sequence/xs:element', 'xs' => XSD).each do |inner|
+        element_name = inner.attribute('name').to_s
+        @types[name][element_name] = { :type => inner.attribute('type').to_s }
 
         [ :nillable, :minOccurs, :maxOccurs ].each do |attr|
           if v = inner.attribute(attr.to_s)
-           @types[name][element_name][attr] = v.to_s
+            @types[name][element_name][attr] = v.to_s
           end
         end
 
         @types[name][:order!] << element_name
       end
 
-      type.xpath("./xs:complexContent/xs:extension/xs:sequence/xs:element", 'xs' => XSD).each do |inner_element|
+      type.xpath('./xs:complexContent/xs:extension/xs:sequence/xs:element', 'xs' => XSD).each do |inner_element|
         element_name = inner_element.attribute('name').to_s
         @types[name][element_name] = { :type => inner_element.attribute('type').to_s }
 
@@ -226,15 +226,15 @@ module Wasabi
     end
 
     def input_for(operation)
-     input_output_for(operation, "input")
+      input_output_for(operation, 'input')
     end
 
     def output_for(operation)
-     input_output_for(operation, "output")
+      input_output_for(operation, 'output')
     end
 
     def input_output_for(operation, input_output)
-      operation_name = operation["name"]
+      operation_name = operation['name']
 
       # Look up the input by walking up to portType, then up to the message.
 
@@ -244,15 +244,15 @@ module Wasabi
       end
 
       port_type_input_output = port_type_operation &&
-                               port_type_operation.element_children.find { |node| node.name == 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.
       if port_type_input_output
-        if port_type_input_output.attribute("message").to_s.include? ':'
-          port_message_ns_id, port_message_type = port_type_input_output.attribute("message").to_s.split(':')
+        if port_type_input_output.attribute('message').to_s.include? ':'
+          port_message_ns_id, port_message_type = port_type_input_output.attribute('message').to_s.split(':')
         else
-          port_message_type = port_type_input_output.attribute("message").to_s
+          port_message_type = port_type_input_output.attribute('message').to_s
         end
 
         message_ns_id, message_type = nil
@@ -262,16 +262,16 @@ module Wasabi
         port_message_part = message.element_children.find { |node| node.name == 'part' }
 
         if port_message_part
-          if (port_message_part_element = port_message_part.attribute("element"))
+          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 the name of the binding operation
         if message_type
-          [message_ns_id, message_type]
+          [message_ns_id, operation_name]
         else
-          [port_message_ns_id, port_message_type]
+          [port_message_ns_id, operation_name]
         end
       else
         [nil, operation_name]
@@ -302,7 +302,5 @@ module Wasabi
 
       @sections = sections
     end
-
   end
-
 end

data/lib/wasabi/version.rb

@@ -1,3 +1,3 @@
 module Wasabi
-  VERSION = "3.2.1"
+  VERSION = "3.2.2"
 end

data/spec/wasabi/document/authentication_spec.rb

@@ -15,7 +15,7 @@ describe Wasabi::Document do
 
     its(:operations) do
       should == {
-        :authenticate => { :input => "authenticate", :output => "authenticateResponse", :action => "authenticate", :namespace_identifier => "tns" }
+        :authenticate => { :input => "authenticate", :output => "authenticate", :action => "authenticate", :namespace_identifier => "tns" }
       }
     end
 

data/spec/wasabi/document/multiple_namespaces_spec.rb

@@ -14,7 +14,7 @@ describe Wasabi::Document do
     it { should have(1).operations }
 
     its(:operations) do
-      should == { :save => { :input => "Save", :output=>"SaveResponse", :action => "http://example.com/actions.Save", :namespace_identifier => "actions", :parameters => { :article => { :name => "article", :type => "Article" } } } }
+      should == { :save => { :input => "Save", :output=>"Save", :action => "http://example.com/actions.Save", :namespace_identifier => "actions", :parameters => { :article => { :name => "article", :type => "Article" } } } }
     end
 
     its(:type_namespaces) do

data/spec/wasabi/document/namespaced_actions_spec.rb

@@ -15,9 +15,9 @@ describe Wasabi::Document do
 
     its(:operations) 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" } }
+        { :delete_client => { :input => "DeleteClient", :output => "DeleteClient", :action => "http://api.example.com/api/Client.Delete", :namespace_identifier => "tns" } },
+        { :get_clients   => { :input => "GetClients", :output => "GetClients", :action => "http://api.example.com/api/User.GetClients", :namespace_identifier => "tns" } },
+        { :get_api_key   => { :input => "GetApiKey", :output => "GetApiKey", :action => "http://api.example.com/api/User.GetApiKey", :namespace_identifier => "tns" } }
       )
     end
 

data/spec/wasabi/document/no_namespace_spec.rb

@@ -15,9 +15,9 @@ describe Wasabi::Document do
 
     its(:operations) do
       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 } }
+        { :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
 

data/spec/wasabi/document/savon295_spec.rb

@@ -7,7 +7,7 @@ describe Wasabi::Document do
 
     its(:operations) do
       should include(
-        { :sendsms => { :input => "sendsmsRequest", :output => "sendsmsResponse", :action => "sendsms", :namespace_identifier => "tns" } }
+        { :sendsms => { :input => "sendsms", :output => "sendsms", :action => "sendsms", :namespace_identifier => "tns" } }
       )
     end
 

data/spec/wasabi/parser/no_message_parts_spec.rb

@@ -1,7 +1,7 @@
-require "spec_helper"
+require 'spec_helper'
 
 describe Wasabi::Parser do
-  context "with: no_message_parts.wsdl" do
+  context 'with: no_message_parts.wsdl' do
 
     subject do
       parser = Wasabi::Parser.new Nokogiri::XML(xml)
@@ -11,16 +11,16 @@ describe Wasabi::Parser do
 
     let(:xml) { fixture(:no_message_parts).read }
 
-    it "falls back to using the message type in the port element" do
+    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.
-      subject.operations[:save][:input].should == "SaveSoapIn"
+      subject.operations[:save][:input].should == 'Save'
 
       # Operation's output has part element in the message, so using part element's type.
-      subject.operations[:save][:output].should == "SaveResponse"
+      subject.operations[:save][:output].should == 'Save'
     end
 
-    it "falls back to using the namespace ID in the port element" do
-      subject.operations[:save][:namespace_identifier].should == "actions"
+    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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wasabi
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpi