devise 1.1.9 → 1.2.rc

data/test/rails_app/db/schema.rb

@@ -1,81 +1,47 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
 # It's strongly recommended to check this file into your version control system.
 
 ActiveRecord::Schema.define(:version => 20100401102949) do
 
-  create_table "accounts", :force => true do |t|
-    t.string   "email",                :default => "", :null => false
-    t.string   "encrypted_password",   :default => "", :null => false
-    t.string   "password_salt",        :default => "", :null => false
-    t.string   "username"
-    t.string   "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
-    t.string   "reset_password_token"
-    t.string   "remember_token"
-    t.datetime "remember_created_at"
-    t.integer  "sign_in_count",        :default => 0
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.integer  "failed_attempts",      :default => 0
-    t.string   "unlock_token"
-    t.datetime "locked_at"
-    t.string   "authentication_token"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "admins", :force => true do |t|
-    t.string   "email",                :default => ""
-    t.string   "encrypted_password",   :default => ""
-    t.string   "password_salt",        :default => ""
-    t.string   "username"
-    t.string   "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
-    t.string   "reset_password_token"
+    t.string   "email"
+    t.string   "encrypted_password",   :limit => 128
+    t.string   "password_salt"
     t.string   "remember_token"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",        :default => 0
-    t.datetime "current_sign_in_at"
-    t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.integer  "failed_attempts",      :default => 0
+    t.string   "reset_password_token"
+    t.integer  "failed_attempts",                     :default => 0
     t.string   "unlock_token"
     t.datetime "locked_at"
-    t.string   "authentication_token"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "users", :force => true do |t|
-    t.string   "email",                :default => "", :null => false
-    t.string   "encrypted_password",   :default => "", :null => false
-    t.string   "password_salt",        :default => "", :null => false
     t.string   "username"
+    t.string   "facebook_token"
+    t.string   "email",                               :default => "", :null => false
+    t.string   "encrypted_password",   :limit => 128, :default => "", :null => false
     t.string   "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
     t.string   "reset_password_token"
-    t.string   "remember_token"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",        :default => 0
+    t.integer  "sign_in_count",                       :default => 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.integer  "failed_attempts",      :default => 0
+    t.integer  "failed_attempts",                     :default => 0
     t.string   "unlock_token"
     t.datetime "locked_at"
     t.string   "authentication_token"

data/test/rails_app/lib/shared_admin.rb

@@ -0,0 +1,9 @@
+module SharedAdmin
+  extend ActiveSupport::Concern
+
+  included do
+    devise :database_authenticatable, :encryptable, :registerable,
+           :timeoutable, :recoverable, :rememberable, :lockable,
+           :unlock_strategy => :time
+  end
+end

data/test/rails_app/lib/shared_user.rb

@@ -0,0 +1,23 @@
+module SharedUser
+  extend ActiveSupport::Concern
+
+  included do
+    devise :database_authenticatable, :confirmable, :lockable, :recoverable,
+           :registerable, :rememberable, :timeoutable, :token_authenticatable,
+           :trackable, :validatable, :omniauthable
+
+    # They need to be included after Devise is called.
+    extend ExtendMethods
+  end
+
+  module ExtendMethods
+    def new_with_session(params, session)
+      super.tap do |user|
+        if data = session["devise.facebook_data"]
+          user.email = data["email"]
+          user.confirmed_at = Time.now
+        end
+      end
+    end
+  end
+end

data/test/routes_test.rb

@@ -86,10 +86,25 @@ class DefaultRoutingTest < ActionController::TestCase
     assert_recognizes({:controller => 'devise/registrations', :action => 'destroy'}, {:path => 'users', :method => :delete})
   end
 
+  test 'map cancel user registration' do
+    assert_recognizes({:controller => 'devise/registrations', :action => 'cancel'}, {:path => 'users/cancel', :method => :get})
+    assert_named_route "/users/cancel", :cancel_user_registration_path
+  end
+
+  test 'map omniauth callbacks' do
+    assert_recognizes({:controller => 'users/omniauth_callbacks', :action => 'facebook'}, {:path => 'users/auth/facebook/callback', :method => :get})
+    assert_recognizes({:controller => 'users/omniauth_callbacks', :action => 'facebook'}, {:path => 'users/auth/facebook/callback', :method => :post})
+    assert_named_route "/users/auth/facebook/callback", :user_omniauth_callback_path, :facebook
+
+    assert_raise ActionController::RoutingError do
+      assert_recognizes({:controller => 'ysers/omniauth_callbacks', :action => 'twitter'}, {:path => 'users/auth/twitter/callback', :method => :get})
+    end
+  end
+
   protected
 
-  def assert_named_route(result, name)
-    assert_equal result, @routes.url_helpers.send(name)
+  def assert_named_route(result, *args)
+    assert_equal result, @routes.url_helpers.send(*args)
   end
 end
 
@@ -99,7 +114,7 @@ class CustomizedRoutingTest < ActionController::TestCase
   end
 
   test 'map admin with :controllers option' do
-    assert_recognizes({:controller => 'sessions', :action => 'new'}, {:path => 'admin_area/sign_in', :method => :get})
+    assert_recognizes({:controller => 'admins/sessions', :action => 'new'}, {:path => 'admin_area/sign_in', :method => :get})
   end
 
   test 'does not map admin password' do
@@ -120,16 +135,34 @@ class CustomizedRoutingTest < ActionController::TestCase
     assert_recognizes({:controller => 'devise/passwords', :action => 'new', :locale => 'en'}, '/en/accounts/secret/new')
   end
 
-  test 'map account with custom path name for confirmation' do
-    assert_recognizes({:controller => 'devise/confirmations', :action => 'new', :locale => 'en'}, '/en/accounts/verification/new')
+  test 'map account with custom path name for registration' do
+    assert_recognizes({:controller => 'devise/registrations', :action => 'new', :locale => 'en'}, '/en/accounts/management/register')
   end
 
-  test 'map account with custom path name for unlock' do
-    assert_recognizes({:controller => 'devise/unlocks', :action => 'new', :locale => 'en'}, '/en/accounts/unblock/new')
+  test 'map account with custom path name for cancel registration' do
+    assert_recognizes({:controller => 'devise/registrations', :action => 'cancel', :locale => 'en'}, '/en/accounts/management/giveup')
   end
 
-  test 'map account with custom path name for registration' do
-    assert_recognizes({:controller => 'devise/registrations', :action => 'new', :locale => 'en'}, '/en/accounts/management/register')
+  test 'map deletes with :sign_out_via option' do
+    assert_recognizes({:controller => 'devise/sessions', :action => 'destroy'}, {:path => '/sign_out_via/deletes/sign_out', :method => :delete})
+    assert_raise ActionController::RoutingError do
+      assert_recognizes({:controller => 'devise/sessions', :action => 'destroy'}, {:path => '/sign_out_via/deletes/sign_out', :method => :get})
+    end
+  end
+
+  test 'map posts with :sign_out_via option' do
+    assert_recognizes({:controller => 'devise/sessions', :action => 'destroy'}, {:path => '/sign_out_via/posts/sign_out', :method => :post})
+    assert_raise ActionController::RoutingError do
+      assert_recognizes({:controller => 'devise/sessions', :action => 'destroy'}, {:path => '/sign_out_via/posts/sign_out', :method => :get})
+    end
+  end
+
+  test 'map delete_or_posts with :sign_out_via option' do
+    assert_recognizes({:controller => 'devise/sessions', :action => 'destroy'}, {:path => '/sign_out_via/delete_or_posts/sign_out', :method => :post})
+    assert_recognizes({:controller => 'devise/sessions', :action => 'destroy'}, {:path => '/sign_out_via/delete_or_posts/sign_out', :method => :delete})
+    assert_raise ActionController::RoutingError do
+      assert_recognizes({:controller => 'devise/sessions', :action => 'destroy'}, {:path => '/sign_out_via/delete_or_posts/sign_out', :method => :get})
+    end
   end
 end
 

data/test/support/integration.rb

@@ -10,8 +10,8 @@ class ActionDispatch::IntegrationTest
       user = User.create!(
         :username => 'usertest',
         :email => options[:email] || 'user@test.com',
-        :password => '123456',
-        :password_confirmation => '123456',
+        :password => options[:password] || '123456',
+        :password_confirmation => options[:password] || '123456',
         :created_at => Time.now.utc
       )
       user.confirm! unless options[:confirm] == false
@@ -32,7 +32,7 @@ class ActionDispatch::IntegrationTest
   def sign_in_as_user(options={}, &block)
     user = create_user(options)
     visit_with_option options[:visit], new_user_session_path
-    fill_in 'email', :with => 'user@test.com'
+    fill_in 'email', :with => options[:email] || 'user@test.com'
     fill_in 'password', :with => options[:password] || '123456'
     check 'remember me' if options[:remember_me] == true
     yield if block_given?

data/test/support/webrat/integrations/rails.rb

@@ -7,6 +7,13 @@ module Webrat
       Rack::Utils.parse_nested_query(params)
     end
   end
+
+  module Logging
+    # Avoid RAILS_DEFAULT_LOGGER deprecation warning
+    def logger # :nodoc:
+      ::Rails.logger
+    end
+  end
 end
 
 module ActionDispatch #:nodoc:

data/test/test_helper.rb

@@ -17,6 +17,8 @@ Webrat.configure do |config|
   config.open_error_files = false
 end
 
+Devise::OmniAuth.test_mode!
+
 # Add support to load paths so we can overwrite broken webrat setup
 $:.unshift File.expand_path('../support', __FILE__)
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/test/test_helpers_test.rb

@@ -53,6 +53,35 @@ class TestHelpersTest < ActionController::TestCase
     assert_redirected_to new_user_session_path
   end
 
+  test "defined Warden after_authentication callback should not be called when sign_in is called" do
+    begin
+      Warden::Manager.after_authentication do |user, auth, opts|
+        flunk "callback was called while it should not"
+      end
+
+      user = create_user
+      user.confirm!
+      sign_in user
+    ensure
+      Warden::Manager._after_set_user.pop
+    end
+  end
+
+  test "defined Warden before_logout callback should not be called when sign_out is called" do
+    begin
+      Warden::Manager.before_logout do |user, auth, opts|
+        flunk "callback was called while it should not"
+      end
+      user = create_user
+      user.confirm!
+
+      sign_in user
+      sign_out user
+    ensure
+      Warden::Manager._before_logout.pop
+    end
+  end
+
   test "allows to sign in with different users" do
     first_user = create_user
     first_user.confirm!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
+  hash: 7712074
+  prerelease: true
   segments: 
   - 1
-  - 1
-  - 9
-  version: 1.1.9
+  - 2
+  - rc
+  version: 1.2.rc
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 +01:00
+date: 2010-11-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,9 +36,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
+  name: orm_adapter
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 0
+        - 2
+        version: 0.0.2
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bcrypt-ruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -50,7 +66,7 @@ dependencies:
         - 2
         version: 2.1.2
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 description: Flexible authentication solution for Rails with Warden
 email: contact@plataformatec.com.br
 executables: []
@@ -59,19 +75,14 @@ extensions: []
 
 extra_rdoc_files: 
 - CHANGELOG.rdoc
-- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
-- TODO
 files: 
 - CHANGELOG.rdoc
-- Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
-- Rakefile
-- TODO
 - app/controllers/devise/confirmations_controller.rb
+- app/controllers/devise/omniauth_callbacks_controller.rb
 - app/controllers/devise/passwords_controller.rb
 - app/controllers/devise/registrations_controller.rb
 - app/controllers/devise/sessions_controller.rb
@@ -97,7 +108,6 @@ files:
 - lib/devise/controllers/url_helpers.rb
 - lib/devise/encryptors/authlogic_sha512.rb
 - lib/devise/encryptors/base.rb
-- lib/devise/encryptors/bcrypt.rb
 - lib/devise/encryptors/clearance_sha1.rb
 - lib/devise/encryptors/restful_authentication_sha1.rb
 - lib/devise/encryptors/sha1.rb
@@ -113,7 +123,9 @@ files:
 - lib/devise/models/authenticatable.rb
 - lib/devise/models/confirmable.rb
 - lib/devise/models/database_authenticatable.rb
+- lib/devise/models/encryptable.rb
 - lib/devise/models/lockable.rb
+- lib/devise/models/omniauthable.rb
 - lib/devise/models/recoverable.rb
 - lib/devise/models/registerable.rb
 - lib/devise/models/rememberable.rb
@@ -122,6 +134,10 @@ files:
 - lib/devise/models/trackable.rb
 - lib/devise/models/validatable.rb
 - lib/devise/modules.rb
+- lib/devise/omniauth.rb
+- lib/devise/omniauth/config.rb
+- lib/devise/omniauth/test_helpers.rb
+- lib/devise/omniauth/url_helpers.rb
 - lib/devise/orm/active_record.rb
 - lib/devise/orm/mongoid.rb
 - lib/devise/path_checker.rb
@@ -142,8 +158,6 @@ files:
 - lib/generators/devise/install_generator.rb
 - lib/generators/devise/orm_helpers.rb
 - lib/generators/devise/views_generator.rb
-- lib/generators/devise_install_generator.rb
-- lib/generators/devise_views_generator.rb
 - lib/generators/mongoid/devise_generator.rb
 - lib/generators/templates/README
 - lib/generators/templates/devise.rb
@@ -153,12 +167,15 @@ files:
 - test/devise_test.rb
 - test/encryptors_test.rb
 - test/failure_app_test.rb
-- test/indifferent_hash.rb
+- test/generators/generators_test_helper.rb
+- test/generators/install_generator_test.rb
+- test/generators/views_generator_test.rb
 - test/integration/authenticatable_test.rb
 - test/integration/confirmable_test.rb
 - test/integration/database_authenticatable_test.rb
 - test/integration/http_authenticatable_test.rb
 - test/integration/lockable_test.rb
+- test/integration/omniauthable_test.rb
 - test/integration/recoverable_test.rb
 - test/integration/registerable_test.rb
 - test/integration/rememberable_test.rb
@@ -171,6 +188,7 @@ files:
 - test/mapping_test.rb
 - test/models/confirmable_test.rb
 - test/models/database_authenticatable_test.rb
+- test/models/encryptable_test.rb
 - test/models/lockable_test.rb
 - test/models/recoverable_test.rb
 - test/models/rememberable_test.rb
@@ -179,17 +197,19 @@ files:
 - test/models/trackable_test.rb
 - test/models/validatable_test.rb
 - test/models_test.rb
+- test/omniauth/url_helpers_test.rb
 - test/orm/active_record.rb
 - test/orm/mongoid.rb
 - test/rails_app/app/active_record/admin.rb
 - test/rails_app/app/active_record/shim.rb
 - test/rails_app/app/active_record/user.rb
+- test/rails_app/app/controllers/admins/sessions_controller.rb
 - test/rails_app/app/controllers/admins_controller.rb
 - test/rails_app/app/controllers/application_controller.rb
 - test/rails_app/app/controllers/home_controller.rb
 - test/rails_app/app/controllers/publisher/registrations_controller.rb
 - test/rails_app/app/controllers/publisher/sessions_controller.rb
-- test/rails_app/app/controllers/sessions_controller.rb
+- test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
 - test/rails_app/app/mongoid/admin.rb
@@ -208,11 +228,12 @@ files:
 - test/rails_app/config/routes.rb
 - test/rails_app/db/migrate/20100401102949_create_tables.rb
 - test/rails_app/db/schema.rb
+- test/rails_app/lib/shared_admin.rb
+- test/rails_app/lib/shared_user.rb
 - test/routes_test.rb
 - test/support/assertions.rb
 - test/support/helpers.rb
 - test/support/integration.rb
-- test/support/test_silencer.rb
 - test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb
@@ -221,8 +242,8 @@ homepage: http://github.com/plataformatec/devise
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -237,16 +258,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden
@@ -257,12 +280,15 @@ test_files:
 - test/devise_test.rb
 - test/encryptors_test.rb
 - test/failure_app_test.rb
-- test/indifferent_hash.rb
+- test/generators/generators_test_helper.rb
+- test/generators/install_generator_test.rb
+- test/generators/views_generator_test.rb
 - test/integration/authenticatable_test.rb
 - test/integration/confirmable_test.rb
 - test/integration/database_authenticatable_test.rb
 - test/integration/http_authenticatable_test.rb
 - test/integration/lockable_test.rb
+- test/integration/omniauthable_test.rb
 - test/integration/recoverable_test.rb
 - test/integration/registerable_test.rb
 - test/integration/rememberable_test.rb
@@ -275,6 +301,7 @@ test_files:
 - test/mapping_test.rb
 - test/models/confirmable_test.rb
 - test/models/database_authenticatable_test.rb
+- test/models/encryptable_test.rb
 - test/models/lockable_test.rb
 - test/models/recoverable_test.rb
 - test/models/rememberable_test.rb
@@ -283,17 +310,19 @@ test_files:
 - test/models/trackable_test.rb
 - test/models/validatable_test.rb
 - test/models_test.rb
+- test/omniauth/url_helpers_test.rb
 - test/orm/active_record.rb
 - test/orm/mongoid.rb
 - test/rails_app/app/active_record/admin.rb
 - test/rails_app/app/active_record/shim.rb
 - test/rails_app/app/active_record/user.rb
+- test/rails_app/app/controllers/admins/sessions_controller.rb
 - test/rails_app/app/controllers/admins_controller.rb
 - test/rails_app/app/controllers/application_controller.rb
 - test/rails_app/app/controllers/home_controller.rb
 - test/rails_app/app/controllers/publisher/registrations_controller.rb
 - test/rails_app/app/controllers/publisher/sessions_controller.rb
-- test/rails_app/app/controllers/sessions_controller.rb
+- test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb
 - test/rails_app/app/controllers/users_controller.rb
 - test/rails_app/app/helpers/application_helper.rb
 - test/rails_app/app/mongoid/admin.rb
@@ -312,11 +341,12 @@ test_files:
 - test/rails_app/config/routes.rb
 - test/rails_app/db/migrate/20100401102949_create_tables.rb
 - test/rails_app/db/schema.rb
+- test/rails_app/lib/shared_admin.rb
+- test/rails_app/lib/shared_user.rb
 - test/routes_test.rb
 - test/support/assertions.rb
 - test/support/helpers.rb
 - test/support/integration.rb
-- test/support/test_silencer.rb
 - test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb