wasabi 2.5.0 → 2.5.1

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 2.5.1 (2012-08-22)
+
+* Fix: [#14](https://github.com/rubiii/wasabi/issues/14) fixes an issue where
+  finding the correct SOAP input tag and namespace identifier fails when portTypes
+  are imported, since imports are currently not supported.
+
+  The bug was introduced in v2.2.0 by [583cf6](https://github.com/rubiii/wasabi/commit/583cf658f1953411a7a7a4c22923fa0a046c8d6d).
+
+* Refactoring: Removed `Object#blank?` core extension.
+
 ## 2.5.0 (2012-06-28)
 
 * Fix: [#10](https://github.com/rubiii/wasabi/issues/10) fixes an issue where

data/lib/wasabi/parser.rb

@@ -1,6 +1,5 @@
 require "uri"
 require "wasabi/xpath_helper"
-require "wasabi/core_ext/object"
 require "wasabi/core_ext/string"
 
 module Wasabi
@@ -86,7 +85,7 @@ module Wasabi
 
         if soap_action
           soap_action = soap_action.to_s
-          action = soap_action.blank? ? name : soap_action
+          action = soap_action && !soap_action.empty? ? soap_action : name
 
           # There should be a matching portType for each binding, so we will lookup the input from there.
           namespace_id, input = input_for(operation)
@@ -129,9 +128,7 @@ module Wasabi
         if @types[base]
           @types[name].merge! @types[base]
         else
-          deferred_types << Proc.new do
-            @types[name].merge! @types[base]
-          end
+          deferred_types << Proc.new { @types[name].merge! @types[base] }
         end
       end
     end
@@ -153,22 +150,28 @@ module Wasabi
       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(':')
+      # TODO: Stupid fix for missing support for imports.
+      # Sometimes portTypes are actually included in a separate WSDL.
+      if port_type_input
+        port_message_ns_id, port_message_type = port_type_input.attribute("message").to_s.split(':')
 
-      message_ns_id, message_type = nil
+        message_ns_id, message_type = nil
 
-      # TODO: Support multiple 'part' elements in the message.
-      if (port_message_part = at_xpath(port_type_input, "../../../wsdl:message[@name='#{port_message_type}']/wsdl:part[1]"))
-        if (port_message_part_element = port_message_part.attribute("element"))
-          message_ns_id, message_type = port_message_part_element.to_s.split(':')
+        # TODO: Support multiple 'part' elements in the message.
+        if (port_message_part = at_xpath(port_type_input, "../../../wsdl:message[@name='#{port_message_type}']/wsdl:part[1]"))
+          if (port_message_part_element = port_message_part.attribute("element"))
+            message_ns_id, message_type = port_message_part_element.to_s.split(':')
+          end
         end
-      end
 
-      # Fall back to the name of the binding operation
-      if message_type
-        [message_ns_id, message_type]
+        # Fall back to the name of the binding operation
+        if message_type
+          [message_ns_id, message_type]
+        else
+          [port_message_ns_id, operation_name]
+        end
       else
-        [port_message_ns_id, operation_name]
+        [nil, operation_name]
       end
     end
 

data/lib/wasabi/version.rb

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

data/spec/fixtures/import_port_types.wsdl

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- reference: savon issue #313 -->
+<wsdl:definitions name="BYDExchangeServer" targetNamespace="http://tempuri.org/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:tns="http://tempuri.org/" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:i0="http://bydexchange.nbs-us.com" xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata">
+   <wsdl:import namespace="http://bydexchange.nbs-us.com" location="http://bydexchange.nbs-us.com/BYDExchangeServer.svc?wsdl=wsdl0"/>
+   <wsdl:types/>
+   <wsdl:binding name="BasicHttpBinding_IBYDExchangeServer" type="i0:IBYDExchangeServer">
+      <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+      <wsdl:operation name="ProductAvail">
+         <soap:operation soapAction="http://bydexchange.nbs-us.com/IBYDExchangeServer/ProductAvail" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="listcustomers">
+         <soap:operation soapAction="http://bydexchange.nbs-us.com/IBYDExchangeServer/listcustomers" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="ParseCSV">
+         <soap:operation soapAction="http://bydexchange.nbs-us.com/IBYDExchangeServer/ParseCSV" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="AddOrder">
+         <soap:operation soapAction="http://bydexchange.nbs-us.com/IBYDExchangeServer/AddOrder" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetOrder">
+         <soap:operation soapAction="http://bydexchange.nbs-us.com/IBYDExchangeServer/GetOrder" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="AddCustomer">
+         <soap:operation soapAction="http://bydexchange.nbs-us.com/IBYDExchangeServer/AddCustomer" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="GetCustomer">
+         <soap:operation soapAction="http://bydexchange.nbs-us.com/IBYDExchangeServer/GetCustomer" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+      <wsdl:operation name="Authenticate">
+         <soap:operation soapAction="http://bydexchange.nbs-us.com/IBYDExchangeServer/Authenticate" style="document"/>
+         <wsdl:input>
+            <soap:body use="literal"/>
+         </wsdl:input>
+         <wsdl:output>
+            <soap:body use="literal"/>
+         </wsdl:output>
+      </wsdl:operation>
+   </wsdl:binding>
+   <wsdl:service name="BYDExchangeServer">
+      <wsdl:port name="BasicHttpBinding_IBYDExchangeServer" binding="tns:BasicHttpBinding_IBYDExchangeServer">
+         <soap:address location="http://bydexchange.nbs-us.com/BYDExchangeServer.svc"/>
+      </wsdl:port>
+   </wsdl:service>
+</wsdl:definitions>

data/spec/wasabi/document_spec.rb

@@ -4,23 +4,21 @@ describe Wasabi::Document do
 
   subject { Wasabi::Document.new fixture(:authentication).read }
 
-  describe ".new" do
-    it "accepts a URL" do
-      HTTPI.expects(:get).returns(HTTPI::Response.new(200, {}, "wsdl"))
+  it "accepts a URL" do
+    HTTPI.should_receive(:get) { HTTPI::Response.new(200, {}, "wsdl") }
 
-      document = Wasabi::Document.new("http://example.com?wsdl")
-      document.xml.should == "wsdl"
-    end
+    document = Wasabi::Document.new("http://example.com?wsdl")
+    document.xml.should == "wsdl"
+  end
 
-    it "accepts a path" do
-      document = Wasabi::Document.new fixture(:authentication).path
-      document.xml.should == fixture(:authentication).read
-    end
+  it "accepts a path" do
+    document = Wasabi::Document.new fixture(:authentication).path
+    document.xml.should == fixture(:authentication).read
+  end
 
-    it "accepts raw XML" do
-      document = Wasabi::Document.new fixture(:authentication).read
-      document.xml.should == fixture(:authentication).read
-    end
+  it "accepts raw XML" do
+    document = Wasabi::Document.new fixture(:authentication).read
+    document.xml.should == fixture(:authentication).read
   end
 
   describe ".validate_element_form_default!" do

data/spec/wasabi/parser/import_port_types_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+describe Wasabi::Parser do
+  context "with: import_port_types.wsdl" do
+
+    subject do
+      parser = Wasabi::Parser.new Nokogiri::XML(xml)
+      parser.parse
+      parser
+    end
+
+    let(:xml) { fixture(:import_port_types).read }
+
+    it "does blow up when portTypes are imported" do
+      get_customer = subject.operations[:get_customer]
+
+      get_customer[:input].should == "GetCustomer"
+      get_customer[:namespace_identifier].should be_nil
+    end
+
+  end
+end

data/spec/wasabi/resolver_spec.rb

@@ -4,7 +4,7 @@ describe Wasabi::Resolver do
 
   describe "#xml" do
     it "resolves remote documents" do
-      HTTPI.expects(:get).returns(HTTPI::Response.new(200, {}, "wsdl"))
+      HTTPI.should_receive(:get) { HTTPI::Response.new(200, {}, "wsdl") }
       xml = Wasabi::Resolver.new("http://example.com?wsdl").xml
       xml.should == "wsdl"
     end

data/wasabi.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rake",  "~> 0.9"
   s.add_development_dependency "rspec", "~> 2.10"
-  s.add_development_dependency "mocha", "~> 0.11"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wasabi
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 2
   - 5
-  - 0
-  version: 2.5.0
+  - 1
+  version: 2.5.1
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -15,10 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-28 00:00:00 Z
+date: 2012-08-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -28,12 +30,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
+  version_requirements: *id001
   name: httpi
-  type: :runtime
-  prerelease: false
-  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +46,12 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
+  version_requirements: *id002
   name: nokogiri
-  type: :runtime
-  prerelease: false
-  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -59,12 +61,12 @@ dependencies:
         - 0
         - 9
         version: "0.9"
+  version_requirements: *id003
   name: rake
-  type: :development
-  prerelease: false
-  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -74,25 +76,8 @@ dependencies:
         - 2
         - 10
         version: "2.10"
+  version_requirements: *id004
   name: rspec
-  type: :development
-  prerelease: false
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 11
-        version: "0.11"
-  name: mocha
-  type: :development
-  prerelease: false
-  requirement: *id005
 description: A simple WSDL parser
 email: 
 - me@rubiii.com
@@ -112,7 +97,6 @@ files:
 - README.md
 - Rakefile
 - lib/wasabi.rb
-- lib/wasabi/core_ext/object.rb
 - lib/wasabi/core_ext/string.rb
 - lib/wasabi/document.rb
 - lib/wasabi/parser.rb
@@ -121,6 +105,7 @@ files:
 - lib/wasabi/xpath_helper.rb
 - spec/fixtures/authentication.wsdl
 - spec/fixtures/geotrust.wsdl
+- spec/fixtures/import_port_types.wsdl
 - spec/fixtures/inherited.wsdl
 - spec/fixtures/lower_camel.wsdl
 - spec/fixtures/multiple_namespaces.wsdl
@@ -134,7 +119,6 @@ files:
 - spec/fixtures/two_bindings.wsdl
 - spec/spec_helper.rb
 - spec/support/fixture.rb
-- spec/wasabi/core_ext/object_spec.rb
 - spec/wasabi/core_ext/string_spec.rb
 - spec/wasabi/document/authentication_spec.rb
 - spec/wasabi/document/geotrust_spec.rb
@@ -146,6 +130,7 @@ files:
 - spec/wasabi/document/soap12_spec.rb
 - spec/wasabi/document/two_bindings_spec.rb
 - spec/wasabi/document_spec.rb
+- spec/wasabi/parser/import_port_types_spec.rb
 - spec/wasabi/parser/multiple_namespaces_spec.rb
 - spec/wasabi/parser/no_message_parts_spec.rb
 - spec/wasabi/parser/no_namespace_spec.rb
@@ -183,13 +168,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: wasabi
-rubygems_version: 1.8.21
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A simple WSDL parser
 test_files: 
 - spec/fixtures/authentication.wsdl
 - spec/fixtures/geotrust.wsdl
+- spec/fixtures/import_port_types.wsdl
 - spec/fixtures/inherited.wsdl
 - spec/fixtures/lower_camel.wsdl
 - spec/fixtures/multiple_namespaces.wsdl
@@ -203,7 +189,6 @@ test_files:
 - spec/fixtures/two_bindings.wsdl
 - spec/spec_helper.rb
 - spec/support/fixture.rb
-- spec/wasabi/core_ext/object_spec.rb
 - spec/wasabi/core_ext/string_spec.rb
 - spec/wasabi/document/authentication_spec.rb
 - spec/wasabi/document/geotrust_spec.rb
@@ -215,6 +200,7 @@ test_files:
 - spec/wasabi/document/soap12_spec.rb
 - spec/wasabi/document/two_bindings_spec.rb
 - spec/wasabi/document_spec.rb
+- spec/wasabi/parser/import_port_types_spec.rb
 - spec/wasabi/parser/multiple_namespaces_spec.rb
 - spec/wasabi/parser/no_message_parts_spec.rb
 - spec/wasabi/parser/no_namespace_spec.rb

data/lib/wasabi/core_ext/object.rb

@@ -1,14 +0,0 @@
-module Wasabi
-  module CoreExt
-    module Object
-
-      # Returns +true+ if the Object is nil, false or empty. Implementation from ActiveSupport.
-      def blank?
-        respond_to?(:empty?) ? empty? : !self
-      end unless method_defined?(:blank?)
-
-    end
-  end
-end
-
-Object.send :include, Wasabi::CoreExt::Object

data/spec/wasabi/core_ext/object_spec.rb

@@ -1,19 +0,0 @@
-require "spec_helper"
-
-describe Object do
-
-  describe "blank?" do
-    it "returns true for Objects perceived to be blank" do
-      ["", false, nil, [], {}].each do |object|
-        object.should be_blank
-      end
-    end
-
-    it "returns false for every other Object" do
-      ["!blank", true, [:a], {:a => "b"}].each do |object|
-        object.should_not be_blank
-      end
-    end
-  end
-
-end