Update CI to ruby 3.1 and rails 7.0. Drop rails 5 and ruby 2.5.

Author: fwininger

.github/workflows/main.yml

@@ -9,19 +9,23 @@ jobs:
       fail-fast: true
       matrix:
         ruby-version:
-          - 2.5
           - 2.6
           - 2.7
           - 3.0
+          - 3.1
         gemfile:
-          - rails_52.gemfile
           - rails_60.gemfile
           - rails_61.gemfile
+          - rails_70.gemfile
         exclude:
-          - ruby-version: [ 2.6, 2.7, 3.0 ]
-            gemfile: rails_52.gemfile
           - ruby-version: 3.0
             gemfile: rails_60.gemfile
+          - ruby-version: 3.1
+            gemfile: rails_60.gemfile 
+          - ruby-version: 2.6
+            gemfile: rails_70.gemfile
+          - ruby-version: 2.7
+            gemfile: rails_70.gemfile
     steps:
       - name: Install packages required for `curb` gem
         run: |
@@ -57,7 +61,7 @@ jobs:
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.0
+          ruby-version: 3.1
           bundler-cache: true
 
       - name: Install required gems

.rubocop.yml

@@ -2,7 +2,7 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
 
 Metrics/AbcSize:
   Max: 28

.rubocop_todo.yml

@@ -1,19 +1,11 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-03-26 22:04:17 UTC using RuboCop version 1.12.0.
+# on 2022-03-17 08:35:06 UTC using RuboCop version 1.26.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
-# Include: **/*.gemspec
-Gemspec/OrderedDependencies:
-  Exclude:
-    - 'api_auth.gemspec'
-
 # Offense count: 1
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
@@ -41,17 +33,6 @@ Lint/Void:
     - 'lib/api_auth/request_drivers/rack.rb'
     - 'lib/api_auth/request_drivers/rest_client.rb'
 
-# Offense count: 1
-# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
-Metrics/AbcSize:
-  Max: 28
-
-# Offense count: 1
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-# IgnoredMethods: refine
-Metrics/BlockLength:
-  Max: 27
-
 # Offense count: 2
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
@@ -79,13 +60,6 @@ Naming/MethodParameterName:
     - 'lib/api_auth/base.rb'
     - 'spec/railtie_spec.rb'
 
-# Offense count: 9
-# Cop supports --auto-correct.
-Style/CommentedKeyword:
-  Exclude:
-    - 'lib/api_auth/base.rb'
-    - 'lib/api_auth/railtie.rb'
-
 # Offense count: 3
 # Configuration parameters: AllowedConstants.
 Style/Documentation:

README.md

@@ -7,7 +7,7 @@ Logins and passwords are for humans. Communication between applications need to
 be protected through different means.
 
 ApiAuth is a Ruby gem designed to be used both in your client and server
-HTTP-based applications. It implements the same authentication methods (HMAC-SHA1)
+HTTP-based applications. It implements the same authentication methods (HMAC-SHA2)
 used by Amazon Web Services.
 
 The gem will sign your requests on the client side and authenticate that
@@ -51,7 +51,7 @@ A cURL request would look like:
 curl -X POST --header 'Content-Type: application/json' --header "Date: Tue, 30 May 2017 03:51:43 GMT" --header "Authorization: ${AUTHORIZATION}"  http://my-app.com/request_path`
 ```
 
-5. On the server side, the SHA1 HMAC is computed in the same way using the
+5. On the server side, the SHA2 HMAC is computed in the same way using the
 request headers and the client's secret key, which is known to only
 the client and the server but can be looked up on the server using the client's
 access id that was attached in the header. The access id can be any integer or
@@ -61,17 +61,13 @@ minutes in order to avoid replay attacks.
 ## References
 
 * [Hash functions](http://en.wikipedia.org/wiki/Cryptographic_hash_function)
-* [SHA-1 Hash function](http://en.wikipedia.org/wiki/SHA-1)
+* [SHA-2 Hash function](http://en.wikipedia.org/wiki/SHA-2)
 * [HMAC algorithm](http://en.wikipedia.org/wiki/HMAC)
 * [RFC 2104 (HMAC)](http://tools.ietf.org/html/rfc2104)
 
 ## Requirement
 
-This gem require Ruby >= 2.5 and Rails >= 5.1 if you use rails.
-
-For older version of Ruby or Rails, please use ApiAuth v2.1 and older.
-
-**IMPORTANT: v2.0.0 is backwards incompatible with the default settings of v1.x to address a security vulnerability. See [CHANGELOG.md](/CHANGELOG.md) for security update information.**
+This gem require Ruby >= 2.6 and Rails >= 6.0 if you use rails.
 
 ## Install
 

api_auth.gemspec

@@ -14,24 +14,24 @@ Gem::Specification.new do |s|
     'rubygems_mfa_required' => 'true'
   }
 
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.6.0'
 
-  s.add_development_dependency 'actionpack', '< 6.2', '> 5.0'
+  s.add_development_dependency 'actionpack', '>= 6.0'
   s.add_development_dependency 'activeresource', '>= 4.0'
-  s.add_development_dependency 'activesupport', '< 6.2', '> 5.0'
+  s.add_development_dependency 'activesupport', '>= 6.0'
   s.add_development_dependency 'amatch'
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'curb', '~> 0.8'
   s.add_development_dependency 'faraday', '>= 1.1.0'
+  s.add_development_dependency 'grape', '~> 1.1.0'
   s.add_development_dependency 'http'
   s.add_development_dependency 'httpi'
   s.add_development_dependency 'multipart-post', '~> 2.0'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rest-client', '~> 2.0'
-  s.add_development_dependency 'grape', '~> 1.1.0'
-  s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'rexml'
+  s.add_development_dependency 'rspec', '~> 3.4'
   s.add_development_dependency 'rubocop'
 
   s.files         = `git ls-files`.split("\n")

gemfiles/rails_52.gemfile gemfiles/rails_70.gemfile

@@ -2,8 +2,8 @@
 
 source "https://rubygems.org"
 
-gem "actionpack", "~> 5.2"
-gem "activeresource", "~> 5.1"
-gem "activesupport", "~> 5.2"
+gem "actionpack", "~> 7.0"
+gem "activeresource", "~> 6.0"
+gem "activesupport", "~> 7.0"
 
 gemspec path: "../"

lib/api_auth/base.rb

@@ -118,5 +118,5 @@ def auth_header(headers, access_id, secret_key, options)
     def parse_auth_header(auth_header)
       AUTH_HEADER_PATTERN.match(auth_header)
     end
-  end # class methods
-end # ApiAuth
+  end
+end

lib/api_auth/railtie.rb

@@ -18,7 +18,7 @@ def api_authenticated?(secret_key)
           ActionController::Base.include(ControllerMethods::InstanceMethods)
         end
       end
-    end # ControllerMethods
+    end
 
     module ActiveResourceExtension # :nodoc:
       module ActiveResourceApiAuth # :nodoc:
@@ -51,11 +51,11 @@ def connection_with_auth(refresh = false)
             c.api_auth_options = api_auth_options
             c
           end
-        end # class methods
+        end
 
         module InstanceMethods
         end
-      end # BaseApiAuth
+      end
 
       module Connection
         def self.included(base)
@@ -82,14 +82,14 @@ def request_with_auth(method, path, *arguments)
 
           request_without_auth(method, path, *arguments)
         end
-      end # Connection
+      end
 
       if defined?(ActiveSupport)
         ActiveSupport.on_load(:active_resource) do
           ActiveResource::Base.include(ActiveResourceApiAuth)
           ActiveResource::Connection.include(Connection)
         end
       end
-    end # ActiveResourceExtension
-  end # Rails
-end # ApiAuth
+    end
+  end
+end