jedlik 0.0.4 → 0.0.5

data/jedlik.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name         = 'jedlik'
-  s.version      = '0.0.4'
+  s.version      = '0.0.5'
   s.summary      = "Communicate with Amazon DynamoDB."
   s.description  = "Communicate with Amazon DynamoDB. Raw access to the full API without having to handle temporary credentials or HTTP requests by yourself."
   s.authors      = ["Hashmal", "Brandon Keene"]

data/lib/jedlik/security_token_service.rb

@@ -68,7 +68,8 @@ module Jedlik
     # credentials were previously obtained, no request is made until they
     # expire.
     def obtain_credentials
-      if not @expiration or @expiration <= Time.now.utc
+      @time = Time.now.utc
+      if not @expiration or @expiration <= @time
         params = {
           :AWSAccessKeyId   => @_access_key_id,
           :SignatureMethod  => 'HmacSHA256',
@@ -87,13 +88,14 @@ module Jedlik
           raise "credential errors: #{response.inspect}"
         end
       end
+      @time = nil
     end
 
     def authorization_params
       {
-        :Action           => 'GetSessionToken',
-        :Timestamp        => Time.now.utc.iso8601,
-        :Version          => '2011-06-15',
+        :Action    => 'GetSessionToken',
+        :Timestamp => (@time || Time.now.utc).iso8601,
+        :Version   => '2011-06-15',
       }
     end
 

data/spec/jedlik/security_token_service_spec.rb

@@ -63,27 +63,27 @@ module Jedlik
     # expire and new ones are requested.
     it "updates the timestamp for different requests" do
       s = SecurityTokenService.new("access_key_id", "secret_access_key")
-      s.string_to_sign.should == [
-        "GET",
-        "sts.amazonaws.com",
-        "/",
-        "AWSAccessKeyId=access_key_id&Action=GetSessionToken&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-03-24T22%3A10%3A38Z&Version=2011-06-15"
-      ].join("\n")
+      s.session_token
 
       Time.stub(:now).and_return(Time.parse("2012-03-24T23:11:38Z"))
-      s.string_to_sign.should == [
-        "GET",
-        "sts.amazonaws.com",
-        "/",
-        "AWSAccessKeyId=access_key_id&Action=GetSessionToken&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-03-24T23%3A11%3A38Z&Version=2011-06-15"
-      ].join("\n")
+      stub_request(:get, "https://sts.amazonaws.com/").
+        with(:query => {
+          "AWSAccessKeyId"   => "access_key_id",
+          "Action"           => "GetSessionToken",
+          "Signature"        => "TRVf5kuncW+c7y3amXH1WWR+Mf9Y+KzVNmUQ9vDRgNQ=",
+          "SignatureMethod"  => "HmacSHA256",
+          "SignatureVersion" => "2",
+          "Timestamp"        => "2012-03-24T23:11:38Z",
+          "Version"          => "2011-06-15"
+        }).to_return(:status => 200, :body => VALID_RESPONSE_BODY)
+      s.session_token
     end
 
     it "does not update the timestamp for the same request" do
-      Time.stub(:now).and_return(
-        Time.parse("2012-03-24T22:10:38Z"),
-        Time.parse("2012-03-24T22:10:39Z")
-      )
+      t1 = Time.parse("2012-03-24T22:10:38Z")
+      t2 = Time.parse("2012-03-24T22:10:39Z")
+      Time.stub(:now).and_return(t1, t2)
+
       sts.session_token
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jedlik
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000Z
+date: 2012-03-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus