Merge branch 'master' into 6-4-stable

Author: jaredbeck

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/setup-ruby@v1
         with:
           # Set to `TargetRubyVersion` in `.rubocopy.yml`
-          ruby-version: 2.4
+          ruby-version: 2.6
       - name: Bundle
         run: |
           gem install bundler
@@ -56,19 +56,17 @@ jobs:
       # have set this up with each database as a separate job, but then we'd be
       # duplicating the matrix configuration three times.
       matrix:
-        gemfile: [ 'rails_5.2', 'rails_6.0', 'rails_6.1' ]
+        gemfile: [ 'rails_5.2', 'rails_6.0', 'rails_6.1', 'rails_7.0' ]
 
         # To keep matrix size down, only test highest and lowest rubies. In
         # `.rubocopy.yml`, set `TargetRubyVersion`, to the lowest ruby version
         # tested here.
-        ruby: [ '2.4', '2.7' ]
+        ruby: [ '2.6', '2.7' ]
 
         exclude:
-          # rails 6 requires ruby >= 2.5.0
-          - ruby: '2.4'
-            gemfile: 'rails_6.0'
-          - ruby: '2.4'
-            gemfile: 'rails_6.1'
+          # rails 7 requires ruby >= 2.7.0
+          - ruby: '2.6'
+            gemfile: 'rails_7.0'
     steps:
       - name: Checkout source
         uses: actions/checkout@v2

.rubocop.yml

@@ -12,7 +12,7 @@ AllCops:
   # rubies on CI.
   #
   # Should be same as `ruby-version` in `.github/workflows/test.yml`
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.6
 
 # Avoid empty lines in methods, they are a sign the method is too big.
 Layout/EmptyLineAfterGuardClause:

CHANGELOG.md

@@ -12,7 +12,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 * Added
   * None
 * Fixed
-  * None
+  * [#743](https://github.com/binarylogic/authlogic/pull/743) - Fixed
+    deprecation warning in Rails 7 re: `ActiveRecord::Base.default_timezone`
 
 ## 6.4.1 (2021-02-22)
 

CONTRIBUTING.md

@@ -21,7 +21,7 @@ Please use github issues only for bug reports and feature suggestions.
 ### Usage Questions
 
 Please ask usage questions on
-[stackoverflow](http://stackoverflow.com/questions/tagged/authlogic).
+[Stack Overflow](http://stackoverflow.com/questions/tagged/authlogic).
 
 ## Development
 
@@ -33,8 +33,21 @@ ruby. See `required_ruby_version` in the gemspec.
 Tests can be run against different versions of Rails:
 
 ```
+# Rails 5.2
+BUNDLE_GEMFILE=gemfiles/rails_5.2.rb bundle install
+BUNDLE_GEMFILE=gemfiles/rails_5.2.rb bundle exec rake
+
+# Rails 6.0
 BUNDLE_GEMFILE=gemfiles/rails_6.0.rb bundle install
 BUNDLE_GEMFILE=gemfiles/rails_6.0.rb bundle exec rake
+
+# Rails 6.1
+BUNDLE_GEMFILE=gemfiles/rails_6.1.rb bundle install
+BUNDLE_GEMFILE=gemfiles/rails_6.1.rb bundle exec rake
+
+# Rails 7.0
+BUNDLE_GEMFILE=gemfiles/rails_7.0.rb bundle install
+BUNDLE_GEMFILE=gemfiles/rails_7.0.rb bundle exec rake
 ```
 
 To run a single test:

authlogic.gemspec

@@ -18,16 +18,16 @@ require "authlogic/version"
     "[email protected]",
     "[email protected]"
   ]
-  s.homepage = "http://github.com/binarylogic/authlogic"
+  s.homepage = "https://github.com/binarylogic/authlogic"
   s.summary = "An unobtrusive ruby authentication library based on ActiveRecord."
   s.license = "MIT"
 
-  s.required_ruby_version = ">= 2.4.0"
+  s.required_ruby_version = ">= 2.6.0"
 
   # See doc/rails_support_in_authlogic_5.0.md
-  s.add_dependency "activemodel", [">= 5.2", "< 6.2"]
-  s.add_dependency "activerecord", [">= 5.2", "< 6.2"]
-  s.add_dependency "activesupport", [">= 5.2", "< 6.2"]
+  s.add_dependency "activemodel", [">= 5.2", "< 7.1"]
+  s.add_dependency "activerecord", [">= 5.2", "< 7.1"]
+  s.add_dependency "activesupport", [">= 5.2", "< 7.1"]
   s.add_dependency "request_store", "~> 1.0"
   s.add_development_dependency "bcrypt", "~> 3.1"
   s.add_development_dependency "byebug", "~> 10.0"

gemfiles/rails_7.0.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+source "https://rubygems.org"
+gemspec path: ".."
+
+gem "activerecord", "~> 7.0.0.alpha", github: "rails/rails", branch: "main"
+gem "activesupport", "~> 7.0.0.alpha", github: "rails/rails", branch: "main"

lib/authlogic/session/base.rb

@@ -2031,7 +2031,7 @@ def search_scope
 
       # @api private
       def set_last_request_at
-        current_time = klass.default_timezone == :utc ? Time.now.utc : Time.now
+        current_time = Time.current
         MagicColumn::AssignsLastRequestAt
           .new(current_time, record, controller, last_request_at_threshold)
           .assign