devise 1.1.3 → 1.2.0

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/schema_test.rb

@@ -0,0 +1,33 @@
+if DEVISE_ORM == :mongoid
+
+  require 'test_helper'
+
+  class User2
+    include Mongoid::Document
+    devise :database_authenticatable
+  end
+
+  class User3
+    include Mongoid::Document
+    devise :database_authenticatable, :authentication_keys => [:username, :email]
+   end
+
+  class User4
+    include Mongoid::Document
+    devise :database_authenticatable, :authentication_keys => [:username]
+  end
+
+  class SchemaTest < ActiveSupport::TestCase
+    test 'should create an email field if there are no custom authentication keys' do
+      assert_not_equal User2.fields['email'], nil
+    end
+
+    test 'should create an email field if there are custom authentication keys and they include email' do
+      assert_not_equal User3.fields['email'], nil
+    end
+
+    test 'should not create an email field if there are custom authentication keys they don\'t include email' do
+      assert_equal User4.fields['email'], nil
+    end
+  end
+end

data/test/support/integration.rb

@@ -9,9 +9,9 @@ class ActionDispatch::IntegrationTest
     @user ||= begin
       user = User.create!(
         :username => 'usertest',
-        :email => 'user@test.com',
-        :password => '123456',
-        :password_confirmation => '123456',
+        :email => options[:email] || 'user@test.com',
+        :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/locale/en.yml

@@ -0,0 +1,4 @@
+en:
+  errors:
+    messages:
+      taken: "has already been taken"

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

@@ -1,32 +1,24 @@
-require 'webrat/core/elements/field'
+require 'webrat/core/elements/form'
 require 'action_dispatch/testing/integration'
 
 module Webrat
-  Field.class_eval do
-    def parse_rails_request_params(params)
+  Form.class_eval do
+    def self.parse_rails_request_params(params)
       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:
   IntegrationTest.class_eval do
     include Webrat::Methods
     include Webrat::Matchers
- 
-    # The Rails version of within supports passing in a model and Webrat
-    # will apply a scope based on Rails' dom_id for that model.
-    #
-    # Example:
-    #   within User.last do
-    #     click_link "Delete"
-    #   end
-    def within(selector_or_object, &block)
-      if selector_or_object.is_a?(String)
-        super
-      else
-        super('#' + RecordIdentifier.dom_id(selector_or_object), &block)
-      end
-    end
   end
-end
+end

data/test/test_helper.rb

@@ -9,8 +9,9 @@ require "rails/test_help"
 require "orm/#{DEVISE_ORM}"
 
 I18n.load_path << File.expand_path("../support/locale/en.yml", __FILE__)
-require 'mocha'
 
+require 'mocha'
+require 'webrat'
 Webrat.configure do |config|
   config.mode = :rails
   config.open_error_files = false
@@ -18,4 +19,9 @@ 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 }
+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

@@ -4,6 +4,12 @@ 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
@@ -13,7 +19,7 @@ class TestHelpersTest < ActionController::TestCase
   test "redirects if attempting to access a page with an unconfirmed account" do
     swap Devise, :confirm_within => 0 do
       user = create_user
-      assert !user.active?
+      assert !user.active_for_authentication?
 
       sign_in user
       get :index
@@ -24,7 +30,7 @@ class TestHelpersTest < ActionController::TestCase
   test "returns nil if accessing current_user with an unconfirmed account" do
     swap Devise, :confirm_within => 0 do
       user = create_user
-      assert !user.active?
+      assert !user.active_for_authentication?
 
       sign_in user
       get :accept, :id => user
@@ -52,6 +58,62 @@ class TestHelpersTest < ActionController::TestCase
     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 "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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 31
+  prerelease: 
   segments: 
   - 1
-  - 1
-  - 3
-  version: 1.1.3
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - "Jos\xC3\xA9 Valim"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 +02:00
+date: 2011-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,18 +27,34 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 57
+        hash: 17
         segments: 
+        - 1
         - 0
-        - 10
-        - 7
-        version: 0.10.7
+        - 3
+        version: 1.0.3
   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: 25
+        segments: 
+        - 0
+        - 0
+        - 3
+        version: 0.0.3
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bcrypt-ruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -50,28 +66,26 @@ 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: []
 
 extensions: []
 
-extra_rdoc_files: 
-- CHANGELOG.rdoc
-- Gemfile.lock
-- MIT-LICENSE
-- README.rdoc
-- TODO
+extra_rdoc_files: []
+
 files: 
+- .gitignore
+- .travis.yml
 - 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
@@ -90,14 +104,15 @@ files:
 - app/views/devise/shared/_links.erb
 - app/views/devise/unlocks/new.html.erb
 - config/locales/en.yml
+- devise.gemspec
 - lib/devise.rb
 - lib/devise/controllers/helpers.rb
 - lib/devise/controllers/internal_helpers.rb
+- lib/devise/controllers/rememberable.rb
 - lib/devise/controllers/scoped_views.rb
 - 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 +128,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 +139,9 @@ 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/url_helpers.rb
 - lib/devise/orm/active_record.rb
 - lib/devise/orm/mongoid.rb
 - lib/devise/path_checker.rb
@@ -142,8 +162,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,11 +171,18 @@ files:
 - test/devise_test.rb
 - test/encryptors_test.rb
 - test/failure_app_test.rb
+- test/generators/active_record_generator_test.rb
+- test/generators/devise_generator_test.rb
+- test/generators/install_generator_test.rb
+- test/generators/mongoid_generator_test.rb
+- test/generators/views_generator_test.rb
+- test/indifferent_hash.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
@@ -170,6 +195,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
@@ -178,24 +204,37 @@ 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/Rakefile
 - 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
 - test/rails_app/app/mongoid/shim.rb
 - test/rails_app/app/mongoid/user.rb
+- test/rails_app/app/views/admins/index.html.erb
+- test/rails_app/app/views/admins/sessions/new.html.erb
+- test/rails_app/app/views/home/index.html.erb
+- test/rails_app/app/views/home/private.html.erb
+- test/rails_app/app/views/layouts/application.html.erb
+- test/rails_app/app/views/users/index.html.erb
+- test/rails_app/app/views/users/mailer/confirmation_instructions.erb
+- test/rails_app/app/views/users/sessions/new.html.erb
+- test/rails_app/config.ru
 - test/rails_app/config/application.rb
 - test/rails_app/config/boot.rb
+- test/rails_app/config/database.yml
 - test/rails_app/config/environment.rb
 - test/rails_app/config/environments/development.rb
 - test/rails_app/config/environments/production.rb
@@ -207,11 +246,19 @@ 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/rails_app/public/404.html
+- test/rails_app/public/422.html
+- test/rails_app/public/500.html
+- test/rails_app/public/favicon.ico
+- test/rails_app/script/rails
 - test/routes_test.rb
+- test/schema_test.rb
 - test/support/assertions.rb
 - test/support/helpers.rb
 - test/support/integration.rb
-- test/support/test_silencer.rb
+- test/support/locale/en.yml
 - test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb
@@ -220,8 +267,8 @@ homepage: http://github.com/plataformatec/devise
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -244,8 +291,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.7
+rubyforge_project: devise
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Flexible authentication solution for Rails with Warden
@@ -256,11 +303,18 @@ test_files:
 - test/devise_test.rb
 - test/encryptors_test.rb
 - test/failure_app_test.rb
+- test/generators/active_record_generator_test.rb
+- test/generators/devise_generator_test.rb
+- test/generators/install_generator_test.rb
+- test/generators/mongoid_generator_test.rb
+- test/generators/views_generator_test.rb
+- test/indifferent_hash.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
@@ -273,6 +327,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
@@ -281,24 +336,37 @@ 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/Rakefile
 - 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
 - test/rails_app/app/mongoid/shim.rb
 - test/rails_app/app/mongoid/user.rb
+- test/rails_app/app/views/admins/index.html.erb
+- test/rails_app/app/views/admins/sessions/new.html.erb
+- test/rails_app/app/views/home/index.html.erb
+- test/rails_app/app/views/home/private.html.erb
+- test/rails_app/app/views/layouts/application.html.erb
+- test/rails_app/app/views/users/index.html.erb
+- test/rails_app/app/views/users/mailer/confirmation_instructions.erb
+- test/rails_app/app/views/users/sessions/new.html.erb
+- test/rails_app/config.ru
 - test/rails_app/config/application.rb
 - test/rails_app/config/boot.rb
+- test/rails_app/config/database.yml
 - test/rails_app/config/environment.rb
 - test/rails_app/config/environments/development.rb
 - test/rails_app/config/environments/production.rb
@@ -310,11 +378,19 @@ 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/rails_app/public/404.html
+- test/rails_app/public/422.html
+- test/rails_app/public/500.html
+- test/rails_app/public/favicon.ico
+- test/rails_app/script/rails
 - test/routes_test.rb
+- test/schema_test.rb
 - test/support/assertions.rb
 - test/support/helpers.rb
 - test/support/integration.rb
-- test/support/test_silencer.rb
+- test/support/locale/en.yml
 - test/support/webrat/integrations/rails.rb
 - test/test_helper.rb
 - test/test_helpers_test.rb

data/TODO

@@ -1,3 +0,0 @@
-* Move integration tests to Capybara
-* Better ORM integration
-* Extract activatable models tests from confirmable

data/lib/devise/encryptors/bcrypt.rb

@@ -1,19 +0,0 @@
-require "bcrypt"
-
-module Devise
-  module Encryptors
-    # = BCrypt
-    # Uses the BCrypt hash algorithm to encrypt passwords.
-    class Bcrypt < Base
-      # Gererates a default password digest based on stretches, salt, pepper and the
-      # incoming password. We don't strech it ourselves since BCrypt does so internally.
-      def self.digest(password, stretches, salt, pepper)
-        ::BCrypt::Engine.hash_secret([password, pepper].join, salt, stretches)
-      end
-
-      def self.salt(stretches)
-        ::BCrypt::Engine.generate_salt(stretches)
-      end
-    end
-  end
-end

data/lib/generators/devise_install_generator.rb

@@ -1,4 +0,0 @@
-# Remove this file after deprecation
-if caller.none? { |l| l =~ %r{lib/rails/generators\.rb:(\d+):in `lookup!'$} }
-  warn "[WARNING] `rails g devise_install` is deprecated, please use `rails g devise:install` instead."
-end

data/lib/generators/devise_views_generator.rb

@@ -1,4 +0,0 @@
-# Remove this file after deprecation
-if caller.none? { |l| l =~ %r{lib/rails/generators\.rb:(\d+):in `lookup!'$} }
-  warn "[WARNING] `rails g devise_views` is deprecated, please use `rails g devise:views` instead."
-end