authmac 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79cdcf6928f30abe694de994eba88c6f2ec89e28
-  data.tar.gz: 62c7ba521390202bb2d61b28d183be513060a1b4
+  metadata.gz: e4b7bd1e6888d9396a2b8625350f3626575facb4
+  data.tar.gz: c868726a7655dd6063eea99029a2b09296d1b405
 SHA512:
-  metadata.gz: a7faef3549f1033ed067aa165c1fbe6c9c2e6572d0d4564f5fbd83ccadaed50bc9c2f0922ff55a23d546ada894ef0fb025cba7e0e9536b8adca8a3d68427e712
-  data.tar.gz: 486d280fccd12f4127caef2fe1c65982cd7b9d721ef350aa2224ae82e6526ca951ed51caa4655350ce14e4a8eee88144f46c243d04a3482da31f320028ebda56
+  metadata.gz: 864d917472213fda96505a9b093a24954805023619b6725b259dc26b9a705605a95156f9914944ec6716e4f348f3f05e211c24bff74069e8bedcdb34eb1164cc
+  data.tar.gz: 9501f5e4860c67f36f2fb0c9c758207c89090c1d10cfc6dc55accbf8f9b5eb81123101ab7728960b60ab392dc1d7063781d700e71f44754b1c785747c91aa0d4

data/authmac.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_development_dependency "rake", "~> 10.0.3"
-  gem.add_development_dependency "rspec", "~> 2.11"
+  gem.add_development_dependency "rspec", "~> 3.0.0.beta1"
 end

data/lib/authmac/hmac_checker.rb

@@ -19,7 +19,7 @@ module Authmac
     private
 
     def digester
-      OpenSSL::Digest::Digest.new(@digest)
+      OpenSSL::Digest.new(@digest)
     end
 
     def message_string(hash)

data/lib/authmac/version.rb

@@ -1,3 +1,3 @@
 module Authmac
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/authmac/hmac_checker_spec.rb

@@ -9,33 +9,33 @@ module Authmac
         let(:hash) { Hash.new }
 
         it 'succeeds with the correct hmac' do
-          checker.validate(hash, hmacify('')).should be_true
+          expect(checker.validate(hash, hmacify(''))).to be_truthy
         end
 
         it 'fails with an incorrect hmac' do
-          checker.validate(hash, "wrong").should be_false
+          expect(checker.validate(hash, "wrong")).to be_falsey
         end
       end
 
       context 'for a hash with a single parameter' do
         it 'succeeds with the correct hmac' do
-          checker.validate({single: 'parameter'}, hmacify("parameter")).should be_true
+          expect(checker.validate({single: 'parameter'}, hmacify("parameter"))).to be_truthy
         end
 
         it 'fails with incorrect hmac' do
-          checker.validate({single: 'parameter'}, 'wrong').should be_false
+          expect(checker.validate({single: 'parameter'}, 'wrong')).to be_falsey
         end
       end
 
       context 'for a hash with multiple parameters' do
         it 'succeeds with correct hmac' do
-          checker.validate({first: 'parameter', second: 'another'},
-                          hmacify('parameter|another')).should be_true
+          expect(checker.validate({first: 'parameter', second: 'another'},
+                                  hmacify('parameter|another'))).to be_truthy
         end
 
         it 'sorts hash values based on their keys' do
-          checker.validate({second: 'another', first: 'parameter'},
-                          hmacify('parameter|another')).should be_true
+          expect(checker.validate({second: 'another', first: 'parameter'},
+                                  hmacify('parameter|another'))).to be_truthy
 
         end
       end
@@ -43,12 +43,12 @@ module Authmac
 
     describe '#calculate_hmac' do
       it 'generates hmac' do
-        checker.sign(second: 'another', first: 'parameter').should == hmacify('parameter|another')
+        expect(checker.sign(second: 'another', first: 'parameter')).to eq(hmacify('parameter|another'))
       end
     end
 
     def hmacify(string, method='sha1')
-      digester = OpenSSL::Digest::Digest.new(method)
+      digester = OpenSSL::Digest.new(method)
       OpenSSL::HMAC.hexdigest(digester, "very secret key", string)
     end
   end

data/spec/authmac/timestamp_checker_spec.rb

@@ -5,15 +5,15 @@ module Authmac
     let(:checker) { TimestampChecker.new(15*60, 5*60) }
 
     it 'returns true if timestamp is recent' do
-      checker.validate(Time.now.to_i).should be_true
+      expect(checker.validate(Time.now.to_i)).to be_truthy
     end
 
     it 'returns false if timestamp is too old' do
-      checker.validate(Time.now.to_i - (15*60 + 1)).should be_false
+      expect(checker.validate(Time.now.to_i - (15*60 + 1))).to be_falsey
     end
 
     it 'returns false if timestamp is too far in the future' do
-      checker.validate(Time.now.to_i + (5*60 + 1)).should be_false
+      expect(checker.validate(Time.now.to_i + (5*60 + 1))).to be_falsey
     end
   end
 end

data/spec/authmac_spec.rb

@@ -2,32 +2,32 @@ require 'authmac'
 
 module Authmac
   describe Authenticator do
-    let(:hmac_checker)      { stub("HmacChecker", validate: true) }
-    let(:timestamp_checker) { stub("TimestampChecker", validate: true) }
+    let(:hmac_checker)      { double("HmacChecker", validate: true) }
+    let(:timestamp_checker) { double("TimestampChecker", validate: true) }
     let(:auth) { Authenticator.new(hmac_checker, timestamp_checker) }
 
     describe '#validate' do
       it 'checks hmac' do
         hash = {userid: 'someone', clientid: 'something'}
         hmac = "a-calculated-hmac"
-        hmac_checker.should_receive(:validate).with(hash, hmac)
+        expect(hmac_checker).to receive(:validate).with(hash, hmac)
         auth.validate(hash.merge(hmac: hmac))
       end
 
       it 'raises HmacError if hmac is incorrect' do
-        hmac_checker.stub(validate: false)
-        auth.validate({}).hmac_failure?.should be_true
+        allow(hmac_checker).to receive(:validate).and_return(false)
+        expect(auth.validate({}).hmac_failure?).to be_truthy
       end
 
       it 'checks timestamp' do
         timestamp = Time.now.to_i
-        timestamp_checker.should_receive(:validate).with(timestamp)
+        expect(timestamp_checker).to receive(:validate).with(timestamp)
         auth.validate({timestamp: timestamp.to_s})
       end
 
       it 'raises TimestampError if timestamp is out of bounds' do
-        timestamp_checker.stub(validate: false)
-        auth.validate({}).timestamp_failure?.should be_true
+        allow(timestamp_checker).to receive(:validate).and_return(false)
+        expect(auth.validate({}).timestamp_failure?).to be_truthy
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authmac
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Marten Veldthuis
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 3.0.0.beta1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 3.0.0.beta1
 description: Single Sign-On implementation based on HMAC.
 email:
 - marten@veldthuis.com