fixed response#header and #body /cc #474

both methods now respect the global :convert_response_tags_to and
:strip_namespaces options and return the expected result instead of
raising a Savon::InvalidResponseError.

CHANGELOG.md

@@ -26,6 +26,10 @@
 * Fix: [#450](https://github.com/savonrb/savon/pull/450) Added `Savon::Response#soap_fault`
   and `Savon::Response#http_error` which were present in version 1.
 
+* Fix: [#474](https://github.com/savonrb/savon/issues/474) Changed `Savon::Response#header` and
+  `Savon::Response#body` to respect the global `:convert_response_tags_to` and `:strip_namespaces`
+  options and return the expected result instead of raising a `Savon::InvalidResponseError`.
+
 ### 2.2.0 (2013-04-21)
 
 * Feature: [#416](https://github.com/savonrb/savon/pull/416) The global `namespace_identifier`

Gemfile

@@ -4,3 +4,5 @@ gemspec
 gem "httpclient", "~> 2.3.0"
 gem "simplecov", :require => false, :group => :test
 gem "coveralls", :require => false
+
+gem "nori", :github => "savonrb/nori"

lib/savon/response.rb

@@ -30,13 +30,11 @@ def http_error?
     end
 
     def header
-      raise_invalid_response_error! unless hash.key? :envelope
-      hash[:envelope][:header]
+      find('Header')
     end
 
     def body
-      raise_invalid_response_error! unless hash.key? :envelope
-      hash[:envelope][:body]
+      find('Body')
     end
 
     alias_method :to_hash, :body
@@ -69,6 +67,13 @@ def xpath(path, namespaces = nil)
       doc.xpath(path, namespaces || xml_namespaces)
     end
 
+    def find(*path)
+      envelope = nori.find(hash, 'Envelope')
+      raise_invalid_response_error! unless envelope
+
+      nori.find(envelope, *path)
+    end
+
     private
 
     def build_soap_and_http_errors!

spec/savon/options_spec.rb

@@ -507,11 +507,13 @@
 
   context "global :strip_namespaces" do
     it "can be changed to not strip any namespaces" do
-      client = new_client(:endpoint => @server.url(:repeat), :convert_response_tags_to => lambda { |tag| tag.snakecase }, :strip_namespaces => false)
-      response = client.call(:authenticate, :xml => Fixture.response(:authentication))
+      client = new_client(
+        :endpoint => @server.url(:repeat),
+        :convert_response_tags_to => lambda { |tag| tag.snakecase },
+        :strip_namespaces => false
+      )
 
-      # the header/body convenience methods fails when conventions are not met. [dh, 2012-12-12]
-      expect { response.body }.to raise_error(Savon::InvalidResponseError)
+      response = client.call(:authenticate, :xml => Fixture.response(:authentication))
 
       expect(response.hash["soap:envelope"]["soap:body"]).to include("ns2:authenticate_response")
     end

spec/savon/response_spec.rb

@@ -95,6 +95,29 @@
       response.header.should include(:session_number => "ABCD1234")
     end
 
+    it 'respects the global :strip_namespaces option' do
+      globals[:strip_namespaces] = false
+
+      response_with_header = soap_response(:body => Fixture.response(:header))
+      header = response_with_header.header
+
+      expect(header).to be_a(Hash)
+
+      # notice: :session_number is a snake_case Symbol without namespaces,
+      # but the Envelope and Header elements are qualified.
+      expect(header.keys).to include(:session_number)
+    end
+
+    it 'respects the global :convert_response_tags_to option' do
+      globals[:convert_response_tags_to] = lambda { |key| key.upcase }
+
+      response_with_header = soap_response(:body => Fixture.response(:header))
+      header = response_with_header.header
+
+      expect(header).to be_a(Hash)
+      expect(header.keys).to include('SESSIONNUMBER')
+    end
+
     it "should throw an exception when the response header isn't parsable" do
       lambda { invalid_soap_response.header }.should raise_error Savon::InvalidResponseError
     end
@@ -120,6 +143,24 @@
         hash[:multi_namespaced_entry_response][:history].should be_a(Hash)
         hash[:multi_namespaced_entry_response][:history][:case].should be_an(Array)
       end
+
+      it 'respects the global :strip_namespaces option' do
+        globals[:strip_namespaces] = false
+
+        body = soap_response.body
+
+        expect(body).to be_a(Hash)
+        expect(body.keys).to include(:"ns2:authenticate_response")
+      end
+
+      it 'respects the global :convert_response_tags_to option' do
+        globals[:convert_response_tags_to] = lambda { |key| key.upcase }
+
+        body = soap_response.body
+
+        expect(body).to be_a(Hash)
+        expect(body.keys).to include('AUTHENTICATERESPONSE')
+      end
     end
   end
 
@@ -175,6 +216,15 @@
     end
   end
 
+  describe '#find' do
+    it 'delegates to Nori#find to find child elements inside the Envelope' do
+      result = soap_response.find('Body', 'authenticateResponse', 'return')
+
+      expect(result).to be_a(Hash)
+      expect(result.keys).to include(:authentication_value)
+    end
+  end
+
   describe "#http" do
     it "should return the HTTPI::Response" do
       soap_response.http.should be_an(HTTPI::Response)