savon 0.9.4 → 0.9.5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.9.5 (2011-07-03)
+
+* Refactoring: Extracted WSSE authentication out into the [akami](http://rubygems.org/gems/akami) gem.
+
 ## 0.9.4 (2011-07-03)
 
 * Refactoring: Extracted the WSDL parser out into the [wasabi](http://rubygems.org/gems/wasabi) gem.

data/lib/savon/client.rb

@@ -1,9 +1,10 @@
 require "httpi/request"
+require "akami"
+
 require "savon/wasabi/document"
 require "savon/soap/xml"
 require "savon/soap/request"
 require "savon/soap/response"
-require "savon/wsse"
 
 module Savon
 
@@ -44,9 +45,9 @@ module Savon
       @http ||= HTTPI::Request.new
     end
 
-    # Returns the <tt>Savon::WSSE</tt> object.
+    # Returns the <tt>Akami::WSSE</tt> object.
     def wsse
-      @wsse ||= WSSE.new
+      @wsse ||= Akami.wsse
     end
 
     # Returns the <tt>Savon::SOAP::XML</tt> object. Please notice, that this object is only available

data/lib/savon/core_ext/string.rb

@@ -16,21 +16,6 @@ module Savon
         str
       end unless method_defined?(:snakecase)
 
-      # Returns the String in lowerCamelCase.
-      def lower_camelcase
-        str = dup
-        str.gsub!(/\/(.?)/) { "::#{$1.upcase}" }
-        str.gsub!(/(?:_+|-+)([a-z])/) { $1.upcase }
-        str.gsub!(/(\A|\s)([A-Z])/) { $1 + $2.downcase }
-        str
-      end
-
-      # Returns whether the String starts with a given +prefix+.
-      def starts_with?(prefix)
-        prefix = prefix.to_s
-        self[0, prefix.length] == prefix
-      end unless method_defined?(:starts_with?)
-
     end
   end
 end

data/lib/savon/version.rb

@@ -1,5 +1,5 @@
 module Savon
 
-  Version = "0.9.4"
+  Version = "0.9.5"
 
 end

data/lib/savon/wasabi/document.rb

@@ -6,7 +6,7 @@ module Savon
 
     # = Savon::Wasabi::Document
     #
-    # Extends the <tt>Wasabi::Document</tt> to extend its document handling by
+    # Extends the document handling of the <tt>Wasabi::Document</tt> by
     # adding support for remote and local WSDL documents.
     class Document < ::Wasabi::Document
 
@@ -15,6 +15,11 @@ module Savon
         @xml ||= document.kind_of?(String) ? resolve_document : document
       end
 
+      # Sets the <tt>HTTPI::Request</tt> for remote WSDL documents.
+      attr_writer :request
+
+    private
+
       # Sets up and returns the <tt>HTTPI::Request</tt>.
       def request
         @request ||= HTTPI::Request.new
@@ -22,11 +27,6 @@ module Savon
         @request
       end
 
-      # Sets the <tt>HTTPI::Request</tt> for remote WSDL documents.
-      attr_writer :request
-
-    private
-
       # Resolves and returns the raw WSDL document.
       def resolve_document
         case document

data/savon.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "nori",     "~> 1.0"
   s.add_dependency "httpi",    "~> 0.9"
   s.add_dependency "wasabi",   "~> 1.0"
+  s.add_dependency "akami",    "~> 1.0"
   s.add_dependency "gyoku",    ">= 0.4.0"
   s.add_dependency "nokogiri", ">= 1.4.0"
 

data/spec/savon/client_spec.rb

@@ -32,7 +32,7 @@ describe Savon::Client do
         Savon::Client.new do |wsdl, http, wsse|
           wsdl.should be_an(Savon::Wasabi::Document)
           http.should be_an(HTTPI::Request)
-          wsse.should be_an(Savon::WSSE)
+          wsse.should be_an(Akami::WSSE)
         end
       end
     end
@@ -47,7 +47,7 @@ describe Savon::Client do
       end
 
       it "should let you access the WSSE object" do
-        Savon::Client.new { wsse.should be_a(Savon::WSSE) }
+        Savon::Client.new { wsse.should be_a(Akami::WSSE) }
       end
     end
   end
@@ -65,8 +65,8 @@ describe Savon::Client do
   end
 
   describe "#wsse" do
-    it "should return the Savon::WSSE object" do
-      client.wsse.should be_a(Savon::WSSE)
+    it "should return the Akami::WSSE object" do
+      client.wsse.should be_a(Akami::WSSE)
     end
   end
 
@@ -171,7 +171,7 @@ describe Savon::Client do
           soap.should be_a(Savon::SOAP::XML)
           wsdl.should be_a(Savon::Wasabi::Document)
           http.should be_an(HTTPI::Request)
-          wsse.should be_a(Savon::WSSE)
+          wsse.should be_a(Akami::WSSE)
         end
       end
     end
@@ -186,7 +186,7 @@ describe Savon::Client do
       end
 
       it "should let you access the WSSE object" do
-        client.request(:authenticate) { wsse.should be_a(Savon::WSSE) }
+        client.request(:authenticate) { wsse.should be_a(Akami::WSSE) }
       end
 
       it "should let you access the WSDL object" do
@@ -222,10 +222,6 @@ describe Savon::Client do
     let(:client) { Savon::Client.new { wsdl.document = Endpoint.wsdl } }
     before { HTTPI.expects(:get).returns(new_response(:body => Fixture.wsdl(:authentication))) }
 
-    it "should return a list of available SOAP actions" do
-      client.wsdl.soap_actions.should == [:authenticate]
-    end
-
     it "adds a SOAPAction header containing the SOAP action name" do
       HTTPI.stubs(:post).returns(new_response)
 
@@ -248,10 +244,6 @@ describe Savon::Client do
 
     before { HTTPI.expects(:get).never }
 
-    it "should return a list of available SOAP actions" do
-      client.wsdl.soap_actions.should == [:authenticate]
-    end
-
     it "adds a SOAPAction header containing the SOAP action name" do
       HTTPI.stubs(:post).returns(new_response)
 
@@ -260,13 +252,6 @@ describe Savon::Client do
       end
     end
 
-    it "should get #element_form_default from the WSDL" do
-      HTTPI.stubs(:post).returns(new_response)
-      Savon::Wasabi::Document.any_instance.expects(:element_form_default).returns(:qualified)
-
-      client.request :authenticate
-    end
-
     it "should execute SOAP requests and return the response" do
       HTTPI.expects(:post).returns(new_response)
       response = client.request(:authenticate)
@@ -298,13 +283,6 @@ describe Savon::Client do
       end
     end
 
-    it "should not get #element_form_default from the WSDL" do
-      HTTPI.stubs(:post).returns(new_response)
-      Savon::Wasabi::Document.any_instance.expects(:element_form_default).never
-
-      client.request :authenticate
-    end
-
     it "should execute SOAP requests and return the response" do
       HTTPI.expects(:post).returns(new_response)
       response = client.request(:authenticate)

data/spec/savon/core_ext/string_spec.rb

@@ -34,17 +34,4 @@ describe String do
     end
   end
 
-  describe "lower_camelcase" do
-    it "converts a snakecase String to lowerCamelCase" do
-      "lower_camel_case".lower_camelcase.should == "lowerCamelCase"
-    end
-  end
-
-  describe "starts_with?" do
-    it "should return whether it starts with a given suffix" do
-      "authenticate".starts_with?("auth").should be_true
-      "authenticate".starts_with?("cate").should be_false
-    end
-  end
-
 end

data/spec/savon/soap/xml_spec.rb

@@ -98,9 +98,9 @@ describe Savon::SOAP::XML do
   end
 
   describe "#wsse" do
-    it "should set the Savon::WSSE object" do
-      xml.wsse = Savon::WSSE.new
-      xml.wsse.should be_a(Savon::WSSE)
+    it "should set the Akami::WSSE object" do
+      xml.wsse = Akami.wsse
+      xml.wsse.should be_a(Akami::WSSE)
     end
   end
 
@@ -235,7 +235,7 @@ describe Savon::SOAP::XML do
 
     context "with WSSE authentication" do
       it "should containg a SOAP header with WSSE authentication details" do
-        xml.wsse = Savon::WSSE.new
+        xml.wsse = Akami.wsse
         xml.wsse.credentials "username", "password"
 
         xml.to_xml.should include("<env:Header><wsse:Security")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -79,9 +79,24 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: gyoku
+  name: akami
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: gyoku
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,11 +108,11 @@ dependencies:
         - 0
         version: 0.4.0
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -109,11 +124,11 @@ dependencies:
         - 0
         version: 1.4.0
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -125,11 +140,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -141,11 +156,11 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -157,11 +172,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: timecop
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -173,11 +188,11 @@ dependencies:
         - 5
         version: 0.3.5
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: autotest
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -187,7 +202,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 description: Ruby's heavy metal SOAP client
 email: me@rubiii.com
 executables: []
@@ -210,7 +225,6 @@ files:
 - lib/savon/client.rb
 - lib/savon/core_ext/object.rb
 - lib/savon/core_ext/string.rb
-- lib/savon/core_ext/time.rb
 - lib/savon/error.rb
 - lib/savon/global.rb
 - lib/savon/http/error.rb
@@ -221,7 +235,6 @@ files:
 - lib/savon/soap/xml.rb
 - lib/savon/version.rb
 - lib/savon/wasabi/document.rb
-- lib/savon/wsse.rb
 - savon.gemspec
 - spec/fixtures/gzip/message.gz
 - spec/fixtures/response/another_soap_fault.xml
@@ -232,15 +245,9 @@ files:
 - spec/fixtures/response/soap_fault.xml
 - spec/fixtures/response/soap_fault12.xml
 - spec/fixtures/wsdl/authentication.xml
-- spec/fixtures/wsdl/geotrust.xml
-- spec/fixtures/wsdl/namespaced_actions.xml
-- spec/fixtures/wsdl/no_namespace.xml
-- spec/fixtures/wsdl/soap12.xml
-- spec/fixtures/wsdl/two_bindings.xml
 - spec/savon/client_spec.rb
 - spec/savon/core_ext/object_spec.rb
 - spec/savon/core_ext/string_spec.rb
-- spec/savon/core_ext/time_spec.rb
 - spec/savon/http/error_spec.rb
 - spec/savon/savon_spec.rb
 - spec/savon/soap/fault_spec.rb
@@ -249,7 +256,6 @@ files:
 - spec/savon/soap/xml_spec.rb
 - spec/savon/soap_spec.rb
 - spec/savon/wasabi/document_spec.rb
-- spec/savon/wsse_spec.rb
 - spec/spec_helper.rb
 - spec/support/endpoint.rb
 - spec/support/fixture.rb

data/lib/savon/core_ext/time.rb

@@ -1,22 +0,0 @@
-module Savon
-  module CoreExt
-    module Time
-
-      # Returns an xs:dateTime formatted String.
-      def xs_datetime
-        zone = if utc_offset < 0
-          "-#{"%02d" % (- utc_offset / 3600)}:#{"%02d" % ((- utc_offset % 3600) / 60)}"
-        elsif utc_offset > 0
-          "+#{"%02d" % (utc_offset / 3600)}:#{"%02d" % ((utc_offset % 3600) / 60)}"
-        else
-          "Z"
-        end
-
-        strftime "%Y-%m-%dT%H:%M:%S#{zone}"
-      end
-
-    end
-  end
-end
-
-Time.send :include, Savon::CoreExt::Time

data/lib/savon/wsse.rb

@@ -1,156 +0,0 @@
-require "base64"
-require "digest/sha1"
-
-require "savon/core_ext/string"
-require "savon/core_ext/time"
-
-module Savon
-
-  # = Savon::WSSE
-  #
-  # Provides WSSE authentication.
-  class WSSE
-
-    # Namespace for WS Security Secext.
-    WSENamespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
-
-    # Namespace for WS Security Utility.
-    WSUNamespace = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-
-    # URI for "wsse:Password/@Type" #PasswordText.
-    PasswordTextURI = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText"
-
-    # URI for "wsse:Password/@Type" #PasswordDigest.
-    PasswordDigestURI = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest"
-
-    # Returns a value from the WSSE Hash.
-    def [](key)
-      hash[key]
-    end
-
-    # Sets a value on the WSSE Hash.
-    def []=(key, value)
-      hash[key] = value
-    end
-
-    # Sets authentication credentials for a wsse:UsernameToken header.
-    # Also accepts whether to use WSSE digest authentication.
-    def credentials(username, password, digest = false)
-      self.username = username
-      self.password = password
-      self.digest = digest
-    end
-
-    attr_accessor :username, :password, :created_at, :expires_at
-
-    # Returns whether to use WSSE digest. Defaults to +false+.
-    def digest?
-      !!@digest
-    end
-
-    attr_writer :digest
-
-    # Returns whether to generate a wsse:UsernameToken header.
-    def username_token?
-      username && password
-    end
-
-    # Returns whether to generate a wsu:Timestamp header.
-    def timestamp?
-      created_at || expires_at || @wsu_timestamp
-    end
-
-    # Sets whether to generate a wsu:Timestamp header.
-    def timestamp=(timestamp)
-      @wsu_timestamp = timestamp
-    end
-
-    # Returns the XML for a WSSE header.
-    def to_xml
-      if username_token? && timestamp?
-        Gyoku.xml wsse_username_token.merge!(wsu_timestamp) {
-          |key, v1, v2| v1.merge!(v2) {
-            |key, v1, v2| v1.merge!(v2)
-          }
-        }
-      elsif username_token?
-        Gyoku.xml wsse_username_token.merge!(hash)
-      elsif timestamp?
-        Gyoku.xml wsu_timestamp.merge!(hash)
-      else
-        ""
-      end
-    end
-
-  private
-
-    # Returns a Hash containing wsse:UsernameToken details.
-    def wsse_username_token
-      if digest?
-        security_hash :wsse, "UsernameToken",
-          "wsse:Username" => username,
-          "wsse:Nonce" => nonce,
-          "wsu:Created" => timestamp,
-          "wsse:Password" => digest_password,
-          :attributes! => { "wsse:Password" => { "Type" => PasswordDigestURI } }
-      else
-        security_hash :wsse, "UsernameToken",
-          "wsse:Username" => username,
-          "wsse:Password" => password,
-          :attributes! => { "wsse:Password" => { "Type" => PasswordTextURI } }
-      end
-    end
-
-    # Returns a Hash containing wsu:Timestamp details.
-    def wsu_timestamp
-      security_hash :wsu, "Timestamp",
-        "wsu:Created" => (created_at || Time.now).xs_datetime,
-        "wsu:Expires" => (expires_at || (created_at || Time.now) + 60).xs_datetime
-    end
-
-    # Returns a Hash containing wsse/wsu Security details for a given
-    # +namespace+, +tag+ and +hash+.
-    def security_hash(namespace, tag, hash)
-      {
-        "wsse:Security" => {
-          "#{namespace}:#{tag}" => hash,
-          :attributes! => { "#{namespace}:#{tag}" => { "wsu:Id" => "#{tag}-#{count}", "xmlns:wsu" => WSUNamespace } }
-        },
-        :attributes! => { "wsse:Security" => { "xmlns:wsse" => WSENamespace } }
-      }
-    end
-
-    # Returns the WSSE password, encrypted for digest authentication.
-    def digest_password
-      token = nonce + timestamp + password
-      Base64.encode64(Digest::SHA1.hexdigest(token)).chomp!
-    end
-
-    # Returns a WSSE nonce.
-    def nonce
-      @nonce ||= Digest::SHA1.hexdigest random_string + timestamp
-    end
-
-    # Returns a random String of 100 characters.
-    def random_string
-      (0...100).map { ("a".."z").to_a[rand(26)] }.join
-    end
-
-    # Returns a WSSE timestamp.
-    def timestamp
-      @timestamp ||= Time.now.xs_datetime
-    end
-
-    # Returns a new number with every call.
-    def count
-      @count ||= 0
-      @count += 1
-    end
-
-    # Returns a memoized and autovivificating Hash.
-    def hash
-      @hash ||= Hash.new { |h, k| h[k] = Hash.new(&h.default_proc) }
-    end
-
-  end
-end