savon 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/savon/client.rb

@@ -10,20 +10,21 @@ module Savon
     # Default behavior for processing the SOAP response. Expects an instance
     # of Net::HTTPResponse and returns the SOAP response body as a Hash.
     @response_process = lambda do |response|
-      response_hash = Crack::XML.parse response.body
-      error_handling.call response, response_hash
+      body = Crack::XML.parse response.body
+      body = body.find_regexp [/.+:Envelope/, /.+:Body/]
+      error_handling.call response, body
 
-      response_hash = response_hash["soap:Envelope"]["soap:Body"]
-      response_hash = response_hash[response_hash.keys.first]
-      (response_hash["return"] || response_hash).map_soap_response
+      body = body.find_regexp /.+/
+      (body["return"] || body).map_soap_response
     end
 
     # Default error handling. Expects an instance of Net::HTTPResponse and
     # a SOAP response body Hash. Raises a Savon::SOAPFault in case of a SOAP
     # fault or a Savon::HTTPError in case of an HTTP error.
-    @error_handling = lambda do |response, response_hash|
-      soap_fault = response_hash.to_soap_fault_message
-      raise Savon::SOAPFault, soap_fault if soap_fault
+    @error_handling = lambda do |response, body|
+      soap_fault = body.find_regexp [/.+:Fault/]
+      soap_fault_message = soap_fault.to_soap_fault_message
+      raise Savon::SOAPFault, soap_fault_message if soap_fault_message
 
       http_error = "#{response.message} (#{response.code})"
       http_error += ": #{response.body}" unless response.body.empty?

data/lib/savon/core_ext/hash.rb

@@ -1,5 +1,20 @@
 class Hash
 
+  # Expects an Array of Regexp Objects of which every Regexp recursively
+  # matches a key to be accessed. Returns the value of the last Regexp filter
+  # found in the Hash or an empty Hash in case the path of Regexp filters
+  # did not match the Hash structure.
+  def find_regexp(regexp)
+    regexp = [regexp] unless regexp.kind_of? Array
+    result = dup
+
+    regexp.each do |pattern|
+      result_key = result.keys.find { |key| key.to_s.match pattern }
+      result = result[result_key] ? result[result_key] : {}
+    end
+    result
+  end
+
   # Returns the Hash translated into SOAP request compatible XML.
   #
   # === Example
@@ -15,13 +30,10 @@ class Hash
   # Tries to generate a SOAP fault message from the Hash. Returns nil in
   # case no SOAP fault could be found or generated.
   def to_soap_fault_message
-    soap_fault = self["soap:Envelope"]["soap:Body"]["soap:Fault"] rescue {}
-    return nil unless soap_fault
-
-    if soap_fault.keys.include? "faultcode"
-      "(#{soap_fault['faultcode']}) #{soap_fault['faultstring']}"
-    elsif soap_fault.keys.include? "code"
-      "(#{soap_fault['code']['value']}) #{soap_fault['reason']['text']}"
+    if keys.include? "faultcode"
+      "(#{self['faultcode']}) #{self['faultstring']}"
+    elsif keys.include? "code"
+      "(#{self['code']['value']}) #{self['reason']['text']}"
     else
       nil
     end

data/spec/savon/core_ext/hash_spec.rb

@@ -2,6 +2,29 @@ require "spec_helper"
 
 describe Hash do
 
+  describe "find_regexp" do
+    before do
+      @soap_fault_hash = { "soap:Envelope" => { "soap:Body" => { "soap:Fault" => {
+        "faultcode" => "soap:Server", "faultstring" => "Fault occurred while processing."
+      } } } }
+    end
+
+    it "returns an empty Hash in case it did not find the specified value" do
+      result = @soap_fault_hash.find_regexp "soap:Fault"
+
+      result.should be_a Hash
+      result.should be_empty
+    end
+
+    it "returns the value of the last Regexp filter found in the Hash" do
+      @soap_fault_hash.find_regexp([".+:Envelope", ".+:Body"]).
+        should == @soap_fault_hash["soap:Envelope"]["soap:Body"]
+
+      @soap_fault_hash.find_regexp([/.+:Envelope/, /.+:Body/, /.+Fault/]).
+        should == @soap_fault_hash["soap:Envelope"]["soap:Body"]["soap:Fault"]
+    end
+  end
+
   describe "to_soap_xml" do
     describe "returns SOAP request compatible XML" do
       it "for a simple Hash" do
@@ -74,20 +97,20 @@ describe Hash do
 
   describe "to_soap_fault_message" do
     it "returns a SOAP fault message for SOAP version 1" do
-      soap_fault = soap_fault_hash(
+      soap_fault = {
         "faultcode" => "soap:Server",
         "faultstring" => "Fault occurred while processing."
-      )
+      }
 
       soap_fault.to_soap_fault_message.should be_a String
       soap_fault.to_soap_fault_message.should_not be_empty
     end
 
     it "returns a SOAP fault message for SOAP version 2" do
-      soap_fault = soap_fault_hash(
+      soap_fault = {
         "code" => { "value" => "soap:Server" },
         "reason" => { "text" => "Fault occurred while processing." }
-      )
+      }
 
       soap_fault.to_soap_fault_message.should be_a String
       soap_fault.to_soap_fault_message.should_not be_empty
@@ -96,14 +119,6 @@ describe Hash do
     it "returns nil in case the Hash does not include a SOAP fault" do
       { :soap_fault => false }.to_soap_fault_message.should be_nil
     end
-
-    it "returns nil for unknown SOAP faults" do
-      soap_fault_hash.to_soap_fault_message.should be_nil
-    end
-
-    def soap_fault_hash(details = {})
-      { "soap:Envelope" => { "soap:Body" => { "soap:Fault" => details } } }
-    end
   end
 
   describe "map_soap_response" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Daniel Harrington