savon 0.6.7 → 0.6.8

data/spec/fixtures/wsdl/xml/no_namespace.xml

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="Api" xmlns:typens="urn:ActionWebService" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="urn:ActionWebService" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <types>
+    <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:ActionWebService">
+      <xsd:complexType name="MpUser">
+        <xsd:all>
+          <xsd:element name="avatar_thumb_url" type="xsd:string"/>
+          <xsd:element name="speciality" type="xsd:string"/>
+          <xsd:element name="avatar_icon_url" type="xsd:string"/>
+          <xsd:element name="firstname" type="xsd:string"/>
+          <xsd:element name="city" type="xsd:string"/>
+          <xsd:element name="mp_id" type="xsd:int"/>
+          <xsd:element name="lastname" type="xsd:string"/>
+          <xsd:element name="login" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="MpUserArray">
+        <xsd:complexContent>
+          <xsd:restriction base="soapenc:Array">
+            <xsd:attribute wsdl:arrayType="typens:MpUser[]" ref="soapenc:arrayType"/>
+          </xsd:restriction>
+        </xsd:complexContent>
+      </xsd:complexType>
+      <xsd:complexType name="McContact">
+        <xsd:all>
+          <xsd:element name="last_name" type="xsd:string"/>
+          <xsd:element name="email" type="xsd:string"/>
+          <xsd:element name="mp_id" type="xsd:int"/>
+          <xsd:element name="role" type="xsd:int"/>
+          <xsd:element name="login" type="xsd:string"/>
+          <xsd:element name="first_name" type="xsd:string"/>
+        </xsd:all>
+      </xsd:complexType>
+      <xsd:complexType name="McContactArray">
+        <xsd:complexContent>
+          <xsd:restriction base="soapenc:Array">
+            <xsd:attribute wsdl:arrayType="typens:McContact[]" ref="soapenc:arrayType"/>
+          </xsd:restriction>
+        </xsd:complexContent>
+      </xsd:complexType>
+    </xsd:schema>
+  </types>
+  <message name="GetUserLoginById">
+    <part name="api_key" type="xsd:string"/>
+    <part name="id" type="xsd:int"/>
+  </message>
+  <message name="GetUserLoginByIdResponse">
+    <part name="return" type="xsd:string"/>
+  </message>
+  <message name="GetAllContacts">
+    <part name="api_key" type="xsd:string"/>
+    <part name="login" type="xsd:string"/>
+  </message>
+  <message name="GetAllContactsResponse">
+    <part name="return" type="typens:McContactArray"/>
+  </message>
+  <message name="SearchUser">
+    <part name="api_key" type="xsd:string"/>
+    <part name="phrase" type="xsd:string"/>
+    <part name="page" type="xsd:string"/>
+    <part name="per_page" type="xsd:string"/>
+  </message>
+  <message name="SearchUserResponse">
+    <part name="return" type="typens:MpUserArray"/>
+  </message>
+  <portType name="ApiApiPort">
+    <operation name="GetUserLoginById">
+      <input message="typens:GetUserLoginById"/>
+      <output message="typens:GetUserLoginByIdResponse"/>
+    </operation>
+    <operation name="GetAllContacts">
+      <input message="typens:GetAllContacts"/>
+      <output message="typens:GetAllContactsResponse"/>
+    </operation>
+    <operation name="SearchUser">
+      <input message="typens:SearchUser"/>
+      <output message="typens:SearchUserResponse"/>
+    </operation>
+  </portType>
+  <binding name="ApiApiBinding" type="typens:ApiApiPort">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
+    <operation name="GetUserLoginById">
+      <soap:operation soapAction="/api/api/GetUserLoginById"/>
+      <input>
+        <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:ActionWebService" use="encoded"/>
+      </input>
+      <output>
+        <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:ActionWebService" use="encoded"/>
+      </output>
+    </operation>
+    <operation name="GetAllContacts">
+      <soap:operation soapAction="/api/api/GetAllContacts"/>
+      <input>
+        <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:ActionWebService" use="encoded"/>
+      </input>
+      <output>
+        <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:ActionWebService" use="encoded"/>
+      </output>
+    </operation>
+    <operation name="SearchUser">
+      <soap:operation soapAction="/api/api/SearchUser"/>
+      <input>
+        <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:ActionWebService" use="encoded"/>
+      </input>
+      <output>
+        <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" namespace="urn:ActionWebService" use="encoded"/>
+      </output>
+    </operation>
+  </binding>
+  <service name="ApiService">
+    <port name="ApiApiPort" binding="typens:ApiApiBinding">
+      <soap:address location="http://example.com/api/api"/>
+    </port>
+  </service>
+</definitions>

data/spec/http_stubs.rb

@@ -1,23 +1,23 @@
-require "fakeweb"
-
 FakeWeb.allow_net_connect = false
 
 # Some WSDL and SOAP request.
-FakeWeb.register_uri :get, EndpointHelper.wsdl_endpoint, :body => UserFixture.user_wsdl
-FakeWeb.register_uri :post, EndpointHelper.soap_endpoint, :body => UserFixture.user_response
-
-# WSDL and SOAP request with multiple "//return" nodes.
-FakeWeb.register_uri :get, EndpointHelper.wsdl_endpoint(:multiple), :body => UserFixture.user_wsdl
-FakeWeb.register_uri :post, EndpointHelper.soap_endpoint(:multiple), :body => UserFixture.multiple_user_response
+FakeWeb.register_uri :get, EndpointHelper.wsdl_endpoint, :body => WSDLFixture.authentication
+FakeWeb.register_uri :post, EndpointHelper.soap_endpoint, :body => ResponseFixture.authentication
 
 # WSDL and SOAP request with a Savon::SOAPFault.
-FakeWeb.register_uri :get, EndpointHelper.wsdl_endpoint(:soap_fault), :body => UserFixture.user_wsdl
-FakeWeb.register_uri :post, EndpointHelper.soap_endpoint(:soap_fault), :body => UserFixture.soap_fault
+FakeWeb.register_uri :get, EndpointHelper.wsdl_endpoint(:soap_fault), :body => WSDLFixture.authentication
+FakeWeb.register_uri :post, EndpointHelper.soap_endpoint(:soap_fault), :body => ResponseFixture.soap_fault
 
 # WSDL and SOAP request with a Savon::HTTPError.
-FakeWeb.register_uri :get, EndpointHelper.wsdl_endpoint(:http_error), :body => UserFixture.user_wsdl
+FakeWeb.register_uri :get, EndpointHelper.wsdl_endpoint(:http_error), :body => WSDLFixture.authentication
 FakeWeb.register_uri :post, EndpointHelper.soap_endpoint(:http_error), :body => "", :status => ["404", "Not Found"]
 
 # WSDL and SOAP request with an invalid endpoint.
 FakeWeb.register_uri :get, EndpointHelper.wsdl_endpoint(:invalid), :body => ""
 FakeWeb.register_uri :post, EndpointHelper.soap_endpoint(:invalid), :body => "", :status => ["404", "Not Found"]
+
+# WSDL request returning a WSDL document where the main sections are not namespaced.
+FakeWeb.register_uri :get, EndpointHelper.wsdl_endpoint(:no_namespace), :body => WSDLFixture.no_namespace
+
+# WSDL request returning a WSDL document with namespaced SOAP actions.
+FakeWeb.register_uri :get, EndpointHelper.wsdl_endpoint(:namespaced_actions), :body => WSDLFixture.namespaced_actions

data/spec/savon/client_spec.rb

@@ -7,10 +7,19 @@ describe Savon::Client do
     Savon::Client.new EndpointHelper.wsdl_endpoint
   end
 
-  it "accepts an optional proxy URI passed in via options" do
+  it "accepts a proxy URI passed in via options" do
     Savon::Client.new EndpointHelper.wsdl_endpoint, :proxy => 'http://proxy'
   end
 
+  it "accepts settings for SSL client authentication via options" do
+    Savon::Client.new EndpointHelper.wsdl_endpoint, :ssl => {
+      :client_cert => "client cert",
+      :client_key => "client key",
+      :ca_file => "ca file",
+      :verify => OpenSSL::SSL::VERIFY_PEER
+    }
+  end
+
   it "has a getter for accessing the Savon::WSDL" do
     @client.wsdl.should be_a Savon::WSDL
   end
@@ -19,48 +28,63 @@ describe Savon::Client do
     @client.request.should be_a Savon::Request
   end
 
-  it "has a getter for returning whether to use the Savon::WSDL (global setting)" do
-    @client.wsdl?.should be_true
-
-    Savon::Client.wsdl = false
-    @client.wsdl?.should be_false
-    Savon::Client.wsdl = true
-
-    @client.wsdl = false
-    @client.wsdl?.should be_false
-  end
-
   it "responds to SOAP actions while still behaving as usual otherwise" do
-    @client.respond_to?(UserFixture.soap_actions.first).should be_true
+    WSDLFixture.authentication(:operations).keys.each do |soap_action|
+      @client.respond_to?(soap_action).should be_true
+    end
+
     @client.respond_to?(:object_id).should be_true
     @client.respond_to?(:some_undefined_method).should be_false
   end
 
   it "dispatches SOAP calls via method_missing and returns the Savon::Response" do
-    @client.find_user.should be_a Savon::Response
+    @client.authenticate.should be_a Savon::Response
   end
 
-  it "dispatches SOAP calls via method_missing without using WSDL" do
-    @client.wsdl = false
-    @client.find_user.should be_a Savon::Response    
+  describe "disabling retrieving and parsing the WSDL document" do
+    it "can be done globally for every instance of Savon::Client" do
+      @client.wsdl?.should be_true
+      Savon::Client.wsdl = false
+
+      expect_the_wsdl_to_be_disabled
+      @client.authenticate.should be_a Savon::Response
+
+      Savon::Client.wsdl = true
+    end
+
+    it "can be done per request" do
+      @client.wsdl = false
+
+      expect_the_wsdl_to_be_disabled
+      @client.authenticate.should be_a Savon::Response
+    end
+
+    def expect_the_wsdl_to_be_disabled
+      @client.wsdl?.should be_false
+      [:respond_to?, :operations, :namespace_uri, :soap_endpoint].each do |method|
+        Savon::WSDL.any_instance.expects(method).never
+      end
+    end
   end
 
   it "raises a Savon::SOAPFault in case of a SOAP fault" do
     client = Savon::Client.new EndpointHelper.wsdl_endpoint(:soap_fault)
-    lambda { client.find_user }.should raise_error Savon::SOAPFault
+    client.wsdl = false
+    lambda { client.authenticate }.should raise_error Savon::SOAPFault
   end
 
   it "raises a Savon::HTTPError in case of an HTTP error" do
     client = Savon::Client.new EndpointHelper.wsdl_endpoint(:http_error)
-    lambda { client.find_user }.should raise_error Savon::HTTPError
+    client.wsdl = false
+    lambda { client.authenticate }.should raise_error Savon::HTTPError
   end
 
   it "yields the SOAP object to a block when it expects one argument" do
-    @client.find_user { |soap| soap.should be_a Savon::SOAP }
+    @client.authenticate { |soap| soap.should be_a Savon::SOAP }
   end
 
   it "yields the SOAP and WSSE object to a block when it expects two argument" do
-    @client.find_user do |soap, wsse|
+    @client.authenticate do |soap, wsse|
       soap.should be_a Savon::SOAP
       wsse.should be_a Savon::WSSE
     end
@@ -70,23 +94,4 @@ describe Savon::Client do
     lambda { @client.some_undefined_method }.should raise_error NoMethodError
   end
 
-  it "passes ssl options to request" do
-    @client.request.class.class_eval { attr_reader :ssl } 
-
-    client = Savon::Client.new(
-      EndpointHelper.wsdl_endpoint,
-      :ssl => {
-        :client_cert => "client cert",
-        :client_key => "client key",
-        :ca_file => "ca file",
-        :verify => OpenSSL::SSL::VERIFY_PEER
-      }
-    )
-
-    client.request.ssl[:client_cert].should == "client cert"
-    client.request.ssl[:client_key].should == "client key"
-    client.request.ssl[:ca_file].should == "ca file"
-    client.request.ssl[:verify].should == OpenSSL::SSL::VERIFY_PEER
-  end
-
-end
+end

data/spec/savon/core_ext/datetime_spec.rb

@@ -4,8 +4,8 @@ describe DateTime do
 
   describe "to_soap_value" do
     it "returns an xs:dateTime compliant String" do
-      UserFixture.datetime_object.to_soap_value.
-        should == UserFixture.datetime_string
+      DateTime.new(2012, 03, 22, 16, 22, 33).to_soap_value.
+        should == "2012-03-22T16:22:33"
     end
   end
 

data/spec/savon/core_ext/hash_spec.rb

@@ -65,26 +65,26 @@ describe Hash do
     end
 
     it "converts DateTime objects to xs:dateTime compliant Strings" do
-      { :before => UserFixture.datetime_object }.to_soap_xml.
-        should == "<before>" << UserFixture.datetime_string << "</before>"
+      { :before => DateTime.new(2012, 03, 22, 16, 22, 33) }.to_soap_xml.
+        should == "<before>" << "2012-03-22T16:22:33" << "</before>"
     end
 
     it "converts Objects responding to to_datetime to xs:dateTime compliant Strings" do
       singleton = Object.new
       def singleton.to_datetime
-        UserFixture.datetime_object
+        DateTime.new(2012, 03, 22, 16, 22, 33)
       end
 
       { :before => singleton }.to_soap_xml.
-        should == "<before>" << UserFixture.datetime_string << "</before>"
+        should == "<before>" << "2012-03-22T16:22:33" << "</before>"
     end
 
     it "calls to_s on Strings even if they respond to to_datetime" do
-      singleton = "gorilla"
-      singleton.expects( :to_s ).returns singleton
-      singleton.expects( :to_datetime ).never
+      object = "gorilla"
+      object.expects(:to_s).returns object
+      object.expects(:to_datetime).never
 
-      { :name => singleton }.to_soap_xml.should == "<name>gorilla</name>"
+      { :name => object }.to_soap_xml.should == "<name>gorilla</name>"
     end
 
     it "call to_s on any other Object" do
@@ -116,8 +116,8 @@ describe Hash do
     end
 
     it "converts Hash values matching the xs:dateTime format into DateTime Objects" do
-      { "response" => { "at" => UserFixture.datetime_string } }.map_soap_response.
-        should == { :response => { :at => UserFixture.datetime_object } }
+      { "response" => { "at" => "2012-03-22T16:22:33" } }.map_soap_response.
+        should == { :response => { :at => DateTime.new(2012, 03, 22, 16, 22, 33) } }
     end
 
     it "converts Hash values matching 'true' to TrueClass" do

data/spec/savon/core_ext/object_spec.rb

@@ -26,10 +26,10 @@ describe Object do
     it "returns an xs:dateTime compliant String for Objects responding to to_datetime" do
       singleton = Object.new
       def singleton.to_datetime
-        UserFixture.datetime_object
+        DateTime.new(2012, 03, 22, 16, 22, 33)
       end
 
-      singleton.to_soap_value.should == UserFixture.datetime_string
+      singleton.to_soap_value.should == "2012-03-22T16:22:33"
     end
 
     it "calls to_s unless the Object responds to to_datetime" do

data/spec/savon/core_ext/string_spec.rb

@@ -42,8 +42,8 @@ describe String do
 
   describe "map_soap_response" do
     it "returns a DateTime Object for Strings matching the xs:dateTime format" do
-      UserFixture.datetime_string.map_soap_response.should ==
-        UserFixture.datetime_object
+      "2012-03-22T16:22:33".map_soap_response.should ==
+        DateTime.new(2012, 03, 22, 16, 22, 33)
     end
 
     it "returns true for Strings matching 'true'" do

data/spec/savon/core_ext/symbol_spec.rb

@@ -8,4 +8,4 @@ describe Symbol do
     end
   end
 
-end
+end

data/spec/savon/core_ext/uri_spec.rb

@@ -12,4 +12,4 @@ describe URI::HTTP do
     end
   end
 
-end
+end

data/spec/savon/request_spec.rb

@@ -67,14 +67,16 @@ describe Savon::Request do
     wsdl_response = @request.wsdl
 
     wsdl_response.should be_a Net::HTTPResponse
-    wsdl_response.body.should == UserFixture.user_wsdl
+    wsdl_response.body.should == WSDLFixture.authentication
   end
 
   it "executes a SOAP request and returns the Net::HTTPResponse" do
-    soap_response = @request.soap Savon::SOAP.new
+    soap = Savon::SOAP.new
+    soap.endpoint = URI EndpointHelper.wsdl_endpoint
+    soap_response = @request.soap soap
 
     soap_response.should be_a Net::HTTPResponse
-    soap_response.body.should == UserFixture.user_response
+    soap_response.body.should == ResponseFixture.authentication
   end
   
   describe "Savon::Request SSL" do

data/spec/savon/response_spec.rb

@@ -94,25 +94,25 @@ describe Savon::Response do
   end
 
   it "can return the SOAP response body as a Hash" do
-    @response.to_hash.should == UserFixture.response_hash
+    @response.to_hash[:return].should == ResponseFixture.authentication(:to_hash)
   end
 
   it "can return the raw SOAP response body" do
-    @response.to_xml.should == UserFixture.user_response
-    @response.to_s.should == UserFixture.user_response
+    @response.to_xml.should == ResponseFixture.authentication
+    @response.to_s.should == ResponseFixture.authentication
   end
 
   def savon_response_with(error_type)
     mock = case error_type
-      when :soap_fault then http_response_mock(200, UserFixture.soap_fault)
-      when :soap_fault12 then http_response_mock(200, UserFixture.soap_fault12)
-      when :http_error then http_response_mock(404, "", "Not found")
+      when :soap_fault   then http_response_mock 200, ResponseFixture.soap_fault
+      when :soap_fault12 then http_response_mock 200, ResponseFixture.soap_fault12
+      when :http_error   then http_response_mock 404, "", "Not found"
     end
     Savon::Response.new mock
   end
 
   def http_response_mock(code = 200, body = nil, message = "OK")
-    body ||= UserFixture.user_response
+    body ||= ResponseFixture.authentication
     mock = mock "Net::HTTPResponse"
     mock.stubs :code => code.to_s, :message => message,
                :content_type => "text/html", :body => body

data/spec/savon/savon_spec.rb

@@ -11,14 +11,13 @@ describe Savon do
     Savon::SOAPDateTimeFormat.should be_a String
     Savon::SOAPDateTimeFormat.should_not be_empty
 
-    UserFixture.datetime_object.strftime(Savon::SOAPDateTimeFormat).
-      should == UserFixture.datetime_string
+    DateTime.new(2012, 03, 22, 16, 22, 33).strftime(Savon::SOAPDateTimeFormat).
+      should == "2012-03-22T16:22:33"
   end
 
   it "contains a Regexp matching the xs:dateTime format" do
     Savon::SOAPDateTimeRegexp.should be_a Regexp
-    (Savon::SOAPDateTimeRegexp === UserFixture.datetime_string).
-      should be_true
+    (Savon::SOAPDateTimeRegexp === "2012-03-22T16:22:33").should be_true
   end
 
 end