devise-token_authenticatable 0.1.0 → 0.2.0.beta1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: efc7e438a5cbc91099707f3555ee5df174ba2bcf
+  data.tar.gz: 4056376f20e6844b5c2609d1dbd481a727e530e7
+SHA512:
+  metadata.gz: a3f9bb7ef09ee19689653736907a3db289e8ec562422d3a89534ce1af6ab7a96b60b19ff020b7039995ac1c3c382a279c11cf6f717aa5eafa662f1a4bc604e2a
+  data.tar.gz: bf3dda8ca8db55cbbdc13babfadd9bf74a1b9c315803fbdda9f2add45b58a9c4dfc5810521b2f7d25acdd3a99df34ea9ad1d45ac51f94d56977dff74573a930f

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "2.0.0"
-  - jruby-19mode # JRuby in 1.9 mode
+  - 1.9.3
+  - 2.0.0
+  - 2.1.2
+  - jruby-19mode
 
 env:
   global:

data/README.md

@@ -20,6 +20,10 @@ Or install it yourself as:
 
     $ gem install devise-token_authenticatable
 
+### Users of Devise earlier than 3.3.0
+
+Please, use version 0.1.0 of this gem. All later versions do not support Devise < 3.3.0.
+
 ## Usage
 
 Add `:token_authenticatable` to your devise model:

data/devise-token_authenticatable.gemspec

@@ -22,16 +22,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
 
-  spec.add_dependency "devise", "~> 3.2.0"
+  spec.add_dependency "devise",                         "~> 3.3.0"
 
-  spec.add_development_dependency "activerecord",       ">= 3.2"
-  spec.add_development_dependency "actionmailer",       ">= 3.2"
-  spec.add_development_dependency "rspec-rails"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "factory_girl_rails"
-  spec.add_development_dependency "timecop"
-  spec.add_development_dependency "bundler",            "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rails",              "~> 4.1.0"
+  spec.add_development_dependency "rspec-rails",        "~> 3.0.2"
+  spec.add_development_dependency "pry",                "~> 0.10.0"
+  spec.add_development_dependency "factory_girl_rails", "~> 4.4.0"
+  spec.add_development_dependency "timecop",            "~> 0.7.0"
+  spec.add_development_dependency "bundler",            "~> 1.6"
 
   # Fix database connection with sqlite3 and jruby
   if    RUBY_ENGINE == 'ruby'

data/lib/devise/token_authenticatable/model.rb

@@ -49,7 +49,7 @@ module Devise
       # Generate new authentication token and save the record.
       def reset_authentication_token!
         reset_authentication_token
-        save(:validate => false)
+        save(validate: false)
       end
 
       # Generate authentication token unless already exists.
@@ -72,14 +72,14 @@ module Devise
 
       module ClassMethods
         def find_for_token_authentication(conditions)
-          find_for_authentication(:authentication_token => conditions[Devise::TokenAuthenticatable.token_authentication_key])
+          find_for_authentication(authentication_token: conditions[Devise::TokenAuthenticatable.token_authentication_key])
         end
 
         # Generate a token checking if one does not already exist in the database.
         def authentication_token
           loop do
             token = Devise.friendly_token
-            break token unless to_adapter.find_first({ :authentication_token => token })
+            break token unless to_adapter.find_first({ authentication_token: token })
           end
         end
 

data/lib/devise/token_authenticatable/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module TokenAuthenticatable
-    VERSION = "0.1.0".freeze
+    VERSION = "0.2.0.beta1".freeze
   end
 end

data/spec/models/devise/token_authenticatable/model_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 ##
-# If a model that is plain token authenticatable should be tested with
+# If a model that is token authenticatable should be tested with
 # this shared example the corresponding factory has to provide a trait
 # +:with_authentication_token+ that sets the attribute +authentication_token+.
 #
-# See spec/factories/account.rb for an example.
+# See spec/factories/user.rb for an example.
 #
-shared_examples "plain token authenticatable" do
+shared_examples "token authenticatable" do
 
   context "instance methods" do
 
@@ -75,5 +75,5 @@ shared_examples "plain token authenticatable" do
 end
 
 describe User do
-  it_behaves_like "plain token authenticatable"
+  it_behaves_like "token authenticatable"
 end

data/spec/requests/devise/token_authenticatable/strategy_spec.rb

@@ -7,15 +7,15 @@ describe Devise::Strategies::TokenAuthenticatable do
     context "through params" do
 
       it "should be a success" do
-        swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
+        swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
           sign_in_as_new_user_with_token
 
-          response.should be_success
+          expect(response).to be_success
         end
       end
 
       it "should set the auth_token parameter" do
-        swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
+        swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
           user = sign_in_as_new_user_with_token
 
           expect(@request.fullpath).to eq("/users?secret_token=#{user.authentication_token}")
@@ -23,7 +23,7 @@ describe Devise::Strategies::TokenAuthenticatable do
       end
 
       it "should authenticate user" do
-        swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
+        swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
           sign_in_as_new_user_with_token
 
           expect(warden).to be_authenticated(:user)
@@ -34,23 +34,23 @@ describe Devise::Strategies::TokenAuthenticatable do
         let(:user) { create(:user, :with_authentication_token) }
 
         it 'should be a success' do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
             post exhibit_user_path(user), Devise::TokenAuthenticatable.token_authentication_key => user.authentication_token, user: { some: "data" }
 
-            response.should be_success
+            expect(response).to be_success
           end
         end
 
         it 'should return proper data' do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
             post exhibit_user_path(user), Devise::TokenAuthenticatable.token_authentication_key => user.authentication_token, user: { some: "data" }
 
-            response.body.should eq('User is authenticated')
+            expect(response.body).to eq('User is authenticated')
           end
         end
 
         it 'should authenticate user' do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
             post exhibit_user_path(user), Devise::TokenAuthenticatable.token_authentication_key => user.authentication_token, user: { some: "data" }
 
             expect(warden).to be_authenticated(:user)
@@ -60,74 +60,139 @@ describe Devise::Strategies::TokenAuthenticatable do
 
       context "when request is stateless" do
 
-        it 'should not store the session' do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
-            swap Devise, :skip_session_storage => [:token_auth] do
+        it 'should authenticate the user with use of authentication token' do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+            swap Devise, skip_session_storage: [:token_auth] do
               sign_in_as_new_user_with_token
               expect(warden).to be_authenticated(:user)
+            end
+          end
+        end
+
+        it 'should redirect to the sign in page' do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+            swap Devise, skip_session_storage: [:token_auth] do
+              sign_in_as_new_user_with_token
+
+              # Try to access a resource that requires authentication
+              get users_path
+              expect(response).to redirect_to new_user_session_path
+            end
+          end
+        end
+
+        it 'should not store the session' do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+            swap Devise, skip_session_storage: [:token_auth] do
+              sign_in_as_new_user_with_token
 
               # Try to access a resource that requires authentication
               get users_path
-              response.should redirect_to(new_user_session_path)
               expect(warden).to_not be_authenticated(:user)
             end
           end
         end
+
       end
 
       context "when request is stateless and timeoutable" do
 
-        it 'should authenticate user' do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
-            swap Devise, :skip_session_storage => [:token_auth], timeout_in: (0.1).second do
-              user = sign_in_as_new_user_with_token
-              expect(warden).to be_authenticated(:user)
+        context "on sign in" do
 
-              # Expiring does not work because we are setting the session value when accessing the resource
-              Timecop.travel(Time.now + (0.3).second)
+          it 'should authenticate the user' do
+            swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+              swap Devise, skip_session_storage: [:token_auth], timeout_in: (0.1).second do
+                sign_in_as_new_user_with_token
+                expect(warden).to be_authenticated(:user)
+              end
+            end
+          end
 
-              sign_in_as_new_user_with_token(user: user)
-              expect(warden).to be_authenticated(:user)
+        end
 
-              Timecop.return
+        context "on delayed access" do
+
+          it 'should authenticate the user' do
+            swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+              swap Devise, skip_session_storage: [:token_auth], timeout_in: (0.1).second do
+                user = sign_in_as_new_user_with_token
+
+                # Expiring does not work because we are setting the session value when accessing the resource
+                Timecop.travel(Time.now + (0.3).second)
+
+                sign_in_as_new_user_with_token(user: user)
+                expect(warden).to be_authenticated(:user)
+
+                Timecop.return
+              end
             end
           end
+
         end
+
       end
 
       context "when expire_auth_token_on_timeout is set to true, timeoutable is enabled and we have a timed out session" do
 
-        it 'should reset authentication token and not authenticate' do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
-            swap Devise, expire_auth_token_on_timeout: true, timeout_in: (-1).minute do
-              user = sign_in_as_new_user_with_token
-              expect(warden).to be_authenticated(:user)
-              token = user.authentication_token
+        context "on sign in" do
 
-              sign_in_as_new_user_with_token(user: user)
-              expect(warden).to_not be_authenticated(:user)
-              user.reload
-              expect(token).to_not eq(user.authentication_token)
+          it 'should authenticate the user' do
+            swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+              swap Devise, expire_auth_token_on_timeout: true, timeout_in: (-1).minute do
+                sign_in_as_new_user_with_token
+                expect(warden).to be_authenticated(:user)
+              end
+            end
+          end
+
+        end
+
+        context "on re-sign in" do
+
+          it 'should not authenticate the user' do
+            swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+              swap Devise, expire_auth_token_on_timeout: true, timeout_in: (-1).minute do
+                user  = sign_in_as_new_user_with_token
+                token = user.authentication_token
+
+                sign_in_as_new_user_with_token(user: user)
+                expect(warden).to_not be_authenticated(:user)
+              end
             end
           end
+
+          it 'should reset the authentication token' do
+            swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+              swap Devise, expire_auth_token_on_timeout: true, timeout_in: (-1).minute do
+                user  = sign_in_as_new_user_with_token
+                token = user.authentication_token
+
+                sign_in_as_new_user_with_token(user: user)
+                user.reload
+                expect(token).to_not eq(user.authentication_token)
+              end
+            end
+          end
+
         end
+
       end
 
       context "when not configured" do
 
         it "should redirect to sign in page" do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
-            swap Devise, :params_authenticatable => [:database] do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+            swap Devise, params_authenticatable: [:database] do
               sign_in_as_new_user_with_token
 
-              response.should redirect_to new_user_session_path
+              expect(response).to redirect_to new_user_session_path
             end
           end
         end
 
         it "should not authenticate user" do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
-            swap Devise, :params_authenticatable => [:database] do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+            swap Devise, params_authenticatable: [:database] do
               sign_in_as_new_user_with_token
 
               expect(warden).to_not be_authenticated(:user)
@@ -140,17 +205,17 @@ describe Devise::Strategies::TokenAuthenticatable do
     context "through http" do
 
       it "should be a success" do
-        swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
+        swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
           swap Devise, http_authenticatable: true do
             sign_in_as_new_user_with_token(http_auth: true)
 
-            response.should be_success
+            expect(response).to be_success
           end
         end
       end
 
       it "should authenticate user" do
-        swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
+        swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
           swap Devise, http_authenticatable: true do
             sign_in_as_new_user_with_token(http_auth: true)
 
@@ -162,18 +227,18 @@ describe Devise::Strategies::TokenAuthenticatable do
       context "when not configured" do
 
         it "should be an unauthorized" do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
-            swap Devise, :http_authenticatable => [:database] do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+            swap Devise, http_authenticatable: [:database] do
               sign_in_as_new_user_with_token(http_auth: true)
 
-              response.status.should eq(401)
+              expect(response.status).to eq(401)
             end
           end
         end
 
         it "should not authenticate user" do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
-            swap Devise, :http_authenticatable => [:database] do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+            swap Devise, http_authenticatable: [:database] do
               sign_in_as_new_user_with_token(http_auth: true)
 
               expect(warden).to_not be_authenticated(:user)
@@ -186,21 +251,30 @@ describe Devise::Strategies::TokenAuthenticatable do
     context "through http header" do
 
       it "should redirect to root path" do
-        swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
+        swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
           swap Devise, http_authenticatable: true do
             sign_in_as_new_user_with_token(token_auth: true)
 
-            response.should be_success
+            expect(response).to be_success
           end
         end
       end
 
-      it "should authenticate user" do
-        swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
+      it "should not set any token options for Devise" do
+        swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
           swap Devise, http_authenticatable: true do
             sign_in_as_new_user_with_token(token_auth: true)
 
             expect(request.env['devise.token_options']).to eq({})
+          end
+        end
+      end
+
+      it "should authenticate user" do
+        swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+          swap Devise, http_authenticatable: true do
+            sign_in_as_new_user_with_token(token_auth: true)
+
             expect(warden).to be_authenticated(:user)
           end
         end
@@ -210,18 +284,18 @@ describe Devise::Strategies::TokenAuthenticatable do
         let(:signature) { "**TESTSIGNATURE**" }
 
         it "should redirect to root path" do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
-            swap Devise, :http_authenticatable => [:token_options] do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+            swap Devise, http_authenticatable: [:token_options] do
               sign_in_as_new_user_with_token(token_auth: true, token_options: { signature: signature, nonce: 'def' })
 
-              response.should be_success
+              expect(response).to be_success
             end
           end
         end
 
         it "should set the signature option" do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
-            swap Devise, :http_authenticatable => [:token_options] do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+            swap Devise, http_authenticatable: [:token_options] do
               sign_in_as_new_user_with_token(token_auth: true, token_options: { signature: signature, nonce: 'def' })
 
               expect(request.env['devise.token_options'][:signature]).to eq(signature)
@@ -230,8 +304,8 @@ describe Devise::Strategies::TokenAuthenticatable do
         end
 
         it "should set the nonce option" do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
-            swap Devise, :http_authenticatable => [:token_options] do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+            swap Devise, http_authenticatable: [:token_options] do
               sign_in_as_new_user_with_token(token_auth: true, token_options: { signature: signature, nonce: 'def' })
 
               expect(request.env['devise.token_options'][:nonce]).to eq('def')
@@ -240,8 +314,8 @@ describe Devise::Strategies::TokenAuthenticatable do
         end
 
         it "should authenticate user" do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
-            swap Devise, :http_authenticatable => [:token_options] do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
+            swap Devise, http_authenticatable: [:token_options] do
               sign_in_as_new_user_with_token(token_auth: true, token_options: { signature: signature, nonce: 'def' })
 
               expect(warden).to be_authenticated(:user)
@@ -253,17 +327,17 @@ describe Devise::Strategies::TokenAuthenticatable do
       context "with denied token authorization" do
 
         it "should be an unauthorized" do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
             swap Devise, http_authenticatable: false do
               sign_in_as_new_user_with_token(token_auth: true)
 
-              response.status.should eq(401)
+              expect(response.status).to eq(401)
             end
           end
         end
 
         it "should not authenticate user" do
-          swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
+          swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
             swap Devise, http_authenticatable: false do
               sign_in_as_new_user_with_token(token_auth: true)
 
@@ -271,42 +345,40 @@ describe Devise::Strategies::TokenAuthenticatable do
             end
           end
         end
+
       end
+
     end
   end
 
   context "with improper authentication token key" do
 
     it "should redirect to the sign in page" do
-      swap Devise::TokenAuthenticatable, :token_authentication_key => :donald_duck_token do
-        sign_in_as_new_user_with_token(:auth_token_key => :secret_token)
+      swap Devise::TokenAuthenticatable, token_authentication_key: :donald_duck_token do
+        sign_in_as_new_user_with_token(auth_token_key: :secret_token)
 
-        response.should redirect_to(new_user_session_path)
+        expect(response).to redirect_to new_user_session_path
       end
     end
 
     it "should not authenticate user" do
-      swap Devise::TokenAuthenticatable, :token_authentication_key => :donald_duck_token do
-        sign_in_as_new_user_with_token(:auth_token_key => :secret_token)
+      swap Devise::TokenAuthenticatable, token_authentication_key: :donald_duck_token do
+        sign_in_as_new_user_with_token(auth_token_key: :secret_token)
 
         expect(warden).to_not be_authenticated(:user)
       end
     end
 
     it "should not be subject to injection" do
-      swap Devise::TokenAuthenticatable, :token_authentication_key => :secret_token do
+      swap Devise::TokenAuthenticatable, token_authentication_key: :secret_token do
         user1 = create(:user, :with_authentication_token)
-
-        # Clean up user cache
-        @user = nil
-
         user2 = create(:user, :with_authentication_token)
 
-        expect(user1).to_not eq(user2)
         get users_path(Devise::TokenAuthenticatable.token_authentication_key.to_s + '[$ne]' => user1.authentication_token)
         expect(warden).to_not be_authenticated(:user)
       end
     end
+
   end
 
   context "with improper authentication token value" do
@@ -316,7 +388,7 @@ describe Devise::Strategies::TokenAuthenticatable do
       before { sign_in_as_new_user_with_token(auth_token: '*** INVALID TOKEN ***') }
 
       it "should redirect to the sign in page" do
-        response.should redirect_to(new_user_session_path)
+        expect(response).to redirect_to new_user_session_path
       end
 
       it "should not authenticate user" do
@@ -329,7 +401,7 @@ describe Devise::Strategies::TokenAuthenticatable do
       before { sign_in_as_new_user_with_token(token_auth: true, auth_token: '*** INVALID TOKEN ***') }
 
       it "should be an unauthorized" do
-        response.status.should eq(401)
+        expect(response.status).to eq(401)
       end
 
       it "does not authenticate with improper authentication token value in header" do

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ require 'timecop'
 require 'pry'
 
 # Required spec helper files
-require 'support/rails_app'
+require 'support/rails_app/config/environment'
 require 'support/helpers'
 require 'support/integration'
 require 'support/session_helper'
@@ -18,10 +18,12 @@ require 'support/session_helper'
 # as it sets the right application root path
 require 'factory_girl_rails'
 
+# Do not show migration output
+ActiveRecord::Migration.verbose = false
+
 # RSpec configuration
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values  = true
   config.use_transactional_fixtures                       = true
   config.run_all_when_everything_filtered                 = true
 
@@ -35,6 +37,8 @@ RSpec.configure do |config|
 
   config.include FactoryGirl::Syntax::Methods
 
+  config.infer_spec_type_from_file_location!
+
   config.before(:suite) do
     # Do initial migration
     ActiveRecord::Migrator.migrate(File.expand_path("support/rails_app/db/migrate/", File.dirname(__FILE__)))

data/spec/support/rails_app/app/controllers/admins_controller.rb

@@ -6,6 +6,6 @@ class AdminsController < ApplicationController
 
   def expire
     admin_session['last_request_at'] = 31.minutes.ago.utc
-    render :text => 'Admin will be expired on next request'
+    render text: 'Admin will be expired on next request'
   end
 end

data/spec/support/rails_app/app/controllers/application_controller.rb

@@ -3,7 +3,7 @@
 
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  before_filter :current_user, :unless => :devise_controller?
-  before_filter :authenticate_user!, :if => :devise_controller?
+  before_filter :current_user,        unless: :devise_controller?
+  before_filter :authenticate_user!,  if:     :devise_controller?
   respond_to *Mime::SET.map(&:to_sym)
 end

data/spec/support/rails_app/app/controllers/home_controller.rb

@@ -20,6 +20,6 @@ class HomeController < ApplicationController
   end
 
   def unauthenticated
-    render :text => "unauthenticated", :status => :unauthorized
+    render text: "unauthenticated", status: :unauthorized
   end
 end

data/spec/support/rails_app/app/controllers/users_controller.rb

@@ -1,6 +1,7 @@
 class UsersController < ApplicationController
-  prepend_before_filter :current_user, :only => :exhibit
-  before_filter :authenticate_user!, :except => [:accept, :exhibit]
+  prepend_before_filter :current_user,        only:   :exhibit
+  before_filter         :authenticate_user!,  except: [:accept, :exhibit]
+
   respond_to :html, :xml
 
   def index
@@ -13,7 +14,7 @@ class UsersController < ApplicationController
   end
 
   def update_form
-    render :text => 'Update'
+    render text: 'Update'
   end
 
   def accept
@@ -21,11 +22,11 @@ class UsersController < ApplicationController
   end
 
   def exhibit
-    render :text => current_user ? "User is authenticated" : "User is not authenticated"
+    render text: current_user ? "User is authenticated" : "User is not authenticated"
   end
 
   def expire
     user_session['last_request_at'] = 31.minutes.ago.utc
-    render :text => 'User will be expired on next request'
+    render text: 'User will be expired on next request'
   end
 end

data/spec/support/rails_app/app/mailers/users/mailer.rb

@@ -1,12 +1,12 @@
 class Users::Mailer < Devise::Mailer
-  default :from     => 'custom@example.com'
+  default from:     'custom@example.com'
 end
 
 class Users::ReplyToMailer < Devise::Mailer
-  default :from     => 'custom@example.com'
-  default :reply_to => 'custom_reply_to@example.com'
+  default from:     'custom@example.com'
+  default reply_to: 'custom_reply_to@example.com'
 end
 
 class Users::FromProcMailer < Devise::Mailer
-  default :from     => proc { 'custom@example.com' }
+  default from:     proc { 'custom@example.com' }
 end

data/spec/support/rails_app/app/models/admin.rb

@@ -1,9 +1,9 @@
 class Admin < ActiveRecord::Base
   devise  :database_authenticatable, :registerable,
           :timeoutable, :recoverable, :lockable, :confirmable,
-          :unlock_strategy => :time, :lock_strategy => :none,
-          :allow_unconfirmed_access_for => 2.weeks, :reconfirmable => true
+          unlock_strategy: :time, lock_strategy: :none,
+          allow_unconfirmed_access_for: 2.weeks, reconfirmable: true
 
-  validates_length_of     :reset_password_token, :minimum => 3, :allow_blank => true
-  validates_uniqueness_of :email, :allow_blank => true, :if => :email_changed?
+  validates_length_of     :reset_password_token,  minimum: 3, allow_blank: true
+  validates_uniqueness_of :email,                 allow_blank: true, if: :email_changed?
 end

data/spec/support/rails_app/config/application.rb

@@ -0,0 +1,13 @@
+require File.expand_path('../boot', __FILE__)
+
+module Devise
+  module TokenAuthenticatable
+    class RailsApp < Rails::Application
+      config.active_support.deprecation         = :log
+      config.action_mailer.default_url_options  = { host: "localhost", port: 3000 }
+      config.action_mailer.delivery_method      = :test
+      config.i18n.enforce_available_locales     = false
+      config.eager_load                         = false
+    end
+  end
+end

data/spec/support/rails_app/config/boot.rb

@@ -0,0 +1,3 @@
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/spec/support/rails_app/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application.
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application.
+Devise::TokenAuthenticatable::RailsApp.initialize!

data/spec/support/rails_app/config/initializers/secret_token.rb

@@ -1,4 +1,7 @@
 config = Rails.application.config
 
-config.secret_token = 'ea942c41850d502f2c8283e26bdc57829f471bb18224ddff0a192c4f32cdf6cb5aa0d82b3a7a7adbeb640c4b06f3aa1cd5f098162d8240f669b39d6b49680571'
-config.session_store :cookie_store, :key => "_my_app"
+if Rails.version.start_with? '4'
+  config.secret_key_base = 'd588e99efff13a86461fd6ab82327823ad2f8feb5dc217ce652cdd9f0dfc5eb4b5a62a92d24d2574d7d51dfb1ea8dd453ea54e00cf672159a13104a135422a10'
+else
+  config.secret_token = 'ea942c41850d502f2c8283e26bdc57829f471bb18224ddff0a192c4f32cdf6cb5aa0d82b3a7a7adbeb640c4b06f3aa1cd5f098162d8240f669b39d6b49680571'
+end

data/spec/support/rails_app/config/initializers/session_store.rb

@@ -0,0 +1 @@
+Devise::TokenAuthenticatable::RailsApp.config.session_store :cookie_store, key: '_my_app'

data/spec/support/rails_app/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
   # Resources for testing
-  resources :users, :only => [:index] do
+  resources :users, only: [:index] do
     member do
       get :expire
       get :accept
@@ -9,96 +9,110 @@ Rails.application.routes.draw do
     end
 
     authenticate do
-      post :exhibit, :on => :member
+      post :exhibit, on: :member
     end
   end
 
-  resources :admins, :only => [:index] do
-    get :expire, :on => :member
+  resources :admins, only: [:index] do
+    get :expire, on: :member
   end
 
   # Users scope
-  devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
+  devise_for :users
 
   as :user do
-    get "/as/sign_in", :to => "devise/sessions#new"
+    get "/as/sign_in", to: "devise/sessions#new"
   end
 
-  get "/sign_in", :to => "devise/sessions#new"
+  get "/sign_in", to: "devise/sessions#new"
 
   # Admin scope
-  devise_for :admin, :path => "admin_area", :controllers => { :sessions => :"admins/sessions" }, :skip => :passwords
+  devise_for :admin, path: "admin_area", controllers: { sessions: "admins/sessions" }, skip: :passwords
 
-  get "/admin_area/home", :to => "admins#index", :as => :admin_root
-  get "/anywhere", :to => "foo#bar", :as => :new_admin_password
+  get "/admin_area/home", to: "admins#index", as: :admin_root
+  get "/anywhere",        to: "foo#bar",      as: :new_admin_password
 
   authenticate(:admin) do
-    get "/private", :to => "home#private", :as => :private
+    get "/private", to: "home#private", as: :private
   end
 
   authenticate(:admin, lambda { |admin| admin.active? }) do
-    get "/private/active", :to => "home#private", :as => :private_active
+    get "/private/active", to: "home#private", as: :private_active
   end
 
   authenticated :admin do
-    get "/dashboard", :to => "home#admin_dashboard"
+    get "/dashboard", to: "home#admin_dashboard"
   end
 
   authenticated :admin, lambda { |admin| admin.active? } do
-    get "/dashboard/active", :to => "home#admin_dashboard"
+    get "/dashboard/active", to: "home#admin_dashboard"
   end
 
   authenticated do
-    get "/dashboard", :to => "home#user_dashboard"
+    get "/dashboard", to: "home#user_dashboard"
   end
 
   unauthenticated do
-    get "/join", :to => "home#join"
+    get "/join", to: "home#join"
   end
 
   # Routes for constraints testing
-  devise_for :headquarters_admin, :class_name => "Admin", :path => "headquarters", :constraints => {:host => /192\.168\.1\.\d\d\d/}
+  devise_for :headquarters_admin, class_name: "Admin", path: "headquarters", constraints: { host: /192\.168\.1\.\d\d\d/ }
 
-  constraints(:host => /192\.168\.1\.\d\d\d/) do
-    devise_for :homebase_admin, :class_name => "Admin", :path => "homebase"
+  constraints(host: /192\.168\.1\.\d\d\d/) do
+    devise_for :homebase_admin, class_name: "Admin", path: "homebase"
   end
 
-  devise_for :skip_admin, :class_name => "Admin", :skip => :all
+  devise_for :skip_admin, class_name: "Admin", skip: :all
 
   # Routes for format=false testing
-  devise_for :htmlonly_admin, :class_name => "Admin", :skip => [:confirmations, :unlocks], :path => "htmlonly_admin", :format => false, :skip_helpers => [:confirmations, :unlocks]
-  devise_for :htmlonly_users, :class_name => "User", :only => [:confirmations, :unlocks], :path => "htmlonly_users", :format => false, :skip_helpers => true
+  devise_for :htmlonly_admin, class_name:   "Admin",
+                              skip:         [:confirmations, :unlocks],
+                              path:         "htmlonly_admin",
+                              format:       false,
+                              skip_helpers: [:confirmations, :unlocks]
+
+  devise_for :htmlonly_users, class_name:   "User",
+                              only:         [:confirmations, :unlocks],
+                              path:         "htmlonly_users",
+                              format:       false,
+                              skip_helpers: true
 
   # Other routes for routing_test.rb
-  devise_for :reader, :class_name => "User", :only => :passwords
+  devise_for :reader, class_name: "User", only: :passwords
 
-  scope :host => "sub.example.com" do
-    devise_for :sub_admin, :class_name => "Admin"
+  scope host: "sub.example.com" do
+    devise_for :sub_admin, class_name: "Admin"
   end
 
-  namespace :publisher, :path_names => { :sign_in => "i_dont_care", :sign_out => "get_out" } do
-    devise_for :accounts, :class_name => "Admin", :path_names => { :sign_in => "get_in" }
+  namespace :publisher, path_names: { sign_in: "i_dont_care", sign_out: "get_out" } do
+    devise_for :accounts, class_name: "Admin", path_names: { sign_in: "get_in" }
   end
 
-  scope ":locale", :module => :invalid do
-    devise_for :accounts, :singular => "manager", :class_name => "Admin",
-      :path_names => {
-        :sign_in => "login", :sign_out => "logout",
-        :password => "secret", :confirmation => "verification",
-        :unlock => "unblock", :sign_up => "register",
-        :registration => "management", :cancel => "giveup"
-      }, :failure_app => lambda { |env| [404, {"Content-Type" => "text/plain"}, ["Oops, not found"]] }, :module => :devise
+  scope ":locale", module: :invalid do
+    devise_for :accounts, singular: "manager", class_name: "Admin",
+      path_names: {
+        sign_in:      "login",
+        sign_out:     "logout",
+        password:     "secret",
+        confirmation: "verification",
+        unlock:       "unblock",
+        sign_up:      "register",
+        registration: "management",
+        cancel:       "giveup"
+      }, failure_app: lambda { |env| [404, { "Content-Type" => "text/plain" }, ["Oops, not found"]] },
+      module: :devise
   end
 
-  namespace :sign_out_via, :module => "devise" do
-    devise_for :deletes, :sign_out_via => :delete, :class_name => "Admin"
-    devise_for :posts, :sign_out_via => :post, :class_name => "Admin"
-    devise_for :delete_or_posts, :sign_out_via => [:delete, :post], :class_name => "Admin"
+  namespace :sign_out_via, module: "devise" do
+    devise_for :deletes,          sign_out_via: :delete,          class_name: "Admin"
+    devise_for :posts,            sign_out_via: :post,            class_name: "Admin"
+    devise_for :delete_or_posts,  sign_out_via: [:delete, :post], class_name: "Admin"
   end
 
-  get "/set", :to => "home#set"
-  get "/unauthenticated", :to => "home#unauthenticated"
+  get "/set",             to: "home#set"
+  get "/unauthenticated", to: "home#unauthenticated"
   get "/custom_strategy/new"
 
-  root :to => "home#index", :via => [:get, :post]
+  root to: "home#index", via: [:get, :post]
 end

metadata

@@ -1,188 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: devise-token_authenticatable
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0.beta1
 platform: ruby
 authors:
 - Sebastian Oelke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: actionmailer
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-description: ! "This gem provides the extracted Token Authenticatable module of devise.\n
-  \                         It enables the user to sign in via an authentication token.
-  This token\n                          can be given via a query string or HTTP Basic
-  Authentication."
+description: |-
+  This gem provides the extracted Token Authenticatable module of devise.
+                            It enables the user to sign in via an authentication token. This token
+                            can be given via a query string or HTTP Basic Authentication.
 email:
 - dev@sohleeatsworld.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -200,7 +151,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/integration.rb
-- spec/support/rails_app.rb
 - spec/support/rails_app/Rakefile
 - spec/support/rails_app/app/controllers/admins/sessions_controller.rb
 - spec/support/rails_app/app/controllers/admins_controller.rb
@@ -214,11 +164,15 @@ files:
 - spec/support/rails_app/app/models/user.rb
 - spec/support/rails_app/app/views/users/index.html.erb
 - spec/support/rails_app/config.ru
+- spec/support/rails_app/config/application.rb
+- spec/support/rails_app/config/boot.rb
 - spec/support/rails_app/config/database.yml
+- spec/support/rails_app/config/environment.rb
 - spec/support/rails_app/config/initializers/backtrace_silencers.rb
 - spec/support/rails_app/config/initializers/devise.rb
 - spec/support/rails_app/config/initializers/inflections.rb
 - spec/support/rails_app/config/initializers/secret_token.rb
+- spec/support/rails_app/config/initializers/session_store.rb
 - spec/support/rails_app/config/routes.rb
 - spec/support/rails_app/db/migrate/20100401102949_create_tables.rb
 - spec/support/rails_app/db/schema.rb
@@ -230,27 +184,26 @@ files:
 homepage: https://github.com/baschtl/devise-token_authenticatable
 licenses:
 - MIT
+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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides authentication based on an authentication token for devise 3.2 and
   up.
 test_files:
@@ -261,7 +214,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/integration.rb
-- spec/support/rails_app.rb
 - spec/support/rails_app/Rakefile
 - spec/support/rails_app/app/controllers/admins/sessions_controller.rb
 - spec/support/rails_app/app/controllers/admins_controller.rb
@@ -275,11 +227,15 @@ test_files:
 - spec/support/rails_app/app/models/user.rb
 - spec/support/rails_app/app/views/users/index.html.erb
 - spec/support/rails_app/config.ru
+- spec/support/rails_app/config/application.rb
+- spec/support/rails_app/config/boot.rb
 - spec/support/rails_app/config/database.yml
+- spec/support/rails_app/config/environment.rb
 - spec/support/rails_app/config/initializers/backtrace_silencers.rb
 - spec/support/rails_app/config/initializers/devise.rb
 - spec/support/rails_app/config/initializers/inflections.rb
 - spec/support/rails_app/config/initializers/secret_token.rb
+- spec/support/rails_app/config/initializers/session_store.rb
 - spec/support/rails_app/config/routes.rb
 - spec/support/rails_app/db/migrate/20100401102949_create_tables.rb
 - spec/support/rails_app/db/schema.rb
@@ -288,3 +244,4 @@ test_files:
 - spec/support/rails_app/public/500.html
 - spec/support/rails_app/public/favicon.ico
 - spec/support/session_helper.rb
+has_rdoc: 

data/spec/support/rails_app.rb

@@ -1,19 +0,0 @@
-# Initializes the rails application used for
-# testing.
-
-# Do not output schema loading
-ActiveRecord::Migration.verbose = false
-
-module Devise
-  module TokenAuthenticatable
-    class RailsApp < Rails::Application
-      config.root                               = File.dirname(__FILE__) + "/rails_app"
-      config.active_support.deprecation         = :log
-      config.action_mailer.default_url_options  = { :host => "localhost:3000" }
-      config.action_mailer.delivery_method      = :test
-      config.eager_load                         = false
-    end
-  end
-end
-
-Devise::TokenAuthenticatable::RailsApp.initialize!