Merge 1b83b98 into b451455

.rubocop.yml

@@ -10,7 +10,7 @@ AllCops:
   # file, we wouldn't have to specify this (https://bit.ly/2vNTsue), but we
   # don't commit that file because that would interfere with testing multiple
   # rubies on CI.
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 
 # Please use normal indentation when aligning parameters.
 #

.rubocop_todo.yml

@@ -31,3 +31,10 @@ Style/MissingRespondToMissing:
 Style/TrivialAccessors:
   Exclude:
     - 'lib/authlogic/session/base.rb'
+
+Style/UnpackFirst:
+  Exclude:
+    - lib/authlogic/crypto_providers/md5/v2.rb
+    - lib/authlogic/crypto_providers/sha1/v2.rb
+    - lib/authlogic/crypto_providers/sha256/v2.rb
+    - lib/authlogic/crypto_providers/sha512/v2.rb

.travis.yml

@@ -25,8 +25,8 @@ env:
 # We only test the oldest and the newest ruby versions that we support. We
 # do not test intermediate versions.
 rvm:
-  - 2.3.8
-  - 2.6.1
+  - 2.4.9
+  - 2.7.0
 
 # We only test living versions of rails, per the [rails maintenance
 # policy](http://guides.rubyonrails.org/maintenance_policy.html)
@@ -37,7 +37,7 @@ gemfile:
 matrix:
   exclude:
     # rails 6 requires ruby >= 2.5.0
-    - rvm: 2.3.8
+    - rvm: 2.4.9
       gemfile: gemfiles/rails_6.0.rb
   fast_finish: true
 

CHANGELOG.md

@@ -5,7 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## 6.0.0 (Unreleased)
+## Unreleased
+
+* Breaking Changes
+  * None
+* Added
+  * None
+* Fixed
+  * None
+
+## 6.0.0 (2020-03-23)
 
 * Breaking Changes, Major
   * There is no longer a default `crypto_provider`. We still recommend SCrypt,
@@ -35,6 +44,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
   * [#697](https://github.com/binarylogic/authlogic/issues/697) - Add V2
     CryptoProviders for MD5 and SHA schemes that fix key stretching by hashing
     the byte digests instead of the hex strings representing those digests
+* Dependencies
+  * Drop support for ruby 2.3 (reached EOL on 2019-04-01)
 
 ## Previous major version
 

README.md

@@ -18,8 +18,9 @@ An unobtrusive ruby authentication library based on ActiveRecord.
 | Version     | Documentation |
 | ----------- | ------------- |
 | Unreleased  | https://github.com/binarylogic/authlogic/blob/master/README.md |
-| 5.0.4       | https://github.com/binarylogic/authlogic/blob/v5.0.4/README.md |
-| 4.4.2       | https://github.com/binarylogic/authlogic/blob/v4.4.2/README.md |
+| 6.0.0       | https://github.com/binarylogic/authlogic/blob/v6.0.0/README.md |
+| 5.1.0       | https://github.com/binarylogic/authlogic/blob/v5.1.0/README.md |
+| 4.5.0       | https://github.com/binarylogic/authlogic/blob/v4.5.0/README.md |
 | 3.7.0       | https://github.com/binarylogic/authlogic/blob/v3.7.0/README.md |
 | 2.1.11      | https://github.com/binarylogic/authlogic/blob/v2.1.11/README.rdoc |
 | 1.4.3       | https://github.com/binarylogic/authlogic/blob/v1.4.3/README.rdoc |
@@ -415,20 +416,6 @@ current controller object. Then Authlogic leverages that to do everything, it's
 a pretty simple design. Nothing crazy going on, Authlogic is just leveraging the
 tools your framework provides in the controller object.
 
-## 90. Compatibility
-
-| Version | branch       | ruby     | activerecord  |
-| ------- | ------------ | -------- | ------------- |
-| 5.0     | master       | >= 2.3.0 | >= 5.2, < 6.1 |
-| 4.4     | 4-4-stable   | >= 2.3.0 | >= 4.2, < 5.3 |
-| 4.3     | 4-3-stable   | >= 2.3.0 | >= 4.2, < 5.3 |
-| 4.2     | 4-2-stable   | >= 2.2.0 | >= 4.2, < 5.3 |
-| 3       | 3-stable     | >= 1.9.3 | >= 3.2, < 5.3 |
-| 2       | rails2       | >= 1.9.3 | ~> 2.3.0      |
-| 1       | ?            | ?        | ?             |
-
-Under SemVer, [changes to dependencies][10] do not require a major release.
-
 ## 7. Extending
 
 ## 7.a. Extending UserSession
@@ -458,6 +445,21 @@ end
 To learn more about available callbacks, see the "Callbacks" documentation
 in `authlogic/session/base.rb`.
 
+## 90. Compatibility
+
+| Version | branch       | ruby     | activerecord  |
+| ------- | ------------ | -------- | ------------- |
+| 6.0     | 6-0-stable   | >= 2.4.0 | >= 5.2, < 6.1 |
+| 5.1     | 5-1-stable   | >= 2.3.0 | >= 5.2, < 6.1 |
+| 4.5     | 4-5-stable   | >= 2.3.0 | >= 4.2, < 5.3 |
+| 4.3     | 4-3-stable   | >= 2.3.0 | >= 4.2, < 5.3 |
+| 4.2     | 4-2-stable   | >= 2.2.0 | >= 4.2, < 5.3 |
+| 3       | 3-stable     | >= 1.9.3 | >= 3.2, < 5.3 |
+| 2       | rails2       | >= 1.9.3 | ~> 2.3.0      |
+| 1       | ?            | ?        | ?             |
+
+Under SemVer, [changes to dependencies][10] do not require a major release.
+
 ## Intellectual Property
 
 Copyright (c) 2012 Ben Johnson of Binary Logic, released under the MIT license

Rakefile

@@ -12,7 +12,14 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = false
 
   # Set interpreter warning level to 2 (verbose)
-  test.ruby_opts += ["-W2"]
+  #
+  # TODO: I had to temporarily disable warnings because TravisCI has a maximum
+  # log length of 4MB and the following warning was printed thousands of times:
+  #
+  # > ../postgresql/database_statements.rb:24:
+  # > warning: rb_tainted_str_new is deprecated and will be removed in Ruby 3.2.
+  #
+  test.ruby_opts += ["-W0"]
 end
 
 require "rubocop/rake_task"

authlogic.gemspec

@@ -22,7 +22,7 @@ require "authlogic/version"
   s.summary = "An unobtrusive ruby authentication library based on ActiveRecord."
   s.license = "MIT"
 
-  s.required_ruby_version = ">= 2.3.0"
+  s.required_ruby_version = ">= 2.4.0"
 
   # See doc/rails_support_in_authlogic_5.0.md
   s.add_dependency "activemodel", [">= 5.2", "< 6.1"]

lib/authlogic/version.rb

@@ -17,6 +17,6 @@ module Authlogic
   #
   # @api public
   def self.gem_version
-    ::Gem::Version.new("5.0.4")
+    ::Gem::Version.new("6.0.0")
   end
 end