savon 0.6.7 → 0.6.8

data/spec/savon/soap_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Savon::SOAP do
   before do
     @soap = Savon::SOAP.new
-    @soap.action = UserFixture.operations[:find_user][:action]
+    @soap.action = WSDLFixture.authentication(:operations)[:authenticate][:action]
   end
 
   it "contains the SOAP namespace for each supported SOAP version" do
@@ -36,7 +36,7 @@ describe Savon::SOAP do
   end
 
   it "is has both getter and setter for the SOAP action" do
-    @soap.action.should == UserFixture.operations[:find_user][:action]
+    @soap.action.should == WSDLFixture.authentication(:operations)[:authenticate][:action]
 
     @soap.action = "someAction"
     @soap.action.should == "someAction"
@@ -76,6 +76,14 @@ describe Savon::SOAP do
     end
   end
 
+  it "has both getter and setter for the SOAP endpoint" do
+    @soap.endpoint.should be_nil
+
+    soap_endpoint = URI EndpointHelper.soap_endpoint
+    @soap.endpoint = soap_endpoint
+    @soap.endpoint.should == soap_endpoint
+  end
+
   it "has a getter for the SOAP version to use which defaults to SOAP 1.1" do
     @soap.version.should == Savon::SOAP.version
   end
@@ -89,12 +97,12 @@ describe Savon::SOAP do
     after { Savon::SOAP.version = 1 }
 
     it "returns the XML for a SOAP request" do
-      @soap.namespaces["xmlns:wsdl"] = "http://v1_0.ws.user.example.com"
+      @soap.namespaces["xmlns:wsdl"] = "http://v1_0.ws.auth.order.example.com/"
       @soap.body = { :id => 666 }
 
-      @soap.to_xml.should include 'xmlns:wsdl="http://v1_0.ws.user.example.com"'
+      @soap.to_xml.should include 'xmlns:wsdl="http://v1_0.ws.auth.order.example.com/"'
       @soap.to_xml.should include 'xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"'
-      @soap.to_xml.should include '<wsdl:findUser><id>666</id></wsdl:findUser>'
+      @soap.to_xml.should include '<wsdl:authenticate><id>666</id></wsdl:authenticate>'
     end
 
     it "caches the XML, returning the same Object every time" do

data/spec/savon/wsdl_spec.rb

@@ -1,37 +1,80 @@
 require "spec_helper"
 
 describe Savon::WSDL do
-  before do
-    @wsdl = Savon::WSDL.new Savon::Request.new(EndpointHelper.wsdl_endpoint)
-  end
+  describe "a common WSDL document" do
+    before { @wsdl = new_wsdl }
 
-  it "is initialized with a Savon::Request object" do
-    Savon::WSDL.new Savon::Request.new(EndpointHelper.wsdl_endpoint)
-  end
+    it "is initialized with a Savon::Request object" do
+      Savon::WSDL.new Savon::Request.new(EndpointHelper.wsdl_endpoint)
+    end
 
-  it "has a getter for the namespace URI" do
-    @wsdl.namespace_uri.should == UserFixture.namespace_uri
-  end
+    it "has a getter for the namespace URI" do
+      @wsdl.namespace_uri.should == WSDLFixture.authentication(:namespace_uri)
+    end
+
+    it "has a getter for returning an Array of available SOAP actions" do
+      WSDLFixture.authentication(:operations).keys.each do |soap_action|
+        @wsdl.soap_actions.should include soap_action
+      end
+    end
+
+    it "has a getter for returning a Hash of available SOAP operations" do
+      @wsdl.operations.should == WSDLFixture.authentication(:operations)
+    end
+
+    it "responds to SOAP actions while still behaving as usual otherwise" do
+      WSDLFixture.authentication(:operations).keys.each do |soap_action|
+        @wsdl.respond_to?(soap_action).should be_true
+      end
+
+      @wsdl.respond_to?(:object_id).should be_true
+      @wsdl.respond_to?(:some_undefined_method).should be_false
+    end
 
-  it "has a getter for returning an Array of available SOAP actions" do
-    UserFixture.soap_actions.each do |soap_action|
-      @wsdl.soap_actions.should include soap_action
+    it "returns the raw WSDL document for to_s" do
+      @wsdl.to_s.should == WSDLFixture.authentication
     end
   end
 
-  it "has a getter for returning a Hash of available SOAP operations" do
-    @wsdl.operations.should == UserFixture.operations
+  describe "a WSDL document having core sections without a namespace" do
+    before { @wsdl = new_wsdl :no_namespace }
+
+    it "returns the namespace URI" do
+      @wsdl.namespace_uri.should == WSDLFixture.no_namespace(:namespace_uri)
+    end
+
+    it "returns an Array of available SOAP actions" do
+      WSDLFixture.no_namespace(:operations).keys.each do |soap_action|
+        @wsdl.soap_actions.should include soap_action
+      end
+    end
+
+    it "returns a Hash of SOAP operations" do
+      @wsdl.operations.should == WSDLFixture.no_namespace(:operations)
+    end
   end
 
-  it "responds to SOAP actions while still behaving as usual otherwise" do
-    @wsdl.respond_to?(UserFixture.soap_actions.first).should be_true
+  describe "a WSDL document with namespaced SOAP actions" do
+    before { @wsdl = new_wsdl :namespaced_actions }
 
-    @wsdl.respond_to?(:object_id).should be_true
-    @wsdl.respond_to?(:some_undefined_method).should be_false
+    it "returns the namespace URI" do
+      @wsdl.namespace_uri.should == WSDLFixture.namespaced_actions(:namespace_uri)
+    end
+
+    it "returns an Array of available SOAP actions" do
+      WSDLFixture.namespaced_actions(:operations).keys.each do |soap_action|
+        @wsdl.soap_actions.should include soap_action
+      end
+    end
+
+    it "returns a Hash of SOAP operations" do
+      @wsdl.operations.should == WSDLFixture.namespaced_actions(:operations)
+    end
   end
 
-  it "returns the raw WSDL document for to_s" do
-    @wsdl.to_s.should == UserFixture.user_wsdl
+  def new_wsdl(fixture = nil)
+    endpoint = fixture ? EndpointHelper.wsdl_endpoint(fixture) : EndpointHelper.wsdl_endpoint
+    Savon::WSDL.new Savon::Request.new(endpoint)
   end
 
 end

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
 require "rubygems"
-gem "rspec", ">= 1.2.8"
+require "rake"
 require "spec"
 require "mocha"
+require "fakeweb"
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha
@@ -10,6 +11,6 @@ end
 require "savon"
 Savon::Request.log = false
 
-require "fixtures/user_fixture"
+FileList["spec/fixtures/**/*.rb"].each { |fixture| require fixture }
 require "endpoint_helper"
 require "http_stubs"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 +01:00
+date: 2010-01-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.2.7
     version: 
-description: Heavy metal Ruby SOAP client library
+description: 
 email: me@rubiii.com
 executables: []
 
@@ -72,30 +72,25 @@ extra_rdoc_files:
 - README.textile
 files: 
 - CHANGELOG
-- README.textile
 - Rakefile
-- VERSION
-- lib/savon.rb
+- README.textile
 - lib/savon/client.rb
-- lib/savon/core_ext.rb
 - lib/savon/core_ext/datetime.rb
 - lib/savon/core_ext/hash.rb
 - lib/savon/core_ext/object.rb
 - lib/savon/core_ext/string.rb
 - lib/savon/core_ext/symbol.rb
 - lib/savon/core_ext/uri.rb
+- lib/savon/core_ext.rb
 - lib/savon/request.rb
 - lib/savon/response.rb
 - lib/savon/soap.rb
 - lib/savon/wsdl.rb
 - lib/savon/wsse.rb
+- lib/savon.rb
 - spec/endpoint_helper.rb
-- spec/fixtures/multiple_user_response.xml
-- spec/fixtures/soap_fault.xml
-- spec/fixtures/soap_fault12.xml
-- spec/fixtures/user_fixture.rb
-- spec/fixtures/user_response.xml
-- spec/fixtures/user_wsdl.xml
+- spec/fixtures/response/response_fixture.rb
+- spec/fixtures/wsdl/wsdl_fixture.rb
 - spec/http_stubs.rb
 - spec/savon/client_spec.rb
 - spec/savon/core_ext/datetime_spec.rb
@@ -111,6 +106,12 @@ files:
 - spec/savon/wsdl_spec.rb
 - spec/savon/wsse_spec.rb
 - spec/spec_helper.rb
+- spec/fixtures/response/xml/authentication.xml
+- spec/fixtures/response/xml/soap_fault.xml
+- spec/fixtures/response/xml/soap_fault12.xml
+- spec/fixtures/wsdl/xml/authentication.xml
+- spec/fixtures/wsdl/xml/namespaced_actions.xml
+- spec/fixtures/wsdl/xml/no_namespace.xml
 has_rdoc: true
 homepage: http://github.com/rubiii/savon
 licenses: []
@@ -145,7 +146,8 @@ specification_version: 3
 summary: Heavy metal Ruby SOAP client library
 test_files: 
 - spec/endpoint_helper.rb
-- spec/fixtures/user_fixture.rb
+- spec/fixtures/response/response_fixture.rb
+- spec/fixtures/wsdl/wsdl_fixture.rb
 - spec/http_stubs.rb
 - spec/savon/client_spec.rb
 - spec/savon/core_ext/datetime_spec.rb

data/VERSION

@@ -1 +0,0 @@
-0.6.7

data/spec/fixtures/multiple_user_response.xml

@@ -1,22 +0,0 @@
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-   <soap:Body>
-      <ns2:findUserResponse xmlns:ns2="http://v1_0.ws.user.example.com">
-         <return>
-            <id>666</id>
-            <email>thedude@example.com</email>
-            <username>thedude</username>
-            <firstname>The</firstname>
-            <lastname>Dude</lastname>
-            <registered>2000-01-22T22:11:21</registered>
-         </return>
-         <return>
-            <id>999</id>
-            <email>anotherdude@example.com</email>
-            <username>anotherdude</username>
-            <firstname>Another</firstname>
-            <lastname>Dude</lastname>
-            <registered>1984-05-26T11:22:12</registered>
-         </return>
-      </ns2:findUserResponse>
-   </soap:Body>
-</soap:Envelope>

data/spec/fixtures/user_fixture.rb

@@ -1,62 +0,0 @@
-class UserFixture
-
-  @namespace_uri = "http://v1_0.ws.user.example.com"
-  @operations = {
-    :user_find_by_id => { :action => "User.FindById", :input => "User.FindById" },
-    :find_user => { :action => "findUser", :input => "findUser" }
-  }
-
-  @datetime_string = "2010-11-22T11:22:33"
-  @datetime_object = DateTime.parse @datetime_string
-
-  @response_hash = {
-    :ns2 => "http://v1_0.ws.user.example.com",
-    :return => {
-      :active => true,
-      :firstname => "The",
-      :lastname => "Dude",
-      :email => "thedude@example.com",
-      :id => "666",
-      :registered => @datetime_object,
-      :username => "thedude"
-    }
-  }
-
-  class << self
-
-    attr_accessor :namespace_uri, :operations,
-      :datetime_string, :datetime_object, :response_hash
-
-    def soap_actions
-      @operations.keys
-    end
-
-    def user_wsdl
-      load_fixture :user_wsdl
-    end
-
-    def user_response
-      load_fixture :user_response
-    end
-
-    def multiple_user_response
-      load_fixture :multiple_user_response
-    end
-
-    def soap_fault
-      load_fixture :soap_fault
-    end
-    
-    def soap_fault12
-      load_fixture :soap_fault12
-    end
-
-  private
-
-    def load_fixture(file)
-      file_path = File.join File.dirname(__FILE__), "#{file}.xml"
-      IO.readlines(file_path, "").to_s
-    end
-
-  end
-end

data/spec/fixtures/user_response.xml

@@ -1,15 +0,0 @@
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-   <soap:Body>
-      <ns2:findUserResponse xmlns:ns2="http://v1_0.ws.user.example.com">
-         <return>
-            <id>666</id>
-            <email>thedude@example.com</email>
-            <username>thedude</username>
-            <firstname>The</firstname>
-            <lastname>Dude</lastname>
-						<registered>2010-11-22T11:22:33</registered>
-						<active>true</active>
-         </return>
-      </ns2:findUserResponse>
-   </soap:Body>
-</soap:Envelope>

data/spec/fixtures/user_wsdl.xml

@@ -1,124 +0,0 @@
-<wsdl:definitions
-  name="UserWebService"
-  targetNamespace="http://v1_0.ws.user.example.com"
-  xmlns:ns1="http://cxf.apache.org/bindings/xformat"
-  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-  xmlns:tns="http://v1_0.ws.user.example.com"
-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <wsdl:types>
-    <xs:schema
-      attributeFormDefault="unqualified"
-      elementFormDefault="unqualified"
-      targetNamespace="http://v1_0.ws.user.example.com"
-      xmlns:tns="http://v1_0.ws.user.example.com"
-      xmlns:xs="http://www.w3.org/2001/XMLSchema">
-      <xs:element name="findUser" type="tns:findUser" />
-			<xs:element name="User.FindById" type="tns:findUser" />
-      <xs:element name="findUserRequest" type="tns:findUserRequest" />
-      <xs:element name="baseFindUserRequest" type="tns:baseFindUserRequest" />
-      <xs:element name="idCredential" type="tns:idCredential" />
-      <xs:element name="emailCredential" type="tns:emailCredential" />
-      <xs:element name="findUserResponse" type="tns:findUserResponse" />
-			<xs:element name="User.FindByIdResponse" type="tns:findUserResponse" />
-      <xs:element name="userResponse" type="tns:userResponse" />
-
-      <xs:complexType name="findUser">
-        <xs:sequence>
-          <xs:element minOccurs="1" name="requestData" type="tns:findUserRequest" />
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="findUserRequest">
-        <xs:complexContent>
-          <xs:extension base="tns:baseFindUserRequest">
-            <xs:sequence>
-              <xs:element minOccurs="0" name="mandant" type="tns:mandant" />
-            </xs:sequence>
-          </xs:extension>
-        </xs:complexContent>
-      </xs:complexType>
-      <xs:complexType name="baseFindUserRequest">
-        <xs:choice>
-          <xs:element ref="tns:idCredential" />
-          <xs:element ref="tns:emailCredential" />
-        </xs:choice>
-      </xs:complexType>
-      <xs:complexType name="idCredential">
-        <xs:sequence>
-          <xs:element name="id" type="xs:string" />
-          <xs:element name="token" type="xs:string" />
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="emailCredential">
-        <xs:sequence>
-          <xs:element name="email" type="xs:string" />
-          <xs:element name="token" type="xs:string" />
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="findUserResponse">
-        <xs:sequence>
-          <xs:element minOccurs="0" name="return" type="tns:userResponse" />
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="userResponse">
-        <xs:sequence>
-          <xs:element minOccurs="0" name="id" type="xs:string" />
-          <xs:element minOccurs="0" name="email" type="xs:string" />
-          <xs:element minOccurs="0" name="username" type="xs:string" />
-          <xs:element minOccurs="0" name="firstname" type="xs:string" />
-          <xs:element minOccurs="0" name="lastname" type="xs:string" />
-        </xs:sequence>
-      </xs:complexType>
-    </xs:schema>
-  </wsdl:types>
-
-  <wsdl:message name="findUser">
-    <wsdl:part element="tns:findUser" name="parameters"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="findUserResponse">
-    <wsdl:part element="tns:findUserResponse" name="parameters"></wsdl:part>
-  </wsdl:message>
-
-  <wsdl:message name="User.FindById">
-    <wsdl:part element="tns:findUser" name="parameters"></wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="User.FindByIdResponse">
-    <wsdl:part element="tns:findUserResponse" name="parameters"></wsdl:part>
-  </wsdl:message>
-
-  <wsdl:portType name="UserWebService">
-    <wsdl:operation name="findUser">
-      <wsdl:input message="tns:findUser" name="findUser"></wsdl:input>
-      <wsdl:output message="tns:findUserResponse" name="findUserResponse"></wsdl:output>
-    </wsdl:operation>
-  </wsdl:portType>
-
-  <wsdl:binding name="UserWebServiceSoapBinding" type="tns:UserWebService">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="findUser">
-      <soap:operation soapAction="" style="document" />
-      <wsdl:input name="findUser">
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output name="findUserResponse">
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-		<wsdl:operation name="User.FindById">
-      <soap:operation soapAction="" style="document" />
-      <wsdl:input name="User.FindById">
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output name="User.FindByIdResponse">
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-
-  <wsdl:service name="UserWebService">
-    <wsdl:port binding="tns:UserWebServiceSoapBinding" name="UserWebServicePort">
-      <soap:address location="http://example.com/user/1.0/UserService" />
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>