google-authenticator-rails 0.0.4 → 1.2.1

data/spec/session/persistance_spec.rb

@@ -16,16 +16,33 @@ describe GoogleAuthenticatorRails::Session::Base do
       end
 
       context 'session' do
-        before  { set_cookie_for(user) }
-        after   { clear_cookie }
+        before  { set_cookie_for(user) unless user.nil? }
+        after   { clear_cookie unless user.nil? }
 
         it            { should be_a UserMfaSession }
         its(:record)  { should eq user }
+
+        context 'custom lookup token' do
+          let(:user) { SaltUser.create(:password => "password", :email => "email@example.com") }
+
+          subject { SaltUserMfaSession.find }
+
+          it           { should be_a SaltUserMfaSession }
+          its(:record) { should eq user }
+        end
+
+        context 'after destroy' do
+          before { UserMfaSession.destroy }
+
+          subject { UserMfaSession.find }
+
+          it { should be_nil }
+        end
       end
     end
 
     describe '::create' do
-      after   { clear_cookie }
+      after   { clear_cookie unless user.nil? }
       subject { UserMfaSession.create(user) }
 
       it            { should be_a UserMfaSession }
@@ -50,9 +67,13 @@ describe GoogleAuthenticatorRails::Session::Base do
 end
 
 def set_cookie_for(user)
-  controller.cookies[UserMfaSession.__send__(:cookie_key)] = { :value => [user.persistence_token, user.id].join('::'), :expires => nil }
+  controller.cookies[klass(user).__send__(:cookie_key)] = { :value => [user.google_token_value, user.id].join('::'), :expires => nil }
+end
+
+def klass(user)
+  "#{user.class.to_s}MfaSession".constantize unless user.nil?
 end
 
 def clear_cookie
-  controller.cookies[UserMfaSession.__send__(:cookie_key)] = nil
-end
+  controller.cookies[klass(user).__send__(:cookie_key)] = nil
+end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ require 'time'
 require 'active_record'
 require 'action_controller'
 require 'rotp'
+require 'bundler'
+require 'bundler/setup'
 
 require 'google-authenticator-rails'
 
@@ -37,12 +39,12 @@ class MockCookieJar < Hash
   def delete(key, options = {})
     super(key)
   end
-end 
+end
 
 class UserMfaSession < GoogleAuthenticatorRails::Session::Base; end
 
 ActiveRecord::Base.establish_connection(
-  :adapter => 'sqlite3',
+  :adapter  => 'sqlite3',
   :database => ':memory:'
 )
 
@@ -55,6 +57,7 @@ ActiveRecord::Schema.define do
     t.string :user_name
     t.string :password
     t.string :persistence_token
+    t.string :salt
 
     t.timestamps
   end
@@ -64,21 +67,30 @@ ActiveRecord::Schema.define do
     t.string :email
     t.string :user_name
     t.string :persistence_token
+    t.string :salt
 
     t.timestamps
   end
 end
 
 class BaseUser < ActiveRecord::Base
-  attr_accessible :email, :user_name
+  # Older versions of ActiveRecord allow attr_accessible, but newer
+  # ones do not
+  begin
+    attr_accessible :email, :user_name, :password
+  rescue
+    attr_accessor :email, :user_name, :password
+  end
+
   self.table_name = "users"
 
   before_save do |user|
     user.persistence_token ||= "token"
+    user.salt              ||= "salt"
   end
 end
 
-class User < BaseUser  
+class User < BaseUser
   acts_as_google_authenticated
 end
 
@@ -95,6 +107,10 @@ class ColumnNameUser < BaseUser
   acts_as_google_authenticated :column_name => :user_name
 end
 
+class DriftUser < BaseUser
+  acts_as_google_authenticated :drift => 31
+end
+
 class ProcUser < BaseUser
   acts_as_google_authenticated :method => Proc.new { |user| "#{user.user_name}@futureadvisor-admin" }
 end
@@ -106,3 +122,9 @@ end
 class StringUser < BaseUser
   acts_as_google_authenticated :method => "email"
 end
+
+class SaltUserMfaSession < GoogleAuthenticatorRails::Session::Base; end
+
+class SaltUser < BaseUser
+  acts_as_google_authenticated :lookup_token => :salt
+end

metadata

@@ -1,110 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: google-authenticator-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+  version: 1.2.1
 platform: ruby
 authors:
 - Jared McFarland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rotp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: google-qr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Add the ability to use the Google Authenticator with ActiveRecord.
@@ -114,14 +115,29 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
+- Appraisals
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- gemfiles/rails2.3.gemfile
+- gemfiles/rails2.3.gemfile.lock
+- gemfiles/rails3.0.gemfile
+- gemfiles/rails3.0.gemfile.lock
+- gemfiles/rails3.1.gemfile
+- gemfiles/rails3.1.gemfile.lock
+- gemfiles/rails3.2..gemfile
+- gemfiles/rails3.2..gemfile.lock
+- gemfiles/rails4.0.gemfile
+- gemfiles/rails4.0.gemfile.lock
+- gemfiles/rails4.1.gemfile
+- gemfiles/rails4.1.gemfile.lock
 - google-authenticator.gemspec
 - lib/google-authenticator-rails.rb
 - lib/google-authenticator-rails/action_controller.rb
@@ -142,27 +158,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/jaredonline/google-authenticator
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Add the ability to use the Google Authenticator with ActiveRecord.
 test_files:
 - spec/action_controller/integration_spec.rb