Prepare 2.6.0 (#214)

* Prepare 2.6.0

* Use Grape 2.x in development

* Fix rubocop

* Small changes for Rails 2.6

* Re-add drb

* ugh

Author: mgomes

.rubocop.yml

@@ -33,3 +33,7 @@ Style/StringLiterals:
 
 Lint/DuplicateBranch:
   Enabled: false
+
+# Development dependencies in gemspec is valid for gems
+Gemspec/DevelopmentDependencies:
+  Enabled: false

.rubocop_todo.yml

@@ -61,17 +61,23 @@ Naming/MethodParameterName:
     - 'lib/api_auth/base.rb'
     - 'spec/railtie_spec.rb'
 
-# Offense count: 3
+# Offense count: 4
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
     - 'test/**/*'
     - 'lib/api_auth/railtie.rb'
+    - 'lib/api_auth/request_drivers/rest_client.rb'
 
 # Offense count: 1
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
   Exclude:
     - 'lib/api_auth/railtie.rb'
+
+# Offense count: 1
+Lint/UselessConstantScoping:
+  Exclude:
+    - 'lib/api_auth/base.rb'

Appraisals

@@ -1,9 +1,3 @@
-appraise 'rails-52' do
-  gem 'actionpack', '~> 5.2'
-  gem 'activeresource', '~> 5.1'
-  gem 'activesupport', '~> 5.2'
-end
-
 appraise 'rails-60' do
   gem 'actionpack', '~> 6.0'
   gem 'activeresource', '~> 5.1'
@@ -15,3 +9,9 @@ appraise 'rails-61' do
   gem 'activeresource', '~> 5.1'
   gem 'activesupport', '~> 6.1'
 end
+
+appraise 'rails-70' do
+  gem 'actionpack', '~> 7.0'
+  gem 'activeresource', '~> 6.0'
+  gem 'activesupport', '~> 7.0'
+end

CHANGELOG.md

@@ -1,3 +1,21 @@
+# 2.6.0 (2025-01-18)
+- Add Faraday middleware support (#1322051 Frédéric Mangano)
+- Add MD5 compatibility option in authentic? method (#a618e15 Samir ALI CHERIF)
+- Add support for Ruby 3.1 and Rails 7.0 (#552cab0 fwininger)
+- Drop support for Rails 5 and Ruby 2.5 (#552cab0 fwininger)
+- Fix HTTPS URL handling (#c734a88 fwininger)
+- Update Grape to v2.0+ for Rails 7/Rack 3 compatibility
+- Update Rubocop to v1.50+ and Curb to v1.0+ for Ruby 3.x compatibility
+- Fix Ruby 2.6 compatibility with Rails 6.x (Logger loading issue)
+- Add drb gem dependency (2.0.4-2.0.5) for Ruby 3.4+ compatibility while avoiding Ruby 2.6 conflicts
+
+# 2.5.1 (2021-11-26)
+- Add spec coverage for all content hashes (#202 fwininger)
+- Require MFA for Rubygems (#203 fwininger)
+- Integration with GitHub Actions
+- Fix look up of `X-AUTHORIZATION-CONTENT-SHA256` header
+- Adding license information to the gemspec
+
 # 2.5.0 (2021-05-11)
 - Add support for Ruby 3.0 (#194 fwininger)
 - Add support for Rails 6.1 (#194 fwininger)

VERSION

@@ -1 +1 @@
-2.5.1
+2.6.0

api_auth.gemspec

@@ -21,9 +21,11 @@ Gem::Specification.new do |s|
   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 'curb', '~> 1.0'
+  # DRb is required for Ruby 3.4+ but must avoid 2.0.6 which breaks Ruby 2.6
+  s.add_development_dependency 'drb', '>= 2.0.4', '< 2.0.6'
   s.add_development_dependency 'faraday', '>= 1.1.0'
-  s.add_development_dependency 'grape', '~> 1.1.0'
+  s.add_development_dependency 'grape', '~> 2.0'
   s.add_development_dependency 'http'
   s.add_development_dependency 'httpi'
   s.add_development_dependency 'multipart-post', '~> 2.0'
@@ -32,10 +34,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rest-client', '~> 2.0'
   s.add_development_dependency 'rexml'
   s.add_development_dependency 'rspec', '~> 3.4'
-  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop', '~> 1.50'
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 end

spec/railtie_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'action_controller/test_case'
 
 describe 'Rails integration' do
   API_KEY_STORE = { '1044' => 'l16imAXie1sRMcJODpOG7UwC1VyoqvO13jejkfpKWX4Z09W8DC9IrU23DvCwMry7pgSFW6c5S1GIfV0OY6F/vUA==' }.freeze

spec/spec_helper.rb

@@ -2,10 +2,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 
+# Fix for Rails 6.1 compatibility issue
+# ActiveSupport 6.1 expects Logger to be available in the global namespace
+require 'logger'
+
 require 'active_support'
-require 'active_support/test_case'
+require 'active_support/core_ext/numeric/time'
 require 'action_controller'
-require 'action_controller/test_case'
+require 'action_dispatch'
 require 'active_resource'
 require 'active_resource/http_mock'