Test with mongoid

.travis.yml

@@ -2,15 +2,13 @@ language: ruby
 
 rvm:
   - 2.1.10
-  - 2.2.8
-  - 2.3.5
-  - 2.4.2
-  - 2.5.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
   - ruby-head
 
 gemfile:
   - Gemfile
-  - gemfiles/Gemfile.rails-5.2-rc1
   - gemfiles/Gemfile.rails-5.0-stable
   - gemfiles/Gemfile.rails-4.2-stable
   - gemfiles/Gemfile.rails-4.1-stable
@@ -19,11 +17,7 @@ matrix:
   exclude:
     - rvm: 2.1.10
       gemfile: Gemfile
-    - rvm: 2.1.10
-      gemfile: gemfiles/Gemfile.rails-5.2-rc1
-    - rvm: 2.5.0
-      gemfile: gemfiles/Gemfile.rails-4.1-stable
-    - rvm: 2.4.2
+    - rvm: 2.4.1
       gemfile: gemfiles/Gemfile.rails-4.1-stable
     - rvm: ruby-head
       gemfile: gemfiles/Gemfile.rails-4.1-stable
@@ -31,12 +25,6 @@ matrix:
       gemfile: gemfiles/Gemfile.rails-5.0-stable
     - rvm: 2.1.10
       gemfile: Gemfile
-    - env: DEVISE_ORM=mongoid
-      gemfile: Gemfile
-    - env: DEVISE_ORM=mongoid
-      gemfile: gemfiles/Gemfile.rails-5.0-stable
-    - env: DEVISE_ORM=mongoid
-      gemfile: gemfiles/Gemfile.rails-5.2-rc1
   allow_failures:
     - rvm: ruby-head
 services:
@@ -51,9 +39,7 @@ env:
     - DEVISE_ORM=active_record
     - DEVISE_ORM=mongoid
 
-before_install:
-  - "rm ${BUNDLE_GEMFILE}.lock"
-  - gem update --system
+before_install: "rm ${BUNDLE_GEMFILE}.lock"
 
 before_script: "bundle update"
 

CHANGELOG.md

@@ -1,51 +1,4 @@
-### Unreleased
-
-### 4.4.3 - 2018-03-17
-
-* bug fixes
-  * Fix undefined method `rails5?` for Devise::Test:Module (by @tegon)
-  * Fix: secret key was being required to be set inside credentials on Rails 5.2 (by @tegon)
-
-### 4.4.2 - 2018-03-15
-
-* enhancements
-  * Support for :credentials on Rails v5.2.x. (by @gencer)
-  * Improve documentation about the test suite. (by @tegon)
-  * Test with Rails 5.2.rc1 on Travis. (by @jcoyne)
-  * Allow test with Rails 6. (by @Fudoshiki)
-  * Creating a new section for controller configuration on `devise.rb` template (by @Danilo-Araujo-Silva)
-
-* bug fixes
-  * Preserve content_type for unauthenticated tests (by @gmcnaughton)
-  * Check if the resource is persisted in `update_tracked_fields!` instead of performing validations (by @tegon)
-  * Revert "Replace log_process_action to append_info_to_payload" (by @tegon)
-
-### 4.4.1 - 2018-01-23
-
-* bug fixes
-  * Ensure Gemspec is loaded as utf-8. (by @segiddins)
-  * Fix `ActiveRecord` check on `Confirmable`. (by @tegon)
-  * Fix `signed_in?` docs without running auth hooks. by (@machty)
-
-### 4.4.0 - 2017-12-29
-
-* enhancements
-  * Add `frozen_string_literal` pragma comment to all Ruby files. (by @pat)
-  * Use `set_flash_method!` instead of `set_flash_method` in `Devise::OmniauthCallbacksController#failure`. (by @saichander17)
-  * Clarify how `store_location_for` modifies URIs. (by @olivierlacan)
-  * Move `failed_attempts` increment into its own function. by (@mobilutz)
-  * Add `autocomplete="email"` to email fields. by (@MikeRogers0)
-  * Add the ability to change the default migrations path introduced in Rails 5.0.3.  (by @alexhifer)
-  * Delete unnecessary condition for helper method. (by @davydovanton)
-  * Support `id: :uuid` option for migrations. (by @filip373)
-
-* bug fixes
-  * Fix syntax for MRI 2.5.0. (by @pat)
-  * Validations were being ignored on singup in the `Trackable#update_tracked_fields!` method. (by @AshleyFoster)
-  * Do not modify options for `#serializable_hash`. (by @guigs)
-  * Email confirmations were being sent on sign in/sign out for application using `mongoid` and `mongoid-paperclip` gems. This is because previously we were checking if a model is from Active Record by checking if the method `after_commit` was defined - since `mongoid` doesn' have one - but `mongoid-paperclip` gem does define one, which cause this issue. (by @fjg)
- 
-### 4.3.0 - 2017-05-14
+### 4.3.0 - unreleased
 
 * Enhancements
   * Dependency support added for Rails 5.1.x.

Gemfile

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 source "https://rubygems.org"
 
 gemspec
@@ -16,6 +14,9 @@ gem "rails-controller-testing"
 
 gem "responders", "~> 2.1"
 
+# TODO: Remove this line when Rails 5.1.1 is released
+gem "minitest", "< 5.10.2"
+
 group :test do
   gem "omniauth-facebook"
   gem "omniauth-openid"
@@ -33,7 +34,6 @@ platforms :ruby do
   gem "sqlite3"
 end
 
-# TODO:
-# group :mongoid do
-#   gem "mongoid", "~> 4.0.0"
-# end
+group :mongoid do
+  gem "mongoid"
+end

Gemfile.lock

@@ -10,10 +10,10 @@ GIT
 PATH
   remote: .
   specs:
-    devise (4.4.3)
+    devise (4.3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
+      railties (>= 4.1.0, < 5.2)
       responders
       warden (~> 1.2.3)
 
@@ -59,6 +59,7 @@ GEM
       tzinfo (~> 1.1)
     arel (8.0.0)
     bcrypt (3.1.11)
+    bson (4.2.1)
     builder (3.2.3)
     concurrent-ruby (1.0.5)
     erubi (1.6.0)
@@ -82,6 +83,11 @@ GEM
     minitest (5.10.1)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
+    mongo (2.4.1)
+      bson (>= 4.2.1, < 5.0.0)
+    mongoid (6.1.0)
+      activemodel (~> 5.0)
+      mongo (>= 2.4.1, < 3.0.0)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -176,7 +182,9 @@ DEPENDENCIES
   activerecord-jdbcsqlite3-adapter
   devise!
   jruby-openssl
+  minitest (< 5.10.2)
   mocha (~> 1.1)
+  mongoid
   oauth2
   omniauth (~> 1.3)
   omniauth-facebook
@@ -190,4 +198,4 @@ DEPENDENCIES
   webrat (= 0.7.3)
 
 BUNDLED WITH
-   1.16.1
+   1.14.6

ISSUE_TEMPLATE.md

@@ -1,19 +0,0 @@
-## Precheck
-
-- Do not use the issues tracker for help or support, try Stack Overflow.
-- For bugs, do a quick search and make sure the bug has not yet been reported
-- Finally, be nice and have fun!
-
-## Environment
-
-- Ruby **[version]**
-- Rails **[version]**
-- Devise **[version]**
-
-## Current behavior
-
-Include code samples, errors, steps to reproduce the error and stacktraces if appropriate.
-
-Will be even more helpful if you provide a sample application or a test case that reproduces the error.
-
-## Expected behavior

README.md

@@ -27,50 +27,6 @@ It's composed of 10 modules:
 * [Validatable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Validatable): provides validations of email and password. It's optional and can be customized, so you're able to define your own validations.
 * [Lockable](http://rubydoc.info/github/plataformatec/devise/master/Devise/Models/Lockable): locks an account after a specified number of failed sign-in attempts. Can unlock via email or after a specified time period.
 
-## Table of Contents
-
-<!-- TOC depthFrom:1 depthTo:6 withLinks:1 orderedList:0 -->
-
-- [Information](#information)
-	- [The Devise wiki](#the-devise-wiki)
-	- [Bug reports](#bug-reports)
-	- [StackOverflow and Mailing List](#stackoverflow-and-mailing-list)
-	- [RDocs](#rdocs)
-	- [Example applications](#example-applications)
-	- [Extensions](#extensions)
-	- [Contributing](#contributing)
-- [Starting with Rails?](#starting-with-rails)
-- [Getting started](#getting-started)
-	- [Controller filters and helpers](#controller-filters-and-helpers)
-	- [Configuring Models](#configuring-models)
-	- [Strong Parameters](#strong-parameters)
-	- [Configuring views](#configuring-views)
-	- [Configuring controllers](#configuring-controllers)
-	- [Configuring routes](#configuring-routes)
-	- [I18n](#i18n)
-	- [Test helpers](#test-helpers)
-	- [Controller tests](#controller-tests)
-	- [Integration tests](#integration-tests)
-	- [OmniAuth](#omniauth)
-	- [Configuring multiple models](#configuring-multiple-models)
-- [Create a migration with the required fields](#create-a-migration-with-the-required-fields)
-- [Inside your Admin model](#inside-your-admin-model)
-- [Inside your routes](#inside-your-routes)
-- [Inside your protected controller](#inside-your-protected-controller)
-- [Inside your controllers and views](#inside-your-controllers-and-views)
-	- [ActiveJob Integration](#activejob-integration)
-	- [Password reset tokens and Rails logs](#password-reset-tokens-and-rails-logs)
-	- [Other ORMs](#other-orms)
-- [Additional information](#additional-information)
-	- [Heroku](#heroku)
-	- [Warden](#warden)
-	- [Contributors](#contributors)
-- [License](#license)
-
-<!-- /TOC -->
-
-
-
 ## Information
 
 ### The Devise wiki
@@ -123,36 +79,7 @@ We hope that you will consider contributing to Devise. Please read this short ov
 
 https://github.com/plataformatec/devise/wiki/Contributing
 
-You will usually want to write tests for your changes.  To run the test suite, go into Devise's top-level directory and run `bundle install` and `bin/test`.
-Devise works with multiple Ruby and Rails versions, and ActiveRecord and Mongoid ORMs, which means you can run the test suite with some modifiers: `DEVISE_ORM` and `BUNDLE_GEMFILE`.
-
-### DEVISE_ORM
-Since Devise support both Mongoid and ActiveRecord, we rely on this variable to run specific code for each ORM.
-The default value of `DEVISE_ORM` is `active_record`. To run the tests for mongoid, you can pass `mongoid`:
-```
-DEVISE_ORM=mongoid bin/test
-
-==> Devise.orm = :mongoid
-```
-When running the tests for Mongoid, you will need to have a MongoDB server (version 2.0 or newer) running on your system.
-
-Please note that the command output will show the variable value being used.
-
-### BUNDLE_GEMFILE
-We can use this variable to tell bundler what Gemfile it should use (instead of the one in the current directory).
-Inside the [gemfiles](https://github.com/plataformatec/devise/tree/master/gemfiles) directory, we have one for each version of Rails we support. When you send us a pull request, it may happen that the test suite brakes on Travis using some of them. If that's the case, you can simulate the same environment using the `BUNDLE_GEMFILE` variable.
-For example, if the tests broke using Ruby 2.4.2 and Rails 4.1, you can do the following:
-```bash
-rbenv shell 2.4.2 # or rvm use 2.4.2
-BUNDLE_GEMFILE=gemfiles/Gemfile.rails-4.1-stable bundle install
-BUNDLE_GEMFILE=gemfiles/Gemfile.rails-4.1-stable bin/test
-```
-
-You can also combine both of them if the tests broke for Mongoid:
-```bash
-BUNDLE_GEMFILE=gemfiles/Gemfile.rails-4.1-stable bundle install
-BUNDLE_GEMFILE=gemfiles/Gemfile.rails-4.1-stable DEVISE_ORM=mongoid bin/test
-```
+You will usually want to write tests for your changes.  To run the test suite, go into Devise's top-level directory and run "bundle install" and "rake".  For the tests to pass, you will need to have a MongoDB server (version 2.0 or newer) running on your system.
 
 ## Starting with Rails?
 
@@ -199,7 +126,7 @@ Next, check the MODEL for any additional configuration options you might want to
 
 Then run `rails db:migrate`
 
-You should restart your application after changing Devise's configuration options (this includes stopping spring). Otherwise, you will run into strange errors, for example, users being unable to login and route helpers being undefined.
+You should restart your application after changing Devise's configuration options. Otherwise, you will run into strange errors, for example, users being unable to login and route helpers being undefined.
 
 ### Controller filters and helpers
 
@@ -289,21 +216,7 @@ class ApplicationController < ActionController::Base
 end
 ```
 
-The above works for any additional fields where the parameters are simple scalar types. If you have nested attributes (say you're using `accepts_nested_attributes_for`), then you will need to tell devise about those nestings and types:
-
-```ruby
-class ApplicationController < ActionController::Base
-  before_action :configure_permitted_parameters, if: :devise_controller?
-
-  protected
-
-  def configure_permitted_parameters
-    devise_parameter_sanitizer.permit(:sign_up, keys: [:first_name, :last_name, address_attributes: [:country, :state, :city, :area, :postal_code]])
-  end
-end
-```
-
-Devise allows you to completely change Devise defaults or invoke custom behaviour by passing a block:
+The above works for any additional fields where the parameters are simple scalar types. If you have nested attributes (say you're using `accepts_nested_attributes_for`), then you will need to tell devise about those nestings and types. Devise allows you to completely change Devise defaults or invoke custom behaviour by passing a block:
 
 To permit simple scalar values for username and email, use this
 
@@ -461,12 +374,6 @@ end
 
 This way, you tell Devise to use the scope `:user` when "/sign_in" is accessed. Notice `devise_scope` is also aliased as `as` in your router.
 
-Please note: You will still need to add `devise_for` in your routes in order to use helper methods such as `current_user`.
-
-```ruby
-devise_for :users, skip: :all
-```
-
 ### I18n
 
 Devise uses flash messages with I18n, in conjunction with the flash keys :notice and :alert. To customize your app, you can set up your locale file:
@@ -703,6 +610,6 @@ https://github.com/plataformatec/devise/graphs/contributors
 
 ## License
 
-MIT License. Copyright 2009-2018 Plataformatec. http://plataformatec.com.br
+MIT License. Copyright 2009-2017 Plataformatec. http://plataformatec.com.br
 
 You are not granted rights or licenses to the trademarks of Plataformatec, including without limitation the Devise name or logo.

Rakefile

@@ -1,5 +1,4 @@
 # encoding: UTF-8
-# frozen_string_literal: true
 
 require 'bundler/gem_tasks'
 require 'rake/testtask'

app/controllers/devise/confirmations_controller.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class Devise::ConfirmationsController < DeviseController
   # GET /resource/confirmation/new
   def new

app/controllers/devise/omniauth_callbacks_controller.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class Devise::OmniauthCallbacksController < DeviseController
   prepend_before_action { request.env["devise.skip_timeout"] = true }
 
@@ -8,7 +6,7 @@ class Devise::OmniauthCallbacksController < DeviseController
   end
 
   def failure
-    set_flash_message! :alert, :failure, kind: OmniAuth::Utils.camelize(failed_strategy.name), reason: failure_message
+    set_flash_message :alert, :failure, kind: OmniAuth::Utils.camelize(failed_strategy.name), reason: failure_message
     redirect_to after_omniauth_failure_path_for(resource_name)
   end
 

app/controllers/devise/passwords_controller.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class Devise::PasswordsController < DeviseController
   prepend_before_action :require_no_authentication
   # Render the #edit only if coming from a reset password email link

app/controllers/devise/registrations_controller.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class Devise::RegistrationsController < DeviseController
   prepend_before_action :require_no_authentication, only: [:new, :create, :cancel]
   prepend_before_action :authenticate_scope!, only: [:edit, :update, :destroy]
@@ -7,7 +5,7 @@ class Devise::RegistrationsController < DeviseController
 
   # GET /resource/sign_up
   def new
-    build_resource
+    build_resource({})
     yield resource if block_given?
     respond_with resource
   end
@@ -99,8 +97,8 @@ class Devise::RegistrationsController < DeviseController
 
   # Build a devise resource passing in the session. Useful to move
   # temporary session data to the newly created user.
-  def build_resource(hash = {})
-    self.resource = resource_class.new_with_session(hash, session)
+  def build_resource(hash=nil)
+    self.resource = resource_class.new_with_session(hash || {}, session)
   end
 
   # Signs in a user on sign up. You can overwrite this method in your own

app/controllers/devise/sessions_controller.rb

@@ -1,10 +1,8 @@
-# frozen_string_literal: true
-
 class Devise::SessionsController < DeviseController
   prepend_before_action :require_no_authentication, only: [:new, :create]
   prepend_before_action :allow_params_authentication!, only: :create
   prepend_before_action :verify_signed_out_user, only: :destroy
-  prepend_before_action(only: [:create, :destroy]) { request.env["devise.skip_timeout"] = true }
+  prepend_before_action only: [:create, :destroy] { request.env["devise.skip_timeout"] = true }
 
   # GET /resource/sign_in
   def new

app/controllers/devise/unlocks_controller.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class Devise::UnlocksController < DeviseController
   prepend_before_action :require_no_authentication
 

app/controllers/devise_controller.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # All Devise controllers are inherited from here.
 class DeviseController < Devise.parent_controller.constantize
   include Devise::Controllers::ScopedViews

app/helpers/devise_helper.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module DeviseHelper
   # A simple way to show error messages for the current devise resource. If you need
   # to customize this method, you can either overwrite it in your application helpers or

app/mailers/devise/mailer.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 if defined?(ActionMailer)
   class Devise::Mailer < Devise.parent_mailer.constantize
     include Devise::Mailers::Helpers

app/views/devise/confirmations/new.html.erb

@@ -5,7 +5,7 @@
 
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email", value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
+    <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.email) %>
   </div>
 
   <div class="actions">

app/views/devise/passwords/new.html.erb

@@ -5,7 +5,7 @@
 
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    <%= f.email_field :email, autofocus: true %>
   </div>
 
   <div class="actions">

app/views/devise/registrations/edit.html.erb

@@ -5,7 +5,7 @@
 
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    <%= f.email_field :email, autofocus: true %>
   </div>
 
   <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>

app/views/devise/registrations/new.html.erb

@@ -5,7 +5,7 @@
 
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    <%= f.email_field :email, autofocus: true %>
   </div>
 
   <div class="field">

app/views/devise/sessions/new.html.erb

@@ -3,7 +3,7 @@
 <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    <%= f.email_field :email, autofocus: true %>
   </div>
 
   <div class="field">

app/views/devise/unlocks/new.html.erb

@@ -5,7 +5,7 @@
 
   <div class="field">
     <%= f.label :email %><br />
-    <%= f.email_field :email, autofocus: true, autocomplete: "email" %>
+    <%= f.email_field :email, autofocus: true %>
   </div>
 
   <div class="actions">

devise.gemspec

@@ -1,6 +1,4 @@
 # -*- encoding: utf-8 -*-
-# frozen_string_literal: true
-
 $:.push File.expand_path("../lib", __FILE__)
 require "devise/version"
 
@@ -23,6 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency("warden", "~> 1.2.3")
   s.add_dependency("orm_adapter", "~> 0.1")
   s.add_dependency("bcrypt", "~> 3.0")
-  s.add_dependency("railties", ">= 4.1.0", "< 6.0")
+  s.add_dependency("railties", ">= 4.1.0", "< 5.2")
   s.add_dependency("responders")
 end

gemfiles/Gemfile.rails-4.1-stable

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 source "https://rubygems.org"
 
 gemspec path: ".."
@@ -7,7 +5,7 @@ gemspec path: ".."
 gem "rails", github: "rails/rails", branch: "4-1-stable"
 gem "omniauth"
 gem "omniauth-oauth2"
-gem "rdoc", "~> 5.1"
+gem "rdoc"
 
 group :test do
   gem "omniauth-facebook"

gemfiles/Gemfile.rails-4.1-stable.lock

@@ -21,10 +21,10 @@ GIT
 PATH
   remote: ..
   specs:
-    devise (4.4.3)
+    devise (4.3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
+      railties (>= 4.1.0, < 5.2)
       responders
       warden (~> 1.2.3)
 
@@ -162,10 +162,10 @@ DEPENDENCIES
   omniauth-oauth2
   omniauth-openid
   rails!
-  rdoc (~> 5.1)
+  rdoc
   sqlite3
   test_after_commit
   webrat (= 0.7.3)
 
 BUNDLED WITH
-   1.16.1
+   1.14.6

gemfiles/Gemfile.rails-4.2-stable

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 source "https://rubygems.org"
 
 gemspec path: ".."
@@ -7,7 +5,7 @@ gemspec path: ".."
 gem "rails", github: "rails/rails", branch: "4-2-stable"
 gem "omniauth"
 gem "omniauth-oauth2"
-gem "rdoc", "~> 5.1"
+gem "rdoc"
 
 group :test do
   gem "omniauth-facebook"

gemfiles/Gemfile.rails-4.2-stable.lock

@@ -57,10 +57,10 @@ GIT
 PATH
   remote: ..
   specs:
-    devise (4.4.3)
+    devise (4.3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
+      railties (>= 4.1.0, < 5.2)
       responders
       warden (~> 1.2.3)
 
@@ -183,10 +183,10 @@ DEPENDENCIES
   omniauth-oauth2
   omniauth-openid
   rails!
-  rdoc (~> 5.1)
+  rdoc
   sqlite3
   test_after_commit
   webrat (= 0.7.3)
 
 BUNDLED WITH
-   1.16.1
+   1.14.6

gemfiles/Gemfile.rails-5.0-stable

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 source "https://rubygems.org"
 
 gemspec path: ".."
@@ -15,6 +13,9 @@ gem "rails-controller-testing"
 
 gem "responders", "~> 2.1"
 
+# TODO: Remove this line when Rails 5.0.3 is released
+gem "minitest", "< 5.10.2"
+
 group :test do
   gem "omniauth-facebook"
   gem "omniauth-openid"
@@ -27,7 +28,6 @@ platforms :ruby do
   gem "sqlite3"
 end
 
-# TODO:
-# group :mongoid do
-#   gem "mongoid", "~> 4.0.0"
-# end
+group :mongoid do
+  gem "mongoid"
+end

gemfiles/Gemfile.rails-5.0-stable.lock

@@ -10,10 +10,10 @@ GIT
 PATH
   remote: ..
   specs:
-    devise (4.4.3)
+    devise (4.3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
+      railties (>= 4.1.0, < 5.2)
       responders
       warden (~> 1.2.3)
 
@@ -59,6 +59,7 @@ GEM
       tzinfo (~> 1.1)
     arel (7.1.4)
     bcrypt (3.1.11)
+    bson (4.2.1)
     builder (3.2.3)
     concurrent-ruby (1.0.5)
     erubis (2.7.0)
@@ -82,6 +83,11 @@ GEM
     minitest (5.10.1)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
+    mongo (2.4.1)
+      bson (>= 4.2.1, < 5.0.0)
+    mongoid (6.1.0)
+      activemodel (~> 5.0)
+      mongo (>= 2.4.1, < 3.0.0)
     multi_json (1.12.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
@@ -175,7 +181,9 @@ PLATFORMS
 DEPENDENCIES
   activemodel-serializers-xml!
   devise!
+  minitest (< 5.10.2)
   mocha (~> 1.1)
+  mongoid
   omniauth
   omniauth-facebook
   omniauth-oauth2
@@ -189,4 +197,4 @@ DEPENDENCIES
   webrat (= 0.7.3)
 
 BUNDLED WITH
-   1.16.1
+   1.14.6

gemfiles/Gemfile.rails-5.2-rc1

@@ -1,26 +0,0 @@
-source "https://rubygems.org"
-
-gemspec path: ".."
-
-gem "rails", '~> 5.2.0.rc1'
-gem "omniauth"
-gem "omniauth-oauth2"
-gem "rdoc"
-
-gem "activemodel-serializers-xml", github: "rails/activemodel-serializers-xml"
-
-gem "rails-controller-testing"
-
-gem "responders", "~> 2.1"
-
-group :test do
-  gem "omniauth-facebook"
-  gem "omniauth-openid"
-  gem "webrat", "0.7.3", require: false
-  gem "mocha", "~> 1.1", require: false
-  gem 'test_after_commit', require: false
-end
-
-platforms :ruby do
-  gem "sqlite3"
-end

gemfiles/Gemfile.rails-5.2-rc1.lock

@@ -1,201 +0,0 @@
-GIT
-  remote: git://github.com/rails/activemodel-serializers-xml.git
-  revision: 356edf4dfc38fb1fbfee90c87856e4fe5b73c5e1
-  specs:
-    activemodel-serializers-xml (1.0.2)
-      activemodel (> 5.x)
-      activesupport (> 5.x)
-      builder (~> 3.1)
-
-PATH
-  remote: ..
-  specs:
-    devise (4.4.3)
-      bcrypt (~> 3.0)
-      orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
-      responders
-      warden (~> 1.2.3)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.2.0.rc1)
-      actionpack (= 5.2.0.rc1)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.0.rc1)
-      actionpack (= 5.2.0.rc1)
-      actionview (= 5.2.0.rc1)
-      activejob (= 5.2.0.rc1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.0.rc1)
-      actionview (= 5.2.0.rc1)
-      activesupport (= 5.2.0.rc1)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0.rc1)
-      activesupport (= 5.2.0.rc1)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.0.rc1)
-      activesupport (= 5.2.0.rc1)
-      globalid (>= 0.3.6)
-    activemodel (5.2.0.rc1)
-      activesupport (= 5.2.0.rc1)
-    activerecord (5.2.0.rc1)
-      activemodel (= 5.2.0.rc1)
-      activesupport (= 5.2.0.rc1)
-      arel (>= 9.0)
-    activestorage (5.2.0.rc1)
-      actionpack (= 5.2.0.rc1)
-      activerecord (= 5.2.0.rc1)
-      marcel (~> 0.3.1)
-    activesupport (5.2.0.rc1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    bcrypt (3.1.11)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
-    crass (1.0.3)
-    erubi (1.7.0)
-    faraday (0.12.2)
-      multipart-post (>= 1.2, < 3)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    hashie (3.5.7)
-    i18n (0.9.3)
-      concurrent-ruby (~> 1.0)
-    jwt (1.5.6)
-    loofah (2.1.1)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.0)
-      mini_mime (>= 0.1.1)
-    marcel (0.3.1)
-      mimemagic (~> 0.3.2)
-    metaclass (0.0.4)
-    method_source (0.9.0)
-    mimemagic (0.3.2)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    mocha (1.3.0)
-      metaclass (~> 0.0.1)
-    multi_json (1.13.1)
-    multi_xml (0.6.0)
-    multipart-post (2.0.0)
-    nio4r (2.2.0)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (>= 1.2, < 3)
-    omniauth (1.8.1)
-      hashie (>= 3.4.6, < 3.6.0)
-      rack (>= 1.6.2, < 3)
-    omniauth-facebook (4.0.0)
-      omniauth-oauth2 (~> 1.2)
-    omniauth-oauth2 (1.5.0)
-      oauth2 (~> 1.1)
-      omniauth (~> 1.2)
-    omniauth-openid (1.0.1)
-      omniauth (~> 1.0)
-      rack-openid (~> 1.3.1)
-    orm_adapter (0.5.0)
-    rack (2.0.4)
-    rack-openid (1.3.1)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
-    rack-test (0.8.2)
-      rack (>= 1.0, < 3)
-    rails (5.2.0.rc1)
-      actioncable (= 5.2.0.rc1)
-      actionmailer (= 5.2.0.rc1)
-      actionpack (= 5.2.0.rc1)
-      actionview (= 5.2.0.rc1)
-      activejob (= 5.2.0.rc1)
-      activemodel (= 5.2.0.rc1)
-      activerecord (= 5.2.0.rc1)
-      activestorage (= 5.2.0.rc1)
-      activesupport (= 5.2.0.rc1)
-      bundler (>= 1.3.0)
-      railties (= 5.2.0.rc1)
-      sprockets-rails (>= 2.0.0)
-    rails-controller-testing (1.0.2)
-      actionpack (~> 5.x, >= 5.0.1)
-      actionview (~> 5.x, >= 5.0.1)
-      activesupport (~> 5.x)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.2.0.rc1)
-      actionpack (= 5.2.0.rc1)
-      activesupport (= 5.2.0.rc1)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.3.0)
-    rdoc (6.0.1)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
-    ruby-openid (2.7.0)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    test_after_commit (1.1.0)
-      activerecord (>= 3.2)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    warden (1.2.7)
-      rack (>= 1.0)
-    webrat (0.7.3)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
-    websocket-driver (0.7.0)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activemodel-serializers-xml!
-  devise!
-  mocha (~> 1.1)
-  omniauth
-  omniauth-facebook
-  omniauth-oauth2
-  omniauth-openid
-  rails (~> 5.2.0.rc1)
-  rails-controller-testing
-  rdoc
-  responders (~> 2.1)
-  sqlite3
-  test_after_commit
-  webrat (= 0.7.3)
-
-BUNDLED WITH
-   1.16.1

guides/bug_report_templates/integration_test.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 begin
   require 'bundler/inline'
 rescue LoadError => e

lib/devise.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'rails'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/dependencies'
@@ -18,7 +16,6 @@ module Devise
   autoload :TestHelpers,        'devise/test_helpers'
   autoload :TimeInflector,      'devise/time_inflector'
   autoload :TokenGenerator,     'devise/token_generator'
-  autoload :SecretKeyFinder,    'devise/secret_key_finder'
 
   module Controllers
     autoload :Helpers,        'devise/controllers/helpers'
@@ -152,7 +149,7 @@ module Devise
   mattr_accessor :timeout_in
   @@timeout_in = 30.minutes
 
-  # Used to hash the password. Please generate one with rails secret.
+  # Used to hash the password. Please generate one with rake secret.
   mattr_accessor :pepper
   @@pepper = nil
 

lib/devise/controllers/helpers.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module Controllers
     # Those helpers are convenience methods added to ApplicationController.

lib/devise/controllers/rememberable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module Controllers
     # A module that may be optionally included in a controller in order

lib/devise/controllers/scoped_views.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module Controllers
     module ScopedViews

lib/devise/controllers/sign_in_out.rb

@@ -1,15 +1,10 @@
-# frozen_string_literal: true
-
 module Devise
   module Controllers
     # Provide sign in and sign out functionality.
     # Included by default in all controllers.
     module SignInOut
       # Return true if the given scope is signed in session. If no scope given, return
-      # true if any scope is signed in. This will run authentication hooks, which may
-      # cause exceptions to be thrown from this method; if you simply want to check
-      # if a scope has already previously been authenticated without running
-      # authentication hooks, you can directly call `warden.authenticated?(scope: scope)`
+      # true if any scope is signed in. Does not run authentication hooks.
       def signed_in?(scope=nil)
         [scope || Devise.mappings.keys].flatten.any? do |_scope|
           warden.authenticate?(scope: _scope)

lib/devise/controllers/store_location.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "uri"
 
 module Devise
@@ -35,9 +33,12 @@ module Devise
       #
       def store_location_for(resource_or_scope, location)
         session_key = stored_location_key_for(resource_or_scope)
-        
-        path = extract_path_from_location(location)
-        session[session_key] = path if path
+        uri = parse_uri(location)
+        if uri
+          path = [uri.path.sub(/\A\/+/, '/'), uri.query].compact.join('?')
+          path = [path, uri.fragment].compact.join('#')
+          session[session_key] = path
+        end
       end
 
       private
@@ -52,25 +53,6 @@ module Devise
         scope = Devise::Mapping.find_scope!(resource_or_scope)
         "#{scope}_return_to"
       end
-
-      def extract_path_from_location(location)
-        uri = parse_uri(location)
-
-        if uri 
-          path = remove_domain_from_uri(uri)
-          path = add_fragment_back_to_path(uri, path)
-
-          path
-        end
-      end
-
-      def remove_domain_from_uri(uri)
-        [uri.path.sub(/\A\/+/, '/'), uri.query].compact.join('?')
-      end
-
-      def add_fragment_back_to_path(uri, path)
-        [path, uri.fragment].compact.join('#')
-      end
     end
   end
 end

lib/devise/controllers/url_helpers.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module Controllers
     # Create url helpers to be used with resource/scope configuration. Acts as

lib/devise/delegator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   # Checks the scope in the given environment and returns the associated failure app.
   class Delegator

lib/devise/encryptor.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'bcrypt'
 
 module Devise

lib/devise/failure_app.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "action_controller/metal"
 
 module Devise

lib/devise/hooks/activatable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # Deny user access whenever their account is not active yet.
 # We need this as hook to validate the user activity on each request
 # and in case the user is using other strategies beside Devise ones.

lib/devise/hooks/csrf_cleaner.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 Warden::Manager.after_authentication do |record, warden, options|
   clean_up_for_winning_strategy = !warden.winning_strategy.respond_to?(:clean_up_csrf?) ||
     warden.winning_strategy.clean_up_csrf?

lib/devise/hooks/forgetable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # Before logout hook to forget the user in the given scope, if it responds
 # to forget_me! Also clear remember token to ensure the user won't be
 # remembered again. Notice that we forget the user unless the record is not persisted.

lib/devise/hooks/lockable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # After each sign in, if resource responds to failed_attempts, sets it to 0
 # This is only triggered when the user is explicitly set (with set_user)
 Warden::Manager.after_set_user except: :fetch do |record, warden, options|

lib/devise/hooks/proxy.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module Hooks
     # A small warden proxy so we can remember, forget and

lib/devise/hooks/rememberable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 Warden::Manager.after_set_user except: :fetch do |record, warden, options|
   scope = options[:scope]
   if record.respond_to?(:remember_me) && options[:store] != false &&

lib/devise/hooks/timeoutable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # Each time a record is set we check whether its session has already timed out
 # or not, based on last request time. If so, the record is logged out and
 # redirected to the sign in page. Also, each time the request comes and the

lib/devise/hooks/trackable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # After each sign in, update sign in time, sign in count and sign in IP.
 # This is only triggered when the user is explicitly set (with set_user)
 # and on authentication. Retrieving the user from session (:fetch) does

lib/devise/mailers/helpers.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module Mailers
     module Helpers

lib/devise/mapping.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   # Responsible for handling devise mappings and routes configuration. Each
   # resource configured by devise_for in routes is actually creating a mapping

lib/devise/models.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module Models
     class MissingAttribute < StandardError

lib/devise/models/authenticatable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'active_model/version'
 require 'devise/hooks/activatable'
 require 'devise/hooks/csrf_cleaner'
@@ -104,7 +102,7 @@ module Devise
       # and passing a new list of attributes you want to exempt. All attributes
       # given to :except will simply add names to exempt to Devise internal list.
       def serializable_hash(options = nil)
-        options = options.try(:dup) || {}
+        options ||= {}
         options[:except] = Array(options[:except])
 
         if options[:force_except]
@@ -258,7 +256,7 @@ module Devise
         #   end
         #
         # Finally, notice that Devise also queries for users in other scenarios
-        # besides authentication, for example when retrieving a user to send
+        # besides authentication, for example when retrieving an user to send
         # an e-mail for password reset. In such cases, find_for_authentication
         # is not called.
         def find_for_authentication(tainted_conditions)

lib/devise/models/confirmable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module Models
     # Confirmable is responsible to verify if an account is already confirmed to
@@ -48,7 +46,7 @@ module Devise
       included do
         before_create :generate_confirmation_token, if: :confirmation_required?
         after_create :skip_reconfirmation_in_callback!, if: :send_confirmation_notification?
-        if defined?(ActiveRecord) && self < ActiveRecord::Base # ActiveRecord
+        if respond_to?(:after_commit) # ActiveRecord
           after_commit :send_on_create_confirmation_instructions, on: :create, if: :send_confirmation_notification?
           after_commit :send_reconfirmation_instructions, on: :update, if: :reconfirmation_required?
         else # Mongoid

lib/devise/models/database_authenticatable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/database_authenticatable'
 
 module Devise
@@ -12,7 +10,7 @@ module Devise
     # DatabaseAuthenticatable adds the following options to devise_for:
     #
     #   * +pepper+: a random string used to provide a more secure hash. Use
-    #     `rails secret` to generate new keys.
+    #     `rake secret` to generate new keys.
     #
     #   * +stretches+: the cost given to bcrypt.
     #

lib/devise/models/lockable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "devise/hooks/lockable"
 
 module Devise
@@ -101,7 +99,8 @@ module Devise
         if super && !access_locked?
           true
         else
-          increment_failed_attempts
+          self.failed_attempts ||= 0
+          self.failed_attempts += 1
           if attempts_exceeded?
             lock_access! unless access_locked?
           else
@@ -110,11 +109,6 @@ module Devise
           false
         end
       end
-      
-      def increment_failed_attempts
-        self.failed_attempts ||= 0
-        self.failed_attempts += 1
-      end
 
       def unauthenticated_message
         # If set to paranoid mode, do not show the locked message because it

lib/devise/models/omniauthable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/omniauth'
 
 module Devise

lib/devise/models/recoverable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module Models
 

lib/devise/models/registerable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module Models
     # Registerable is responsible for everything related to registering a new

lib/devise/models/rememberable.rb

@@ -1,12 +1,10 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/rememberable'
 require 'devise/hooks/rememberable'
 require 'devise/hooks/forgetable'
 
 module Devise
   module Models
-    # Rememberable manages generating and clearing token for remembering the user
+    # Rememberable manages generating and clearing token for remember the user
     # from a saved cookie. Rememberable also has utility methods for dealing
     # with serializing the user into the cookie and back from the cookie, trying
     # to lookup the record based on the saved information.

lib/devise/models/timeoutable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/hooks/timeoutable'
 
 module Devise

lib/devise/models/trackable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/hooks/trackable'
 
 module Devise
@@ -31,11 +29,6 @@ module Devise
       end
 
       def update_tracked_fields!(request)
-        # We have to check if the user is already persisted before running
-        # `save` here because invalid users can be saved if we don't.
-        # See https://github.com/plataformatec/devise/issues/4673 for more details.
-        return if new_record?
-
         update_tracked_fields(request)
         save(validate: false)
       end

lib/devise/models/validatable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module Models
     # Validatable creates all needed validations for a user email and password.
@@ -12,7 +10,7 @@ module Devise
     # Validatable adds the following options to devise_for:
     #
     #   * +email_regexp+: the regular expression used to validate e-mails;
-    #   * +password_length+: a range expressing password length. Defaults to 6..128.
+    #   * +password_length+: a range expressing password length. Defaults to 8..72.
     #
     module Validatable
       # All validations used by this module.

lib/devise/modules.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'active_support/core_ext/object/with_options'
 
 Devise.with_options model: true do |d|

lib/devise/omniauth.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 begin
   require "omniauth"
   require "omniauth/version"

lib/devise/omniauth/config.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module OmniAuth
     class StrategyNotFound < NameError

lib/devise/omniauth/url_helpers.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module OmniAuth
     module UrlHelpers

lib/devise/orm/active_record.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'orm_adapter/adapters/active_record'
 
 ActiveSupport.on_load(:active_record) do

lib/devise/orm/mongoid.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 ActiveSupport.on_load(:mongoid) do
   require 'orm_adapter/adapters/mongoid'
 

lib/devise/parameter_filter.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   class ParameterFilter
     def initialize(case_insensitive_keys, strip_whitespace_keys)

lib/devise/parameter_sanitizer.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   # The +ParameterSanitizer+ deals with permitting specific parameters values
   # for each +Devise+ scope in the application.

lib/devise/rails.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/rails/routes'
 require 'devise/rails/warden_compat'
 
@@ -34,7 +32,11 @@ module Devise
     end
 
     initializer "devise.secret_key" do |app|
-      Devise.secret_key ||= Devise::SecretKeyFinder.new(app).find
+      if app.respond_to?(:secrets)
+        Devise.secret_key ||= app.secrets.secret_key_base
+      elsif app.config.respond_to?(:secret_key_base)
+        Devise.secret_key ||= app.config.secret_key_base
+      end
 
       Devise.token_generator ||=
         if secret_key = Devise.secret_key

lib/devise/rails/routes.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "active_support/core_ext/object/try"
 require "active_support/core_ext/hash/slice"
 

lib/devise/rails/warden_compat.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Warden::Mixins::Common
   def request
     @request ||= ActionDispatch::Request.new(env)

lib/devise/secret_key_finder.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Devise
-  class SecretKeyFinder
-    def initialize(application)
-      @application = application
-    end
-
-    def find
-      if @application.respond_to?(:credentials) && key_exists?(@application.credentials)
-        @application.credentials.secret_key_base
-      elsif @application.respond_to?(:secrets) && key_exists?(@application.secrets)
-        @application.secrets.secret_key_base
-      elsif @application.config.respond_to?(:secret_key_base) && key_exists?(@application.config)
-        @application.config.secret_key_base
-      end
-    end
-
-    private
-
-    def key_exists?(object)
-      object.secret_key_base.present?
-    end
-  end
-end

lib/devise/strategies/authenticatable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/base'
 
 module Devise

lib/devise/strategies/base.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module Strategies
     # Base strategy for Devise. Responsible for verifying correct scope and mapping.

lib/devise/strategies/database_authenticatable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/authenticatable'
 
 module Devise

lib/devise/strategies/rememberable.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'devise/strategies/authenticatable'
 
 module Devise

lib/devise/test/controller_helpers.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module Test
     # `Devise::Test::ControllerHelpers` provides a facility to test controllers
@@ -139,7 +137,6 @@ module Devise
 
           status, headers, response = Devise.warden_config[:failure_app].call(env).to_a
           @controller.response.headers.merge!(headers)
-          @controller.response.content_type = headers["Content-Type"] unless Rails.version.start_with?('5')
           @controller.status = status
           @controller.response.body = response.body
           nil # causes process return @response

lib/devise/test/integration_helpers.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   # Devise::Test::IntegrationHelpers is a helper module for facilitating
   # authentication on Rails integration tests to bypass the required steps for

lib/devise/test_helpers.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module TestHelpers
     def self.included(base)

lib/devise/time_inflector.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require "active_support/core_ext/module/delegation"
 
 module Devise

lib/devise/token_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'openssl'
 
 module Devise

lib/devise/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
-  VERSION = "4.4.3".freeze
+  VERSION = "4.3.0".freeze
 end

lib/generators/active_record/devise_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'rails/generators/active_record'
 require 'generators/devise/orm_helpers'
 
@@ -8,16 +6,14 @@ module ActiveRecord
     class DeviseGenerator < ActiveRecord::Generators::Base
       argument :attributes, type: :array, default: [], banner: "field:type field:type"
 
-      class_option :primary_key_type, type: :string, desc: "The type for primary key"
-
       include Devise::Generators::OrmHelpers
       source_root File.expand_path("../templates", __FILE__)
 
       def copy_devise_migration
         if (behavior == :invoke && model_exists?) || (behavior == :revoke && migration_exists?(table_name))
-          migration_template "migration_existing.rb", "#{migration_path}/add_devise_to_#{table_name}.rb", migration_version: migration_version
+          migration_template "migration_existing.rb", "db/migrate/add_devise_to_#{table_name}.rb", migration_version: migration_version
         else
-          migration_template "migration.rb", "#{migration_path}/devise_create_#{table_name}.rb", migration_version: migration_version
+          migration_template "migration.rb", "db/migrate/devise_create_#{table_name}.rb", migration_version: migration_version
         end
       end
 
@@ -96,15 +92,6 @@ RUBY
          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
        end
      end
-
-     def primary_key_type
-       primary_key_string if rails5?
-     end
-
-     def primary_key_string
-       key_string = options[:primary_key_type]
-       ", id: :#{key_string}" if key_string
-     end
     end
   end
 end

lib/generators/active_record/templates/migration.rb

@@ -1,8 +1,6 @@
-# frozen_string_literal: true
-
 class DeviseCreate<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :<%= table_name %><%= primary_key_type %> do |t|
+    create_table :<%= table_name %> do |t|
 <%= migration_data -%>
 
 <% attributes.each do |attribute| -%>

lib/generators/active_record/templates/migration_existing.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddDeviseTo<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
   def self.up
     change_table :<%= table_name %> do |t|

lib/generators/devise/controllers_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'rails/generators/base'
 
 module Devise

lib/generators/devise/devise_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'rails/generators/named_base'
 
 module Devise
@@ -10,7 +8,7 @@ module Devise
       namespace "devise"
       source_root File.expand_path("../templates", __FILE__)
 
-      desc "Generates a model with the given NAME (if one does not exist) with devise " \
+      desc "Generates a model with the given NAME (if one does not exist) with devise " <<
            "configuration plus a migration file and devise routes."
 
       hook_for :orm
@@ -18,7 +16,7 @@ module Devise
       class_option :routes, desc: "Generate routes", type: :boolean, default: true
 
       def add_devise_routes
-        devise_route  = "devise_for :#{plural_name}".dup
+        devise_route  = "devise_for :#{plural_name}"
         devise_route << %Q(, class_name: "#{class_name}") if class_name.include?("::")
         devise_route << %Q(, skip: :all) unless options.routes?
         route devise_route

lib/generators/devise/install_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'rails/generators/base'
 require 'securerandom'
 

lib/generators/devise/orm_helpers.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module Devise
   module Generators
     module OrmHelpers
@@ -25,11 +23,7 @@ CONTENT
       end
 
       def migration_path
-        if Rails.version >= '5.0.3'
-          db_migrate_path
-        else
-          @migration_path ||= File.join("db", "migrate")
-        end
+        @migration_path ||= File.join("db", "migrate")
       end
 
       def model_path

lib/generators/devise/views_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'rails/generators/base'
 
 module Devise
@@ -23,6 +21,13 @@ module Devise
         public_task :copy_views
       end
 
+      # TODO: Add this to Rails itself
+      module ClassMethods
+        def hide!
+          Rails::Generators.hide_namespace self.namespace
+        end
+      end
+
       def copy_views
         if options[:views]
           options[:views].each do |directory|
@@ -134,11 +139,7 @@ module Devise
                               default: defined?(SimpleForm) ? "simple_form_for" : "form_for"
 
       hook_for :markerb,  desc: "Generate markerb instead of erb mail views",
-                          default: defined?(Markerb),
-                          type: :boolean
-
-      hook_for :erb,      desc: "Generate erb mail views",
-                          default: !defined?(Markerb),
+                          default: defined?(Markerb) ? :markerb : :erb,
                           type: :boolean
     end
   end

lib/generators/mongoid/devise_generator.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'rails/generators/named_base'
 require 'generators/devise/orm_helpers'
 

lib/generators/templates/controllers/confirmations_controller.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class <%= @scope_prefix %>ConfirmationsController < Devise::ConfirmationsController
   # GET /resource/confirmation/new
   # def new

lib/generators/templates/controllers/omniauth_callbacks_controller.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class <%= @scope_prefix %>OmniauthCallbacksController < Devise::OmniauthCallbacksController
   # You should configure your model like this:
   # devise :omniauthable, omniauth_providers: [:twitter]

lib/generators/templates/controllers/passwords_controller.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class <%= @scope_prefix %>PasswordsController < Devise::PasswordsController
   # GET /resource/password/new
   # def new

lib/generators/templates/controllers/registrations_controller.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class <%= @scope_prefix %>RegistrationsController < Devise::RegistrationsController
   # before_action :configure_sign_up_params, only: [:create]
   # before_action :configure_account_update_params, only: [:update]

lib/generators/templates/controllers/sessions_controller.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class <%= @scope_prefix %>SessionsController < Devise::SessionsController
   # before_action :configure_sign_in_params, only: [:create]