savon 0.8.2 → 0.8.3

data/CHANGELOG.md

@@ -1,6 +1,13 @@
+## 0.8.3 (2010-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)
 
-* Fix for [issue #127](https://github.com/rubiii/savon/issues/127) ([0eb3da](https://github.com/rubiii/savon/commit/0eb3da4))
+* Fix for [issue #127](https://github.com/rubiii/savon/issues/127) ([0eb3da](https://github.com/rubiii/savon/commit/0eb3da4)).
 
 * Changed `Savon::WSSE` to be based on a Hash instead of relying on builder ([4cebc3](https://github.com/rubiii/savon/commit/4cebc3)).
 

data/README.md

@@ -3,7 +3,7 @@ Savon
 
 Heavy metal Ruby SOAP client
 
-[Guide](http://rubiii.github.com/savon) | [Rubydoc](http://rubydoc.info/gems/savon) | [Wishlist](http://savon.uservoice.com) | [Bugs](http://github.com/rubiii/savon/issues)
+[Guide](http://rubiii.github.com/savon) | [Rubydoc](http://rubydoc.info/gems/savon) | [Google Group](http://groups.google.com/group/savon-soap) | [Wishlist](http://savon.uservoice.com) | [Bugs](http://github.com/rubiii/savon/issues)
 
 Installation
 ------------

data/lib/savon/core_ext/string.rb

@@ -31,12 +31,6 @@ module Savon
         self[0, prefix.length] == prefix
       end unless defined? starts_with?
 
-      # Returns whether the String ends with a given +suffix+.
-      def ends_with?(suffix)
-        suffix = suffix.to_s
-        self[-suffix.length, suffix.length] == suffix
-      end unless defined? ends_with?
-
       # Returns the String without namespace.
       def strip_namespace
         split(":").last

data/lib/savon/soap/response.rb

@@ -45,19 +45,12 @@ module Savon
 
       # Returns the SOAP response body as a Hash.
       def to_hash
-        @hash ||= Savon::SOAP::XML.to_hash to_xml
+        @hash ||= Savon::SOAP::XML.to_hash http.body
       end
 
-      # 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.
+      # Returns the SOAP response body as an Array.
       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
+        Savon::SOAP::XML.to_array to_hash, *path
       end
 
       # Returns the SOAP response XML.

data/lib/savon/soap/xml.rb

@@ -20,10 +20,25 @@ 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
       end
 
+      # Expects a SOAP response XML or Hash, traverses it 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 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
+
       # Accepts an +endpoint+, an +input+ tag and a SOAP +body+.
       def initialize(endpoint = nil, input = nil, body = nil)
         self.endpoint = endpoint if endpoint

data/lib/savon/version.rb

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

data/lib/savon/wsse.rb

@@ -81,12 +81,19 @@ module Savon
 
     # Returns a Hash containing wsse:UsernameToken details.
     def wsse_username_token
-      wsse_security "UsernameToken",
-        "wsse:Username" => username,
-        "wsse:Nonce" => nonce,
-        "wsu:Created" => timestamp,
-        "wsse:Password" => password_value,
-        :attributes! => { "wsse:Password" => { "Type" => password_type } }
+      if digest?
+        wsse_security "UsernameToken",
+          "wsse:Username" => username,
+          "wsse:Nonce" => nonce,
+          "wsu:Created" => timestamp,
+          "wsse:Password" => digest_password,
+          :attributes! => { "wsse:Password" => { "Type" => PasswordDigestURI } }
+      else
+        wsse_security "UsernameToken",
+          "wsse:Username" => username,
+          "wsse:Password" => password,
+          :attributes! => { "wsse:Password" => { "Type" => PasswordTextURI } }
+      end
     end
 
     # Returns a Hash containing wsse:Timestamp details.
@@ -107,19 +114,12 @@ module Savon
       }
     end
 
-    # Returns the WSSE password. Encrypts the password for digest authentication.
-    def password_value
-      return password unless digest?
-
+    # Returns the WSSE password, encrypted for digest authentication.
+    def digest_password
       token = nonce + timestamp + password
       Base64.encode64(Digest::SHA1.hexdigest(token)).chomp!
     end
 
-    # Returns the URI for the "wsse:Password/@Type" attribute.
-    def password_type
-      digest? ? PasswordDigestURI : PasswordTextURI
-    end
-
     # Returns a WSSE nonce.
     def nonce
       @nonce ||= Digest::SHA1.hexdigest random_string + timestamp

data/savon.gemspec

@@ -16,12 +16,12 @@ 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.5"
-  s.add_dependency "gyoku", ">= 0.1.1"
+  s.add_dependency "httpi", ">= 0.7.8"
+  s.add_dependency "gyoku", ">= 0.2.0"
 
-  s.add_development_dependency "rspec", "~> 2.0.0"
+  s.add_development_dependency "rspec", "~> 2.4.0"
   s.add_development_dependency "autotest"
-  s.add_development_dependency "mocha", "~> 0.9.7"
+  s.add_development_dependency "mocha", "~> 0.9.8"
   s.add_development_dependency "timecop", "~> 0.3.5"
 
   s.files = `git ls-files`.split("\n")

data/spec/savon/core_ext/string_spec.rb

@@ -25,14 +25,6 @@ describe String do
     end
   end
 
-  describe "ends_with?" do
-    it "should return whether it ends with a given suffix" do
-      "authenticate!".ends_with?("!").should be_true
-      "authenticate".ends_with?("cate").should be_true
-      "authenticate".ends_with?("?").should be_false
-    end
-  end
-
   describe "strip_namespace" do
     it "strips the namespace from a namespaced String" do
       "ns:customer".strip_namespace.should == "customer"

data/spec/savon/soap/response_spec.rb

@@ -124,25 +124,9 @@ describe Savon::SOAP::Response do
   end
 
   describe "#to_array" do
-    let(:response) { soap_response }
-
-    context "when the given path exists" do
-      it "should return an Array containing the path value" do
-        response.to_array(:authenticate_response, :return).should ==
-          [Fixture.response_hash(:authentication)[:authenticate_response][:return]]
-      end
-    end
-
-    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 "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
+    it "should delegate to Savon::SOAP::XML.to_array" do
+      Savon::SOAP::XML.expects(:to_array).with(soap_response.to_hash, :authenticate_response, :return)
+      soap_response.to_array :authenticate_response, :return
     end
   end
 

data/spec/savon/soap/xml_spec.rb

@@ -31,6 +31,29 @@ describe Savon::SOAP::XML do
     end
   end
 
+  describe ".to_array" do
+    let(:response_hash) { Fixture.response_hash :authentication }
+
+    context "when the given path exists" do
+      it "should return an Array containing the path value" do
+        Savon::SOAP::XML.to_array(response_hash, :authenticate_response, :return).should ==
+          [response_hash[:authenticate_response][:return]]
+      end
+    end
+
+    context "when the given path returns nil" do
+      it "should return an empty Array" do
+        Savon::SOAP::XML.to_array(response_hash, :authenticate_response, :undefined).should == []
+      end
+    end
+
+    context "when the given path does not exist at all" do
+      it "should return an empty Array" do
+        Savon::SOAP::XML.to_array(response_hash, :authenticate_response, :some, :wrong, :path).should == []
+      end
+    end
+  end
+
   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

data/spec/savon/wsse_spec.rb

@@ -118,12 +118,12 @@ describe Savon::WSSE do
         wsse.to_xml.should include("username", "password")
       end
 
-      it "should contain a wsse:Nonce tag" do
-        wsse.to_xml.should match(/<wsse:Nonce>\w+<\/wsse:Nonce>/)
+      it "should not contain a wsse:Nonce tag" do
+        wsse.to_xml.should_not match(/<wsse:Nonce>.*<\/wsse:Nonce>/)
       end
 
-      it "should contain a wsu:Created tag" do
-        wsse.to_xml.should match(/<wsu:Created>#{Savon::SOAP::DateTimeRegexp}.+<\/wsu:Created>/)
+      it "should not contain a wsu:Created tag" do
+        wsse.to_xml.should_not match(/<wsu:Created>.*<\/wsu:Created>/)
       end
 
       it "should contain the PasswordText type attribute" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 +01:00
+date: 2011-01-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,12 +58,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 19
         segments: 
         - 0
         - 7
-        - 5
-        version: 0.7.5
+        - 8
+        version: 0.7.8
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,12 +74,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 23
         segments: 
         - 0
-        - 1
-        - 1
-        version: 0.1.1
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -90,12 +90,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 31
         segments: 
         - 2
+        - 4
         - 0
-        - 0
-        version: 2.0.0
+        version: 2.4.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -120,12 +120,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 43
         segments: 
         - 0
         - 9
-        - 7
-        version: 0.9.7
+        - 8
+        version: 0.9.8
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -161,7 +161,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- autotest/discover.rb
 - lib/savon.rb
 - lib/savon/client.rb
 - lib/savon/core_ext/hash.rb

data/autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }