wasabi 2.4.1 → 2.5.0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.5.0 (2012-06-28)
+
+* Fix: [#10](https://github.com/rubiii/wasabi/issues/10) fixes an issue where
+  Wasabi used the wrong operation name.
+
 ## 2.4.1 (2012-06-18)
 
 * Fix: [rubiii/savon#296](https://github.com/rubiii/savon/issues/296) fixes an issue where

data/lib/wasabi/parser.rb

@@ -146,7 +146,7 @@ module Wasabi
     end
 
     def input_for(operation)
-      operation_name = operation.attribute("name")
+      operation_name = operation["name"]
 
       # Look up the input by walking up to portType, then up to the message.
 
@@ -164,11 +164,11 @@ module Wasabi
         end
       end
 
-      # Fall back to message name in portType input if no 'element' attribute in wsdl:message
+      # Fall back to the name of the binding operation
       if message_type
         [message_ns_id, message_type]
       else
-        [port_message_ns_id, port_message_type]
+        [port_message_ns_id, operation_name]
       end
     end
 

data/lib/wasabi/version.rb

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

data/spec/fixtures/savon295.wsdl

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<definitions name="SendSMS" targetNamespace="http://bedrift.telefonkatalogen.no" xmlns:tns="http://bedrift.telefonkatalogen.no" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns="http://schemas.xmlsoap.org/wsdl/">
+    <types>
+     <xsd:schema elementFormDefault="qualified" targetNamespace="http://bedrift.telefonkatalogen.no" xmlns="http://www.w3.org/2001/XMLSchema">
+
+     </xsd:schema>
+    </types>
+
+
+<message name="sendsmsRequest">
+ <part name="sender" type="xsd:string"/>
+ <part name="cellular" type="xsd:string"/>
+ <part name="msg" type="xsd:string"/>
+ <part name="smsnumgroup" type="xsd:string"/>
+ <part name="emailaddr" type="xsd:string"/>
+ <part name="udh" type="xsd:string"/>
+ <part name="datetime" type="xsd:string"/>
+ <part name="format" type="xsd:string"/>
+ <part name="dlrurl" type="xsd:string"/>
+</message>
+<message name="sendsmsResponse">
+ <part name="body" type="xsd:string"/>
+</message>
+
+<portType name="SendSmsPortType">
+ <operation name="sendsms">
+  <input message="tns:sendsmsRequest"/>
+  <output message="tns:sendsmsResponse"/>
+ </operation>
+</portType>
+
+<binding name="SendSmsBinding" type="tns:SendSmsPortType">
+ <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="sendsms">
+  <soap:operation soapAction="sendsms"/>
+  <input>
+   <soap:body use="literal"/>
+  </input>
+  <output>
+   <soap:body use="literal"/>
+  </output>
+ </operation>
+</binding>
+
+<service name="SendSms">
+<documentation>Interfaces to telephone directory services, using rpc/literal</documentation>
+<port name="SendSmsPort" binding="tns:SendSmsBinding">
+<soap:address location="http://bedrift.telefonkatalogen.no/tk/websvcsendsms.php"/>
+</port>
+</service>
+
+</definitions>

data/spec/wasabi/document/savon295_spec.rb

@@ -0,0 +1,15 @@
+require "spec_helper"
+
+describe Wasabi::Document do
+  context "with: savon295.wsdl" do
+
+    subject { Wasabi::Document.new fixture(:savon295).read }
+
+    its(:operations) do
+      should include(
+        { :sendsms => { :input => "sendsms", :action => "sendsms", :namespace_identifier => "tns" } }
+      )
+    end
+
+  end
+end

data/spec/wasabi/parser/no_message_parts_spec.rb

@@ -12,7 +12,7 @@ describe Wasabi::Parser do
     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"
+      subject.operations[:save][:input].should == "Save"
     end
 
     it "falls back to using the namespace ID in the port element" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wasabi
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 2
-  - 4
-  - 1
-  version: 2.4.1
+  - 5
+  - 0
+  version: 2.5.0
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-18 00:00:00 Z
+date: 2012-06-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -128,6 +128,7 @@ files:
 - spec/fixtures/namespaced_actions.wsdl
 - spec/fixtures/no_message_parts.wsdl
 - spec/fixtures/no_namespace.wsdl
+- spec/fixtures/savon295.wsdl
 - spec/fixtures/soap12.wsdl
 - spec/fixtures/symbolic_endpoint.wsdl
 - spec/fixtures/two_bindings.wsdl
@@ -141,6 +142,7 @@ files:
 - spec/wasabi/document/multiple_namespaces_spec.rb
 - spec/wasabi/document/namespaced_actions_spec.rb
 - spec/wasabi/document/no_namespace_spec.rb
+- spec/wasabi/document/savon295_spec.rb
 - spec/wasabi/document/soap12_spec.rb
 - spec/wasabi/document/two_bindings_spec.rb
 - spec/wasabi/document_spec.rb
@@ -195,6 +197,7 @@ test_files:
 - spec/fixtures/namespaced_actions.wsdl
 - spec/fixtures/no_message_parts.wsdl
 - spec/fixtures/no_namespace.wsdl
+- spec/fixtures/savon295.wsdl
 - spec/fixtures/soap12.wsdl
 - spec/fixtures/symbolic_endpoint.wsdl
 - spec/fixtures/two_bindings.wsdl
@@ -208,6 +211,7 @@ test_files:
 - spec/wasabi/document/multiple_namespaces_spec.rb
 - spec/wasabi/document/namespaced_actions_spec.rb
 - spec/wasabi/document/no_namespace_spec.rb
+- spec/wasabi/document/savon295_spec.rb
 - spec/wasabi/document/soap12_spec.rb
 - spec/wasabi/document/two_bindings_spec.rb
 - spec/wasabi/document_spec.rb