visa 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f100a7183b849f640a7613dd135bf03d2b48e45
-  data.tar.gz: ba75001cfa1ecd0a285386a39431591f222edc30
+  metadata.gz: f2af2c06bc21beec4d5480f0a38e1a117d0e50a7
+  data.tar.gz: 433dbff707b3de766c194b719548ef204fa5a9d5
 SHA512:
-  metadata.gz: d8c99ae11ed0d4095bb671d4ca18594e01fc308ace4ec344e659e7319e238d3988858022c2e098ceb98e114899dadcbb18b05e3923d35f0ab34b3eeca9f89dcc
-  data.tar.gz: ba52559000d5691e7ddefe32ec34dbe6bf203086c96492975d8d5d525457977f19a940fdbff5d4bbce8d57f20284c74743f910eda63de2476f3ba8850b80e519
+  metadata.gz: 520a808fc5dc34b4e6e59f48d2dfc3c54be7de21c510b43c0c1c7c012e4c6a24332126453822d8ac9ea987ed52127cd101a1f278399bc45b73068de2c26dcc65
+  data.tar.gz: ea0aa2b9f2a0ff6b71b519df3f32fb611281c306c51bb3d96eb165ec08358f811dd70e157077de42523bd53507956cae55518b7069644bc4e8764d4723ab36c8

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+script: bundle exec rspec spec
+cache: bundler
+rvm:
+  - 2.2

data/README.md

@@ -7,7 +7,7 @@ Multi-token authentication for Rails apps. Built with Devise in mind, but can be
 Something like the following should go in your Gemfile:
 
 ```ruby
-gem 'visa', '~> 0.0.1'
+gem 'visa', '~> 0.0.2'
 ```
 
 ## Usage

data/db/migrate/2_add_voided_at.rb

@@ -0,0 +1,5 @@
+class AddVoidedAt < ActiveRecord::Migration
+  def change
+    add_column :visa_tokens, :voided_at, :datetime
+  end
+end

data/lib/visa.rb

@@ -6,7 +6,7 @@ module Visa
 end
 
 Visa.encryption_cost = 10
-Visa.request_header  = 'Authentication'
+Visa.request_header  = 'HTTP_AUTHENTICATION'
 Visa.timeout         = 14.days
 
 require 'visa/engine'

data/lib/visa/request.rb

@@ -5,12 +5,16 @@ class Visa::Request
     @environment = environment
   end
 
+  def invalidate
+    token.touch :voided_at
+  end
+
   def touch
     token.touch :last_requested_at
   end
 
   def valid?
-    token.present? && not_too_old?
+    token.present? && token.voided_at.nil? && not_too_old?
   end
 
   private
@@ -19,14 +23,14 @@ class Visa::Request
 
   def credentials
     string = request.params['access_token'] ||
-      request.headers[Visa.request_header]
+      environment[Visa.request_header] || ''
 
     [string[0..15], string[16..57]]
   end
 
   def not_too_old?
-    time = token.last_requested_at
-    time.nil? || (time > Visa.timeout.ago)
+    time = token.last_requested_at || token.created_at
+    time > Visa.timeout.ago
   end
 
   def request

data/spec/visa/request_spec.rb

@@ -4,13 +4,15 @@ RSpec.describe Visa::Request do
   describe '#valid?' do
     let(:environment) { {'rack.input' => StringIO.new('')} }
     let(:request)     { Visa::Request.new environment }
+    let(:token)       { double 'token', last_requested_at: nil,
+      created_at: 1.minute.ago, voided_at: nil }
 
     before :each do
       environment['QUERY_STRING'] = <<-STR
 access_token=1234567890123456789012345678901234567890123456789012345678
       STR
 
-      allow(Visa::Token).to receive(:find_by_credentials).and_return(nil)
+      allow(Visa::Token).to receive(:find_by_credentials).and_return(token)
     end
 
     it 'sources credentials from the access_token parameter' do
@@ -22,29 +24,47 @@ access_token=1234567890123456789012345678901234567890123456789012345678
     end
 
     it 'returns true when a matching token is found' do
-      allow(Visa::Token).to receive(:find_by_credentials).
-        and_return(double('token', last_requested_at: nil))
+      expect(request).to be_valid
+    end
+
+    it 'returns true when an unused token is less than two weeks old' do
+      allow(token).to receive(:created_at).and_return(13.days.ago)
 
       expect(request).to be_valid
     end
 
-    it 'returns true when a matching token is less than two weeks old' do
-      allow(Visa::Token).to receive(:find_by_credentials).
-        and_return(double('token', last_requested_at: 13.days.ago))
+    it 'returns true when a matching token has been used within two weeks' do
+      allow(token).to receive(:last_requested_at).and_return(13.days.ago)
+
+      expect(request).to be_valid
+    end
+
+    it 'returns true when a matching token has not been voided' do
+      allow(token).to receive(:voided_at).and_return(nil)
 
       expect(request).to be_valid
     end
 
     it 'returns false when no token is found' do
-      allow(Visa::Token).to receive(:find_by_credentials).
-        and_return(nil)
+      allow(Visa::Token).to receive(:find_by_credentials).and_return(nil)
+
+      expect(request).to_not be_valid
+    end
+
+    it 'returns false when an unused token is more than two weeks old' do
+      allow(token).to receive(:created_at).and_return(15.days.ago)
+
+      expect(request).to_not be_valid
+    end
+
+    it 'returns false when token has not been used in more than two weeks' do
+      allow(token).to receive(:last_requested_at).and_return(15.days.ago)
 
       expect(request).to_not be_valid
     end
 
-    it 'returns false when a matching token is more than two weeks old' do
-      allow(Visa::Token).to receive(:find_by_credentials).
-        and_return(double('token', last_requested_at: 15.days.ago))
+    it 'returns false when token has been voided' do
+      allow(token).to receive(:voided_at).and_return(1.minute.ago)
 
       expect(request).to_not be_valid
     end

data/visa.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 Gem::Specification.new do |spec|
   spec.name          = 'visa'
-  spec.version       = '0.0.1'
+  spec.version       = '0.0.2'
   spec.authors       = ['Pat Allan']
   spec.email         = ['pat@freelancing-gods.com']
   spec.summary       = %q{Multi-token authentication for Rails apps.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: visa
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -102,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -109,6 +110,7 @@ files:
 - app/models/visa/token.rb
 - config.ru
 - db/migrate/1_create_tokens.rb
+- db/migrate/2_add_voided_at.rb
 - lib/visa.rb
 - lib/visa/engine.rb
 - lib/visa/request.rb