akami 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d17edac634460b7b9cee2f6113d89c2713813a4
-  data.tar.gz: f5e4aea68fbb2c589b4016998244180a0a124e3f
+  metadata.gz: 825ae5faa9ad5fa6de8a41b5cafaf9440c1ed815
+  data.tar.gz: eb85cd1306247a20e0197a6243f4655814c1ff66
 SHA512:
-  metadata.gz: db43635bac8d3f6246bc5c265ee90ba55d258cd22fa2522a6f2c8c328973bf09d8e1bcb8991e3aef978076a68be28a6beda9a3d22e0cbd4170730b1698ebff35
-  data.tar.gz: c7d2242e8205bf0952dfc058026aa37544941c6cda31efc67329baa283aa90229736066ddf00832a9d80f93bcb3336314f801c9b2b2d8e0b17daf8635d642fca
+  metadata.gz: 68eca4d3c681de14d7b263214f1572cea56890783daf3dfb7f9fd72e1489f61119e38cce7baae1eac854d22b5afd8bb35fc82f2563c54550006136357a32fb62
+  data.tar.gz: 8888ee881ba31dea74e698f232dd63c72b420d4c01d1aee5ffd06b231d3361026e49ee87571dfcbcb3d1623a3c404a8e92f374c7850058cc0a9818fb2e9a6552

data/lib/akami/version.rb

@@ -1,5 +1,5 @@
 module Akami
 
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 
 end

data/lib/akami/wsse.rb

@@ -28,6 +28,8 @@ module Akami
     # PasswordDigest URI.
     PASSWORD_DIGEST_URI = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest"
 
+    BASE64_URI = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary"
+
     # Returns a value from the WSSE Hash.
     def [](key)
       hash[key]
@@ -116,7 +118,7 @@ module Akami
           "wsse:Nonce" => Base64.encode64(nonce),
           "wsu:Created" => timestamp,
           "wsse:Password" => digest_password,
-          :attributes! => { "wsse:Password" => { "Type" => PASSWORD_DIGEST_URI } }
+          :attributes! => { "wsse:Password" => { "Type" => PASSWORD_DIGEST_URI },  "wsse:Nonce" => { "EncodingType" => BASE64_URI } }
         # clear the nonce after each use
         @nonce = nil
       else

data/spec/akami/wsse_spec.rb

@@ -25,6 +25,11 @@ describe Akami do
       "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest"
   end
 
+  it "contains the namespace for Base64 Encoding type" do 
+    Akami::WSSE::BASE64_URI.should == 
+      "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary"
+  end
+
   describe "#credentials" do
     it "sets the username" do
       wsse.credentials "username", "password"
@@ -121,7 +126,7 @@ describe Akami do
       end
 
       it "does not contain a wsse:Nonce tag" do
-        wsse.to_xml.should_not match(/<wsse:Nonce>.*<\/wsse:Nonce>/)
+        wsse.to_xml.should_not match(/<wsse:Nonce.*>.*<\/wsse:Nonce>/)
       end
 
       it "does not contain a wsu:Created tag" do
@@ -148,8 +153,8 @@ describe Akami do
         wsse.to_xml.should_not include("password")
       end
 
-      it "contains a wsse:Nonce tag" do
-        wsse.to_xml.should match(/<wsse:Nonce>[^<]+<\/wsse:Nonce>/)
+      it "contains the Nonce base64 type attribute" do
+        wsse.to_xml.should include(Akami::WSSE::BASE64_URI)
       end
 
       it "contains a wsu:Created tag" do
@@ -166,7 +171,7 @@ describe Akami do
       it "should reset the nonce every time" do
         created_at = Time.now
         Timecop.freeze created_at do
-          nonce_regexp = /<wsse:Nonce>([^<]+)<\/wsse:Nonce>/
+          nonce_regexp = /<wsse:Nonce.*>([^<]+)<\/wsse:Nonce>/
           nonce_first = Base64.decode64(nonce_regexp.match(wsse.to_xml)[1])
           nonce_second = Base64.decode64(nonce_regexp.match(wsse.to_xml)[1])
           nonce_first.should_not == nonce_second

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akami
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gyoku