Add basic WS-Addressing support (refs savonrb#409)

Author: alexanderk23

Gemfile

@@ -5,6 +5,7 @@ gem "httpclient", "~> 2.3.4"
 
 gem "simplecov", :require => false
 gem "coveralls", :require => false
+gem "uuid"
 
 platform :rbx do
   gem 'json'

lib/savon/builder.rb

@@ -17,6 +17,8 @@ class Builder
       2 => "http://www.w3.org/2003/05/soap-envelope"
     }
 
+    WSA_NAMESPACE = "http://www.w3.org/2005/08/addressing"
+
     def initialize(operation_name, wsdl, globals, locals)
       @operation_name = operation_name
 
@@ -32,15 +34,25 @@ def pretty
       Nokogiri.XML(to_s).to_xml(:indent => 2)
     end
 
-    def to_s
-      return @locals[:xml] if @locals.include? :xml
-
+    def build_document
       tag(builder, :Envelope, namespaces_with_globals) do |xml|
-        tag(xml, :Header) { xml << header.to_s } unless header.empty?
-        tag(xml, :Body)   { xml.tag!(*namespaced_message_tag) { xml << message.to_s } }
+        tag(xml, :Header, header_attributes) { xml << header.to_s } unless header.empty?
+        tag(xml, :Body, body_attributes) { xml.tag!(*namespaced_message_tag) { xml << message.to_s } }
       end
     end
 
+    def header_attributes
+       { 'xmlns:wsa' => WSA_NAMESPACE } if @globals[:use_wsa_headers]
+    end
+
+    def body_attributes
+    end
+
+    def to_s
+      return @locals[:xml] if @locals.include? :xml
+      build_document
+    end
+
     private
 
     def convert_type_definitions_to_hash

lib/savon/header.rb

@@ -1,5 +1,6 @@
 require "akami"
 require "gyoku"
+require "uuid"
 
 module Savon
   class Header
@@ -13,6 +14,9 @@ def initialize(globals, locals)
       @global_header  = globals[:soap_header]
       @local_header   = locals[:soap_header]
 
+      @globals        = globals
+      @locals         = locals
+
       @header = build
     end
 
@@ -30,7 +34,7 @@ def to_s
     private
 
     def build
-      build_header + build_wsse_header
+      build_header + build_wsa_header + build_wsse_header
     end
 
     def build_header
@@ -51,6 +55,15 @@ def build_wsse_header
       wsse_header.respond_to?(:to_xml) ? wsse_header.to_xml : ""
     end
 
+    def build_wsa_header
+       return '' unless @globals[:use_wsa_headers]
+       convert_to_xml({
+         'wsa:Action' => @locals[:soap_action],
+         'wsa:To' => @globals[:endpoint],
+         'wsa:MessageID' => "urn:uuid:#{UUID.new.generate}"
+       })
+    end
+
     def convert_to_xml(hash_or_string)
       if hash_or_string.kind_of? Hash
         Gyoku.xml(hash_or_string, gyoku_options)

lib/savon/operation.rb

@@ -87,6 +87,9 @@ def call_with_logging(request)
     end
 
     def build_request(builder)
+      @locals[:soap_action] ||= soap_action
+      @globals[:endpoint] ||= endpoint
+
       request = SOAPRequest.new(@globals).build(
         :soap_action => soap_action,
         :cookies     => @locals[:cookies]

lib/savon/options.rb

@@ -57,6 +57,7 @@ def initialize(options = {})
         :convert_attributes_to     => lambda { |k,v| [k,v] },
         :multipart                 => false,
         :adapter                   => nil,
+        :use_wsa_headers           => false,
       }
 
       options = defaults.merge(options)
@@ -271,6 +272,11 @@ def multipart(multipart)
     def adapter(adapter)
       @options[:adapter] = adapter
     end
+
+    # Enable inclusion of WS-Addressing headers.
+    def use_wsa_headers(use)
+      @options[:use_wsa_headers] = use
+    end
   end
 
   class LocalOptions < Options