RubyGems - devise - Versions diffs - 3.2.0 → 4.7.1 - Mend

devise 3.2.0 → 4.7.1

Files changed (235) hide show

checksums.yaml +7 -0
data/CHANGELOG.md +260 -949
data/MIT-LICENSE +1 -1
data/README.md +383 -100
data/app/controllers/devise/confirmations_controller.rb +13 -5
data/app/controllers/devise/omniauth_callbacks_controller.rb +12 -6
data/app/controllers/devise/passwords_controller.rb +23 -8
data/app/controllers/devise/registrations_controller.rb +60 -24
data/app/controllers/devise/sessions_controller.rb +48 -16
data/app/controllers/devise/unlocks_controller.rb +11 -4
data/app/controllers/devise_controller.rb +67 -31
data/app/helpers/devise_helper.rb +12 -19
data/app/mailers/devise/mailer.rb +10 -0
data/app/views/devise/confirmations/new.html.erb +9 -5
data/app/views/devise/mailer/confirmation_instructions.html.erb +1 -1
data/app/views/devise/mailer/email_changed.html.erb +7 -0
data/app/views/devise/mailer/password_change.html.erb +3 -0
data/app/views/devise/mailer/reset_password_instructions.html.erb +1 -1
data/app/views/devise/mailer/unlock_instructions.html.erb +1 -1
data/app/views/devise/passwords/edit.html.erb +16 -7
data/app/views/devise/passwords/new.html.erb +9 -5
data/app/views/devise/registrations/edit.html.erb +29 -15
data/app/views/devise/registrations/new.html.erb +20 -9
data/app/views/devise/sessions/new.html.erb +19 -10
data/app/views/devise/shared/_error_messages.html.erb +15 -0
data/app/views/devise/shared/{_links.erb → _links.html.erb} +9 -9
data/app/views/devise/unlocks/new.html.erb +9 -5
data/config/locales/en.yml +23 -17
data/lib/devise/controllers/helpers.rb +113 -49
data/lib/devise/controllers/rememberable.rb +15 -6
data/lib/devise/controllers/scoped_views.rb +3 -1
data/lib/devise/controllers/sign_in_out.rb +42 -26
data/lib/devise/controllers/store_location.rb +76 -0
data/lib/devise/controllers/url_helpers.rb +9 -7
data/lib/devise/delegator.rb +2 -0
data/lib/devise/encryptor.rb +24 -0
data/lib/devise/failure_app.rb +122 -40
data/lib/devise/hooks/activatable.rb +7 -6
data/lib/devise/hooks/csrf_cleaner.rb +5 -1
data/lib/devise/hooks/forgetable.rb +2 -0
data/lib/devise/hooks/lockable.rb +7 -2
data/lib/devise/hooks/proxy.rb +4 -2
data/lib/devise/hooks/rememberable.rb +4 -2
data/lib/devise/hooks/timeoutable.rb +16 -9
data/lib/devise/hooks/trackable.rb +3 -1
data/lib/devise/mailers/helpers.rb +15 -12
data/lib/devise/mapping.rb +8 -2
data/lib/devise/models/authenticatable.rb +81 -56
data/lib/devise/models/confirmable.rb +137 -42
data/lib/devise/models/database_authenticatable.rb +114 -28
data/lib/devise/models/lockable.rb +30 -17
data/lib/devise/models/omniauthable.rb +3 -1
data/lib/devise/models/recoverable.rb +62 -26
data/lib/devise/models/registerable.rb +4 -0
data/lib/devise/models/rememberable.rb +62 -33
data/lib/devise/models/timeoutable.rb +4 -8
data/lib/devise/models/trackable.rb +20 -4
data/lib/devise/models/validatable.rb +16 -9
data/lib/devise/models.rb +3 -1
data/lib/devise/modules.rb +12 -10
data/lib/devise/omniauth/config.rb +2 -0
data/lib/devise/omniauth/url_helpers.rb +14 -5
data/lib/devise/omniauth.rb +2 -0
data/lib/devise/orm/active_record.rb +5 -1
data/lib/devise/orm/mongoid.rb +6 -2
data/lib/devise/parameter_filter.rb +4 -0
data/lib/devise/parameter_sanitizer.rb +139 -65
data/lib/devise/rails/routes.rb +150 -104
data/lib/devise/rails/warden_compat.rb +3 -10
data/lib/devise/rails.rb +10 -13
data/lib/devise/secret_key_finder.rb +27 -0
data/lib/devise/strategies/authenticatable.rb +21 -10
data/lib/devise/strategies/base.rb +3 -1
data/lib/devise/strategies/database_authenticatable.rb +15 -4
data/lib/devise/strategies/rememberable.rb +15 -3
data/lib/devise/test/controller_helpers.rb +165 -0
data/lib/devise/test/integration_helpers.rb +63 -0
data/lib/devise/test_helpers.rb +7 -124
data/lib/devise/time_inflector.rb +4 -2
data/lib/devise/token_generator.rb +3 -41
data/lib/devise/version.rb +3 -1
data/lib/devise.rb +111 -83
data/lib/generators/active_record/devise_generator.rb +49 -12
data/lib/generators/active_record/templates/migration.rb +9 -7
data/lib/generators/active_record/templates/migration_existing.rb +9 -7
data/lib/generators/devise/controllers_generator.rb +46 -0
data/lib/generators/devise/devise_generator.rb +9 -5
data/lib/generators/devise/install_generator.rb +22 -0
data/lib/generators/devise/orm_helpers.rb +10 -21
data/lib/generators/devise/views_generator.rb +51 -28
data/lib/generators/mongoid/devise_generator.rb +22 -19
data/lib/generators/templates/README +5 -12
data/lib/generators/templates/controllers/README +14 -0
data/lib/generators/templates/controllers/confirmations_controller.rb +30 -0
data/lib/generators/templates/controllers/omniauth_callbacks_controller.rb +30 -0
data/lib/generators/templates/controllers/passwords_controller.rb +34 -0
data/lib/generators/templates/controllers/registrations_controller.rb +62 -0
data/lib/generators/templates/controllers/sessions_controller.rb +27 -0
data/lib/generators/templates/controllers/unlocks_controller.rb +30 -0
data/lib/generators/templates/devise.rb +81 -36
data/lib/generators/templates/markerb/confirmation_instructions.markerb +1 -1
data/lib/generators/templates/markerb/email_changed.markerb +7 -0
data/lib/generators/templates/markerb/password_change.markerb +3 -0
data/lib/generators/templates/markerb/reset_password_instructions.markerb +1 -1
data/lib/generators/templates/markerb/unlock_instructions.markerb +1 -1
data/lib/generators/templates/simple_form_for/confirmations/new.html.erb +6 -2
data/lib/generators/templates/simple_form_for/passwords/edit.html.erb +12 -4
data/lib/generators/templates/simple_form_for/passwords/new.html.erb +5 -2
data/lib/generators/templates/simple_form_for/registrations/edit.html.erb +14 -6
data/lib/generators/templates/simple_form_for/registrations/new.html.erb +12 -4
data/lib/generators/templates/simple_form_for/sessions/new.html.erb +11 -6
data/lib/generators/templates/simple_form_for/unlocks/new.html.erb +5 -2
metadata +46 -280
data/.gitignore +0 -10
data/.travis.yml +0 -20
data/.yardopts +0 -9
data/CONTRIBUTING.md +0 -14
data/Gemfile +0 -31
data/Gemfile.lock +0 -160
data/Rakefile +0 -35
data/devise.gemspec +0 -27
data/devise.png +0 -0
data/gemfiles/Gemfile.rails-3.2.x +0 -31
data/gemfiles/Gemfile.rails-3.2.x.lock +0 -159
data/test/controllers/custom_strategy_test.rb +0 -62
data/test/controllers/helpers_test.rb +0 -253
data/test/controllers/internal_helpers_test.rb +0 -120
data/test/controllers/passwords_controller_test.rb +0 -31
data/test/controllers/sessions_controller_test.rb +0 -99
data/test/controllers/url_helpers_test.rb +0 -59
data/test/delegator_test.rb +0 -19
data/test/devise_test.rb +0 -94
data/test/failure_app_test.rb +0 -232
data/test/generators/active_record_generator_test.rb +0 -103
data/test/generators/devise_generator_test.rb +0 -39
data/test/generators/install_generator_test.rb +0 -13
data/test/generators/mongoid_generator_test.rb +0 -23
data/test/generators/views_generator_test.rb +0 -67
data/test/helpers/devise_helper_test.rb +0 -51
data/test/integration/authenticatable_test.rb +0 -713
data/test/integration/confirmable_test.rb +0 -284
data/test/integration/database_authenticatable_test.rb +0 -84
data/test/integration/http_authenticatable_test.rb +0 -105
data/test/integration/lockable_test.rb +0 -239
data/test/integration/omniauthable_test.rb +0 -133
data/test/integration/recoverable_test.rb +0 -334
data/test/integration/registerable_test.rb +0 -349
data/test/integration/rememberable_test.rb +0 -167
data/test/integration/timeoutable_test.rb +0 -178
data/test/integration/trackable_test.rb +0 -92
data/test/mailers/confirmation_instructions_test.rb +0 -115
data/test/mailers/reset_password_instructions_test.rb +0 -96
data/test/mailers/unlock_instructions_test.rb +0 -91
data/test/mapping_test.rb +0 -127
data/test/models/authenticatable_test.rb +0 -13
data/test/models/confirmable_test.rb +0 -454
data/test/models/database_authenticatable_test.rb +0 -244
data/test/models/lockable_test.rb +0 -298
data/test/models/omniauthable_test.rb +0 -7
data/test/models/recoverable_test.rb +0 -184
data/test/models/registerable_test.rb +0 -7
data/test/models/rememberable_test.rb +0 -183
data/test/models/serializable_test.rb +0 -49
data/test/models/timeoutable_test.rb +0 -51
data/test/models/trackable_test.rb +0 -13
data/test/models/validatable_test.rb +0 -127
data/test/models_test.rb +0 -144
data/test/omniauth/config_test.rb +0 -57
data/test/omniauth/url_helpers_test.rb +0 -54
data/test/orm/active_record.rb +0 -10
data/test/orm/mongoid.rb +0 -13
data/test/parameter_sanitizer_test.rb +0 -81
data/test/rails_app/Rakefile +0 -6
data/test/rails_app/app/active_record/admin.rb +0 -6
data/test/rails_app/app/active_record/shim.rb +0 -2
data/test/rails_app/app/active_record/user.rb +0 -6
data/test/rails_app/app/controllers/admins/sessions_controller.rb +0 -6
data/test/rails_app/app/controllers/admins_controller.rb +0 -11
data/test/rails_app/app/controllers/application_controller.rb +0 -9
data/test/rails_app/app/controllers/home_controller.rb +0 -25
data/test/rails_app/app/controllers/publisher/registrations_controller.rb +0 -2
data/test/rails_app/app/controllers/publisher/sessions_controller.rb +0 -2
data/test/rails_app/app/controllers/users/omniauth_callbacks_controller.rb +0 -14
data/test/rails_app/app/controllers/users_controller.rb +0 -31
data/test/rails_app/app/helpers/application_helper.rb +0 -3
data/test/rails_app/app/mailers/users/mailer.rb +0 -12
data/test/rails_app/app/mongoid/admin.rb +0 -29
data/test/rails_app/app/mongoid/shim.rb +0 -23
data/test/rails_app/app/mongoid/user.rb +0 -39
data/test/rails_app/app/views/admins/index.html.erb +0 -1
data/test/rails_app/app/views/admins/sessions/new.html.erb +0 -2
data/test/rails_app/app/views/home/admin_dashboard.html.erb +0 -1
data/test/rails_app/app/views/home/index.html.erb +0 -1
data/test/rails_app/app/views/home/join.html.erb +0 -1
data/test/rails_app/app/views/home/private.html.erb +0 -1
data/test/rails_app/app/views/home/user_dashboard.html.erb +0 -1
data/test/rails_app/app/views/layouts/application.html.erb +0 -24
data/test/rails_app/app/views/users/edit_form.html.erb +0 -1
data/test/rails_app/app/views/users/index.html.erb +0 -1
data/test/rails_app/app/views/users/mailer/confirmation_instructions.erb +0 -1
data/test/rails_app/app/views/users/sessions/new.html.erb +0 -1
data/test/rails_app/bin/bundle +0 -3
data/test/rails_app/bin/rails +0 -4
data/test/rails_app/bin/rake +0 -4
data/test/rails_app/config/application.rb +0 -40
data/test/rails_app/config/boot.rb +0 -8
data/test/rails_app/config/database.yml +0 -18
data/test/rails_app/config/environment.rb +0 -5
data/test/rails_app/config/environments/development.rb +0 -34
data/test/rails_app/config/environments/production.rb +0 -84
data/test/rails_app/config/environments/test.rb +0 -36
data/test/rails_app/config/initializers/backtrace_silencers.rb +0 -7
data/test/rails_app/config/initializers/devise.rb +0 -181
data/test/rails_app/config/initializers/inflections.rb +0 -2
data/test/rails_app/config/initializers/secret_token.rb +0 -8
data/test/rails_app/config/initializers/session_store.rb +0 -1
data/test/rails_app/config/routes.rb +0 -104
data/test/rails_app/config.ru +0 -4
data/test/rails_app/db/migrate/20100401102949_create_tables.rb +0 -71
data/test/rails_app/db/schema.rb +0 -51
data/test/rails_app/lib/shared_admin.rb +0 -17
data/test/rails_app/lib/shared_user.rb +0 -29
data/test/rails_app/public/404.html +0 -26
data/test/rails_app/public/422.html +0 -26
data/test/rails_app/public/500.html +0 -26
data/test/rails_app/public/favicon.ico +0 -0
data/test/routes_test.rb +0 -250
data/test/support/assertions.rb +0 -40
data/test/support/helpers.rb +0 -70
data/test/support/integration.rb +0 -92
data/test/support/locale/en.yml +0 -8
data/test/support/webrat/integrations/rails.rb +0 -24
data/test/test_helper.rb +0 -34
data/test/test_helpers_test.rb +0 -173
data/test/test_models.rb +0 -26

data/test/test_helper.rb DELETED Viewed

@@ -1,34 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-DEVISE_ORM = (ENV["DEVISE_ORM"] || :active_record).to_sym
-$:.unshift File.dirname(__FILE__)
-puts "\n==> Devise.orm = #{DEVISE_ORM.inspect}"
-module Devise
-  # Detection for minor differences between Rails 3.2 and 4 in tests.
-  def self.rails4?
-    Rails.version.start_with? '4'
-  end
-end
-require "rails_app/config/environment"
-require "rails/test_help"
-require "orm/#{DEVISE_ORM}"
-I18n.load_path << File.expand_path("../support/locale/en.yml", __FILE__)
-require 'mocha/setup'
-require 'webrat'
-Webrat.configure do |config|
-  config.mode = :rails
-  config.open_error_files = false
-end
-# 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 }
-# For generators
-require "rails/generators/test_case"
-require "generators/devise/install_generator"
-require "generators/devise/views_generator"

data/test/test_helpers_test.rb DELETED Viewed

@@ -1,173 +0,0 @@
-require 'test_helper'
-class TestHelpersTest < ActionController::TestCase
-  tests UsersController
-  include Devise::TestHelpers
-  class CustomFailureApp < Devise::FailureApp
-    def redirect
-      self.status = 306
-    end
-  end
-  test "redirects if attempting to access a page unauthenticated" do
-    get :index
-    assert_redirected_to new_user_session_path
-    assert_equal "You need to sign in or sign up before continuing.", flash[:alert]
-  end
-  test "redirects if attempting to access a page with an unconfirmed account" do
-    swap Devise, :allow_unconfirmed_access_for => 0 do
-      user = create_user
-      assert !user.active_for_authentication?
-      sign_in user
-      get :index
-      assert_redirected_to new_user_session_path
-    end
-  end
-  test "returns nil if accessing current_user with an unconfirmed account" do
-    swap Devise, :allow_unconfirmed_access_for => 0 do
-      user = create_user
-      assert !user.active_for_authentication?
-      sign_in user
-      get :accept, :id => user
-      assert_nil assigns(:current_user)
-    end
-  end
-  test "does not redirect with valid user" do
-    user = create_user
-    user.confirm!
-    sign_in user
-    get :index
-    assert_response :success
-  end
-  test "does not redirect with valid user after failed first attempt" do
-    get :index
-    assert_response :redirect
-    user = create_user
-    user.confirm!
-    sign_in user
-    get :index
-    assert_response :success
-  end
-  test "redirects if valid user signed out" do
-    user = create_user
-    user.confirm!
-    sign_in user
-    get :index
-    sign_out user
-    get :index
-    assert_redirected_to new_user_session_path
-  end
-  test "respects custom failure app" do
-    begin
-      Devise.warden_config.failure_app = CustomFailureApp
-      get :index
-      assert_response 306
-    ensure
-      Devise.warden_config.failure_app = Devise::FailureApp
-    end
-  end
-  test "returns the body of a failure app" do
-    get :index
-    assert_equal response.body, "<html><body>You are being <a href=\"http://test.host/users/sign_in\">redirected</a>.</body></html>"
-  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 "before_failure call should work" do
-    begin
-      executed = false
-      Warden::Manager.before_failure do |env,opts|
-        executed = true
-      end
-      user = create_user
-      sign_in user
-      get :index
-      assert executed
-    ensure
-      Warden::Manager._before_failure.pop
-    end
-  end
-  test "allows to sign in with different users" do
-    first_user = create_user
-    first_user.confirm!
-    sign_in first_user
-    get :index
-    assert_match /User ##{first_user.id}/, @response.body
-    sign_out first_user
-    second_user = create_user
-    second_user.confirm!
-    sign_in second_user
-    get :index
-    assert_match /User ##{second_user.id}/, @response.body
-  end
-  test "passes  given headers from the failure app to the response" do
-    begin
-      old_failure_app = Devise.warden_config[:failure_app]
-      class CustomTestFailureApp < Devise::FailureApp
-        def respond
-          self.status = 401
-          self.response.headers["CUSTOMHEADER"] = 1
-        end
-      end
-      Devise.warden_config[:failure_app] = CustomTestFailureApp
-      user = create_user
-      sign_in user
-      get :index
-      assert_equal 1, @response.headers["CUSTOMHEADER"]
-    ensure
-      Devise.warden_config[:failure_app] = old_failure_app
-    end
-  end
-end

data/test/test_models.rb DELETED Viewed

@@ -1,26 +0,0 @@
-class Configurable < User
-  devise :database_authenticatable, :confirmable, :rememberable, :timeoutable, :lockable,
-         :stretches => 15, :pepper => 'abcdef', :allow_unconfirmed_access_for => 5.days,
-         :remember_for => 7.days, :timeout_in => 15.minutes, :unlock_in => 10.days
-end
-class WithValidation < Admin
-  devise :database_authenticatable, :validatable, :password_length => 2..6
-end
-class UserWithValidation < User
-  validates_presence_of :username
-end
-class UserWithVirtualAttributes < User
-  devise :case_insensitive_keys => [ :email, :email_confirmation ]
-  validates :email, :presence => true, :confirmation => {:on => :create}
-end
-class Several < Admin
-  devise :validatable
-  devise :lockable
-end
-class Inheritable < Admin
-end