devise 0.6.1 → 0.6.2

data/test/models/timeoutable_test.rb

@@ -3,11 +3,11 @@ require 'test/test_helper'
 class TimeoutableTest < ActiveSupport::TestCase
 
   test 'should be expired' do
-    assert new_user.timeout?(11.minutes.ago)
+    assert new_user.timeout?(31.minutes.ago)
   end
 
   test 'should not be expired' do
-    assert_not new_user.timeout?(9.minutes.ago)
+    assert_not new_user.timeout?(29.minutes.ago)
   end
 
   test 'should not be expired when params is nil' do
@@ -15,11 +15,12 @@ class TimeoutableTest < ActiveSupport::TestCase
   end
 
   test 'fallback to Devise config option' do
-    swap Devise, :timeout => 1.minute do
+    swap Devise, :timeout_in => 1.minute do
       user = new_user
       assert user.timeout?(2.minutes.ago)
       assert_not user.timeout?(30.seconds.ago)
-      Devise.timeout = 5.minutes
+
+      Devise.timeout_in = 5.minutes
       assert_not user.timeout?(2.minutes.ago)
       assert user.timeout?(6.minutes.ago)
     end

data/test/models/trackable_test.rb

@@ -0,0 +1,5 @@
+require 'test/test_helper'
+
+class TrackableTest < ActiveSupport::TestCase
+
+end

data/test/models/validatable_test.rb

@@ -96,4 +96,10 @@ class ValidatableTest < ActiveSupport::TestCase
     assert user.errors[:password]
     assert_not user.errors[:password].to_a.include?('is too short (minimum is 6 characters)')
   end
+
+  test 'shuold not be included in objects with invalid API' do
+    assert_raise RuntimeError do
+      Class.new.send :include, Devise::Models::Validatable
+    end
+  end
 end

data/test/models_test.rb

@@ -16,6 +16,10 @@ class Rememberable < User
   devise :authenticatable, :rememberable
 end
 
+class Trackable < User
+  devise :authenticatable, :trackable
+end
+
 class Timeoutable < User
   devise :authenticatable, :timeoutable
 end
@@ -37,7 +41,7 @@ class Configurable < User
                :pepper => 'abcdef',
                :confirm_within => 5.days,
                :remember_for => 7.days,
-               :timeout => 15.minutes
+               :timeout_in => 15.minutes
 end
 
 class ActiveRecordTest < ActiveSupport::TestCase
@@ -50,52 +54,47 @@ class ActiveRecordTest < ActiveSupport::TestCase
     modules.each do |mod|
       assert include_module?(klass, mod)
     end
-  end
 
-  def assert_not_include_modules(klass, *modules)
-    modules.each do |mod|
+    (Devise::ALL - modules).each do |mod|
       assert_not include_module?(klass, mod)
     end
   end
 
   test 'include by default authenticatable only' do
     assert_include_modules Authenticatable, :authenticatable
-    assert_not_include_modules Authenticatable, :confirmable, :recoverable, :rememberable, :timeoutable, :validatable
   end
 
   test 'add confirmable module only' do
     assert_include_modules Confirmable, :authenticatable, :confirmable
-    assert_not_include_modules Confirmable, :recoverable, :rememberable, :timeoutable, :validatable
   end
 
   test 'add recoverable module only' do
     assert_include_modules Recoverable, :authenticatable, :recoverable
-    assert_not_include_modules Recoverable, :confirmable, :rememberable, :timeoutable, :validatable
   end
 
   test 'add rememberable module only' do
     assert_include_modules Rememberable, :authenticatable, :rememberable
-    assert_not_include_modules Rememberable, :confirmable, :recoverable, :timeoutable, :validatable
+  end
+
+  test 'add trackable module only' do
+    assert_include_modules Trackable, :authenticatable, :trackable
   end
 
   test 'add timeoutable module only' do
     assert_include_modules Timeoutable, :authenticatable, :timeoutable
-    assert_not_include_modules Timeoutable, :confirmable, :recoverable, :rememberable, :validatable
   end
 
   test 'add validatable module only' do
     assert_include_modules Validatable, :authenticatable, :validatable
-    assert_not_include_modules Validatable, :confirmable, :recoverable, :timeoutable, :rememberable
   end
 
   test 'add all modules' do
     assert_include_modules Devisable,
-      :authenticatable, :confirmable, :recoverable, :rememberable, :timeoutable, :validatable
+      :authenticatable, :confirmable, :recoverable, :rememberable, :trackable, :timeoutable, :validatable
   end
 
   test 'configure modules with except option' do
-    assert_include_modules Exceptable, :authenticatable, :confirmable
-    assert_not_include_modules Exceptable, :recoverable, :rememberable, :validatable
+    assert_include_modules Exceptable, :authenticatable, :confirmable, :trackable, :timeoutable
   end
 
   test 'set a default value for stretches' do
@@ -114,8 +113,8 @@ class ActiveRecordTest < ActiveSupport::TestCase
     assert_equal 7.days, Configurable.remember_for
   end
 
-  test 'set a default value for timeout' do
-    assert_equal 15.minutes, Configurable.timeout
+  test 'set a default value for timeout_in' do
+    assert_equal 15.minutes, Configurable.timeout_in
   end
 
   test 'set null fields on migrations' do

data/test/rails_app/app/controllers/users_controller.rb

@@ -5,13 +5,8 @@ class UsersController < ApplicationController
     user_session[:cart] = "Cart"
   end
 
-  def new
-    user_session['last_request_at'] = 11.minutes.ago.utc
-    render :text => 'New user!'
-  end
-
-  def edit
-    user_session['last_request_at'] = 9.minutes.ago.utc
-    render :text => 'Edit user!'
+  def expire
+    user_session['last_request_at'] = 31.minutes.ago.utc
+    render :text => 'User will be expired on next request'
   end
 end

data/test/rails_app/app/models/admin.rb

@@ -1,5 +1,5 @@
 class Admin < ActiveRecord::Base
-  devise :all, :except => [:recoverable, :confirmable, :rememberable, :validatable]
+  devise :all, :except => [:recoverable, :confirmable, :rememberable, :validatable, :trackable]
 
   def self.find_for_authentication(conditions)
     last(:conditions => conditions)

data/test/rails_app/app/models/user.rb

@@ -1,3 +1,4 @@
 class User < ActiveRecord::Base
   devise :all
+  attr_accessible :username, :email, :password, :password_confirmation
 end

data/test/rails_app/config/routes.rb

@@ -8,7 +8,7 @@ ActionController::Routing::Routes.draw do |map|
                               :path_prefix => '/:locale',
                               :requirements => { :extra => 'value' }
 
-  map.resources :users, :only => [:index, :new, :edit]
+  map.resources :users, :only => [:index], :member => { :expire => :get }
   map.resources :admins, :only => :index
   map.root :controller => :home
 

data/test/test_helper.rb

@@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), 'rails_app', 'config', 'environment')
 
 require 'test_help'
 require 'webrat'
+require 'mocha'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
@@ -24,6 +25,7 @@ ActiveRecord::Schema.define(:version => 1) do
         t.confirmable
         t.recoverable
         t.rememberable
+        t.trackable
       end
 
       t.timestamps

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-24 00:00:00 -02:00
+date: 2009-11-25 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,6 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
-- TODO
 files: 
 - CHANGELOG.rdoc
 - MIT-LICENSE
@@ -72,6 +71,7 @@ files:
 - lib/devise/failure_app.rb
 - lib/devise/hooks/confirmable.rb
 - lib/devise/hooks/timeoutable.rb
+- lib/devise/hooks/trackable.rb
 - lib/devise/locales/en.yml
 - lib/devise/mapping.rb
 - lib/devise/models.rb
@@ -80,6 +80,7 @@ files:
 - lib/devise/models/recoverable.rb
 - lib/devise/models/rememberable.rb
 - lib/devise/models/timeoutable.rb
+- lib/devise/models/trackable.rb
 - lib/devise/models/validatable.rb
 - lib/devise/orm/active_record.rb
 - lib/devise/orm/data_mapper.rb
@@ -124,47 +125,49 @@ signing_key:
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden
 test_files: 
-- test/controllers/filters_test.rb
-- test/controllers/helpers_test.rb
+- test/rails_app/config/boot.rb
+- test/rails_app/config/routes.rb
+- test/rails_app/config/environments/development.rb
+- test/rails_app/config/environments/production.rb
+- test/rails_app/config/environments/test.rb
+- test/rails_app/config/environment.rb
+- test/rails_app/config/initializers/session_store.rb
+- test/rails_app/config/initializers/new_rails_defaults.rb
+- test/rails_app/app/controllers/users_controller.rb
+- test/rails_app/app/controllers/application_controller.rb
+- test/rails_app/app/controllers/admins_controller.rb
+- test/rails_app/app/controllers/home_controller.rb
+- test/rails_app/app/helpers/application_helper.rb
+- test/rails_app/app/models/admin.rb
+- test/rails_app/app/models/organizer.rb
+- test/rails_app/app/models/account.rb
+- test/rails_app/app/models/user.rb
 - test/controllers/url_helpers_test.rb
-- test/models/validatable_test.rb
-- test/models/rememberable_test.rb
-- test/models/timeoutable_test.rb
-- test/models/confirmable_test.rb
-- test/models/recoverable_test.rb
-- test/models/authenticatable_test.rb
+- test/controllers/helpers_test.rb
+- test/controllers/filters_test.rb
+- test/models_test.rb
+- test/integration/authenticatable_test.rb
 - test/integration/rememberable_test.rb
+- test/integration/recoverable_test.rb
 - test/integration/timeoutable_test.rb
+- test/integration/trackable_test.rb
 - test/integration/confirmable_test.rb
-- test/integration/recoverable_test.rb
-- test/integration/authenticatable_test.rb
-- test/test_helper.rb
-- test/test_helpers_test.rb
-- test/encryptors_test.rb
-- test/mailers/reset_password_instructions_test.rb
 - test/mailers/confirmation_instructions_test.rb
-- test/routes_test.rb
-- test/devise_test.rb
-- test/failure_app_test.rb
-- test/rails_app/app/controllers/admins_controller.rb
-- test/rails_app/app/controllers/home_controller.rb
-- test/rails_app/app/controllers/users_controller.rb
-- test/rails_app/app/controllers/application_controller.rb
-- test/rails_app/app/models/account.rb
-- test/rails_app/app/models/user.rb
-- test/rails_app/app/models/admin.rb
-- test/rails_app/app/models/organizer.rb
-- test/rails_app/app/helpers/application_helper.rb
-- test/rails_app/config/boot.rb
-- test/rails_app/config/environments/production.rb
-- test/rails_app/config/environments/development.rb
-- test/rails_app/config/environments/test.rb
-- test/rails_app/config/initializers/new_rails_defaults.rb
-- test/rails_app/config/initializers/session_store.rb
-- test/rails_app/config/routes.rb
-- test/rails_app/config/environment.rb
-- test/mapping_test.rb
+- test/mailers/reset_password_instructions_test.rb
+- test/models/authenticatable_test.rb
+- test/models/rememberable_test.rb
+- test/models/recoverable_test.rb
+- test/models/timeoutable_test.rb
+- test/models/trackable_test.rb
+- test/models/validatable_test.rb
+- test/models/confirmable_test.rb
+- test/encryptors_test.rb
 - test/support/model_tests_helper.rb
 - test/support/assertions_helper.rb
 - test/support/integration_tests_helper.rb
-- test/models_test.rb
+- test/failure_app_test.rb
+- test/devise_test.rb
+- test/routes_test.rb
+- test/test_helper.rb
+- test/test_helpers_test.rb
+- test/mapping_test.rb