savon 0.8.3 → 0.8.4

data/CHANGELOG.md

@@ -1,11 +1,20 @@
-## 0.8.3 (2010-01-11)
+## 0.8.4 (2011-01-26)
+
+* Fix for issues [issue #130](https://github.com/rubiii/savon/issues/130) and [#134](https://github.com/rubiii/savon/issues/134)
+  ([4f9847](https://github.com/rubiii/savon/commit/4f9847)).
+
+* Fix for [issue #91](https://github.com/rubiii/savon/issues/91) ([5c8ec1](https://github.com/rubiii/savon/commit/5c8ec1)).
+
+* Fix for [issue #135](https://github.com/rubiii/savon/issues/135) ([c9261d](https://github.com/rubiii/savon/commit/c9261d)).
+
+## 0.8.3 (2011-01-11)
 
 * Moved implementation of `Savon::SOAP::Response#to_array` to a class method at `Savon::SOAP::XML.to_array`
   ([05a7d3](https://github.com/rubiii/savon/commit/05a7d3)).
 
 * Fix for [issue #131](https://github.com/rubiii/savon/issues/131) ([4e57b3](https://github.com/rubiii/savon/commit/4e57b3)).
 
-## 0.8.2 (2010-01-04)
+## 0.8.2 (2011-01-04)
 
 * Fix for [issue #127](https://github.com/rubiii/savon/issues/127) ([0eb3da](https://github.com/rubiii/savon/commit/0eb3da4)).
 

data/lib/savon/client.rb

@@ -69,12 +69,12 @@ module Savon
     #   client.request(:get_user, "xmlns:wsdl" => "http://example.com")
     def request(*args, &block)
       raise ArgumentError, "Savon::Client#request requires at least one argument" if args.empty?
-      
+
       self.soap = SOAP::XML.new
       preconfigure extract_options(args)
       process &block if block
       soap.wsse = wsse
-      
+
       response = SOAP::Request.new(http, soap).response
       set_cookie response.http.headers
       response
@@ -99,7 +99,7 @@ module Savon
       attributes = Hash === args.last ? args.pop : {}
       namespace = args.size > 1 ? args.shift.to_sym : nil
       input = args.first
-      
+
       [namespace, input, attributes]
     end
 
@@ -108,8 +108,9 @@ module Savon
       soap.endpoint = wsdl.endpoint
       soap.namespace_identifier = options[0]
       soap.namespace = wsdl.namespace
+      soap.element_form_default = wsdl.element_form_default if wsdl.present?
       soap.body = options[2].delete(:body) if options[2][:body]
-      
+
       set_soap_action options[1]
       set_soap_input *options
     end

data/lib/savon/core_ext/hash.rb

@@ -18,12 +18,16 @@ module Savon
         self
       end unless defined? deep_merge!
 
-      # Returns the values from the soap:Body element or an empty Hash in case the soap:Body tag could
+      # Returns the values from the soap:Header element or an empty Hash in case the element could
+      # not be found.
+      def find_soap_header
+        find_soap_element /.+:Header/
+      end
+
+      # Returns the values from the soap:Body element or an empty Hash in case the element could
       # not be found.
       def find_soap_body
-        envelope = self[keys.first] || {}
-        body_key = envelope.keys.find { |key| /.+:Body/ =~ key } rescue nil
-        body_key ? envelope[body_key].map_soap_response : {}
+        find_soap_element /.+:Body/
       end
 
       # Maps keys and values of a Hash created from SOAP response XML to more convenient Ruby Objects.
@@ -34,13 +38,13 @@ module Savon
             when ::Array  then value.map { |val| val.map_soap_response rescue val }
             when ::String then value.map_soap_response
           end
-          
+
           new_key = if Savon.strip_namespaces?
             key.strip_namespace.snakecase.to_sym
           else
             key.snakecase
           end
-          
+
           if hash[new_key] # key already exists, value should be added as an Array
             hash[new_key] = [hash[new_key], value].flatten
             result = hash
@@ -51,6 +55,14 @@ module Savon
         end
       end
 
+    private
+
+      def find_soap_element(element)
+        envelope = self[keys.first] || {}
+        element_key = envelope.keys.find { |key| element =~ key } rescue nil
+        element_key ? envelope[element_key].map_soap_response : {}
+      end
+
     end
   end
 end

data/lib/savon/soap/response.rb

@@ -43,9 +43,14 @@ module Savon
         @http_error ||= HTTP::Error.new http
       end
 
+      # Returns the SOAP response header as a Hash.
+      def header
+        @header_hash ||= basic_hash.find_soap_header
+      end
+
       # Returns the SOAP response body as a Hash.
       def to_hash
-        @hash ||= Savon::SOAP::XML.to_hash http.body
+        @hash ||= Savon::SOAP::XML.to_hash basic_hash
       end
 
       # Returns the SOAP response body as an Array.
@@ -53,6 +58,11 @@ module Savon
         Savon::SOAP::XML.to_array to_hash, *path
       end
 
+      # Returns the complete SOAP response XML without normalization.
+      def basic_hash
+        @basic_hash ||= Savon::SOAP::XML.parse http.body
+      end
+
       # Returns the SOAP response XML.
       def to_xml
         http.body

data/lib/savon/soap/xml.rb

@@ -20,9 +20,15 @@ module Savon
         "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance"
       }
 
-      # Converts the given SOAP response +xml+ into a Hash.
-      def self.to_hash(xml)
-        (Crack::XML.parse(xml) rescue {}).find_soap_body
+      # Converts the given SOAP response +value+ (XML or Hash) into a normalized Hash.
+      def self.to_hash(value)
+        value = parse value unless value.kind_of? Hash
+        value.find_soap_body
+      end
+
+      # Converts a given SOAP response +xml+ to a Hash.
+      def self.parse(xml)
+        Crack::XML.parse(xml) rescue {}
       end
 
       # Expects a SOAP response XML or Hash, traverses it for a given +path+ of Hash keys
@@ -30,12 +36,12 @@ module Savon
       # path does not exist or returns nil.
       def self.to_array(object, *path)
         hash = object.kind_of?(Hash) ? object : to_hash(object)
-        
+
         result = path.inject hash do |memo, key|
           return [] unless memo[key]
           memo[key]
         end
-        
+
         result.kind_of?(Array) ? result.compact : [result].compact
       end
 
@@ -98,6 +104,15 @@ module Savon
         @namespace_identifier ||= :wsdl
       end
 
+      # Returns whether all local elements should be namespaced. Might be set to :qualified,
+      # but defaults to :unqualified.
+      def element_form_default
+        @element_form_default ||= :unqualified
+      end
+
+      # Sets whether all local elements should be namespaced.
+      attr_writer :element_form_default
+
       # Accessor for the default namespace URI.
       attr_accessor :namespace
 
@@ -159,7 +174,8 @@ module Savon
 
       # Returns the SOAP body as an XML String.
       def body_to_xml
-        body.kind_of?(Hash) ? Gyoku.xml(body) : body.to_s
+        return body.to_s unless body.kind_of? Hash
+        Gyoku.xml body, :element_form_default => element_form_default, :namespace => namespace_identifier
       end
 
     end

data/lib/savon/version.rb

@@ -1,5 +1,5 @@
 module Savon
 
-  Version = "0.8.3"
+  Version = "0.8.4"
 
 end

data/lib/savon/wsdl/document.rb

@@ -61,6 +61,11 @@ module Savon
         @operations ||= parser.operations
       end
 
+      # Returns the elementFormDefault value.
+      def element_form_default
+        @element_form_default ||= parser.element_form_default
+      end
+
       # Sets the location of the WSDL document to use. This can either be a URL
       # or a path to a local file.
       attr_writer :document

data/lib/savon/wsdl/parser.rb

@@ -13,7 +13,10 @@ module Savon
       Sections = %w(definitions types message portType binding service)
 
       def initialize
-        @path, @operations, @namespaces = [], {}, {}
+        @path = []
+        @operations = {}
+        @namespaces = {}
+        @element_form_default = :unqualified
       end
 
       # Returns the namespace URI.
@@ -25,6 +28,9 @@ module Savon
       # Returns the SOAP endpoint.
       attr_reader :endpoint
 
+      # Returns the elementFormDefault value.
+      attr_reader :element_form_default
+
       # Hook method called when the stream parser encounters a starting tag.
       def tag_start(tag, attrs)
         # read xml namespaces if root element
@@ -33,6 +39,10 @@ module Savon
         tag, namespace = tag.split(":").reverse
         @path << tag
 
+        if @section == :types && tag == "schema"
+          @element_form_default = attrs["elementFormDefault"].to_sym if attrs["elementFormDefault"]
+        end
+
         if @section == :binding && tag == "binding"
           # ensure that we are in an wsdl/soap namespace
           @section = nil unless @namespaces[namespace].starts_with? "http://schemas.xmlsoap.org/wsdl/soap"
@@ -66,6 +76,8 @@ module Savon
           # no soapAction attribute found till now
           operation_from tag, "soapAction" => @input
         end
+
+        @section = :definitions if Sections.include?(tag) && depth <= 1
       end
 
       # Stores available operations from a given tag +name+ and +attrs+.

data/savon.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "builder", ">= 2.1.2"
   s.add_dependency "crack", "~> 0.1.8"
   s.add_dependency "httpi", ">= 0.7.8"
-  s.add_dependency "gyoku", ">= 0.2.0"
+  s.add_dependency "gyoku", ">= 0.3.0"
 
   s.add_development_dependency "rspec", "~> 2.4.0"
   s.add_development_dependency "autotest"

data/spec/fixtures/response/header.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+  <soap:Header xmlns="http://webservices.somewhere.com/definitions">
+    <SessionNumber>ABCD1234</SessionNumber>
+  </soap:Header>
+  <soap:Body>
+    <AuthenticateReply xmlns="http://xml.somewhere.com/ABCD">
+      <processStatus>
+        <statusCode>P</statusCode>
+      </processStatus>
+    </AuthenticateReply>
+  </soap:Body>
+</soap:Envelope>

data/spec/fixtures/wsdl/two_bindings.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Example of a WSDL with two <binding> tags ("sections" in Savon
+     parlance).
+
+     This is stripped down from a real example found in the wild, although
+     having different operations for the SOAP 1.1 and SOAP 1.2 bindings
+     is hypothetical (the real-world example I saw had the same operations
+     in each binding section). -->
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <types>
+    </types>
+    <portType name="BlogSoap">
+    </portType>
+    <binding name="BlogSoap">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <operation name="Post" />
+        <operation name="Post11only" />
+    </binding>
+    <binding name="BlogSoap12">
+        <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        <operation name="Post" />
+        <operation name="Post12only" />
+    </binding>
+</definitions>
+

data/spec/savon/client_spec.rb

@@ -82,14 +82,14 @@ describe Savon::Client do
       it "should set the target namespace with the default identifier" do
         namespace = 'xmlns:wsdl="http://v1_0.ws.auth.order.example.com/"'
         HTTPI::Request.any_instance.expects(:body=).with { |value| value.include? namespace }
-        
+
         client.request :get_user
       end
 
       it "should not set the target namespace if soap.namespace was set to nil" do
         namespace = "http://v1_0.ws.auth.order.example.com/"
         HTTPI::Request.any_instance.expects(:body=).with { |value| !value.include?(namespace) }
-        
+
         client.request(:get_user) { soap.namespace = nil }
       end
     end
@@ -114,14 +114,14 @@ describe Savon::Client do
       it "should set the target namespace with the given identifier" do
         namespace = 'xmlns:v1="http://v1_0.ws.auth.order.example.com/"'
         HTTPI::Request.any_instance.expects(:body=).with { |value| value.include? namespace }
-        
+
         client.request :v1, :get_user
       end
 
       it "should not set the target namespace if soap.namespace was set to nil" do
         namespace = "http://v1_0.ws.auth.order.example.com/"
         HTTPI::Request.any_instance.expects(:body=).with { |value| !value.include?(namespace) }
-        
+
         client.request(:v1, :get_user) { soap.namespace = nil }
       end
     end
@@ -190,7 +190,7 @@ describe Savon::Client do
       client.http.headers.expects(:[]=).with("Cookie", anything).never
       client.http.headers.stubs(:[]=).with("SOAPAction", '"authenticate"')
       client.http.headers.stubs(:[]=).with("Content-Type", "text/xml;charset=UTF-8")
-      
+
       client.request :authenticate
     end
   end
@@ -205,7 +205,7 @@ describe Savon::Client do
       client.http.headers.expects(:[]=).with("Cookie", "some-cookie")
       client.http.headers.stubs(:[]=).with("SOAPAction", '"authenticate"')
       client.http.headers.stubs(:[]=).with("Content-Type", "text/xml;charset=UTF-8")
-      
+
       client.request :authenticate
     end
   end
@@ -220,7 +220,7 @@ describe Savon::Client do
 
     it "adds a SOAPAction header containing the SOAP action name" do
       HTTPI.stubs(:post).returns(new_response)
-      
+
       client.request :authenticate do
         http.headers["SOAPAction"].should == %{"authenticate"}
       end
@@ -229,7 +229,7 @@ describe Savon::Client do
     it "should execute SOAP requests and return the response" do
       HTTPI.expects(:post).returns(new_response)
       response = client.request(:authenticate)
-      
+
       response.should be_a(Savon::SOAP::Response)
       response.to_xml.should == Fixture.response(:authentication)
     end
@@ -246,16 +246,23 @@ describe Savon::Client do
 
     it "adds a SOAPAction header containing the SOAP action name" do
       HTTPI.stubs(:post).returns(new_response)
-      
+
       client.request :authenticate do
         http.headers["SOAPAction"].should == %{"authenticate"}
       end
     end
 
+    it "should get #element_form_default from the WSDL" do
+      HTTPI.stubs(:post).returns(new_response)
+      Savon::WSDL::Document.any_instance.expects(:element_form_default).returns(:qualified)
+
+      client.request :authenticate
+    end
+
     it "should execute SOAP requests and return the response" do
       HTTPI.expects(:post).returns(new_response)
       response = client.request(:authenticate)
-      
+
       response.should be_a(Savon::SOAP::Response)
       response.to_xml.should == Fixture.response(:authentication)
     end
@@ -277,16 +284,23 @@ describe Savon::Client do
 
     it "adds a SOAPAction header containing the SOAP action name" do
       HTTPI.stubs(:post).returns(new_response)
-      
+
       client.request :authenticate do
         http.headers["SOAPAction"].should == %{"authenticate"}
       end
     end
 
+    it "should not get #element_form_default from the WSDL" do
+      HTTPI.stubs(:post).returns(new_response)
+      Savon::WSDL::Document.any_instance.expects(:element_form_default).never
+
+      client.request :authenticate
+    end
+
     it "should execute SOAP requests and return the response" do
       HTTPI.expects(:post).returns(new_response)
       response = client.request(:authenticate)
-      
+
       response.should be_a(Savon::SOAP::Response)
       response.to_xml.should == Fixture.response(:authentication)
     end
@@ -325,7 +339,7 @@ describe Savon::Client do
   def new_response(options = {})
     defaults = { :code => 200, :headers => {}, :body => Fixture.response(:authentication) }
     response = defaults.merge options
-    
+
     HTTPI::Response.new response[:code], response[:headers], response[:body]
   end
 

data/spec/savon/core_ext/hash_spec.rb

@@ -6,12 +6,24 @@ describe Hash do
     it "should recursively merge two Hashes" do
       hash = { :one => 1, "two" => { "three" => 3 } }
       other_hash = { :four => 4, "two" => { "three" => "merge", :five => 5 } }
-      
+
       hash.merge!(other_hash).should == { :one => 1, :four => 4, "two" => { "three" => "merge", :five => 5 } }
     end
   end
 
-  describe "find_soap_body" do
+  describe "#find_soap_header" do
+    it "should return the content from the 'soap:Header' element" do
+      soap_header = { "soap:Envelope" => { "soap:Header" => "content" } }
+      soap_header.find_soap_header.should == "content"
+    end
+
+    it "should return an empty Hash in case the 'soap:Header' element could not be found" do
+      soap_header = { "some_hash" => "content" }
+      soap_header.find_soap_header.should == {}
+    end
+  end
+
+  describe "#find_soap_body" do
     it "should return the content from the 'soap:Body' element" do
       soap_body = { "soap:Envelope" => { "soap:Body" => "content" } }
       soap_body.find_soap_body.should == "content"
@@ -23,7 +35,7 @@ describe Hash do
     end
   end
 
-  describe "map_soap_response" do
+  describe "#map_soap_response" do
     it "should convert Hash key Strings to snake_case Symbols" do
       soap_response = { "userResponse" => { "accountStatus" => "active" } }
       result = { :user_response => { :account_status => "active" } }
@@ -95,13 +107,13 @@ describe Hash do
           "ns11:case" => { "ns11:name" => "another_name" }
         }
       }
-      
+
       result = {
         :history => {
           :case => [{ :name => "a_name" }, { :name => "another_name" }]
         }
       }
-      
+
       soap_response.map_soap_response.should == result
     end
   end

data/spec/savon/soap/response_spec.rb

@@ -116,6 +116,13 @@ describe Savon::SOAP::Response do
     end
   end
 
+  describe "#header" do
+    it "should return the SOAP response header as a Hash" do
+      response = soap_response :body => Fixture.response(:header)
+      response.header.should include(:session_number => "ABCD1234")
+    end
+  end
+
   describe "#to_hash" do
     it "should return the SOAP response body as a Hash" do
       soap_response.to_hash[:authenticate_response][:return].should ==
@@ -130,6 +137,13 @@ describe Savon::SOAP::Response do
     end
   end
 
+  describe "#basic_hash" do
+    it "should return the complete SOAP response XML as a Hash" do
+      response = soap_response :body => Fixture.response(:header)
+      response.basic_hash["soap:Envelope"]["soap:Header"]["SessionNumber"].should == "ABCD1234"
+    end
+  end
+
   describe "#to_xml" do
     it "should return the raw SOAP response body" do
       soap_response.to_xml.should == Fixture.response(:authentication)

data/spec/savon/soap/xml_spec.rb

@@ -18,19 +18,26 @@ describe Savon::SOAP::XML do
 
     it "should return a Hash for a SOAP multiRef response" do
       hash = Savon::SOAP::XML.to_hash Fixture.response(:multi_ref)
-      
+
       hash[:list_response].should be_a(Hash)
       hash[:multi_ref].should be_an(Array)
     end
 
     it "should add existing namespaced elements as an array" do
       hash = Savon::SOAP::XML.to_hash Fixture.response(:list)
-      
+
       hash[:multi_namespaced_entry_response][:history].should be_a(Hash)
       hash[:multi_namespaced_entry_response][:history][:case].should be_an(Array)
     end
   end
 
+  describe ".parse" do
+    it "should convert the given XML into a Hash" do
+      hash = Savon::SOAP::XML.parse Fixture.response(:list)
+      hash["soapenv:Envelope"]["soapenv:Body"].should be_a(Hash)
+    end
+  end
+
   describe ".to_array" do
     let(:response_hash) { Fixture.response_hash :authentication }
 
@@ -57,7 +64,7 @@ describe Savon::SOAP::XML do
   describe ".new" do
     it "should accept an endpoint, an input tag and a SOAP body" do
       xml = Savon::SOAP::XML.new Endpoint.soap, :authentication, :id => 1
-      
+
       xml.endpoint.should == Endpoint.soap
       xml.input.should == :authentication
       xml.body.should == { :id => 1 }
@@ -86,7 +93,7 @@ describe Savon::SOAP::XML do
     it "should default to the global default" do
       Savon.soap_version = 2
       xml.version.should == 2
-      
+
       reset_soap_version
     end
 
@@ -224,7 +231,7 @@ describe Savon::SOAP::XML do
     context "with the global SOAP version set to 1.2" do
       it "should contain the namespace for SOAP 1.2" do
         Savon.soap_version = 2
-        
+
         uri = "http://www.w3.org/2003/05/soap-envelope"
         xml.to_xml.should match(/<env:Envelope (.*)xmlns:env="#{uri}"(.*)>/)
         reset_soap_version
@@ -235,7 +242,7 @@ describe Savon::SOAP::XML do
       it "should contain the namespace for the request SOAP version" do
         Savon.soap_version = 2
         xml.version = 1
-        
+
         uri = "http://schemas.xmlsoap.org/soap/envelope/"
         xml.to_xml.should match(/<env:Envelope (.*)xmlns:env="#{uri}"(.*)>/)
         reset_soap_version
@@ -257,6 +264,23 @@ describe Savon::SOAP::XML do
       end
     end
 
+    context "with :element_form_default set to :qualified and a :namespace" do
+      let :xml do
+        Savon::SOAP::XML.new Endpoint.soap, :authenticate, :user => { :id => 1, ":noNamespace" => true }
+      end
+
+      it "should namespace the default elements" do
+        xml.element_form_default = :qualified
+        xml.namespace_identifier = :wsdl
+
+        xml.to_xml.should include(
+          "<wsdl:user>",
+          "<wsdl:id>1</wsdl:id>",
+          "<noNamespace>true</noNamespace>"
+        )
+      end
+    end
+
     context "with WSSE authentication" do
       it "should containg a SOAP header with WSSE authentication details" do
         xml.wsse = Savon::WSSE.new

data/spec/savon/wsdl/document_spec.rb

@@ -64,11 +64,17 @@ describe Savon::WSDL::Document do
     let(:wsdl) { Savon::WSDL::Document.new HTTPI::Request.new, Endpoint.wsdl }
 
     before do
-      response = HTTPI::Response.new(200, {}, Fixture.wsdl(:authentication))
+      response = HTTPI::Response.new 200, {}, Fixture.wsdl(:authentication)
       HTTPI.stubs(:get).returns(response)
     end
 
     it_should_behave_like "a WSDL document"
+
+    describe "#element_form_default" do
+      it "should return :unqualified" do
+        wsdl.element_form_default.should == :unqualified
+      end
+    end
   end
 
   context "with a local document" do
@@ -108,4 +114,19 @@ describe Savon::WSDL::Document do
     end
   end
 
+  context "with a WSDL document containing elementFormDefault='qualified'" do
+    let(:wsdl) { Savon::WSDL::Document.new HTTPI::Request.new, Endpoint.wsdl }
+
+    before do
+      response = HTTPI::Response.new 200, {}, Fixture.wsdl(:geotrust)
+      HTTPI.stubs(:get).returns(response)
+    end
+
+    describe "#element_form_default" do
+      it "should return :qualified" do
+        wsdl.element_form_default.should == :qualified
+      end
+    end
+  end
+
 end

data/spec/savon/wsdl/parser_spec.rb

@@ -5,60 +5,81 @@ describe Savon::WSDL::Parser do
   context "with namespaced_actions.xml" do
     let(:parser) { new_parser :namespaced_actions }
 
-    it "should know the target namespace" do
+    it "should return the target namespace" do
       parser.namespace.should == "http://api.example.com/api/"
     end
 
-    it "should know the SOAP endpoint" do
+    it "should return the SOAP endpoint" do
       parser.endpoint.should == URI("https://api.example.com/api/api.asmx")
     end
 
-    it "should know the available SOAP operations" do
+    it "should return the available SOAP operations" do
       parser.operations.should match_operations(
         :get_api_key => { :input => "GetApiKey", :action => "http://api.example.com/api/User.GetApiKey" },
         :delete_client => { :input => "DeleteClient", :action => "http://api.example.com/api/Client.Delete" },
         :get_clients => { :input => "GetClients", :action => "http://api.example.com/api/User.GetClients" }
       )
     end
+
+    it "should return that :element_form_default is set to :qualified" do
+      parser.element_form_default.should == :qualified
+    end
   end
 
   context "with no_namespace.xml" do
     let(:parser) { new_parser :no_namespace }
 
-    it "should know the target namespace" do
+    it "should return the target namespace" do
       parser.namespace.should == "urn:ActionWebService"
     end
 
-    it "should know the SOAP endpoint" do
+    it "should return the SOAP endpoint" do
       parser.endpoint.should == URI("http://example.com/api/api")
     end
 
-    it "should know the available SOAP operations" do
+    it "should return the available SOAP operations" do
       parser.operations.should match_operations(
         :search_user => { :input => "SearchUser", :action => "/api/api/SearchUser" },
         :get_user_login_by_id => { :input => "GetUserLoginById", :action => "/api/api/GetUserLoginById" },
         :get_all_contacts => { :input => "GetAllContacts", :action => "/api/api/GetAllContacts" }
       )
     end
+
+    it "should return that :element_form_default is set to :unqualified" do
+      parser.element_form_default.should == :unqualified
+    end
   end
 
   context "with geotrust.xml" do
     let(:parser) { new_parser :geotrust }
 
-    it "should know the target namespace" do
+    it "should return the target namespace" do
       parser.namespace.should == "http://api.geotrust.com/webtrust/query"
     end
 
-    it "should know the SOAP endpoint" do
+    it "should return the SOAP endpoint" do
       parser.endpoint.should == URI("https://test-api.geotrust.com/webtrust/query.jws")
     end
 
-    it "should know the available SOAP operations" do
+    it "should return the available SOAP operations" do
       parser.operations.should match_operations(
         :get_quick_approver_list => { :input => "GetQuickApproverList", :action => "GetQuickApproverList" },
         :hello => { :input => "hello", :action => "hello" }
       )
     end
+
+    it "should return that :element_form_default is set to :qualified" do
+      parser.element_form_default.should == :qualified
+    end
+  end
+
+  context "with two_bindings.xml" do
+    let(:parser) { new_parser :two_bindings }
+
+    it "should merge operations from all binding sections (until we have an example where it makes sense to do otherwise)" do
+      parser.operations.keys.map(&:to_s).sort.should ==
+        %w{post post11only post12only}
+    end
   end
 
   RSpec::Matchers.define :match_operations do |expected|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 +01:00
+date: 2011-01-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,12 +74,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 0
-        - 2
+        - 3
         - 0
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -184,6 +184,7 @@ files:
 - spec/fixtures/gzip/message.gz
 - spec/fixtures/response/another_soap_fault.xml
 - spec/fixtures/response/authentication.xml
+- spec/fixtures/response/header.xml
 - spec/fixtures/response/list.xml
 - spec/fixtures/response/multi_ref.xml
 - spec/fixtures/response/soap_fault.xml
@@ -192,6 +193,7 @@ files:
 - spec/fixtures/wsdl/geotrust.xml
 - spec/fixtures/wsdl/namespaced_actions.xml
 - spec/fixtures/wsdl/no_namespace.xml
+- spec/fixtures/wsdl/two_bindings.xml
 - spec/savon/client_spec.rb
 - spec/savon/core_ext/hash_spec.rb
 - spec/savon/core_ext/object_spec.rb