clearance 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f79f5aa24e81ddb8b9fc746a557db5bcf7770e17ee52f758c070656afda4434
-  data.tar.gz: c8bfc11a5c5b3e4035aaa4fb118dd24f45a72e148499ed935a15c2a5fb4764dd
+  metadata.gz: 6c7eb11d597ee18d41e6655e608bb82c9e774baa30e0e4f05dbcd7cc99c553e5
+  data.tar.gz: c221f519c1191b0d8487d302db40a3c69724e6a59df5b67efd9bbaffbf2f10cf
 SHA512:
-  metadata.gz: af3771ef9f0981c1666f01b8dad6271e61cd1ed7a13d8268f9214827682c6ba1da9e6c0fac1c81cfa89f71b44dde927d3f71b829324a6c3794b0c90e66f6c8f1
-  data.tar.gz: 8f69cf0a50f4064a120f8e63a9c80e0ebdf5aa69be0fc68998bbe6e4e73b14ba78789c1bdd28c3f7c3c02623135036189c764d7bd6c93a8125767cebd09cf458
+  metadata.gz: 586d54d09d31cbdae4caf13a1aa3920559806feb92701e6e9bb73d5dcf9001790c5e73e7d0f4af9a9e2e5b4cf72ae7865e1b7013bbe8ab18235353842449ca9c
+  data.tar.gz: 2df91d418506ba30981dec2b0139074f543193e389b1b00a79163a61c48de714ce1b480a215e98e1c13a95076d09dc271ce7f4bdb34539c822d83fc2f46d61e2

data/.travis.yml

@@ -4,16 +4,15 @@ language:
   - ruby
 
 rvm:
-  - 2.3.8
   - 2.4.6
   - 2.5.5
   - 2.6.2
 
 gemfile:
-  - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
+  - gemfiles/rails_6.0.gemfile
 
 before_install:
   - gem update --system
@@ -24,11 +23,10 @@ install:
 branches:
   only:
     - master
-    - 2.0
 
 matrix:
-  allow_failures:
-    - gemfile: gemfiles/rails_4.2.gemfile
-      rvm: 2.6.2
+  exclude:
+    - rvm: 2.4.6
+      gemfile: gemfiles/rails_6.0.gemfile
 
 sudo: false

data/Appraisals

@@ -1,15 +1,23 @@
 rails_versions = %w(
-  4.2
   5.0
   5.1
   5.2
+  6.0
 )
 
 rails_versions.each do |version|
   appraise "rails_#{version}" do
     gem "railties", "~> #{version}.0"
-    if Gem::Version.new(version) >= Gem::Version.new("5.0")
-      gem "rails-controller-testing"
+    gem "rails-controller-testing"
+
+    if Gem::Version.new(version) >= Gem::Version.new("6.0")
+      # TODO - Switch to 4.0 gem once release is made
+      gem 'rspec-rails', '~> 4.0.0.beta2'
+      gem 'sqlite3', '~> 1.4.0'
+    else
+      gem 'sqlite3', '~> 1.3.13'
+      gem 'rspec-rails', '~> 3.1'
     end
+
   end
 end

data/Gemfile

@@ -10,7 +10,5 @@ gem 'database_cleaner', '~> 1.0'
 gem 'factory_bot_rails', '~> 5.0'
 gem 'nokogiri', '~> 1.10.0'
 gem 'pry', require: false
-gem 'rspec-rails', '~> 3.5'
-gem 'shoulda-matchers', '~> 4.0'
-gem 'sqlite3', '~> 1.3.13'
+gem 'shoulda-matchers', '~> 4.1'
 gem 'timecop', '~> 0.6'

data/Gemfile.lock

@@ -1,50 +1,50 @@
 PATH
   remote: .
   specs:
-    clearance (2.0.0.beta1)
-      actionmailer (>= 4.2)
-      activemodel (>= 4.2)
-      activerecord (>= 4.2)
+    clearance (2.0.0.beta2)
+      actionmailer (>= 5.0)
+      activemodel (>= 5.0)
+      activerecord (>= 5.0)
       bcrypt
       email_validator (~> 1.4)
-      railties (>= 4.2)
+      railties (>= 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailer (6.0.0)
+      actionpack (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.0)
+      activesupport (= 6.0.0)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activesupport (5.2.3)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     ammeter (1.1.4)
@@ -55,16 +55,15 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    arel (9.0.0)
-    bcrypt (3.1.12)
+    bcrypt (3.1.13)
     builder (3.2.3)
-    capybara (3.16.2)
+    capybara (3.29.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.2)
+      regexp_parser (~> 1.5)
       xpath (~> 3.2)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
@@ -76,8 +75,8 @@ GEM
     erubi (1.8.0)
     factory_bot (5.0.2)
       activesupport (>= 4.2.0)
-    factory_bot_rails (5.0.1)
-      factory_bot (~> 5.0.0)
+    factory_bot_rails (5.0.2)
+      factory_bot (~> 5.0.2)
       railties (>= 4.2.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -89,37 +88,37 @@ GEM
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     method_source (0.9.2)
-    mini_mime (1.0.1)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    nokogiri (1.10.2)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.3)
+    public_suffix (3.1.1)
     rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
+    rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (12.3.2)
-    regexp_parser (1.4.0)
-    rspec-core (3.8.0)
+      thor (>= 0.20.3, < 2.0)
+    rake (12.3.3)
+    regexp_parser (1.6.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-rails (3.8.2)
@@ -130,10 +129,9 @@ GEM
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    shoulda-matchers (4.0.1)
+    rspec-support (3.8.2)
+    shoulda-matchers (4.1.2)
       activesupport (>= 4.2.0)
-    sqlite3 (1.3.13)
     thor (0.20.3)
     thread_safe (0.3.6)
     timecop (0.9.1)
@@ -141,6 +139,7 @@ GEM
       thread_safe (~> 0.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
+    zeitwerk (2.1.10)
 
 PLATFORMS
   ruby
@@ -155,9 +154,7 @@ DEPENDENCIES
   factory_bot_rails (~> 5.0)
   nokogiri (~> 1.10.0)
   pry
-  rspec-rails (~> 3.5)
-  shoulda-matchers (~> 4.0)
-  sqlite3 (~> 1.3.13)
+  shoulda-matchers (~> 4.1)
   timecop (~> 0.6)
 
 BUNDLED WITH

data/NEWS.md

@@ -3,6 +3,25 @@
 The noteworthy changes for each Clearance version are included here. For a
 complete changelog, see the git history for each version via the version links.
 
+## [2.0.0.beta2] - September 17, 2019
+
+### Added
+
+- Add support for Rails version 6
+- Allow `cookie_domain` to be configured with a lambda for custom configuration
+
+### Fixed
+
+- The backdoor auth mechanism now supports scenarios where `Rails.env` has been
+  configured via env variables other than `RAILS_ENV` (`RACK_ENV` for example).
+
+### Removed
+
+- Removed support for Ruby versions older than 2.4
+- Removed support for Rails versions older than 5.0
+
+[2.0.0.beta2]: https://github.com/thoughtbot/clearance/compare/v2.0.0.beta1...v2.0.0.beta2
+
 ## [2.0.0.beta1] - April 12, 2019
 
 ### Removed

data/README.md

@@ -31,8 +31,8 @@ Run the bundle command to install it.
 
 After you install Clearance, you need to run the generator:
 
-```sh
-$ rails generate clearance:install
+```shell
+rails generate clearance:install
 ```
 
 The Clearance install generator:
@@ -62,7 +62,7 @@ Clearance.configure do |config|
   config.rotate_csrf_on_sign_in = false
   config.secure_cookie = false
   config.sign_in_guards = []
-  config.user_model = User
+  config.user_model = "User"
 end
 ```
 
@@ -130,6 +130,18 @@ Clearance.configure do |config|
 end
 ```
 
+### Multiple Domain Support
+
+You can support multiple domains, or other special domain configurations by
+optionally setting `cookie_domain` as a callable object. The first argument
+passed to the method is an ActionDispatch::Request object.
+
+```ruby
+Clearance.configure do |config|
+  config.cookie_domain = lambda { |request| request.host }
+end
+```
+
 ### Integrating with Rack Applications
 
 Clearance adds its session to the Rack environment hash so middleware and other
@@ -161,15 +173,16 @@ As of Clearance 1.5 it is recommended that you disable Clearance routes and take
 full control over routing and URL design. This ensures that your app's URL design
 won't be affected if the gem's routes and URL design are changed.
 
-To disable the routes, change the `routes` configuration option to false: 
+To disable the routes, change the `routes` configuration option to false:
 
 ```ruby
 Clearance.configure do |config|
   config.routes = false
 end
 ```
-You can optionally run `rails generate clearance:routes` to dump a copy of the default routes into your
-application for modification.
+
+You can optionally run `rails generate clearance:routes` to dump a copy of the
+default routes into your application for modification.
 
 ### Controllers
 
@@ -188,22 +201,29 @@ class UsersController < Clearance::UsersController
 
 ### Redirects
 
-All of these controller methods redirect to
+The post-action redirects in Clearance are simple methods which can be
+overridden one by one, or configured globally.
+
+These "success" methods are called for signed in users, and redirect to
 `Clearance.configuration.redirect_url` (which is `/` by default):
 
-```
-passwords#url_after_update
-sessions#url_after_create
-sessions#url_for_signed_in_users
-users#url_after_create
-application#url_after_denied_access_when_signed_in
-```
+- `passwords#url_after_update`
+- `sessions#url_after_create`
+- `sessions#url_for_signed_in_users`
+- `users#url_after_create`
+- `application#url_after_denied_access_when_signed_in`
 
 To override them all at once, change the global configuration of `redirect_url`.
-To change individual URLs, override the appropriate method.
+To change individual URLs, override the appropriate method in your subclassed
+controller.
+
+These "failure" methods are called for signed out sessions:
 
-`application#url_after_denied_access_when_signed_out` defaults to `sign_in_url`.
-Override this method to change this.
+- `application#url_after_denied_access_when_signed_out`
+- `sessions#url_after_destroy`
+
+They both default to `sign_in_url`. Override this method to change both of their
+behavior, or override them individually to just change one.
 
 ### Views
 
@@ -226,7 +246,7 @@ You can use the Clearance views generator to copy the default views to your
 application for modification.
 
 ```shell
-$ rails generate clearance:views
+rails generate clearance:views
 ```
 
 ### Layouts
@@ -245,8 +265,10 @@ end
 
 ### Translations
 
-All flash messages and email subject lines are stored in [i18n translations](http://guides.rubyonrails.org/i18n.html). Override them like any other
-translation.
+All flash messages and email subject lines are stored in [i18n translations].
+Override them like any other translation.
+
+[i18n translations]: http://guides.rubyonrails.org/i18n.html
 
 See [config/locales/clearance.en.yml](/config/locales/clearance.en.yml) for the
 default behavior.
@@ -377,7 +399,7 @@ feature specs, will also require `factory_bot_rails`.
 To Generate the clearance specs, run:
 
 ```shell
-$ rails generate clearance:specs
+rails generate clearance:specs
 ```
 
 ### Controller Test Helpers

data/clearance.gemspec

@@ -1,14 +1,13 @@
 $LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'clearance/version'
-require 'date'
 
 Gem::Specification.new do |s|
   s.add_dependency 'bcrypt'
   s.add_dependency 'email_validator', '~> 1.4'
-  s.add_dependency 'railties', '>= 4.2'
-  s.add_dependency 'activemodel', '>= 4.2'
-  s.add_dependency 'activerecord', '>= 4.2'
-  s.add_dependency 'actionmailer', '>= 4.2'
+  s.add_dependency 'railties', '>= 5.0'
+  s.add_dependency 'activemodel', '>= 5.0'
+  s.add_dependency 'activerecord', '>= 5.0'
+  s.add_dependency 'actionmailer', '>= 5.0'
   s.authors = [
     'Dan Croak',
     'Eugene Bolshakov',
@@ -38,7 +37,7 @@ Gem::Specification.new do |s|
   s.name = %q{clearance}
   s.rdoc_options = ['--charset=UTF-8']
   s.require_paths = ['lib']
-  s.required_ruby_version = Gem::Requirement.new('>= 2.3.0')
+  s.required_ruby_version = Gem::Requirement.new('>= 2.4.0')
   s.summary = 'Rails authentication & authorization with email & password.'
   s.test_files = `git ls-files -- {spec}/*`.split("\n")
   s.version = Clearance::VERSION

data/gemfiles/rails_5.0.gemfile

@@ -10,11 +10,11 @@ gem "database_cleaner", "~> 1.0"
 gem "factory_bot_rails", "~> 5.0"
 gem "nokogiri", "~> 1.10.0"
 gem "pry", require: false
-gem "rspec-rails", "~> 3.5"
-gem "shoulda-matchers", "~> 4.0"
-gem "sqlite3", "~> 1.3.13"
+gem "shoulda-matchers", "~> 4.1"
 gem "timecop", "~> 0.6"
 gem "railties", "~> 5.0.0"
 gem "rails-controller-testing"
+gem "sqlite3", "~> 1.3.13"
+gem "rspec-rails", "~> 3.1"
 
 gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -10,11 +10,11 @@ gem "database_cleaner", "~> 1.0"
 gem "factory_bot_rails", "~> 5.0"
 gem "nokogiri", "~> 1.10.0"
 gem "pry", require: false
-gem "rspec-rails", "~> 3.5"
-gem "shoulda-matchers", "~> 4.0"
-gem "sqlite3", "~> 1.3.13"
+gem "shoulda-matchers", "~> 4.1"
 gem "timecop", "~> 0.6"
 gem "railties", "~> 5.1.0"
 gem "rails-controller-testing"
+gem "sqlite3", "~> 1.3.13"
+gem "rspec-rails", "~> 3.1"
 
 gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -10,11 +10,11 @@ gem "database_cleaner", "~> 1.0"
 gem "factory_bot_rails", "~> 5.0"
 gem "nokogiri", "~> 1.10.0"
 gem "pry", require: false
-gem "rspec-rails", "~> 3.5"
-gem "shoulda-matchers", "~> 4.0"
-gem "sqlite3", "~> 1.3.13"
+gem "shoulda-matchers", "~> 4.1"
 gem "timecop", "~> 0.6"
 gem "railties", "~> 5.2.0"
 gem "rails-controller-testing"
+gem "sqlite3", "~> 1.3.13"
+gem "rspec-rails", "~> 3.1"
 
 gemspec path: "../"

data/gemfiles/{rails_4.2.gemfile → rails_6.0.gemfile}

@@ -10,10 +10,11 @@ gem "database_cleaner", "~> 1.0"
 gem "factory_bot_rails", "~> 5.0"
 gem "nokogiri", "~> 1.10.0"
 gem "pry", require: false
-gem "rspec-rails", "~> 3.5"
-gem "shoulda-matchers", "~> 4.0"
-gem "sqlite3", "~> 1.3.13"
+gem "shoulda-matchers", "~> 4.1"
 gem "timecop", "~> 0.6"
-gem "railties", "~> 4.2.0"
+gem "railties", "~> 6.0.0"
+gem "rails-controller-testing"
+gem "rspec-rails", "~> 4.0.0.beta2"
+gem "sqlite3", "~> 1.4.0"
 
 gemspec path: "../"

data/lib/clearance/back_door.rb

@@ -68,7 +68,7 @@ module Clearance
 
     # @api private
     def environment_is_allowed?
-      allowed_environments.include? ENV["RAILS_ENV"]
+      allowed_environments.include? Rails.env
     end
 
     # @api private

data/lib/clearance/configuration.rb

@@ -112,7 +112,7 @@ module Clearance
     end
 
     def user_model
-      @user_model ||= ::User
+      (@user_model || "User").to_s.constantize
     end
 
     # Is the user sign up route enabled?

data/lib/clearance/session.rb

@@ -154,7 +154,7 @@ module Clearance
     # @api private
     def cookie_options
       {
-        domain: Clearance.configuration.cookie_domain,
+        domain: domain,
         expires: remember_token_expires,
         httponly: Clearance.configuration.httponly,
         path: Clearance.configuration.cookie_path,
@@ -162,5 +162,24 @@ module Clearance
         value: remember_token,
       }
     end
+
+    # @api private
+    def domain
+      if configured_cookie_domain.respond_to?(:call)
+        configured_cookie_domain.call(request_with_env)
+      else
+        configured_cookie_domain
+      end
+    end
+
+    # @api private
+    def configured_cookie_domain
+      Clearance.configuration.cookie_domain
+    end
+
+    # @api private
+    def request_with_env
+      ActionDispatch::Request.new(@env)
+    end
   end
 end

data/lib/clearance/version.rb

@@ -1,3 +1,3 @@
 module Clearance
-  VERSION = "2.0.0.beta1".freeze
+  VERSION = "2.0.0.beta2".freeze
 end

data/lib/generators/clearance/install/install_generator.rb

@@ -119,17 +119,11 @@ module Clearance
       end
 
       def migration_version
-        if Rails.version >= "5.0.0"
-          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-        end
+        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
       end
 
       def models_inherit_from
-        if Rails.version >= "5.0.0"
-          "ApplicationRecord"
-        else
-          "ActiveRecord::Base"
-        end
+        "ApplicationRecord"
       end
     end
   end

data/spec/app_templates/testapp/app/controllers/home_controller.rb

@@ -1,9 +1,5 @@
 class HomeController < ApplicationController
   def show
-    if Rails::VERSION::MAJOR >= 5
-      render html: "", layout: "application"
-    else
-      render text: "", layout: "application"
-    end
+    render html: "", layout: "application"
   end
 end

data/spec/clearance/back_door_spec.rb

@@ -1,9 +1,6 @@
 require "spec_helper"
-require "support/environment"
 
 describe Clearance::BackDoor do
-  include EnvironmentSupport
-
   it "signs in as a given user" do
     user_id = "123"
     user = double("user")
@@ -42,7 +39,7 @@ describe Clearance::BackDoor do
   end
 
   it "can't be used outside the allowed environments" do
-    with_environment("RAILS_ENV" => "production") do
+    with_environment("production") do
       expect { Clearance::BackDoor.new(mock_app) }.
         to raise_exception "Can't use auth backdoor outside of configured \
           environments (test, ci, development).".squish
@@ -55,7 +52,7 @@ describe Clearance::BackDoor do
     end
 
     it "raises an error for a default allowed env" do
-      with_environment("RAILS_ENV" => "test") do
+      with_environment("test") do
         expect { Clearance::BackDoor.new(mock_app) }.
           to raise_exception "BackDoor auth is disabled."
       end
@@ -68,7 +65,7 @@ describe Clearance::BackDoor do
     end
 
     it "can be used with configured allowed environments" do
-      with_environment("RAILS_ENV" => "demo") do
+      with_environment("demo") do
         user_id = "123"
         user = double("user")
         allow(User).to receive(:find).with(user_id).and_return(user)
@@ -100,4 +97,13 @@ describe Clearance::BackDoor do
   def mock_app
     lambda { |env| [200, {}, ["okay"]] }
   end
+
+  def with_environment(environment)
+    original_env = Rails.env
+    Rails.env = environment
+
+    yield
+  ensure
+    Rails.env = original_env
+  end
 end

data/spec/clearance/session_spec.rb

@@ -238,17 +238,31 @@ describe Clearance::Session do
     end
   end
 
-  describe 'cookie domain option' do
-    context 'when set' do
+  describe "cookie domain option" do
+    context "when set" do
       before do
-        Clearance.configuration.cookie_domain = '.example.com'
+        Clearance.configuration.cookie_domain = cookie_domain
         session.sign_in(user)
       end
 
-      it 'sets a standard cookie' do
-        session.add_cookie_to_headers(headers)
+      context "with string" do
+        let(:cookie_domain) { ".example.com" }
+
+        it "sets a standard cookie" do
+          session.add_cookie_to_headers(headers)
+
+          expect(headers['Set-Cookie']).to match(/domain=\.example\.com; path/)
+        end
+      end
+
+      context "with lambda" do
+        let(:cookie_domain) { lambda { |_r| ".example.com" } }
 
-        expect(headers['Set-Cookie']).to match(/domain=\.example\.com; path/)
+        it "sets a standard cookie" do
+          session.add_cookie_to_headers(headers)
+
+          expect(headers['Set-Cookie']).to match(/domain=\.example\.com; path/)
+        end
       end
     end
 
@@ -258,7 +272,7 @@ describe Clearance::Session do
       it 'sets a standard cookie' do
         session.add_cookie_to_headers(headers)
 
-        expect(headers['Set-Cookie']).not_to match(/domain=.+; path/)
+        expect(headers["Set-Cookie"]).not_to match(/domain=.+; path/)
       end
     end
   end
@@ -270,7 +284,7 @@ describe Clearance::Session do
       it 'sets a standard cookie' do
         session.add_cookie_to_headers(headers)
 
-        expect(headers['Set-Cookie']).to_not match(/domain=.+; path/)
+        expect(headers["Set-Cookie"]).to_not match(/domain=.+; path/)
       end
     end
 

data/spec/configuration_spec.rb

@@ -8,12 +8,25 @@ describe Clearance::Configuration do
   end
 
   context "when a custom user_model_name is specified" do
-    it "is used instead of User" do
+    before(:each) do
       MyUser = Class.new
+    end
+
+    after(:each) do
+      Object.send(:remove_const, :MyUser)
+    end
+
+    it "is used instead of User" do
       Clearance.configure { |config| config.user_model = MyUser }
 
       expect(Clearance.configuration.user_model).to eq ::MyUser
     end
+
+    it "can be specified as a string to avoid triggering autoloading" do
+      Clearance.configure { |config| config.user_model = "MyUser" }
+
+      expect(Clearance.configuration.user_model).to eq ::MyUser
+    end
   end
 
   context "when secure_cookie is set to true" do

data/spec/controllers/permissions_controller_spec.rb

@@ -65,7 +65,7 @@ describe PermissionsController do
   context 'when remember_token is blank' do
     it 'denies acess to show' do
       user = create(:user)
-      user.update_attributes(remember_token: '')
+      user.update(remember_token: '')
       cookies[:remember_token] = ''
 
       get :show

data/spec/dummy/app/controllers/application_controller.rb

@@ -2,10 +2,6 @@ class ApplicationController < ActionController::Base
   include Clearance::Controller
 
   def show
-    if Rails::VERSION::MAJOR >= 5
-      render html: "", layout: "application"
-    else
-      render text: "", layout: "application"
-    end
+    render html: "", layout: "application"
   end
 end

data/spec/dummy/application.rb

@@ -28,7 +28,13 @@ module Dummy
     config.secret_key_base = "SECRET_KEY_BASE"
 
     if config.active_record.sqlite3.respond_to?(:represent_boolean_as_integer)
-      config.active_record.sqlite3.represent_boolean_as_integer = true
+      if Rails::VERSION::MAJOR < 6
+        config.active_record.sqlite3.represent_boolean_as_integer = true
+      end
+    end
+
+    if Rails::VERSION::MAJOR >= 6
+      config.action_mailer.delivery_job = "ActionMailer::MailDeliveryJob"
     end
 
     config.active_job.queue_adapter = :inline

data/spec/generators/clearance/install/install_generator_spec.rb

@@ -128,10 +128,6 @@ describe Clearance::Generators::InstallGenerator, :generator do
   end
 
   def models_inherit_from
-    if Rails.version >= "5.0.0"
-      "ApplicationRecord"
-    else
-      "ActiveRecord::Base"
-    end
+    "ApplicationRecord"
   end
 end

data/spec/generators/clearance/views/views_generator_spec.rb

@@ -22,7 +22,6 @@ describe Clearance::Generators::ViewsGenerator, :generator do
 
     view_files.each do |each|
       expect(each).to exist
-      expect(each).to have_correct_syntax
     end
   end
 

data/spec/requests/token_expiration_spec.rb

@@ -3,10 +3,15 @@ require "spec_helper"
 describe "Token expiration" do
   describe "after signing in" do
     before do
+      Timecop.freeze
       create_user_and_sign_in
       @initial_cookies = remember_token_cookies
     end
 
+    after do
+      Timecop.return
+    end
+
     it "should have a remember_token cookie with a future expiration" do
       expect(first_cookie.expires).to be_between(
         1.years.from_now - 1.second,

data/spec/spec_helper.rb

@@ -29,12 +29,10 @@ RSpec.configure do |config|
 
   config.before { restore_default_warning_free_config }
 
-  if Rails::VERSION::MAJOR >= 5
-    require 'rails-controller-testing'
-    config.include Rails::Controller::Testing::TestProcess
-    config.include Rails::Controller::Testing::TemplateAssertions
-    config.include Rails::Controller::Testing::Integration
-  end
+  require 'rails-controller-testing'
+  config.include Rails::Controller::Testing::TestProcess
+  config.include Rails::Controller::Testing::TemplateAssertions
+  config.include Rails::Controller::Testing::Integration
 end
 
 Shoulda::Matchers.configure do |config|

data/spec/support/generator_spec_helpers.rb

@@ -34,11 +34,7 @@ module GeneratorSpecHelpers
   end
 
   def versionize_template(template_file)
-    if Rails.version >= "5.0.0"
-      template_file = ["rails5", template_file].join("/")
-    end
-
-    template_file
+    ["rails5", template_file].join("/")
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clearance
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Dan Croak
@@ -25,7 +25,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -61,56 +61,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 description: Rails authentication & authorization with email & password.
 email: support@thoughtbot.com
 executables: []
@@ -154,10 +154,10 @@ files:
 - config/routes.rb
 - db/migrate/20110111224543_create_clearance_users.rb
 - db/schema.rb
-- gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
 - lib/clearance.rb
 - lib/clearance/authentication.rb
 - lib/clearance/authorization.rb
@@ -255,11 +255,9 @@ files:
 - spec/spec_helper.rb
 - spec/support/clearance.rb
 - spec/support/cookies.rb
-- spec/support/environment.rb
 - spec/support/fake_model_with_password_strategy.rb
 - spec/support/fake_model_without_password_strategy.rb
 - spec/support/generator_spec_helpers.rb
-- spec/support/http_method_shim.rb
 - spec/support/request_with_remember_token.rb
 - spec/views/view_helpers_spec.rb
 homepage: https://github.com/thoughtbot/clearance
@@ -275,7 +273,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"

data/spec/support/environment.rb

@@ -1,12 +0,0 @@
-module EnvironmentSupport
-  def with_environment(replacement_env)
-    original_env = ENV.to_hash
-    ENV.update(replacement_env)
-
-    begin
-      yield
-    ensure
-      ENV.replace(original_env)
-    end
-  end
-end

data/spec/support/http_method_shim.rb

@@ -1,25 +0,0 @@
-# Rails 5 deprecates calling HTTP action methods with positional arguments
-# in favor of keyword arguments. However, the keyword argument form is only
-# supported in Rails 5+. Since we support 4.2, we must give it a shim to massage
-# the params into the previous style!
-
-module PreRailsFiveHTTPMethodShim
-  def get(path, params: {}, headers: {}, format: :html)
-    super(path, params.merge(format: format), headers)
-  end
-
-  def put(path, params: {}, headers: {}, format: :html)
-    super(path, params.merge(format: format), headers)
-  end
-
-  def post(path, params: {}, headers: {}, format: :html)
-    super(path, params.merge(format: format), headers)
-  end
-end
-
-if Rails::VERSION::MAJOR < 5
-  RSpec.configure do |config|
-    config.include PreRailsFiveHTTPMethodShim, type: :controller
-    config.include PreRailsFiveHTTPMethodShim, type: :request
-  end
-end