savon 0.7.6 → 0.7.7

data/CHANGELOG

@@ -1,5 +1,20 @@
+== 0.7.7 (2010-05-09)
+  * SOAP requests now start with a proper XML declaration.
+  * Added support for gzipped requests and responses (http://github.com/lucascs). While gzipped SOAP
+    responses are decoded automatically, you have to manually instruct Savon to gzip SOAP requests:
+
+      client = Savon::Client.new "http://example.com/UserService?wsdl", :gzip => true
+
+  * Fix for issue #51. Added the :soap_endpoint option to Savon::Client.new which let's you specify a SOAP
+    endpoint per client instance:
+
+    client = Savon::Client.new "http://example.com/UserService?wsdl",
+      :soap_endpoint => "http://localhost/UserService"
+
+  * Fix for issue #50. Savon still escapes special characters in SOAP request Hash values, but you can now
+    append an exclamation mark to Hash keys specifying that it's value should not be escaped.
+
 == 0.7.6 (2010-03-21)
-  * Renamed 
   * Moved documentation from the Github Wiki to the actual class files and established a much nicer
     documentation combining examples and implementation (using Hanna) at: http://savon.rubiii.com
   * Added Savon::Client#call as a workaround for dispatching calls to SOAP actions  named after
@@ -153,4 +168,3 @@
 
 == 0.5.0 (2009-11-29)
   * Complete rewrite.
-

data/README.rdoc

@@ -16,7 +16,7 @@ Instantiate Savon::Client, passing in the WSDL of your service.
 
   client = Savon::Client.new "http://example.com/UserService?wsdl"
 
-For production, it is highly recommended to not use Savon::WSDL. Information on {how to disable the WSDL}[http://savon.rubiii.com/docs/latest/classes/Savon/WSDL.html].
+For production, it is highly recommended to not use Savon::WSDL. Information on {how to disable the WSDL}[http://savon.rubiii.com/docs/0.7.7/classes/Savon/WSDL.html].
 
 == Calling a SOAP action
 
@@ -56,9 +56,9 @@ Savon::Response represents the HTTP and SOAP response. It contains and raises er
 == HTTP errors and SOAP faults
 
 Savon raises a Savon::SOAPFault in case of a SOAP fault and a Savon::HTTPError in case of an HTTP error.
-More information: {Errors}[http://savon.rubiii.com/docs/latest/classes/Savon/Response.html]
+More information: {Errors}[http://savon.rubiii.com/docs/0.7.7/classes/Savon/Response.html]
 
 == Logging
 
 Savon logs each request and response to STDOUT. But there are a couple of options to change the default behavior.
-More information: {Logging}[http://savon.rubiii.com/docs/latest/classes/Savon/Request.html]
+More information: {Logging}[http://savon.rubiii.com/docs/0.7.7/classes/Savon/Request.html]

data/Rakefile

@@ -36,7 +36,6 @@ Spec::Rake::SpecTask.new(:run_integration_spec) do |spec|
 end
 
 begin
-  $:.unshift File.join(File.dirname(__FILE__), "..", "hanna", "lib")
   require "hanna/rdoctask"
 
   Rake::RDocTask.new do |rdoc|

data/lib/savon.rb

@@ -14,6 +14,9 @@ require "net/https"
 require "base64"
 require "digest/sha1"
 require "rexml/document"
+require "stringio"
+require "zlib"
+require "cgi"
 
 # gem dependencies
 require "builder"
@@ -29,3 +32,4 @@ require "savon/response"
 require "savon/wsdl_stream"
 require "savon/wsdl"
 require "savon/client"
+require "savon/version"

data/lib/savon/client.rb

@@ -27,6 +27,19 @@ module Savon
   #
   #   client = Savon::Client.new "http://example.com/UserService?wsdl", :proxy => "http://proxy.example.com"
   #
+  # == Forcing a particular SOAP endpoint
+  #
+  # In case you don't want to use the SOAP endpoint specified in the WSDL, you can tell Savon to use
+  # another SOAP endpoint.
+  #
+  #   client = Savon::Client.new "http://example.com/UserService?wsdl", :soap_endpoint => "http://localhost/UserService"
+  #
+  # == Gzipped SOAP requests
+  #
+  # Sending gzipped SOAP requests can be specified per client instance.
+  #
+  #   client = Savon::Client.new "http://example.com/UserService?wsdl", :gzip => true
+  #
   # == Savon::WSDL
   #
   # You can access Savon::WSDL via:
@@ -40,11 +53,17 @@ module Savon
   #   client.request
   class Client
 
-    # Expects a SOAP +endpoint+ string. Also accepts an optional hash of +options+ for specifying
-    # a +:proxy+ server to use.
+    # Expects a SOAP +endpoint+ string. Also accepts a Hash of +options+.
+    #
+    # ==== Options:
+    #
+    # [proxy]  the proxy server to use
+    # [gzip]  whether to gzip SOAP requests
+    # [soap_endpoint]  force to use this SOAP endpoint
     def initialize(endpoint, options = {})
+      soap_endpoint = options.delete(:soap_endpoint)
       @request = Request.new endpoint, options
-      @wsdl = WSDL.new @request
+      @wsdl = WSDL.new @request, soap_endpoint
     end
 
     # Returns the Savon::WSDL.

data/lib/savon/core_ext/array.rb

@@ -1,14 +1,14 @@
 class Array
 
   # Translates the Array into SOAP compatible XML. See: Hash.to_soap_xml.
-  def to_soap_xml(key, attributes = {})
+  def to_soap_xml(key, escape_xml = true, attributes = {})
     xml = Builder::XmlMarkup.new
 
     each_with_index do |item, index|
       attrs = tag_attributes attributes, index
       case item
         when Hash then xml.tag!(key, attrs) { xml << item.to_soap_xml }
-        else           xml.tag!(key, attrs) { xml << item.to_soap_value }
+        else           xml.tag!(key, attrs) { xml << (escape_xml ? item.to_soap_value : item.to_soap_value!) }
       end
     end
 

data/lib/savon/core_ext/datetime.rb

@@ -5,4 +5,6 @@ class DateTime
     strftime Savon::SOAP::DateTimeFormat
   end
 
+  alias_method :to_soap_value!, :to_soap_value
+
 end

data/lib/savon/core_ext/hash.rb

@@ -35,7 +35,11 @@ class Hash
   #     <perform_at>2012-06-11T10:42:21</perform_at>
   #   </magicRequest>
   #
-  # ==== :order!
+  # ==== Escaped XML values
+  #
+  # By default, special characters in XML String values are escaped.
+  #
+  # ==== Fixed order of XML tags
   #
   # In case your service requires the tags to be in a specific order (parameterOrder), you have two
   # options. The first is to specify your body as an XML string. The second is to specify the order
@@ -44,7 +48,7 @@ class Hash
   #   { :name => "Eve", :id => 123, :order! => [:id, :name] }.to_soap_xml
   #   # => "<id>123</id><name>Eve</name>"
   #
-  # ==== :attributes!
+  # ==== XML attributes
   #
   # If you need attributes, you could either go with an XML string or add another hash under the
   # +:attributes!+ key.
@@ -58,12 +62,13 @@ class Hash
     order.each do |key|
       attrs = attributes[key] || {}
       value = self[key]
+      escape_xml = key.to_s[-1, 1] != "!"
       key = key.to_soap_key
 
       case value
-        when Array then xml << value.to_soap_xml(key, attrs)
+        when Array then xml << value.to_soap_xml(key, escape_xml, attrs)
         when Hash  then xml.tag!(key, attrs) { xml << value.to_soap_xml }
-        else            xml.tag!(key, attrs) { xml << value.to_soap_value }
+        else            xml.tag!(key, attrs) { xml << (escape_xml ? value.to_soap_value : value.to_soap_value!) }
       end
     end
 

data/lib/savon/core_ext/object.rb

@@ -5,15 +5,12 @@ class Object
     respond_to?(:empty?) ? empty? : !self
   end unless defined? blank?
 
-  # Returns the Object as a SOAP request compliant key.
-  def to_soap_key
-    to_s
-  end
-
   # Returns the Object as a SOAP request compliant value.
   def to_soap_value
     return to_s unless respond_to? :to_datetime
     to_datetime.to_soap_value
   end
 
+  alias_method :to_soap_value!, :to_soap_value
+
 end

data/lib/savon/core_ext/string.rb

@@ -51,16 +51,19 @@ class String
     self
   end
 
-  # Returns the String as a SOAP request compliant value.
-  # Escapes special characters for XML.
+  # Returns the Object as a SOAP request compliant key.
+  def to_soap_key
+    self[-1, 1] == "!" ? chop : self
+  end
+
+  # Returns the String as a SOAP value. Escapes special characters for XML.
   def to_soap_value
-    str = dup
-    str.gsub! "&", "&"
-    str.gsub! '"', """
-    str.gsub! "'", "'"
-    str.gsub! "<", "&lt;"
-    str.gsub! ">", "&gt;"
-    str
+    CGI.escapeHTML self
+  end
+
+  # Convert the String into a SOAP value without escaping special characters.
+  def to_soap_value!
+    self
   end
 
 end

data/lib/savon/core_ext/symbol.rb

@@ -2,7 +2,7 @@ class Symbol
 
   # Returns the Symbol as a lowerCamelCase String.
   def to_soap_key
-    to_s.lower_camelcase
+    to_s.to_soap_key.lower_camelcase
   end
 
 end

data/lib/savon/request.rb

@@ -46,11 +46,11 @@ module Savon
     # Content-Types by SOAP version.
     ContentType = { 1 => "text/xml;charset=UTF-8", 2 => "application/soap+xml;charset=UTF-8" }
 
-    # Expects a SOAP +endpoint+ String. Also accepts an optional Hash
-    # of +options+ for specifying a proxy server.
+    # Expects a WSDL or SOAP +endpoint+ and accepts a custom +proxy+ address.
     def initialize(endpoint, options = {})
       @endpoint = URI endpoint
-      @proxy = options[:proxy] ? URI(options[:proxy]) : URI("")
+      @proxy = URI options[:proxy] || ""
+      headers["Accept-encoding"] = "gzip,deflate" if options[:gzip]
     end
 
     # Returns the endpoint URI.
@@ -135,3 +135,4 @@ module Savon
 
   end
 end
+

data/lib/savon/response.rb

@@ -100,12 +100,12 @@ module Savon
 
     # Returns the SOAP response body as a Hash.
     def to_hash
-      @body ||= (Crack::XML.parse(@http.body) rescue {}).find_soap_body
+      @hash ||= (Crack::XML.parse(body) rescue {}).find_soap_body
     end
 
     # Returns the SOAP response XML.
     def to_xml
-      @http.body
+      body
     end
 
     # Returns the HTTP response object.
@@ -115,6 +115,24 @@ module Savon
 
   private
 
+    # Returns the response body.
+    def body
+      @body || gzipped_body? ? decoded_body : @http.body
+    end
+
+    # Returns whether the body is gzipped.
+    def gzipped_body?
+      @http["content-encoding"] == "gzip" || @http.body[0..1] == "\x1f\x8b"
+    end
+
+    # Returns the gzip decoded body.
+    def decoded_body
+      gz = Zlib::GzipReader.new StringIO.new(@http.body)
+      gz.read
+    ensure
+      gz.close
+    end
+
     # Handles SOAP faults. Raises a Savon::SOAPFault unless the default behavior of raising errors
     # was turned off.
     def handle_soap_fault
@@ -146,10 +164,11 @@ module Savon
     def handle_http_error
       if @http.code.to_i > MaxNonErrorResponseCode
         @http_error = "#{@http.message} (#{@http.code})"
-        @http_error << ": #{@http.body}" unless @http.body.empty?
+        @http_error << ": #{body}" unless body.empty?
         raise Savon::HTTPError, http_error if self.class.raise_errors?
       end
     end
 
   end
 end
+

data/lib/savon/version.rb

@@ -0,0 +1,5 @@
+module Savon
+
+  Version = "0.7.7"
+
+end

data/lib/savon/wsdl.rb

@@ -71,9 +71,9 @@ module Savon
   #   end
   class WSDL
 
-    # Initializer, expects a Savon::Request.
-    def initialize(request)
-      @request, @enabled = request, true
+    # Expects a Savon::Request and accepts a custom +soap_endpoint+.
+    def initialize(request, soap_endpoint = nil)
+      @request, @enabled, @soap_endpoint = request, true, soap_endpoint
     end
 
     # Sets whether to use the WSDL.

data/spec/fixtures/gzip/gzip_response_fixture.rb

@@ -0,0 +1,7 @@
+class GzipResponseFixture
+
+  def self.message
+    File.read(File.join(File.dirname(__FILE__), 'message.gz'))
+  end
+end
+

data/spec/savon/client_spec.rb

@@ -14,6 +14,11 @@ describe Savon::Client do
     client.request.http.proxy_address == "http://proxy"
   end
 
+  it "should accept a SOAP endpoint via an optional Hash of options" do
+    client = Savon::Client.new EndpointHelper.wsdl_endpoint, :soap_endpoint => "http://localhost"
+    client.wsdl.soap_endpoint.should == "http://localhost"
+  end
+
   it "should have a method that returns the Savon::WSDL" do
     @client.wsdl.should be_a(Savon::WSDL)
   end

data/spec/savon/core_ext/array_spec.rb

@@ -3,17 +3,47 @@ require "spec_helper"
 describe Array do
 
   describe "to_soap_xml" do
-    describe "should return SOAP request compatible XML" do
-      it "for an Array of Hashes" do
-        hash, result = [{ :name => "Eve" }], "<findUser><name>Eve</name></findUser>"
-        hash.to_soap_xml("findUser").should == result
-      end
-
-      it "for an Array of Strings and other Objects" do
-        hash, result = [:id, :name], "<someValues>id</someValues><someValues>name</someValues>"
-        hash.to_soap_xml("someValues").should == result
-      end
+    it "should return the XML for an Array of Hashes" do
+      array = [{ :name => "adam" }, { :name => "eve" }]
+      result = "<user><name>adam</name></user><user><name>eve</name></user>"
+      
+      array.to_soap_xml("user").should == result
+    end
+
+    it "should return the XML for an Array of different Objects" do
+      array = [:symbol, "string", 123]
+      result = "<value>symbol</value><value>string</value><value>123</value>"
+      
+      array.to_soap_xml("value").should == result
+    end
+
+    it "should default to escape special characters" do
+      array = ["<tag />", "adam & eve"]
+      result = "<value>&lt;tag /&gt;</value><value>adam &amp; eve</value>"
+      
+      array.to_soap_xml("value").should == result
+    end
+
+    it "should not escape special characters when told to" do
+      array = ["<tag />", "adam & eve"]
+      result = "<value><tag /></value><value>adam & eve</value>"
+      
+      array.to_soap_xml("value", false).should == result
+    end
+
+    it "should add attributes to a given tag" do
+      array = ["adam", "eve"]
+      result = '<value active="true">adam</value><value active="true">eve</value>'
+      
+      array.to_soap_xml("value", :escape_xml, :active => true).should == result
+    end
+
+    it "should add attributes to duplicate tags" do
+      array = ["adam", "eve"]
+      result = '<value id="1">adam</value><value id="2">eve</value>'
+      
+      array.to_soap_xml("value", :escape_xml, :id => [1, 2]).should == result
     end
   end
 
-end
+end

data/spec/savon/core_ext/datetime_spec.rb

@@ -1,11 +1,20 @@
 require "spec_helper"
 
 describe DateTime do
+  before do
+    @datetime = DateTime.new 2012, 03, 22, 16, 22, 33
+    @datetime_string = "2012-03-22T16:22:33Z"
+  end
 
   describe "to_soap_value" do
-    it "returns an xs:dateTime compliant String" do
-      DateTime.new(2012, 03, 22, 16, 22, 33).to_soap_value.
-        should == "2012-03-22T16:22:33Z"
+    it "should return an xs:dateTime compliant String" do
+      @datetime.to_soap_value.should == @datetime_string
+    end
+  end
+
+  describe "to_soap_value!" do
+    it "should act like :to_soap_value" do
+      @datetime.to_soap_value.should == @datetime_string
     end
   end
 

data/spec/savon/core_ext/hash_spec.rb

@@ -85,6 +85,18 @@ describe Hash do
       end
     end
 
+    it "should default to escape special characters" do
+      result = { :some => { :nested => "<tag />" }, :tag => "<tag />" }.to_soap_xml
+      result.should include("<tag>&lt;tag /&gt;</tag>")
+      result.should include("<some><nested>&lt;tag /&gt;</nested></some>")
+    end
+
+    it "should not escape special characters for keys marked with an exclamation mark" do
+      result = { :some => { :nested! => "<tag />" }, :tag! => "<tag />" }.to_soap_xml
+      result.should include("<tag><tag /></tag>")
+      result.should include("<some><nested><tag /></nested></some>")
+    end
+
     it "should preserve the order of Hash keys and values specified through :order!" do
       hash = { :find_user => { :name => "Lucy", :id => 666, :order! => [:id, :name] } }
       result = "<findUser><id>666</id><name>Lucy</name></findUser>"

data/spec/savon/core_ext/object_spec.rb

@@ -16,12 +16,6 @@ describe Object do
     end
   end
 
-  describe "to_soap_key" do
-    it "calls to_s for every Object" do
-      Object.to_soap_key.should == Object.to_s
-    end
-  end
-
   describe "to_soap_value" do
     it "returns an xs:dateTime compliant String for Objects responding to to_datetime" do
       singleton = Object.new

data/spec/savon/core_ext/string_spec.rb

@@ -74,13 +74,25 @@ describe String do
     end
   end
 
+  describe "to_soap_key" do
+    it "removes exclamation marks from the end of the String" do
+      "value".to_soap_key.should == "value"
+      "value!".to_soap_key.should == "value"
+    end
+  end
+
   describe "to_soap_value" do
-    it "should return the string value and escape special characters" do
+    it "should return the String value and escape special characters" do
       "string".to_soap_value.should == "string"
       "<tag>".to_soap_value.should == "&lt;tag&gt;"
       "at&t".to_soap_value.should == "at&amp;t"
       '"quotes"'.to_soap_value.should == "&quot;quotes&quot;"
-      "'apos'".to_soap_value.should == "&apos;apos&apos;"
+    end
+  end
+
+  describe "to_soap_value!" do
+    it "should just return the String value without escaping special characters" do
+      "<tag>".to_soap_value!.should == "<tag>"
     end
   end
 

data/spec/savon/core_ext/symbol_spec.rb

@@ -5,6 +5,7 @@ describe Symbol do
   describe "to_soap_key" do
     it "converts the Symbol from snake_case to a lowerCamelCase String" do
       :lower_camel_case.to_soap_key.should == "lowerCamelCase"
+      :lower_camel_case!.to_soap_key.should == "lowerCamelCase"
     end
   end
 

data/spec/savon/request_spec.rb

@@ -75,14 +75,38 @@ describe Savon::Request do
     wsdl_response.body.should == WSDLFixture.authentication
   end
 
-  it "executes a SOAP request and returns the Net::HTTP response" do
-    operation = WSDLFixture.authentication(:operations)[:authenticate]
-    action, input = operation[:action], operation[:input]
-    soap = Savon::SOAP.new action, input, EndpointHelper.soap_endpoint
-    soap_response = @request.soap soap
 
-    soap_response.should be_a(Net::HTTPResponse)
-    soap_response.body.should == ResponseFixture.authentication
+  describe "when executing a SOAP request" do
+    before :each do
+      operation = WSDLFixture.authentication(:operations)[:authenticate]
+      action, input = operation[:action], operation[:input]
+      @soap = Savon::SOAP.new action, input, EndpointHelper.soap_endpoint
+    end
+
+    it "should return the Net::HTTP response" do
+      soap_response = @request.soap @soap
+
+      soap_response.should be_a(Net::HTTPResponse)
+      soap_response.body.should == ResponseFixture.authentication
+    end
+
+    it "should include Accept-Encoding gzip if it is enabled" do
+      @request = Savon::Request.new EndpointHelper.wsdl_endpoint, :gzip => true
+      a_post = Net::HTTP::Post.new(@soap.endpoint.request_uri, {})
+
+      Net::HTTP::Post.expects(:new).with(anything, has_entry("Accept-encoding" => "gzip,deflate")).returns(a_post)
+
+      @request.soap @soap
+    end
+
+    it "should not include Accept-Encoding gzip if it is not enabled" do
+      @request = Savon::Request.new EndpointHelper.wsdl_endpoint, :gzip => false
+      a_post = Net::HTTP::Post.new(@soap.endpoint.request_uri, {})
+
+      Net::HTTP::Post.expects(:new).with(anything, Not(has_entry("Accept-encoding" => "gzip,deflate"))).returns(a_post)
+
+      @request.soap @soap
+    end
   end
 
   it "should not include host when creating HTTP requests" do
@@ -90,4 +114,4 @@ describe Savon::Request do
     request.path.should_not include("example.com")
   end
 
-end
+end

data/spec/savon/response_spec.rb

@@ -21,13 +21,13 @@ describe Savon::Response do
     it "raises a Savon::SOAPFault in case of a SOAP fault" do
       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
       savon_response_with :soap_fault
       Savon::Response.raise_errors = true
     end
- 
+
     it "raises a Savon::HTTPError in case of an HTTP error" do
       lambda { savon_response_with :http_error }.should raise_error(Savon::HTTPError)
     end
@@ -102,7 +102,7 @@ describe Savon::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) 
+    @response.to_hash[:multi_ref].should be_an(Array)
   end
 
   it "should return the raw SOAP response body" do
@@ -117,6 +117,44 @@ describe Savon::Response do
     @response.http.should respond_to(:body)
   end
 
+  describe "GZipped responses" do
+    it "should be decoded if Content-encoding header is gzip" do
+      @response = Savon::Response.new http_response_mock(200, body = "Encoded", "OK", 'content-encoding' => 'gzip')
+
+      should_decode_body body
+
+      @response.to_xml
+    end
+
+    # header logic extracted from http://dev.ctor.org/svn/soap4r/trunk/lib/soap/streamHandler.rb
+    it "should be decoded if body starts with gzip header" do
+      @response = Savon::Response.new http_response_mock(200, body = "\x1f\x8bEncoded", "OK")
+
+      should_decode_body body
+
+      @response.to_xml
+    end
+
+    it "should be decoded when header is set" do
+      @response = Savon::Response.new http_response_mock(200, GzipResponseFixture.message, "OK", 'content-encoding' => 'gzip')
+      @response.to_xml.should == "A short gzip encoded message\n"
+    end
+
+    it "should be decoded when header is not set" do
+      @response = Savon::Response.new http_response_mock(200, GzipResponseFixture.message, "OK")
+      @response.to_xml.should == "A short gzip encoded message\n"
+    end
+  end
+
+  def should_decode_body(body)
+    StringIO.expects(:new).with(body).returns(stream = mock("StringIO"))
+
+    Zlib::GzipReader.expects(:new).with(stream).returns(mock("Zlib::GzipReader") do
+      expects(:read)
+      expects(:close)
+    end)
+  end
+
   def savon_response_with(error_type)
     mock = case error_type
       when :soap_fault   then http_response_mock 200, ResponseFixture.soap_fault
@@ -126,12 +164,16 @@ describe Savon::Response do
     Savon::Response.new mock
   end
 
-  def http_response_mock(code = 200, body = nil, message = "OK")
+  def http_response_mock(code = 200, body = nil, message = "OK", headers = {})
     body ||= ResponseFixture.authentication
     mock = mock "Net::HTTPResponse"
-    mock.stubs :code => code.to_s, :message => message,
-               :content_type => "text/html", :body => body
+    mock.stubs :code => code.to_s, :message => message, :content_type => "text/html", :body => body
+
+    mock.stubs("[]").with(anything).returns(nil)
+    headers.each { |key, value| mock.stubs("[]").with(key).returns(value) }
+
     mock
   end
 
 end
+

data/spec/savon/soap_spec.rb

@@ -49,7 +49,7 @@ describe Savon::SOAP do
       @namespace = { "xmlns:ns" => "http://example.com" }
       @namespace_string = 'xmlns:ns="http://example.com"'
       @namespaces = { "xmlns:ns" => "http://ns.example.com", "xmlns:ns2" => "http://ns2.example.com" }
-      
+
       # reset to defaults
       Savon::SOAP.version = 1
       Savon::SOAP.header = {}
@@ -137,15 +137,15 @@ describe Savon::SOAP do
     it "should merge global and per request headers defined as Hashes" do
       Savon::SOAP.header = { :key => "value", :key2 => "global value" }
       @soap.header[:key2] = "request value"
-      @soap.to_xml.should include(
-        "<env:Header><key>value</key><key2>request value</key2></env:Header>"
+      @soap.to_xml.should match(
+        /<env:Header>(<key>value<\/key><key2>request value<\/key2>|<key2>request value<\/key2><key>value<\/key>)<\/env:Header>/
       )
     end
 
     it "should use the :header method from a given WSSE object to include a WSSE header" do
       wsse = "some compliant object"
       wsse.stubs(:header).returns("<wsse>authentication</wsse>")
-      
+
       @soap.wsse = wsse
       @soap.to_xml.should include("<env:Header><wsse>authentication</wsse></env:Header>")
     end
@@ -195,7 +195,8 @@ describe Savon::SOAP do
         '<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/">' <<
           '<env:Body><wsdl:authenticate></wsdl:authenticate></env:Body>' <<
         '</env:Envelope>'
-      ) 
+      )
     end
   end
-end
+end
+

data/spec/savon/wsdl_spec.rb

@@ -8,6 +8,11 @@ describe Savon::WSDL do
       Savon::WSDL.new Savon::Request.new(EndpointHelper.wsdl_endpoint)
     end
 
+    it "it accepts a custom SOAP endpoint" do
+      wsdl = Savon::WSDL.new Savon::Request.new(EndpointHelper.wsdl_endpoint), "http://localhost"
+      wsdl.soap_endpoint.should == "http://localhost"
+    end
+
     it "is enabled by default" do
       @wsdl.enabled?.should be_true
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 6
-  version: 0.7.6
+  - 7
+  version: 0.7.7
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-21 00:00:00 +01:00
+date: 2010-05-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,12 +113,14 @@ files:
 - lib/savon/request.rb
 - lib/savon/response.rb
 - lib/savon/soap.rb
+- lib/savon/version.rb
 - lib/savon/wsdl.rb
 - lib/savon/wsdl_stream.rb
 - lib/savon/wsse.rb
 - lib/savon.rb
 - spec/basic_spec_helper.rb
 - spec/endpoint_helper.rb
+- spec/fixtures/gzip/gzip_response_fixture.rb
 - spec/fixtures/response/response_fixture.rb
 - spec/fixtures/wsdl/wsdl_fixture.rb
 - spec/http_stubs.rb
@@ -147,6 +149,7 @@ files:
 - spec/fixtures/wsdl/xml/geotrust.xml
 - spec/fixtures/wsdl/xml/namespaced_actions.xml
 - spec/fixtures/wsdl/xml/no_namespace.xml
+- spec/fixtures/gzip/message.gz
 has_rdoc: true
 homepage: http://github.com/rubiii/savon
 licenses: []
@@ -184,6 +187,7 @@ summary: Heavy metal Ruby SOAP client library
 test_files: 
 - spec/basic_spec_helper.rb
 - spec/endpoint_helper.rb
+- spec/fixtures/gzip/gzip_response_fixture.rb
 - spec/fixtures/response/response_fixture.rb
 - spec/fixtures/wsdl/wsdl_fixture.rb
 - spec/http_stubs.rb