savon 0.7.2 → 0.7.3

data/CHANGELOG

@@ -1,10 +1,22 @@
+== 0.7.3 (2010-01-31)
+  * Added support for Geotrust-style WSDL documents (Julian Kornberger <github.corny@digineo.de>).
+  * Make HTTP requests include path and query only. This was breaking requests via proxy as scheme and host
+    were repeated (Adrian Mugnolo <adrian@mugnolo.com>)
+  * Avoid warning on 1.8.7 and 1.9.1 (Adrian Mugnolo <adrian@mugnolo.com>).
+  * Fix for issue #29 (WSSE Created Bug?). Default to UTC to xs:dateTime value for WSSE authentication.
+  * Fix for issue #28 (Undefined Method ssl? on URI::Generic).
+  * Fix for issue #27 (http content-type defaults to utf-8). The Content-Type now defaults to UTF-8.
+  * Modification to allow assignment of an Array with an input name and an optional Hash of values to soap.input.
+    Patches issue #30 (stanleydrew <andrewmbenton@gmail.com>).
+  * Fix for issue #25 (header-tag should not be sent if not set).
+
 == 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).
+  * Fix for issue #21 (savon is stripping ?SOAP off the end of WSDL locations).
+  * Fix for issue #22 (REXML::ParseException parsing 401 Unauthorized response body).
+  * Fix for issue #19 (Unable to set attribute in name-spaced WSSE password element).
+  * Added support for global header and namespaces. See 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.

data/README.textile

@@ -2,11 +2,7 @@ h1. Savon
 
 h4. Heavy metal Ruby SOAP client library
 
-p. "RDoc":http://rdoc.info/projects/rubiii/savon | "Wiki":http://wiki.github.com/rubiii/savon | "ToDo":http://rubiii.tadalist.com/lists/1459816/public | "Metrics":http://getcaliper.com/caliper/project?repo=git://github.com/rubiii/savon.git
-
-h2. Warning
-
-p. Savon 0.7.0 comes with several changes to the public API. Pay attention to the CHANGELOG and the updated Wiki.
+p. "RDoc":http://rdoc.info/projects/rubiii/savon | "Wiki":http://wiki.github.com/rubiii/savon | "Metrics":http://getcaliper.com/caliper/project?repo=git://github.com/rubiii/savon.git
 
 h2. Installation
 

data/lib/savon.rb

@@ -4,7 +4,7 @@ module Savon
   SOAPVersions = [1, 2]
 
   # SOAP xs:dateTime format.
-  SOAPDateTimeFormat = "%Y-%m-%dT%H:%M:%S"
+  SOAPDateTimeFormat = "%Y-%m-%dT%H:%M:%SZ"
 
   # SOAP xs:dateTime Regexp.
   SOAPDateTimeRegexp = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/
@@ -18,17 +18,13 @@ module Savon
 end
 
 # standard libs
-%w(logger net/https openssl base64 digest/sha1 rexml/document).each do |lib|
-  require lib
-end
+stdlibs = %w(logger net/https openssl base64 digest/sha1 rexml/document)
+stdlibs.each { |stdlib| require stdlib }
 
 # gems
-require "rubygems"
-%w(builder crack/xml).each do |gem|
-  require gem
-end
+gems = %w(builder crack/xml)
+gems.each { |gem| require gem }
 
 # core files
-%w(core_ext wsse soap request response wsdl client).each do |file|
-  require File.dirname(__FILE__) + "/savon/#{file}"
-end
+files = %w(core_ext wsse soap request response wsdl_stream wsdl client)
+files.each { |file| require "savon/#{file}" }

data/lib/savon/core_ext.rb

@@ -1,3 +1,2 @@
-%w(object string symbol datetime hash uri net_http).each do |file|
-  require File.dirname(__FILE__) + "/core_ext/#{file}"
-end
+files = %w(object string symbol datetime hash uri net_http)
+files.each { |file| require "savon/core_ext/#{file}" }

data/lib/savon/core_ext/uri.rb

@@ -1,5 +1,5 @@
 module URI
-  class HTTP
+  class Generic
 
     # Returns whether the URI hints to SSL.
     def ssl?
@@ -7,4 +7,4 @@ module URI
     end
 
   end
-end
+end

data/lib/savon/request.rb

@@ -6,7 +6,7 @@ module Savon
   class Request
 
     # Content-Types by SOAP version.
-    ContentType = { 1 => "text/xml", 2 => "application/soap+xml" }
+    ContentType = { 1 => "text/xml;charset=UTF-8", 2 => "application/soap+xml;charset=UTF-8" }
 
     # Whether to log HTTP requests.
     @@log = true
@@ -108,7 +108,7 @@ module Savon
     # Logs the SOAP request.
     def log_request
       log "SOAP request: #{@soap.endpoint}"
-      log headers.merge(soap_headers).map { |key, value| "#{key}: #{value}" }.join(", ")
+      log soap_headers.merge(headers).map { |key, value| "#{key}: #{value}" }.join(", ")
       log @soap.to_xml
     end
 
@@ -122,10 +122,10 @@ module Savon
     # to an optional block.
     def request(type)
       request = case type
-        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)
+        when :wsdl then Net::HTTP::Get.new @endpoint.request_uri
+        when :soap then Net::HTTP::Post.new @soap.endpoint.request_uri, soap_headers.merge(headers)
       end
-      request.basic_auth *@basic_auth if @basic_auth
+      request.basic_auth(*@basic_auth) if @basic_auth
       yield request if block_given?
       request
     end

data/lib/savon/soap.rb

@@ -119,7 +119,7 @@ module Savon
     def to_xml
       unless @xml_body
         @xml_body = @builder.env :Envelope, all_namespaces do |xml|
-          xml_header xml
+          xml.env(:Header) { xml << all_header } unless all_header.empty?
           xml_body xml
         end
       end
@@ -128,20 +128,19 @@ module Savon
 
   private
 
-    # Adds a SOAP XML header to a given +xml+ Object.
-    def xml_header(xml)
-      xml.env(:Header) do
-        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
+        custom_header = self.class.header.merge(header).to_soap_xml
       else
-        self.class.header.to_s + header.to_s
+        custom_header = self.class.header.to_s + header.to_s
       end
+      custom_header + wsse_header
+    end
+
+    # Returns the WSSE header or an empty String in case WSSE was not set.
+    def wsse_header
+      @wsse.respond_to?(:header) ? @wsse.header : ""
     end
 
     # Adds a SOAP XML body to a given +xml+ Object.
@@ -162,15 +161,10 @@ module Savon
     # Defaults to use the name of the SOAP action and may be an empty Array
     # in case the specified SOAP input seems invalid.
     def input_array
-      return [input.to_sym] unless input.blank?
+      return input.map { |i| i.is_a?(Hash) ? i : i.to_sym } unless input.blank?
       return [action.to_sym] unless action.blank?
       []
     end
 
-    # Returns the WSSE header or an empty String in case WSSE was not set.
-    def wsse_header
-      @wsse.respond_to?(:header) ? @wsse.header : ""
-    end
-
   end
 end

data/lib/savon/wsdl.rb

@@ -62,61 +62,4 @@ module Savon
     end
 
   end
-
-  # Savon::WSDLStream
-  #
-  # Stream listener for parsing the WSDL document.
-  class WSDLStream
-
-    # The main sections of a WSDL document.
-    Sections = %w(definitions types message portType binding service)
-
-    def initialize
-      @depth, @operations = 0, {}
-    end
-
-    # Returns the namespace URI.
-    attr_reader :namespace_uri
-
-    # Returns the SOAP operations.
-    attr_reader :operations
-
-    # Returns the SOAP endpoint.
-    attr_reader :soap_endpoint
-
-    # Hook method called when the stream parser encounters a starting tag.
-    def tag_start(tag, attrs)
-      @depth += 1
-      tag = tag.strip_namespace
-
-      @section = tag.to_sym if @depth <= 2 && Sections.include?(tag)
-      @namespace_uri ||= attrs["targetNamespace"] if @section == :definitions
-      @soap_endpoint ||= URI(attrs["location"]) if @section == :service && tag == "address"
-
-      operation_from tag, attrs if @section == :binding && tag == "operation"
-    end
-
-    # Hook method called when the stream parser encounters a closing tag.
-    def tag_end(tag)
-      @depth -= 1
-    end
-
-    # Stores available operations from a given tag +name+ and +attrs+.
-    def operation_from(tag, attrs)
-      @input = attrs["name"] if attrs["name"]
-
-      if attrs["soapAction"]
-        @action = !attrs["soapAction"].blank? ? attrs["soapAction"] : @input
-        @input = @action.split("/").last if !@input || @input.empty?
-
-        @operations[@input.snakecase.to_sym] = { :action => @action, :input => @input }
-        @input, @action = nil, nil
-      end
-    end
-
-    # Catches calls to unimplemented hook methods.
-    def method_missing(method, *args)
-    end
-
-  end
 end

data/lib/savon/wsdl_stream.rb

@@ -0,0 +1,88 @@
+module Savon
+
+  # Savon::WSDLStream
+  #
+  # Stream listener for parsing the WSDL document.
+  class WSDLStream
+
+    # The main sections of a WSDL document.
+    Sections = %w(definitions types message portType binding service)
+
+    def initialize
+      @path, @operations = [], {}
+      @namespaces = {}
+    end
+
+    # Returns the namespace URI.
+    attr_reader :namespace_uri
+
+    # Returns the SOAP operations.
+    attr_reader :operations
+
+    # Returns the SOAP endpoint.
+    attr_reader :soap_endpoint
+
+    # Hook method called when the stream parser encounters a starting tag.
+    def tag_start(tag, attrs)
+      # read xml namespaces if root element
+      read_namespaces(attrs) if @path.empty?
+
+      tag,namespace = tag.split(":").reverse
+      @path << tag
+
+      if @section == :binding && tag == "binding"
+        # ensure that we are in an wsdl/soap namespace
+        @section = nil unless @namespaces[namespace] == "http://schemas.xmlsoap.org/wsdl/soap/"
+      end
+
+      @section = tag.to_sym if Sections.include?(tag) && depth <= 2
+
+      @namespace_uri ||= attrs["targetNamespace"] if @section == :definitions
+      @soap_endpoint ||= URI(attrs["location"]) if @section == :service && tag == "address"
+
+      operation_from tag, attrs if @section == :binding && tag == "operation"
+    end
+
+    # Returns our current depth in the WSDL document.
+    def depth
+      @path.size
+    end
+
+    # Reads namespace definitions from a given +attrs+ Hash.
+    def read_namespaces(attrs)
+      attrs.each do |key, value|
+        @namespaces[key.split(":").last] = value if key.start_with? "xmlns:"
+      end
+    end
+
+    # Hook method called when the stream parser encounters a closing tag.
+    def tag_end(tag)
+      @path.pop
+      
+      if @section == :binding && @input && tag.strip_namespace == "operation"
+        # no soapAction attribute found till now
+        operation_from tag, "soapAction" => @input
+      end
+      
+    end
+
+    # Stores available operations from a given tag +name+ and +attrs+.
+    def operation_from(tag, attrs)
+      @input = attrs["name"] if attrs["name"]
+
+      if attrs["soapAction"]
+        @action = !attrs["soapAction"].blank? ? attrs["soapAction"] : @input
+        @input = @action.split("/").last if !@input || @input.empty?
+
+        @operations[@input.snakecase.to_sym] = { :action => @action, :input => @input }
+        @input, @action = nil, nil
+        @input = nil
+      end
+    end
+
+    # Catches calls to unimplemented hook methods.
+    def method_missing(method, *args)
+    end
+
+  end
+end

data/spec/endpoint_helper.rb

@@ -5,6 +5,7 @@ class EndpointHelper
     case type
       when :no_namespace       then "http://nons.example.com/Service?wsdl"
       when :namespaced_actions then "http://nsactions.example.com/Service?wsdl"
+      when :geotrust           then "https://test-api.geotrust.com/webtrust/query.jws?WSDL"
       else                          soap_endpoint(type)
     end
   end

data/spec/fixtures/wsdl/xml/geotrust.xml

@@ -0,0 +1,156 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<s0:definitions name="queryDefinitions" targetNamespace="http://api.geotrust.com/webtrust/query" xmlns="" xmlns:s0="http://schemas.xmlsoap.org/wsdl/" xmlns:s1="http://api.geotrust.com/webtrust/query" xmlns:s2="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s3="http://www.openuri.org/2006/12/wsdl/upgradedJWS">
+  <s0:types>
+    <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://api.geotrust.com/webtrust/query" xmlns:s0="http://schemas.xmlsoap.org/wsdl/" xmlns:s1="http://api.geotrust.com/webtrust/query" xmlns:s2="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:s3="http://www.openuri.org/2006/12/wsdl/upgradedJWS" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+      <xs:complexType name="GetQuickApproverListInput">
+        <xs:sequence>
+          <xs:element minOccurs="0" name="QueryRequestHeader" type="quer:queryRequestHeader" xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+          <xs:element minOccurs="0" name="Domain" type="xs:string"/>
+          <xs:element minOccurs="0" name="IncludeUserAgreement" type="quer:includeUserAgreement" xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="queryRequestHeader">
+        <xs:sequence>
+          <xs:element minOccurs="0" name="PartnerCode" type="xs:string"/>
+          <xs:element minOccurs="0" name="AuthToken" type="quer:authToken" xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+          <xs:element minOccurs="0" name="ReplayToken" type="xs:string"/>
+          <xs:element minOccurs="0" name="UseReplayToken" type="xs:boolean"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="authToken">
+        <xs:sequence>
+          <xs:element minOccurs="0" name="UserName" type="xs:string"/>
+          <xs:element minOccurs="0" name="Password" type="xs:string"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="includeUserAgreement">
+        <xs:sequence>
+          <xs:element minOccurs="0" name="UserAgreementProductCode" type="xs:string"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="GetUserAgreementInput">
+        <xs:sequence>
+          <xs:element minOccurs="0" name="QueryRequestHeader" type="quer:queryRequestHeader" xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+          <xs:element minOccurs="0" name="UserAgreementProductCode" type="xs:string"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="GetQuickApproverListOutput">
+        <xs:sequence>
+          <xs:element minOccurs="0" name="QueryResponseHeader" type="quer:queryResponseHeader" xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+          <xs:element minOccurs="0" name="ApproverList" type="quer:ArrayOfApprover" xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+          <xs:element minOccurs="0" name="UserAgreement" type="xs:string"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="queryResponseHeader">
+        <xs:sequence>
+          <xs:element name="SuccessCode" type="xs:int"/>
+          <xs:element minOccurs="0" name="Errors" type="quer:ArrayOfError" xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+          <xs:element minOccurs="0" name="Timestamp" type="xs:dateTime"/>
+          <xs:element name="ReturnCount" type="xs:int"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="Error">
+        <xs:sequence>
+          <xs:element name="ErrorCode" type="xs:int"/>
+          <xs:element minOccurs="0" name="ErrorField" type="xs:string"/>
+          <xs:element minOccurs="0" name="ErrorMessage" type="xs:string"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="ArrayOfError">
+        <xs:sequence>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="Error" type="quer:Error" xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:element name="ArrayOfError" type="quer:ArrayOfError" xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+      <xs:complexType name="Approver">
+        <xs:sequence>
+          <xs:element minOccurs="0" name="ApproverType" type="xs:string"/>
+          <xs:element minOccurs="0" name="ApproverEmail" type="xs:string"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:complexType name="ArrayOfApprover">
+        <xs:sequence>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="Approver" type="quer:Approver" xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:element name="ArrayOfApprover" type="quer:ArrayOfApprover" xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+      <xs:complexType name="ArrayOfString">
+        <xs:sequence>
+          <xs:element maxOccurs="unbounded" minOccurs="0" name="String" type="xs:string"/>
+        </xs:sequence>
+      </xs:complexType>
+      <xs:element name="ArrayOfString" type="quer:ArrayOfString" xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+      <xs:element name="GetQuickApproverList">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" name="Request" type="quer:GetQuickApproverListInput" xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="GetQuickApproverListResponse">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" name="GetQuickApproverListResult" type="quer:GetQuickApproverListOutput" xmlns:quer="http://api.geotrust.com/webtrust/query"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="hello">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" name="Input" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="helloResponse">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element minOccurs="0" name="helloResult" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:schema>
+  </s0:types>
+  <s0:message name="hello">
+    <s0:part element="s1:hello" name="parameters"/>
+  </s0:message>
+  <s0:message name="helloResponse">
+    <s0:part element="s1:helloResponse" name="helloResultPart"/>
+  </s0:message>
+  <s0:portType name="querySoap">
+    <s0:operation name="GetQuickApproverList" parameterOrder="parameters">
+      <s0:input message="s1:GetQuickApproverList"/>
+      <s0:output message="s1:GetQuickApproverListResponse"/>
+    </s0:operation>
+    <s0:operation name="hello" parameterOrder="parameters">
+      <s0:input message="s1:hello"/>
+      <s0:output message="s1:helloResponse"/>
+    </s0:operation>
+  </s0:portType>
+  <s0:binding name="querySoapBinding" type="s1:querySoap">
+    <s2:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <s0:operation name="GetQuickApproverList">
+      <s2:operation style="document"/>
+      <s0:input>
+        <s2:body parts="parameters" use="literal"/>
+      </s0:input>
+      <s0:output>
+        <s2:body parts="GetQuickApproverListResultPart" use="literal"/>
+      </s0:output>
+    </s0:operation>
+    <s0:operation name="hello">
+      <s2:operation style="document"/>
+      <s0:input>
+        <s2:body parts="parameters" use="literal"/>
+      </s0:input>
+      <s0:output>
+        <s2:body parts="helloResultPart" use="literal"/>
+      </s0:output>
+    </s0:operation>
+  </s0:binding>
+  <s0:service name="query">
+    <s3:upgraded81/>
+    <s0:port binding="s1:querySoapBinding" name="querySoap">
+      <s2:address location="https://test-api.geotrust.com:443/webtrust/query.jws"/>
+    </s0:port>
+  </s0:service>
+</s0:definitions>

data/spec/http_stubs.rb

@@ -21,3 +21,6 @@ FakeWeb.register_uri :get, EndpointHelper.wsdl_endpoint(:no_namespace), :body =>
 
 # WSDL request returning a WSDL document with namespaced SOAP actions.
 FakeWeb.register_uri :get, EndpointHelper.wsdl_endpoint(:namespaced_actions), :body => WSDLFixture.namespaced_actions
+
+# WSDL request returning a WSDL document with geotrust SOAP actions.
+FakeWeb.register_uri :get, EndpointHelper.wsdl_endpoint(:geotrust), :body => WSDLFixture.geotrust

data/spec/savon/core_ext/datetime_spec.rb

@@ -5,7 +5,7 @@ describe DateTime do
   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:33"
+        should == "2012-03-22T16:22:33Z"
     end
   end
 

data/spec/savon/core_ext/hash_spec.rb

@@ -53,7 +53,7 @@ describe Hash do
 
     it "converts DateTime objects to xs:dateTime compliant Strings" do
       { :before => DateTime.new(2012, 03, 22, 16, 22, 33) }.to_soap_xml.
-        should == "<before>" << "2012-03-22T16:22:33" << "</before>"
+        should == "<before>" << "2012-03-22T16:22:33Z" << "</before>"
     end
 
     it "converts Objects responding to to_datetime to xs:dateTime compliant Strings" do
@@ -63,7 +63,7 @@ describe Hash do
       end
 
       { :before => singleton }.to_soap_xml.
-        should == "<before>" << "2012-03-22T16:22:33" << "</before>"
+        should == "<before>" << "2012-03-22T16:22:33Z" << "</before>"
     end
 
     it "calls to_s on Strings even if they respond to to_datetime" do

data/spec/savon/core_ext/object_spec.rb

@@ -29,7 +29,7 @@ describe Object do
         DateTime.new(2012, 03, 22, 16, 22, 33)
       end
 
-      singleton.to_soap_value.should == "2012-03-22T16:22:33"
+      singleton.to_soap_value.should == "2012-03-22T16:22:33Z"
     end
 
     it "calls to_s unless the Object responds to to_datetime" do

data/spec/savon/request_spec.rb

@@ -4,10 +4,8 @@ describe Savon::Request do
   before { @request = Savon::Request.new EndpointHelper.wsdl_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
+    content_type = { 1 => "text/xml;charset=UTF-8", 2 => "application/soap+xml;charset=UTF-8" }
+    content_type.each { |version, type| Savon::Request::ContentType[version].should == type }
   end
 
   # defaults to log request and response. disabled for spec execution
@@ -86,4 +84,9 @@ describe Savon::Request do
     soap_response.body.should == ResponseFixture.authentication
   end
 
+  it "should not include host when creating HTTP requests" do
+    request = @request.send(:request, :wsdl)
+    request.path.should_not include("example.com")
+  end
+
 end

data/spec/savon/savon_spec.rb

@@ -12,7 +12,7 @@ describe Savon do
     Savon::SOAPDateTimeFormat.should_not be_empty
 
     DateTime.new(2012, 03, 22, 16, 22, 33).strftime(Savon::SOAPDateTimeFormat).
-      should == "2012-03-22T16:22:33"
+      should == "2012-03-22T16:22:33Z"
   end
 
   it "contains a Regexp matching the xs:dateTime format" do

data/spec/savon/soap_spec.rb

@@ -43,7 +43,7 @@ describe Savon::SOAP do
   end
 
   it "has a setter for the SOAP input" do
-    @soap.input = "FindUserRequest"
+    @soap.input = "FindUserRequest", { "username" => "auser", "anotherAttr" => "someVal" }
   end
 
   it "has both getter and setter for global SOAP headers" do
@@ -124,9 +124,21 @@ 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>')
+      xml = @soap.to_xml
+      xml.should include('xmlns:wsdl="http://v1_0.ws.auth.order.example.com/"')
+      xml.should include('xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"')
+      xml.should include('<wsdl:authenticate><id>666</id></wsdl:authenticate>')
+    end
+
+    it "does not include an empty header tag" do
+      @soap.to_xml.should_not include('env:Header')
+    end
+    
+    it "returns the appropriate XML for a SOAP Body's root node when parameters are present" do
+      @soap.input = "authenticate", { "protocol" => "tls", "version" => "1.2" }
+      @soap.body = { :id => 666 }
+
+      @soap.to_xml.should include('<wsdl:authenticate protocol="tls" version="1.2"><id>666</id></wsdl:authenticate>')
     end
 
     it "caches the XML, returning the same Object every time" do

data/spec/savon/wsdl_spec.rb

@@ -76,6 +76,24 @@ describe Savon::WSDL do
     end
   end
 
+  describe "a WSDL document from geotrust" do
+    before { @wsdl = new_wsdl :geotrust }
+    
+    it "returns the namespace URI" do
+      @wsdl.namespace_uri.should == WSDLFixture.geotrust(:namespace_uri)
+    end
+    
+    it "returns an Array of available SOAP actions" do
+      WSDLFixture.geotrust(:operations).keys.each do |soap_action|
+        @wsdl.soap_actions.should include(soap_action)
+      end
+    end
+    
+    it "returns a Hash of SOAP operations" do
+      @wsdl.operations.should == WSDLFixture.geotrust(:operations)
+    end
+  end
+
   def new_wsdl(fixture = nil)
     endpoint = fixture ? EndpointHelper.wsdl_endpoint(fixture) : EndpointHelper.wsdl_endpoint
     Savon::WSDL.new Savon::Request.new(endpoint)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-17 00:00:00 +01:00
+date: 2010-01-31 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,6 +87,7 @@ files:
 - lib/savon/response.rb
 - lib/savon/soap.rb
 - lib/savon/wsdl.rb
+- lib/savon/wsdl_stream.rb
 - lib/savon/wsse.rb
 - lib/savon.rb
 - spec/basic_spec_helper.rb
@@ -116,6 +117,7 @@ files:
 - spec/fixtures/response/xml/soap_fault.xml
 - spec/fixtures/response/xml/soap_fault12.xml
 - spec/fixtures/wsdl/xml/authentication.xml
+- spec/fixtures/wsdl/xml/geotrust.xml
 - spec/fixtures/wsdl/xml/namespaced_actions.xml
 - spec/fixtures/wsdl/xml/no_namespace.xml
 has_rdoc: true