savon 0.7.1 → 0.7.2

data/CHANGELOG

@@ -1,3 +1,11 @@
+== 0.7.2 (2010-01-17)
+  * Exposed the Net::HTTP response (added by Kevin Ingolfsland). Use the "http" accessor (response.http) on your
+    Savon::Response to access the Net::HTTP response object.
+  * Fix for Github issue #21 (savon is stripping ?SOAP off the end of WSDL locations).
+  * Fix for Github issue #22 (REXML::ParseException parsing 401 Unauthorized response body).
+  * Fix for Github issue #19 (Unable to set attribute in name-spaced WSSE password element).
+  * Added support for global header and namespaces. See Github issue #9 (Setting headers and namespaces).
+
 == 0.7.1 (2010-01-10)
   * The Hash of HTTP headers for SOAP calls is now public via Savon::Request#headers.
     Patch for: http://github.com/rubiii/savon/issues/#issue/8

data/lib/savon/request.rb

@@ -122,20 +122,14 @@ module Savon
     # to an optional block.
     def request(type)
       request = case type
-        when :wsdl then Net::HTTP::Get.new wsdl_endpoint
-        when :soap then Net::HTTP::Post.new @soap.endpoint.path, headers.merge(soap_headers)
+        when :wsdl then Net::HTTP::Get.new @endpoint.to_s
+        when :soap then Net::HTTP::Post.new @soap.endpoint.to_s, headers.merge(soap_headers)
       end
       request.basic_auth *@basic_auth if @basic_auth
       yield request if block_given?
       request
     end
 
-    # Returns the WSDL endpoint.
-    def wsdl_endpoint
-      return @endpoint.path unless @endpoint.query
-      "#{@endpoint.path}?#{@endpoint.query}"
-    end
-
     # Returns a Hash containing the SOAP headers for an HTTP request.
     def soap_headers
       { "Content-Type" => ContentType[@soap.version], "SOAPAction" => @soap.action }

data/lib/savon/response.rb

@@ -19,8 +19,8 @@ module Savon
     end
 
     # Expects a Net::HTTPResponse and handles errors.
-    def initialize(response)
-      @response = response
+    def initialize(http)
+      @http = http
 
       handle_soap_fault
       handle_http_error
@@ -44,14 +44,17 @@ module Savon
 
     # Returns the SOAP response body as a Hash.
     def to_hash
-      @body ||= Crack::XML.parse(@response.body).find_soap_body
+      @body ||= (Crack::XML.parse(@http.body) rescue {}).find_soap_body
     end
 
     # Returns the SOAP response XML.
     def to_xml
-      @response.body
+      @http.body
     end
 
+    # Returns the HTTP response object.
+    attr_reader :http
+	
     alias :to_s :to_xml
 
   private
@@ -85,9 +88,9 @@ module Savon
     # Handles HTTP errors. Raises a Savon::HTTPError unless the default
     # behavior of raising errors was turned off.
     def handle_http_error
-      if @response.code.to_i >= 300
-        @http_error = "#{@response.message} (#{@response.code})"
-        @http_error << ": #{@response.body}" unless @response.body.empty?
+      if @http.code.to_i >= 300
+        @http_error = "#{@http.message} (#{@http.code})"
+        @http_error << ": #{@http.body}" unless @http.body.empty?
         raise Savon::HTTPError, http_error if self.class.raise_errors?
       end
     end

data/lib/savon/soap.rb

@@ -27,6 +27,30 @@ module Savon
       @@version = version if Savon::SOAPVersions.include? version
     end
 
+    # Sets the global SOAP header. Expected to be a Hash that can be translated
+    # to XML via Hash.to_soap_xml or any other Object responding to to_s.
+    def self.header=(header)
+      @@header = header
+    end
+
+    # Returns the global SOAP header. Defaults to an empty Hash.
+    def self.header
+      @@header ||= {}
+    end
+
+    # Sets the global namespaces. Expected to be a Hash containing the
+    # namespaces (keys) and the corresponding URI's (values).
+    def self.namespaces=(namespaces)
+      @@namespaces = namespaces if namespaces.kind_of? Hash
+    end
+
+    # Returns the global namespaces. A Hash containing the namespaces (keys)
+    # and the corresponding URI's (values).
+    def self.namespaces
+      @@namespaces ||= {}
+    end
+
+    # Initialzes the SOAP object.
     def initialize
       @builder = Builder::XmlMarkup.new
     end
@@ -70,8 +94,8 @@ module Savon
     # (keys) and the corresponding URI's (values).
     attr_writer :namespaces
 
-    # Returns the namespaces. A Hash containing the namespaces (keys) and
-    # the corresponding URI's (values).
+    # Returns the namespaces. A Hash containing the namespaces (keys)
+    # and the corresponding URI's (values).
     def namespaces
       @namespaces ||= { "xmlns:env" => SOAPNamespace[version] }
     end
@@ -94,7 +118,7 @@ module Savon
     # Returns the SOAP envelope XML.
     def to_xml
       unless @xml_body
-        @xml_body = @builder.env :Envelope, namespaces do |xml|
+        @xml_body = @builder.env :Envelope, all_namespaces do |xml|
           xml_header xml
           xml_body xml
         end
@@ -107,7 +131,16 @@ module Savon
     # Adds a SOAP XML header to a given +xml+ Object.
     def xml_header(xml)
       xml.env(:Header) do
-        xml << (header.to_soap_xml rescue header.to_s) + wsse_header
+        xml << all_header + wsse_header
+      end
+    end
+
+    # Returns a String containing the global and per request header.
+    def all_header
+      if self.class.header.kind_of?(Hash) && header.kind_of?(Hash)
+        self.class.header.merge(header).to_soap_xml
+      else
+        self.class.header.to_s + header.to_s
       end
     end
 
@@ -120,6 +153,11 @@ module Savon
       end
     end
 
+    # Returns a Hash containing the global and per request namespaces.
+    def all_namespaces
+      self.class.namespaces.merge namespaces
+    end
+
     # Returns an Array of SOAP input names to append to the :wsdl namespace.
     # Defaults to use the name of the SOAP action and may be an empty Array
     # in case the specified SOAP input seems invalid.

data/lib/savon/wsse.rb

@@ -5,11 +5,20 @@ module Savon
   # Represents parameters for WSSE authentication.
   class WSSE
 
+    # Base address for WSSE docs.
+    BaseAddress = "http://docs.oasis-open.org/wss/2004/01"
+
     # Namespace for WS Security Secext.
-    WSENamespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
+    WSENamespace = BaseAddress + "/oasis-200401-wss-wssecurity-secext-1.0.xsd"
 
     # Namespace for WS Security Utility.
-    WSUNamespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+    WSUNamespace = BaseAddress + "/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+
+    # URI for "wsse:Password/@Type" #PasswordText.
+    PasswordTextURI = BaseAddress + "/oasis-200401-wss-username-token-profile-1.0#PasswordText"
+
+    # URI for "wsse:Password/@Type" #PasswordDigest.
+    PasswordDigestURI = BaseAddress + "/oasis-200401-wss-username-token-profile-1.0#PasswordDigest"
 
     # Global WSSE username.
     @@username = nil
@@ -93,7 +102,7 @@ module Savon
           xml.wsse :Username, username
           xml.wsse :Nonce, nonce
           xml.wsu :Created, timestamp
-          xml.wsse :Password, password_node
+          xml.wsse :Password, password_node, :Type => password_type
         end
       end
     end
@@ -108,6 +117,11 @@ module Savon
       Base64.encode64(Digest::SHA1.hexdigest(token)).chomp!
     end
 
+    # Returns the URI for the "wsse:Password/@Type" attribute.
+    def password_type
+      digest? ? PasswordDigestURI : PasswordTextURI
+    end
+
     # Returns a WSSE nonce.
     def nonce
       @nonce ||= Digest::SHA1.hexdigest String.random + timestamp

data/spec/endpoint_helper.rb

@@ -5,16 +5,16 @@ class EndpointHelper
     case type
       when :no_namespace       then "http://nons.example.com/Service?wsdl"
       when :namespaced_actions then "http://nsactions.example.com/Service?wsdl"
-      else                          soap_endpoint(type) + "?wsdl"
+      else                          soap_endpoint(type)
     end
   end
 
   # Returns the SOAP endpoint for a given +type+ of request.
   def self.soap_endpoint(type = nil)
     case type
-      when :soap_fault then "http://soapfault.example.com/Service"
-      when :http_error then "http://httperror.example.com/Service"
-      when :invalid    then "http://invalid.example.com/Service"
+      when :soap_fault then "http://soapfault.example.com/Service?wsdl"
+      when :http_error then "http://httperror.example.com/Service?wsdl"
+      when :invalid    then "http://invalid.example.com/Service?wsdl"
       else                  "http://example.com/validation/1.0/AuthenticationService"
     end
   end

data/spec/integration/http_basic_auth_spec.rb

@@ -1,12 +1,16 @@
 require "basic_spec_helper"
 
 describe Savon do
-  before { @endpoint = "http://localhost:8080/http-basic-auth" }
+  before { @client = Savon::Client.new "http://localhost:8080/http-basic-auth" }
 
   it "should be able to handle HTTP basic authentication" do
-    client = Savon::Client.new @endpoint
-    client.request.basic_auth "user", "password"
-    response = client.do_something!
+    @client.request.basic_auth "user", "password"
+    response = @client.do_something!
     response.to_hash[:authenticate_response][:return][:success].should == true
   end
+
+  it "should raise a Savon::HTTPError in case authentication failed" do
+    lambda { @client.do_something! }.should raise_error(Savon::HTTPError)
+  end
+
 end

data/spec/savon/response_spec.rb

@@ -110,6 +110,13 @@ describe Savon::Response do
     @response.to_s.should == ResponseFixture.authentication
   end
 
+  it "should return the Net::HTTP response object" do
+    @response.http.should be_a(Mocha::Mock)
+    @response.http.should respond_to(:code)
+    @response.http.should respond_to(:message)
+    @response.http.should respond_to(:body)
+  end
+
   def savon_response_with(error_type)
     mock = case error_type
       when :soap_fault   then http_response_mock 200, ResponseFixture.soap_fault

data/spec/savon/soap_spec.rb

@@ -46,6 +46,14 @@ describe Savon::SOAP do
     @soap.input = "FindUserRequest"
   end
 
+  it "has both getter and setter for global SOAP headers" do
+    header = { "some" => "header" }
+    Savon::SOAP.header = header
+    Savon::SOAP.header.should == header
+
+    Savon::SOAP.header = {}
+  end
+
   it "has both getter and setter for the SOAP header" do
     @soap.header.should be_a(Hash)
     @soap.header.should be_empty
@@ -76,6 +84,14 @@ describe Savon::SOAP do
     end
   end
 
+  it "has both getter and setter for global namespaces" do
+    namespaces = { "some" => "namespace" }
+    Savon::SOAP.namespaces = namespaces
+    Savon::SOAP.namespaces.should == namespaces
+
+    Savon::SOAP.namespaces = {}
+  end
+
   it "has a convenience method for setting the 'xmlns:wsdl' namespace" do
     @soap.namespaces.should == { "xmlns:env" => "http://schemas.xmlsoap.org/soap/envelope/" }
 
@@ -126,6 +142,30 @@ describe Savon::SOAP do
       Savon::SOAP.version = 2
       @soap.to_xml.should include(Savon::SOAP::SOAPNamespace[2])
     end
+
+    it "merges global and per request headers defined as Hashes" do
+      Savon::SOAP.header = { "API-KEY" => "secret", "SOME-KEY" => "something" }
+      @soap.header["SOME-KEY"] = "somethingelse"
+
+      @soap.to_xml.should include("<API-KEY>secret</API-KEY>")
+      @soap.to_xml.should include("<SOME-KEY>somethingelse</SOME-KEY>")
+    end
+
+    it "joins global and per request headers defined as Strings" do
+      Savon::SOAP.header = "<API-KEY>secret</API-KEY>"
+      @soap.header = "<SOME-KEY>somethingelse</SOME-KEY>"
+
+      @soap.to_xml.should include("<API-KEY>secret</API-KEY>")
+      @soap.to_xml.should include("<SOME-KEY>somethingelse</SOME-KEY>")
+    end
+
+    it "merges the global and per request namespaces" do
+      Savon::SOAP.namespaces = { "xmlns:wsdl" => "namespace", "xmlns:v1" => "v1namespace" }
+      @soap.namespaces["xmlns:v1"] = "newV1namespace"
+
+      @soap.to_xml.should include('xmlns:wsdl="namespace"')
+      @soap.to_xml.should include('xmlns:v1="newV1namespace"')
+    end
   end
 
 end

data/spec/savon/wsse_spec.rb

@@ -2,12 +2,8 @@ require "spec_helper"
 
 describe Savon::WSSE do
   before do
-    Savon::WSSE.username = nil
-    Savon::WSSE.password = nil
-    Savon::WSSE.digest = false
-
-    @wsse = Savon::WSSE.new
-    @username, @password = "gorilla", "secret"
+    Savon::WSSE.username, Savon::WSSE.password, Savon::WSSE.digest = nil, nil, false
+    @wsse, @username, @password = Savon::WSSE.new, "gorilla", "secret"
   end
 
   it "contains the namespace for WS Security Secext" do
@@ -84,6 +80,7 @@ describe Savon::WSSE do
         header.should include_security_namespaces
         header.should include(@username)
         header.should include(@password)
+        header.should include(Savon::WSSE::PasswordTextURI)
       end
 
       it "with WSSE credentials specified via defaults" do
@@ -94,6 +91,7 @@ describe Savon::WSSE do
         header.should include_security_namespaces
         header.should include(@username)
         header.should include(@password)
+        header.should include(Savon::WSSE::PasswordTextURI)
       end
     end
 
@@ -107,6 +105,7 @@ describe Savon::WSSE do
         header.should include_security_namespaces
         header.should include(@username)
         header.should_not include(@password)
+        header.should include(Savon::WSSE::PasswordDigestURI)
       end
 
       it "via defaults" do
@@ -118,6 +117,7 @@ describe Savon::WSSE do
         header.should include_security_namespaces
         header.should include(@username)
         header.should_not include(@password)
+        header.should include(Savon::WSSE::PasswordDigestURI)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 +01:00
+date: 2010-01-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency