savon 0.8.0.beta.3 → 0.8.0.beta.4

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 0.8.0.beta.4 (2010-11-20)
+
+* Fix for issue #107 (Soap Fault regex not working for API I connect).
+
+* Fix for issue #108 (Fixing an issue with :attributes! getting overriden by a double call).
+
+* Replaced Savon.response_pattern with a slightly different implementation of the
+  Savon::SOAP::Response#to_array method. The method now accepts multiple arguments
+  representing the response Hash keys to traverse and returns the result as an Array
+  or an empty Array in case the key is nil or does not exist.
+
+      response.to_array :get_user_response, :return
+      # => [{ :id => 1, :name => "foo"}, { :id => 2, :name => "bar"}]
+
+## 0.8.0.beta.3 (2010-11-06)
+
+* Fix for [savon_spec](http://rubygems.org/gems/savon_spec) to not send nil to Savon::SOAP::XML#body.
+
 ## 0.8.0.beta.2 (2010-11-05)
 
 * Added Savon.response_pattern to automatically walk deeper into the SOAP response Hash when a

data/lib/savon/global.rb

@@ -61,14 +61,6 @@ module Savon
     # Sets whether to strip namespaces in a SOAP response Hash.
     attr_writer :strip_namespaces
 
-    # Returns the response pattern to apply.
-    def response_pattern
-      @response_pattern ||= []
-    end
-
-    # Sets the response pattern (an Array of Regexps or Symbols).
-    attr_writer :response_pattern
-
     # Reset to default configuration.
     def reset_config!
       self.log = true
@@ -77,7 +69,6 @@ module Savon
       self.raise_errors = true
       self.soap_version = SOAP::DefaultVersion
       self.strip_namespaces = true
-      self.response_pattern = []
     end
 
   end

data/lib/savon/soap/fault.rb

@@ -19,7 +19,7 @@ module Savon
 
       # Returns whether a SOAP fault is present.
       def present?
-        @present ||= http.body =~ /<soap:Fault>/
+        @present ||= http.body =~ /<(.+:)?Body>(\s*)<(.+:)?Fault>/
       end
 
       # Returns the SOAP fault message.

data/lib/savon/soap/response.rb

@@ -44,22 +44,20 @@ module Savon
       end
 
       # Returns the SOAP response body as a Hash.
-      def original_hash
-        @original_hash ||= Savon::SOAP::XML.to_hash to_xml
-      end
-
-      # Returns the SOAP response body as a Hash and applies
-      # the <tt>Savon.response_pattern</tt> if defined.
       def to_hash
-        @hash ||= apply_response_pattern original_hash
+        @hash ||= Savon::SOAP::XML.to_hash to_xml
       end
 
-      # Returns the SOAP response Hash as an Array.
-      def to_array
-        @array ||= begin
-          array = to_hash.kind_of?(Array) ? to_hash : [to_hash]
-          array.compact
+      # Traverses the SOAP response Hash for a given +path+ of Hash keys
+      # and returns the value as an Array. Defaults to return an empty Array
+      # in case the path does not exist or returns nil.
+      def to_array(*path)
+        value = path.inject to_hash do |memo, key|
+          return [] unless memo[key]
+          memo[key]
         end
+        
+        value.kind_of?(Array) ? value.compact : [value].compact
       end
 
       # Returns the SOAP response XML.
@@ -74,20 +72,6 @@ module Savon
         raise http_error if http_error?
       end
 
-      def apply_response_pattern(hash)
-        return hash if Savon.response_pattern.blank?
-        
-        Savon.response_pattern.inject(hash) do |memo, pattern|
-          key = case pattern
-            when Regexp then memo.keys.find { |key| key.to_s =~ pattern }
-            else             memo.keys.find { |key| key.to_s == pattern.to_s }
-          end
-          
-          return hash unless key
-          memo[key]
-        end
-      end
-
     end
   end
 end

data/lib/savon/soap/xml.rb

@@ -114,7 +114,7 @@ module Savon
 
       # Returns the SOAP header as an XML String.
       def header_for_xml
-        header.to_soap_xml + wsse_header
+        @header_for_xml ||= header.to_soap_xml + wsse_header
       end
 
       # Returns the WSSE header or an empty String in case WSSE was not set.

data/lib/savon/version.rb

@@ -1,5 +1,5 @@
 module Savon
 
-  Version = "0.8.0.beta.3"
+  Version = "0.8.0.beta.4"
 
 end

data/savon.gemspec

@@ -16,7 +16,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.6.0"
+  s.add_dependency "httpi", ">= 0.7.1"
 
   s.add_development_dependency "rspec", "~> 2.0.0"
   s.add_development_dependency "mocha", "~> 0.9.7"

data/spec/fixtures/response/response_fixture.rb

@@ -18,6 +18,10 @@ class ResponseFixture
       @soap_fault12 ||= load_fixture :soap_fault12
     end
 
+    def another_soap_fault
+      @another_soap_fault ||= load_fixture :another_soap_fault
+    end
+
     def multi_ref
       @multi_ref ||= load_fixture :multi_ref
     end

data/spec/fixtures/response/xml/another_soap_fault.xml

@@ -0,0 +1,14 @@
+<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"
+  xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
+  xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <SOAP-ENV:Body>
+    <SOAP-ENV:Fault>
+      <faultcode>ERR_NO_SESSION</faultcode>
+      <faultfactor>doGetItemsInfo - Wrong session</faultfactor>
+      <faultstring>Wrong session message</faultstring>
+      <detail><soapVal><ERRNO xsi:type="xsd:string">80:1289245853:55</ERRNO></soapVal></detail>
+    </SOAP-ENV:Fault>
+  </SOAP-ENV:Body>
+</SOAP-ENV:Envelope>

data/spec/savon/savon_spec.rb

@@ -80,19 +80,6 @@ describe Savon do
         Savon.strip_namespaces?.should == false
       end
     end
-
-    describe "response_pattern" do
-      it "should default to an empty Array" do
-        Savon.response_pattern.should == []
-      end
-
-      it "should return the response pattern to apply" do
-        pattern = [/.+_response/, :return]
-        Savon.configure { |config| config.response_pattern = pattern }
-        
-        Savon.response_pattern.should == pattern
-      end
-    end
   end
 
 end

data/spec/savon/soap/fault_spec.rb

@@ -3,6 +3,7 @@ require "spec_helper"
 describe Savon::SOAP::Fault do
   let(:soap_fault) { Savon::SOAP::Fault.new new_response(:body => ResponseFixture.soap_fault) }
   let(:soap_fault2) { Savon::SOAP::Fault.new new_response(:body => ResponseFixture.soap_fault12) }
+  let(:another_soap_fault) { Savon::SOAP::Fault.new new_response(:body => ResponseFixture.another_soap_fault) }
   let(:no_fault) { Savon::SOAP::Fault.new new_response }
 
   it "should be a Savon::Error" do
@@ -24,6 +25,10 @@ describe Savon::SOAP::Fault do
       soap_fault2.should be_present
     end
 
+    it "should return true if the HTTP response contains a SOAP fault with different namespaces" do
+      another_soap_fault.should be_present
+    end
+
     it "should return false unless the HTTP response contains a SOAP fault" do
       no_fault.should_not be_present
     end
@@ -42,6 +47,10 @@ describe Savon::SOAP::Fault do
       it "should return a SOAP 1.2 fault message" do
         soap_fault2.send(method).should == "(soap:Sender) Sender Timeout"
       end
+
+      it "should return a SOAP fault message (with different namespaces)" do
+        another_soap_fault.send(method).should == "(ERR_NO_SESSION) Wrong session message"
+      end
     end
   end
 

data/spec/savon/soap/response_spec.rb

@@ -116,72 +116,35 @@ describe Savon::SOAP::Response do
     end
   end
 
-  describe "#original_hash" do
+  describe "#to_hash" do
     it "should return the SOAP response body as a Hash" do
-      soap_response.original_hash[:authenticate_response][:return].should ==
+      soap_response.to_hash[:authenticate_response][:return].should ==
         ResponseFixture.authentication(:to_hash)
     end
   end
 
-  describe "#to_hash" do
+  describe "#to_array" do
     let(:response) { soap_response }
 
-    it "should memoize the result" do
-      response.to_hash.should equal(response.to_hash)
-    end
-
-    context "without response pattern" do
-      it "should return the original Hash" do
-        response.to_hash[:authenticate_response].should be_a(Hash)
+    context "when the given path exists" do
+      it "should return an Array containing the path value" do
+        response.to_array(:authenticate_response, :return).should == [ResponseFixture.authentication(:to_hash)]
       end
     end
 
-    context "with response pattern" do
-      it "should apply the response pattern" do
-        Savon.response_pattern = [/.+_response/, :return]
-        response.to_hash[:success].should be_true
-        
-        Savon.response_pattern = nil  # reset to default
+    context "when the given path returns nil" do
+      it "should return an empty Array" do
+        response.to_array(:authenticate_response, :undefined).should == []
       end
     end
 
-    context "with unmatched response pattern" do
-      it "should return the original Hash" do
-        Savon.response_pattern = [:unmatched, :pattern]
-        response.to_hash.should == response.original_hash
-        
-        Savon.response_pattern = nil  # reset to default
+    context "when the given path does not exist at all" do
+      it "should return an empty Array" do
+        response.to_array(:authenticate_response, :some, :wrong, :path).should == []
       end
     end
   end
 
-  describe "#to_array" do
-    let(:response) { soap_response }
-
-    around do |example|
-      Savon.response_pattern = [/.+_response/, :return]
-      example.run
-      Savon.response_pattern = nil  # reset to default
-    end
-
-    it "should memoize the result" do
-      response.to_array.should equal(response.to_array)
-    end
-
-    it "should return an Array for a single response element" do
-      response.to_array.should be_an(Array)
-      response.to_array.first[:success].should be_true
-    end
-
-    it "should return an Array for multiple response element" do
-      Savon.response_pattern = [/.+_response/, :history, :case]
-      list_response = soap_response :body => ResponseFixture.list
-      
-      list_response.to_array.should be_an(Array)
-      list_response.to_array.should have(2).items
-    end
-  end
-
   describe "#to_xml" do
     it "should return the raw SOAP response body" do
       soap_response.to_xml.should == ResponseFixture.authentication

data/spec/savon/soap/xml_spec.rb

@@ -166,6 +166,17 @@ describe Savon::SOAP::XML do
       end
     end
 
+    context "with a SOAP header" do
+      it "should contain the given header" do
+        xml.header = {
+          :token => "secret",
+          :attributes! => { :token => { :xmlns => "http://example.com" } }
+        }
+        
+        xml.to_xml.should include('<env:Header><token xmlns="http://example.com">secret</token></env:Header>')
+      end
+    end
+
     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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  hash: 62196261
+  hash: 62196267
   prerelease: true
   segments: 
   - 0
   - 8
   - 0
   - beta
-  - 3
-  version: 0.8.0.beta.3
+  - 4
+  version: 0.8.0.beta.4
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-06 00:00:00 +01:00
+date: 2010-11-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,12 +60,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 1
         segments: 
         - 0
-        - 6
-        - 0
-        version: 0.6.0
+        - 7
+        - 1
+        version: 0.7.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -143,6 +143,7 @@ files:
 - spec/fixtures/gzip/gzip_response_fixture.rb
 - spec/fixtures/gzip/message.gz
 - spec/fixtures/response/response_fixture.rb
+- spec/fixtures/response/xml/another_soap_fault.xml
 - spec/fixtures/response/xml/authentication.xml
 - spec/fixtures/response/xml/list.xml
 - spec/fixtures/response/xml/multi_ref.xml