savon 0.6.3 → 0.6.4

data/spec/savon/request_spec.rb

@@ -1,92 +1,72 @@
 require "spec_helper"
 
 describe Savon::Request do
-  before { @request = some_request_instance }
+  before { @request = Savon::Request.new EndpointHelper.wsdl_endpoint }
 
-  def some_request_instance
-    Savon::Request.new SpecHelper.some_endpoint
+  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_not be_empty
+    end
   end
 
-  def some_soap_instance(options = {})
-    Savon::SOAP.new UserFixture.soap_actions[:find_user]
-  end
+  # defaults to log request and response. disabled for spec execution
 
-  describe "ContentType" 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_not be_empty
-      end
-    end
+  it "has both getter and setter for whether to log (global setting)" do
+    Savon::Request.log = true
+    Savon::Request.log?.should be_true
+    Savon::Request.log = false
+    Savon::Request.log?.should be_false
   end
 
-  describe "@log" do
-    # It defaults to true, but it's turned off for spec execution.
-
-    it "has accessor methods" do
-      Savon::Request.log = true
-      Savon::Request.log?.should be_true
-      Savon::Request.log = false
-      Savon::Request.log?.should be_false
-    end
+  it "defaults to use a Logger instance for logging" do
+    Savon::Request.logger.should be_a Logger
   end
 
-  describe "@logger" do
-    it "defaults to Logger" do
-      Savon::Request.logger.should be_a Logger
-    end
+  it "has both getter and setter for the logger to use (global setting)" do
+    Savon::Request.logger = nil
+    Savon::Request.logger.should be_nil
+    Savon::Request.logger = Logger.new STDOUT
+  end
 
-    it "has accessor methods" do
-      Savon::Request.logger = nil
-      Savon::Request.logger.should be_nil
-      Savon::Request.logger = Logger.new STDOUT
-    end
+  it "defaults to :debug for logging" do
+    Savon::Request.log_level.should == :debug
   end
 
-  describe "@log_level" do
-    it "defaults to :debug" do
-      Savon::Request.log_level.should == :debug
-    end
+  it "has both getter and setter for the log level to use (global setting)" do
+    Savon::Request.log_level = :info
+    Savon::Request.log_level.should == :info
+    Savon::Request.log_level = :debug
+  end
 
-    it "has accessor methods" do
-      Savon::Request.log_level = :info
-      Savon::Request.log_level.should == :info
-      Savon::Request.log_level = :debug
-    end
+  it "is initialized with a SOAP endpoint String" do
+    Savon::Request.new EndpointHelper.wsdl_endpoint
   end
 
-  describe "initialize" do
-    it "expects a SOAP endpoint String" do
-      some_request_instance
-    end
+  it "raises an ArgumentError when initialized with an invalid endpoint" do
+    lambda { Savon::Request.new "invalid" }.should raise_error ArgumentError
+  end
 
-    it "raises an ArgumentError in case of an invaluid endpoint" do
-      lambda { Savon::Request.new "invalid" }.should raise_error ArgumentError
-    end
+  it "has a getter for the SOAP endpoint URI" do
+    @request.endpoint.should == URI(EndpointHelper.wsdl_endpoint)
   end
 
-  describe "endpoint" do
-    it "returns the SOAP endpoint URI" do
-      @request.endpoint.should == SpecHelper.some_endpoint_uri
-    end
+  it "has a setter for specifying a read_timeout" do
+    @request.read_timeout = 30
   end
 
-  describe "wsdl" do
-    it "retrieves the WSDL document and returns the Net::HTTPResponse" do
-      wsdl_response = @request.wsdl
+  it "retrieves the WSDL document and returns the Net::HTTPResponse" do
+    wsdl_response = @request.wsdl
 
-      wsdl_response.should be_a Net::HTTPResponse
-      wsdl_response.body.should == UserFixture.user_wsdl
-    end
+    wsdl_response.should be_a Net::HTTPResponse
+    wsdl_response.body.should == UserFixture.user_wsdl
   end
 
-  describe "soap" do
-    it "executes a SOAP request and returns the Net::HTTPResponse" do
-      soap_response = @request.soap some_soap_instance
+  it "executes a SOAP request and returns the Net::HTTPResponse" do
+    soap_response = @request.soap Savon::SOAP.new
 
-      soap_response.should be_a Net::HTTPResponse
-      soap_response.body.should == UserFixture.user_response
-    end
+    soap_response.should be_a Net::HTTPResponse
+    soap_response.body.should == UserFixture.user_response
   end
 
-end
+end

data/spec/savon/response_spec.rb

@@ -1,54 +1,40 @@
 require "spec_helper"
 
 describe Savon::Response do
-  before { @response = some_response_instance }
+  before { @response = Savon::Response.new http_response_mock }
 
-  def some_response_instance
-    Savon::Response.new http_response_mock
+  it "defaults to raises both Savon::SOAPFault and Savon::HTTPError" do
+    Savon::Response.raise_errors?.should be_true
   end
 
-  def soap_fault_response_instance
-    Savon::Response.new http_response_mock(200, UserFixture.soap_fault)
-  end
-
-  def http_error_response_instance
-    Savon::Response.new http_response_mock(404, "", "Not found")
-  end
-
-  describe "@raise_errors" do
-    it "defaults to true" do
-      Savon::Response.raise_errors?.should be_true
-    end
-
-    it "has accessor methods" do
-      Savon::Response.raise_errors = false
-      Savon::Response.raise_errors?.should == false
-      Savon::Response.raise_errors = true
-    end
+  it "has both getter and setter for whether to raise errors (global setting)" do
+    Savon::Response.raise_errors = false
+    Savon::Response.raise_errors?.should == false
+    Savon::Response.raise_errors = true
   end
 
   describe "initialize" do
     it "expects a Net::HTTPResponse" do
-      some_response_instance
+      Savon::Response.new http_response_mock
     end
 
     it "raises a Savon::SOAPFault in case of a SOAP fault" do
-      lambda { soap_fault_response_instance }.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
       Savon::Response.raise_errors = false
-      soap_fault_response_instance
+      savon_response_with :soap_fault
       Savon::Response.raise_errors = true
     end
  
     it "raises a Savon::HTTPError in case of an HTTP error" do
-      lambda { http_error_response_instance }.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
       Savon::Response.raise_errors = false
-      http_error_response_instance
+      savon_response_with :http_error
       Savon::Response.raise_errors = true
     end
   end
@@ -61,8 +47,7 @@ describe Savon::Response do
     end
 
     it "returns true in case of a SOAP fault" do
-      response = soap_fault_response_instance
-      response.soap_fault?.should be_true
+      savon_response_with(:soap_fault).soap_fault?.should be_true
     end
 
     after { Savon::Response.raise_errors = true }
@@ -72,8 +57,8 @@ describe Savon::Response do
     before { Savon::Response.raise_errors = false }
 
     it "returns the SOAP fault message in case of a SOAP fault" do
-      response = soap_fault_response_instance
-      response.soap_fault.should == "(soap:Server) Fault occurred while processing."
+      savon_response_with(:soap_fault).soap_fault.
+        should == "(soap:Server) Fault occurred while processing."
     end
 
     after { Savon::Response.raise_errors = true }
@@ -87,8 +72,7 @@ describe Savon::Response do
     end
 
     it "returns true in case of an HTTP error" do
-      response = http_error_response_instance
-      response.http_error?.should be_true
+      savon_response_with(:http_error).http_error?.should be_true
     end
 
     after { Savon::Response.raise_errors = true }
@@ -98,36 +82,35 @@ describe Savon::Response do
     before { Savon::Response.raise_errors = false }
 
     it "returns the HTTP error message in case of an HTTP error" do
-      response = http_error_response_instance
-      response.http_error.should == "Not found (404)"
+      savon_response_with(:http_error).http_error.should == "Not found (404)"
     end
 
     after { Savon::Response.raise_errors = true }
   end
 
-  describe "to_hash" do
-    it "returns the SOAP response body as a Hash" do
-      @response.to_hash.should == UserFixture.response_hash
-    end
+  it "can return the SOAP response body as a Hash" do
+    @response.to_hash.should == UserFixture.response_hash
   end
 
-  describe "to_xml" do
-    it "returns the SOAP response body" do
-      @response.to_xml.should == UserFixture.user_response
-    end
+  it "can return the raw SOAP response body" do
+    @response.to_xml.should == UserFixture.user_response
+    @response.to_s.should == UserFixture.user_response
   end
 
-  describe "to_s (alias)" do
-    it "returns the SOAP response body" do
-      @response.to_s.should == UserFixture.user_response
+  def savon_response_with(error_type)
+    mock = case error_type
+      when :soap_fault then http_response_mock(200, UserFixture.soap_fault)
+      when :http_error then http_response_mock(404, "", "Not found")
     end
+    Savon::Response.new mock
   end
 
-  def http_response_mock(code = 200, body = UserFixture.user_response, message = "OK")
-    http_response_mock = mock "Net::HTTPResponse"
-    http_response_mock.stubs :code => code.to_s, :message => message,
-        :content_type => "text/html", :body => body
-    http_response_mock
+  def http_response_mock(code = 200, body = nil, message = "OK")
+    body ||= UserFixture.user_response
+    mock = mock "Net::HTTPResponse"
+    mock.stubs :code => code.to_s, :message => message,
+               :content_type => "text/html", :body => body
+    mock
   end
 
-end
+end

data/spec/savon/savon_spec.rb

@@ -2,29 +2,23 @@ require "spec_helper"
 
 describe Savon do
 
-  describe "SOAPVersions" do
-    it "contains an Array of supported SOAP versions" do
-      Savon::SOAPVersions.should be_an Array
-      Savon::SOAPVersions.should_not be_empty
-    end
+  it "contains an Array of supported SOAP versions" do
+    Savon::SOAPVersions.should be_an Array
+    Savon::SOAPVersions.should_not be_empty
   end
 
-  describe "SOAPDateTimeFormat" do
-    it "contains the xs:dateTime format" do
-      Savon::SOAPDateTimeFormat.should be_a String
-      Savon::SOAPDateTimeFormat.should_not be_empty
+  it "contains the xs:dateTime format" do
+    Savon::SOAPDateTimeFormat.should be_a String
+    Savon::SOAPDateTimeFormat.should_not be_empty
 
-      UserFixture.datetime_object.strftime(Savon::SOAPDateTimeFormat).
-        should == UserFixture.datetime_string
-    end
+    UserFixture.datetime_object.strftime(Savon::SOAPDateTimeFormat).
+      should == UserFixture.datetime_string
   end
 
-  describe "SOAPDateTimeRegexp" do
-    it "contains a Regexp matching the xs:dateTime format" do
-      Savon::SOAPDateTimeRegexp.should be_a Regexp
-      (Savon::SOAPDateTimeRegexp === UserFixture.datetime_string).
-        should be_true
-    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
   end
 
-end
+end

data/spec/savon/soap_spec.rb

@@ -1,146 +1,115 @@
 require "spec_helper"
 
 describe Savon::SOAP do
-  before { @soap = some_soap_instance }
-
-  def some_soap_instance
-    Savon::SOAP.new UserFixture.soap_actions[:find_user]
+  before do
+    @soap = Savon::SOAP.new
+    @soap.action = UserFixture.operations[:find_user][:action]
   end
 
-  describe "SOAPNamespace" 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_not be_empty
-      end
+  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_not be_empty
     end
   end
 
-  describe "ContentType" do
-    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_not be_empty
-      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_not be_empty
     end
   end
 
-  describe "@version" do
-    it "defaults to 1" do
-      Savon::SOAP.version.should == 1
-    end
-
-    it "has accessor methods" do
-      [2, 1].each do |soap_version|
-        Savon::SOAP.version = soap_version
-        Savon::SOAP.version.should == soap_version
-      end
-    end
+  it "defaults to SOAP 1.1" do
+    Savon::SOAP.version.should == 1
   end
 
-  describe "initialize" do
-    it "expects a SOAP action map" do
-      some_soap_instance
+  it "has both getter and setter for the SOAP version to use (global setting)" do
+    [2, 1].each do |soap_version|
+      Savon::SOAP.version = soap_version
+      Savon::SOAP.version.should == soap_version
     end
   end
 
-  describe "wsse" do
-    it "expects a Savon::WSSE" do
-      @soap.wsse = Savon::WSSE.new
-    end
+  it "has a setter for the Savon::WSSE" do
+    @soap.wsse = Savon::WSSE.new
   end
 
-  describe "action" do
-    it "is an accessor for the SOAP action" do
-      @soap.action.should == UserFixture.soap_actions[:find_user][:name]
+  it "is has both getter and setter for the SOAP action" do
+    @soap.action.should == UserFixture.operations[:find_user][:action]
 
-      action = "someAction"
-      @soap.action = action
-      @soap.action.should == action
-    end
+    @soap.action = "someAction"
+    @soap.action.should == "someAction"
   end
 
-  describe "input" do
-    it "sets the name of the SOAP input node" do
-      @soap.input = "FindUserRequest"
-    end
+  it "has a setter for the SOAP input" do
+    @soap.input = "FindUserRequest"
   end
 
-  describe "header" do
-    it "is an accessor for the SOAP header" do
-      @soap.header.should be_a Hash
-      @soap.header.should be_empty
+  it "has both getter and setter for the SOAP header" do
+    @soap.header.should be_a Hash
+    @soap.header.should be_empty
 
-      header = { "specialAuthKey" => "secret" }
-      @soap.header = header
-      @soap.header.should == header
-    end
+    @soap.header = { "specialAuthKey" => "secret" }
+    @soap.header.should == { "specialAuthKey" => "secret" }
   end
 
-  describe "body" do
-    it "expects a SOAP-translatable Hash or an XML String" do
-      @soap.body = { :id => 666 }
-      @soap.body = "<id>666</id>"
-    end
+  it "has a getter for the SOAP body, expecting a Hash or an XML String" do
+    @soap.body = { :id => 666 }
+    @soap.body = "<id>666</id>"
   end
 
-  describe "namespaces" do
-    it "defaults to a Hash with xmlns:env set to SOAP 1.1" do
-      soap = some_soap_instance
-      soap.namespaces.should == { "xmlns:env" => Savon::SOAP::SOAPNamespace[1] }
+  it "has a setter for specifying a Hash of namespaces" do
+    namespaces = { "xmlns:env" => "http://example.com" }
+    @soap.namespaces = namespaces
+    @soap.namespaces.should == namespaces
+  end
+
+  describe "has a getter for namespaces" do
+    it "which defaults to include the SOAP 1.1 namespace" do
+      @soap.namespaces.should == { "xmlns:env" => Savon::SOAP::SOAPNamespace[1] }
     end
 
-    it "contains the xmlns:env for SOAP 1.2 if specified" do
-      soap = some_soap_instance
-      soap.version = 2
-      soap.namespaces.should == { "xmlns:env" => Savon::SOAP::SOAPNamespace[2] }
+    it "which contains the SOAP 1.2 namespace if specified" do
+      @soap.version = 2
+      @soap.namespaces.should == { "xmlns:env" => Savon::SOAP::SOAPNamespace[2] }
     end
   end
 
-  describe "version" do
-    it "returns the SOAP version from options" do
-      soap = some_soap_instance
-      soap.version = 2
-      soap.version.should == 2
-    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
 
-    it "returns the default SOAP version otherwise" do
-      @soap.version.should == Savon::SOAP.version
-    end
+  it "has a setter for specifying the SOAP version to use" do
+    @soap.version = 2
+    @soap.version.should == 2
   end
 
   describe "to_xml" do
-    before { Savon::SOAP.version = 1 }
+    after { Savon::SOAP.version = 1 }
 
     it "returns the XML for a SOAP request" do
-      soap = some_soap_instance
-      soap.namespaces["xmlns:wsdl"] = "http://v1_0.ws.user.example.com"
-      soap.body = { :id => 666 }
-      soap.to_xml.should == soap_body
+      @soap.namespaces["xmlns:wsdl"] = "http://v1_0.ws.user.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:env="http://schemas.xmlsoap.org/soap/envelope/"'
+      @soap.to_xml.should include '<wsdl:findUser><id>666</id></wsdl:findUser>'
     end
 
     it "caches the XML, returning the same Object every time" do
       @soap.to_xml.object_id.should == @soap.to_xml.object_id
     end
 
-    it "uses the SOAP namespace for the SOAP version passed in via options" do
-      soap = some_soap_instance
-      soap.version = 2
-      soap.to_xml.should include Savon::SOAP::SOAPNamespace[2]
+    it "uses the SOAP namespace for the specified SOAP version" do
+      @soap.version = 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]
     end
-
-    def soap_body
-      "<env:Envelope xmlns:wsdl=\"http://v1_0.ws.user.example.com\" " <<
-        "xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\">" <<
-        "<env:Header></env:Header>" <<
-        "<env:Body><wsdl:findUser><id>666</id></wsdl:findUser></env:Body>" <<
-      "</env:Envelope>"
-    end
   end
 
 end