savon 0.6.8 → 0.7.0

data/spec/savon/core_ext/string_spec.rb

@@ -4,12 +4,12 @@ describe String do
 
   describe "self.random" do
     it "returns a random 100-character String" do
-      String.random.should be_a String
+      String.random.should be_a(String)
       String.random.length.should == 100
     end
 
     it "returns a random String of a given length" do
-      String.random(50).should be_a String
+      String.random(50).should be_a(String)
       String.random(50).length.should == 50
     end
   end

data/spec/savon/request_spec.rb

@@ -5,7 +5,7 @@ describe Savon::Request do
 
   it "contains the ContentType for each supported SOAP version" do
     Savon::SOAPVersions.each do |soap_version|
-      Savon::Request::ContentType[soap_version].should be_a String
+      Savon::Request::ContentType[soap_version].should be_a(String)
       Savon::Request::ContentType[soap_version].should_not be_empty
     end
   end
@@ -20,7 +20,7 @@ describe Savon::Request do
   end
 
   it "defaults to use a Logger instance for logging" do
-    Savon::Request.logger.should be_a Logger
+    Savon::Request.logger.should be_a(Logger)
   end
 
   it "has both getter and setter for the logger to use (global setting)" do
@@ -43,10 +43,6 @@ describe Savon::Request do
     Savon::Request.new EndpointHelper.wsdl_endpoint
   end
 
-  it "ccepts an optional proxy URI passed in via options" do
-    Savon::Request.new EndpointHelper.wsdl_endpoint, :proxy => "http://localhost:8080"
-  end
-
   it "has a getter for the SOAP endpoint URI" do
     @request.endpoint.should == URI(EndpointHelper.wsdl_endpoint)
   end
@@ -55,70 +51,28 @@ describe Savon::Request do
     @request.proxy.should == URI("")
   end
 
-  it "has a setter for specifying an open_timeout" do
-    @request.open_timeout = 30
+  it "should return the Net::HTTP object" do
+    @request.http.should be_kind_of(Net::HTTP)
   end
 
-  it "has a setter for specifying a read_timeout" do
-    @request.read_timeout = 30
+  it "should have a method for setting HTTP basic auth credentials" do
+    @request.basic_auth "user", "password"
   end
 
-  it "retrieves the WSDL document and returns the Net::HTTPResponse" do
+  it "retrieves the WSDL document and returns the Net::HTTP response" do
     wsdl_response = @request.wsdl
 
-    wsdl_response.should be_a Net::HTTPResponse
+    wsdl_response.should be_a(Net::HTTPResponse)
     wsdl_response.body.should == WSDLFixture.authentication
   end
 
-  it "executes a SOAP request and returns the Net::HTTPResponse" do
+  it "executes a SOAP request and returns the Net::HTTP response" do
     soap = Savon::SOAP.new
     soap.endpoint = URI EndpointHelper.wsdl_endpoint
     soap_response = @request.soap soap
 
-    soap_response.should be_a Net::HTTPResponse
+    soap_response.should be_a(Net::HTTPResponse)
     soap_response.body.should == ResponseFixture.authentication
   end
-  
-  describe "Savon::Request SSL" do
-    before { @request.class.class_eval { public "http" }  }
-
-    it "defaults to not setting ssl parameters" do
-      http = @request.http
-      http.cert.should be_nil
-      http.key.should be_nil
-      http.ca_file.should be_nil
-      http.verify_mode.should == OpenSSL::SSL::VERIFY_NONE
-    end
-
-    it "sets client cert in http object when set in request constructor" do
-      request = Savon::Request.new(EndpointHelper.wsdl_endpoint, :ssl => {
-        :client_cert => "client cert"
-      })
-      request.http.cert.should == "client cert"
-    end
-
-    it "sets ca cert in http object when set in request constructor" do
-      request = Savon::Request.new(EndpointHelper.wsdl_endpoint, :ssl => {
-        :client_key => "client key"
-      })
-      request.http.key.should == "client key"
-    end
-
-    it "sets client cert in http object when set in request constructor" do
-      request = Savon::Request.new(EndpointHelper.wsdl_endpoint, :ssl => {
-        :ca_file => "ca file"
-      })
-      request.http.ca_file.should == "ca file"
-    end
 
-    it "sets client cert in http object when set in request constructor" do
-      request = Savon::Request.new(EndpointHelper.wsdl_endpoint, :ssl => {
-        :verify => OpenSSL::SSL::VERIFY_PEER
-      })
-      request.http.verify_mode.should == OpenSSL::SSL::VERIFY_PEER
-    end
-
-    after { @request.class.class_eval { private "http" } }
-  end
-  
 end

data/spec/savon/response_spec.rb

@@ -19,7 +19,7 @@ describe Savon::Response do
     end
 
     it "raises a Savon::SOAPFault in case of a SOAP fault" do
-      lambda { savon_response_with :soap_fault }.should raise_error Savon::SOAPFault
+      lambda { savon_response_with :soap_fault }.should raise_error(Savon::SOAPFault)
     end
  
     it "does not raise a Savon::SOAPFault in case the default is turned off" do
@@ -29,7 +29,7 @@ describe Savon::Response do
     end
  
     it "raises a Savon::HTTPError in case of an HTTP error" do
-      lambda { savon_response_with :http_error }.should raise_error Savon::HTTPError
+      lambda { savon_response_with :http_error }.should raise_error(Savon::HTTPError)
     end
 
     it "does not raise a Savon::HTTPError in case the default is turned off" do
@@ -93,11 +93,19 @@ describe Savon::Response do
     after { Savon::Response.raise_errors = true }
   end
 
-  it "can return the SOAP response body as a Hash" do
-    @response.to_hash[:return].should == ResponseFixture.authentication(:to_hash)
+  it "should return the SOAP response body as a Hash" do
+    @response.to_hash[:authenticate_response][:return].should ==
+      ResponseFixture.authentication(:to_hash)
   end
 
-  it "can return the raw SOAP response body" do
+  it "should return a Hash for a SOAP multiRef response" do
+    @response = Savon::Response.new http_response_mock(200, ResponseFixture.multi_ref, "OK")
+
+    @response.to_hash[:list_response].should be_a(Hash)
+    @response.to_hash[:multi_ref].should be_an(Array) 
+  end
+
+  it "should return the raw SOAP response body" do
     @response.to_xml.should == ResponseFixture.authentication
     @response.to_s.should == ResponseFixture.authentication
   end

data/spec/savon/savon_spec.rb

@@ -3,12 +3,12 @@ require "spec_helper"
 describe Savon do
 
   it "contains an Array of supported SOAP versions" do
-    Savon::SOAPVersions.should be_an Array
+    Savon::SOAPVersions.should be_an(Array)
     Savon::SOAPVersions.should_not be_empty
   end
 
   it "contains the xs:dateTime format" do
-    Savon::SOAPDateTimeFormat.should be_a String
+    Savon::SOAPDateTimeFormat.should be_a(String)
     Savon::SOAPDateTimeFormat.should_not be_empty
 
     DateTime.new(2012, 03, 22, 16, 22, 33).strftime(Savon::SOAPDateTimeFormat).
@@ -16,7 +16,7 @@ describe Savon do
   end
 
   it "contains a Regexp matching the xs:dateTime format" do
-    Savon::SOAPDateTimeRegexp.should be_a Regexp
+    Savon::SOAPDateTimeRegexp.should be_a(Regexp)
     (Savon::SOAPDateTimeRegexp === "2012-03-22T16:22:33").should be_true
   end
 

data/spec/savon/soap_spec.rb

@@ -8,14 +8,14 @@ describe Savon::SOAP do
 
   it "contains the SOAP namespace for each supported SOAP version" do
     Savon::SOAPVersions.each do |soap_version|
-      Savon::SOAP::SOAPNamespace[soap_version].should be_a String
+      Savon::SOAP::SOAPNamespace[soap_version].should be_a(String)
       Savon::SOAP::SOAPNamespace[soap_version].should_not be_empty
     end
   end
 
   it "contains the Content-Types for each supported SOAP version" do
     Savon::SOAPVersions.each do |soap_version|
-      Savon::SOAP::ContentType[soap_version].should be_a String
+      Savon::SOAP::ContentType[soap_version].should be_a(String)
       Savon::SOAP::ContentType[soap_version].should_not be_empty
     end
   end
@@ -47,7 +47,7 @@ describe Savon::SOAP do
   end
 
   it "has both getter and setter for the SOAP header" do
-    @soap.header.should be_a Hash
+    @soap.header.should be_a(Hash)
     @soap.header.should be_empty
 
     @soap.header = { "specialAuthKey" => "secret" }
@@ -76,6 +76,14 @@ describe Savon::SOAP do
     end
   end
 
+  it "has a convenience method for setting the 'xmlns:wsdl' namespace" do
+    @soap.namespaces.should == { "xmlns:env" => "http://schemas.xmlsoap.org/soap/envelope/" }
+
+    @soap.namespace = "http://example.com"
+    @soap.namespaces.should include("xmlns:env" => "http://schemas.xmlsoap.org/soap/envelope/")
+    @soap.namespaces.should include("xmlns:wsdl" => "http://example.com")
+  end
+
   it "has both getter and setter for the SOAP endpoint" do
     @soap.endpoint.should be_nil
 
@@ -100,9 +108,9 @@ describe Savon::SOAP do
       @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.auth.order.example.com/"'
-      @soap.to_xml.should include 'xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"'
-      @soap.to_xml.should include '<wsdl:authenticate><id>666</id></wsdl:authenticate>'
+      @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:authenticate><id>666</id></wsdl:authenticate>')
     end
 
     it "caches the XML, returning the same Object every time" do
@@ -111,12 +119,12 @@ describe Savon::SOAP do
 
     it "uses the SOAP namespace for the specified SOAP version" do
       @soap.version = 2
-      @soap.to_xml.should include Savon::SOAP::SOAPNamespace[2]
+      @soap.to_xml.should include(Savon::SOAP::SOAPNamespace[2])
     end
 
     it "uses the SOAP namespace for the default SOAP version otherwise" do
       Savon::SOAP.version = 2
-      @soap.to_xml.should include Savon::SOAP::SOAPNamespace[2]
+      @soap.to_xml.should include(Savon::SOAP::SOAPNamespace[2])
     end
   end
 

data/spec/savon/wsdl_spec.rb

@@ -8,13 +8,17 @@ describe Savon::WSDL do
       Savon::WSDL.new Savon::Request.new(EndpointHelper.wsdl_endpoint)
     end
 
+    it "is enabled by default" do
+      @wsdl.enabled?.should be_true
+    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
+        @wsdl.soap_actions.should include(soap_action)
       end
     end
 
@@ -45,7 +49,7 @@ describe Savon::WSDL do
 
     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
+        @wsdl.soap_actions.should include(soap_action)
       end
     end
 
@@ -63,7 +67,7 @@ describe Savon::WSDL do
 
     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
+        @wsdl.soap_actions.should include(soap_action)
       end
     end
 

data/spec/savon/wsse_spec.rb

@@ -11,12 +11,12 @@ describe Savon::WSSE do
   end
 
   it "contains the namespace for WS Security Secext" do
-    Savon::WSSE::WSENamespace.should be_a String
+    Savon::WSSE::WSENamespace.should be_a(String)
     Savon::WSSE::WSENamespace.should_not be_empty
   end
 
   it "contains the namespace for WS Security Utility" do
-    Savon::WSSE::WSUNamespace.should be_a String
+    Savon::WSSE::WSUNamespace.should be_a(String)
     Savon::WSSE::WSUNamespace.should_not be_empty
   end
 
@@ -82,8 +82,8 @@ describe Savon::WSSE do
         header = @wsse.header
 
         header.should include_security_namespaces
-        header.should include @username
-        header.should include @password
+        header.should include(@username)
+        header.should include(@password)
       end
 
       it "with WSSE credentials specified via defaults" do
@@ -92,8 +92,8 @@ describe Savon::WSSE do
         header = @wsse.header
 
         header.should include_security_namespaces
-        header.should include @username
-        header.should include @password
+        header.should include(@username)
+        header.should include(@password)
       end
     end
 
@@ -105,8 +105,8 @@ describe Savon::WSSE do
         header = @wsse.header
   
         header.should include_security_namespaces
-        header.should include @username
-        header.should_not include @password
+        header.should include(@username)
+        header.should_not include(@password)
       end
 
       it "via defaults" do
@@ -116,15 +116,15 @@ describe Savon::WSSE do
         header = @wsse.header
   
         header.should include_security_namespaces
-        header.should include @username
-        header.should_not include @password
+        header.should include(@username)
+        header.should_not include(@password)
       end
     end
 
     def include_security_namespaces
       simple_matcher("include security namespaces") do |given|
-        given.should include Savon::WSSE::WSENamespace
-        given.should include Savon::WSSE::WSUNamespace
+        given.should include(Savon::WSSE::WSENamespace)
+        given.should include(Savon::WSSE::WSUNamespace)
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,15 +1,4 @@
-require "rubygems"
-require "rake"
-require "spec"
-require "mocha"
-require "fakeweb"
-
-Spec::Runner.configure do |config|
-  config.mock_with :mocha
-end
-
-require "savon"
-Savon::Request.log = false
+require "basic_spec_helper"
 
 FileList["spec/fixtures/**/*.rb"].each { |fixture| require fixture }
 require "endpoint_helper"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-01 00:00:00 +01:00
+date: 2010-01-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,7 @@ files:
 - lib/savon/client.rb
 - lib/savon/core_ext/datetime.rb
 - lib/savon/core_ext/hash.rb
+- lib/savon/core_ext/net_http.rb
 - lib/savon/core_ext/object.rb
 - lib/savon/core_ext/string.rb
 - lib/savon/core_ext/symbol.rb
@@ -88,13 +89,17 @@ files:
 - lib/savon/wsdl.rb
 - lib/savon/wsse.rb
 - lib/savon.rb
+- spec/basic_spec_helper.rb
 - spec/endpoint_helper.rb
 - spec/fixtures/response/response_fixture.rb
 - spec/fixtures/wsdl/wsdl_fixture.rb
 - spec/http_stubs.rb
+- spec/integration/http_basic_auth_spec.rb
+- spec/integration/server.rb
 - spec/savon/client_spec.rb
 - spec/savon/core_ext/datetime_spec.rb
 - spec/savon/core_ext/hash_spec.rb
+- spec/savon/core_ext/net_http_spec.rb
 - spec/savon/core_ext/object_spec.rb
 - spec/savon/core_ext/string_spec.rb
 - spec/savon/core_ext/symbol_spec.rb
@@ -107,6 +112,7 @@ files:
 - spec/savon/wsse_spec.rb
 - spec/spec_helper.rb
 - spec/fixtures/response/xml/authentication.xml
+- spec/fixtures/response/xml/multi_ref.xml
 - spec/fixtures/response/xml/soap_fault.xml
 - spec/fixtures/response/xml/soap_fault12.xml
 - spec/fixtures/wsdl/xml/authentication.xml
@@ -145,13 +151,17 @@ signing_key:
 specification_version: 3
 summary: Heavy metal Ruby SOAP client library
 test_files: 
+- spec/basic_spec_helper.rb
 - spec/endpoint_helper.rb
 - spec/fixtures/response/response_fixture.rb
 - spec/fixtures/wsdl/wsdl_fixture.rb
 - spec/http_stubs.rb
+- spec/integration/http_basic_auth_spec.rb
+- spec/integration/server.rb
 - spec/savon/client_spec.rb
 - spec/savon/core_ext/datetime_spec.rb
 - spec/savon/core_ext/hash_spec.rb
+- spec/savon/core_ext/net_http_spec.rb
 - spec/savon/core_ext/object_spec.rb
 - spec/savon/core_ext/string_spec.rb
 - spec/savon/core_ext/symbol_spec.rb