savon 0.8.4 → 0.8.5

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.8.5 (2011-01-28)
+
+* Fix for [issue #146](https://github.com/rubiii/savon/issues/146) ([98655c](https://github.com/rubiii/savon/commit/98655c)).
+
+* Fix for [issue #147](https://github.com/rubiii/savon/issues/147) ([252670](https://github.com/rubiii/savon/commit/252670)).
+
 ## 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)

data/lib/savon/soap/fault.rb

@@ -19,7 +19,7 @@ module Savon
 
       # Returns whether a SOAP fault is present.
       def present?
-        @present ||= http.body[0,1000] =~ /<(.+:)?Body>(\s*)<(.+:)?Fault>/
+        @present ||= http.code == 500 && http.body.include?("Fault>") && (soap1_fault? || soap2_fault?)
       end
 
       # Returns the SOAP fault message.
@@ -35,6 +35,17 @@ module Savon
 
     private
 
+      # Returns whether the response contains a SOAP 1.1 fault.
+      def soap1_fault?
+        http.body.include?("faultcode>") && http.body.include?("faultstring>")
+      end
+
+      # Returns whether the response contains a SOAP 1.2 fault.
+      def soap2_fault?
+        http.body.include?("Code>") && http.body.include?("Reason>")
+      end
+
+      # Returns the SOAP fault message by version.
       def message_by_version(fault)
         if fault[:faultcode]
           "(#{fault[:faultcode]}) #{fault[:faultstring]}"

data/lib/savon/soap/xml.rb

@@ -135,7 +135,7 @@ module Savon
       def to_xml
         @xml ||= tag(builder, :Envelope, complete_namespaces) do |xml|
           tag(xml, :Header) { xml << header_for_xml } unless header_for_xml.empty?
-          tag(xml, :Body) { xml.tag!(*input) { xml << body_to_xml } }
+          input.nil? ? tag(xml, :Body) : tag(xml, :Body) { xml.tag!(*input) { xml << body_to_xml } }
         end
       end
 

data/lib/savon/version.rb

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

data/spec/savon/soap/fault_spec.rb

@@ -32,6 +32,11 @@ describe Savon::SOAP::Fault do
     it "should return false unless the HTTP response contains a SOAP fault" do
       no_fault.should_not be_present
     end
+
+    it "should return false if the HTTP response code is not 500" do
+      fault = Savon::SOAP::Fault.new new_response(:code => 200, :body => Fixture.response(:soap_fault))
+      fault.should_not be_present
+    end
   end
 
   [:message, :to_s].each do |method|
@@ -80,7 +85,7 @@ describe Savon::SOAP::Fault do
   end
 
   def new_response(options = {})
-    defaults = { :code => 200, :headers => {}, :body => Fixture.response(:authentication) }
+    defaults = { :code => 500, :headers => {}, :body => Fixture.response(:authentication) }
     response = defaults.merge options
     
     HTTPI::Response.new response[:code], response[:headers], response[:body]

data/spec/savon/soap/response_spec.rb

@@ -159,12 +159,12 @@ describe Savon::SOAP::Response do
   def soap_response(options = {})
     defaults = { :code => 200, :headers => {}, :body => Fixture.response(:authentication) }
     response = defaults.merge options
-    
+
     Savon::SOAP::Response.new HTTPI::Response.new(response[:code], response[:headers], response[:body])
   end
 
   def soap_fault_response
-    soap_response :body => Fixture.response(:soap_fault)
+    soap_response :code => 500, :body => Fixture.response(:soap_fault)
   end
 
   def http_error_response

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +01:00
+date: 2011-01-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency