Merge pull request #134 from FundingCircle/support-rails8

Support for rails 8

Author: bliof-fc

.github/workflows/build-and-test.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.3'
+          ruby-version: '3.4'
           bundler-cache: true
 
       - name: Run RuboCop
@@ -51,7 +51,7 @@ jobs:
           - 6379:6379
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3', 'head']
+        ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4', 'head']
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4

.github/workflows/publish-gem.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.3'
+          ruby-version: '3.4'
           bundler-cache: true
 
       - name: Build gem

.rubocop.yml

@@ -10,9 +10,9 @@ AllCops:
     - 'vendor/bundle/**/*'
     - 'gemfiles/vendor/bundle/**/*'
 
-require: rubocop-rspec
+plugins: rubocop-rspec
 
-Documentation:
+Style/Documentation:
   Enabled: false
 
 Layout/ExtraSpacing:
@@ -21,17 +21,17 @@ Layout/ExtraSpacing:
 Layout/SpaceAroundOperators:
   Enabled: false
 
+Layout/LineLength:
+  Enabled: true
+  Max: 90
+
 Metrics/AbcSize:
   Enabled: false
 
 Metrics/BlockLength:
   Exclude:
     - spec/**/*_spec.rb
 
-Metrics/LineLength:
-  Enabled: true
-  Max: 90
-
 Metrics/MethodLength:
   Enabled: true
   Max: 15
@@ -42,11 +42,6 @@ RSpec/DescribeClass:
 RSpec/ExampleLength:
   Enabled: false
 
-RSpec/FilePath:
-  Exclude:
-    - spec/integration/rails/action_mailer_spec.rb
-    - spec/integration/rails/railtie_spec.rb
-
 RSpec/MultipleExpectations:
   Enabled: false
 

.rubocop_todo.yml

@@ -1,15 +1,14 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --exclude-limit 10000000`
-# on 2024-02-09 15:03:07 UTC using RuboCop version 1.60.2.
+# on 2025-08-29 07:24:21 UTC using RuboCop version 1.80.1.
 # 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: 5
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
-# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation.
 Bundler/OrderedGems:
   Exclude:
     - 'Gemfile'
@@ -36,11 +35,24 @@ Layout/HashAlignment:
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
+# Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment, AllowRBSInlineAnnotation, AllowSteepAnnotation.
 Layout/LeadingCommentSpace:
   Exclude:
     - 'lib/loga/railtie.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# URISchemes: http, https
+Layout/LineLength:
+  Exclude:
+    - 'spec/loga/sidekiq_latest/job_logger_spec.rb'
+
+# Offense count: 2
+Lint/CopDirectiveSyntax:
+  Exclude:
+    - 'spec/unit/loga/rack/logger_spec.rb'
+
 # Offense count: 2
 # Configuration parameters: AllowComments, AllowEmptyLambdas.
 Lint/EmptyBlock:
@@ -66,6 +78,18 @@ Lint/SendWithMixinArgument:
   Exclude:
     - 'lib/loga/railtie.rb'
 
+# Offense count: 2
+Lint/UselessConstantScoping:
+  Exclude:
+    - 'lib/loga/rack/request.rb'
+
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: CheckForMethodsWithNoSideEffects.
+Lint/Void:
+  Exclude:
+    - 'lib/loga/railtie.rb'
+
 # Offense count: 1
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
@@ -98,12 +122,27 @@ RSpec/ContextWording:
     - 'spec/support/timecop_shared.rb'
     - 'spec/unit/loga/configuration_spec.rb'
 
+# Offense count: 1
+RSpec/DescribeMethod:
+  Exclude:
+    - 'spec/loga/sidekiq_latest/job_logger_spec.rb'
+
+# Offense count: 22
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/IncludeExamples:
+  Exclude:
+    - 'spec/integration/rails/request_spec.rb'
+    - 'spec/integration/sinatra_spec.rb'
+    - 'spec/unit/loga/formatters/gelf_formatter_spec.rb'
+    - 'spec/unit/loga/parameter_filter_spec.rb'
+    - 'spec/unit/loga/rack/logger_spec.rb'
+
 # Offense count: 41
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 12
 
-# Offense count: 6
+# Offense count: 9
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:
@@ -112,10 +151,10 @@ RSpec/NoExpectationExample:
     - 'spec/integration/sidekiq61_spec.rb'
     - 'spec/integration/sidekiq65_spec.rb'
     - 'spec/integration/sidekiq7_spec.rb'
+    - 'spec/integration/sidekiq8_spec.rb'
 
 # Offense count: 2
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
-# Include: **/*_spec.rb
+# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata.
 RSpec/SpecFilePathFormat:
   Exclude:
     - '**/spec/routing/**/*'
@@ -142,12 +181,20 @@ Style/CommentAnnotation:
   Exclude:
     - 'lib/loga/configuration.rb'
 
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/FileNull:
+  Exclude:
+    - 'lib/loga/ext/rails/rack/logger.rb'
+    - 'spec/unit/loga/rack/logger_spec.rb'
+
 # Offense count: 25
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Exclude:
+    - '**/*.arb'
     - 'Appraisals'
     - 'Gemfile'
     - 'Guardfile'
@@ -180,6 +227,12 @@ Style/GlobalStdStream:
   Exclude:
     - 'lib/loga/configuration.rb'
 
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/HashSlice:
+  Exclude:
+    - 'lib/loga/sidekiq7/job_logger.rb'
+
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
@@ -204,3 +257,9 @@ Style/RedundantFileExtensionInRequire:
 Style/RedundantFreeze:
   Exclude:
     - 'lib/loga/sidekiq7/job_logger.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantRegexpEscape:
+  Exclude:
+    - 'lib/loga/rack/request_id.rb'

Appraisals

@@ -1,88 +1,137 @@
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0.0')
   appraise 'rails52' do
+    gem 'concurrent-ruby', '1.3.4'
     gem 'rails', '~> 5.2.0'
   end
 end
 
 appraise 'sinatra14' do
+  gem 'concurrent-ruby', '1.3.4'
   gem 'sinatra', '~> 1.4.0'
 end
 
 appraise 'sinatra2' do
+  gem 'concurrent-ruby', '1.3.4'
   gem 'sinatra', '~> 2.2.4'
 end
 
 appraise 'sinatra3' do
+  gem 'concurrent-ruby', '1.3.4'
   gem 'sinatra', '~> 3.2.0'
 end
 
 appraise 'sinatra4' do
+  gem 'concurrent-ruby', '1.3.4'
   gem 'sinatra', '~> 4.0.0'
 end
 
-appraise 'sidekiq51' do
-  gem 'sidekiq', '~> 5.1.0'
-end
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.5.0')
+  appraise 'sidekiq51' do
+    gem 'concurrent-ruby', '1.3.4'
+    gem 'sidekiq', '~> 5.1.0'
+  end
 
-appraise 'sidekiq60' do
-  gem 'sidekiq', '~> 6.0.0'
-end
+  appraise 'sidekiq60' do
+    gem 'concurrent-ruby', '1.3.4'
+    gem 'sidekiq', '~> 6.0.0'
+  end
 
-appraise 'sidekiq61' do
-  gem 'sidekiq', '~> 6.1.0'
-end
+  appraise 'sidekiq61' do
+    gem 'concurrent-ruby', '1.3.4'
+    gem 'sidekiq', '~> 6.1.0'
+  end
 
-appraise 'sidekiq62' do
-  gem 'sidekiq', '~> 6.2.0'
-end
+  appraise 'sidekiq62' do
+    gem 'concurrent-ruby', '1.3.4'
+    gem 'sidekiq', '~> 6.2.0'
+  end
 
-appraise 'sidekiq63' do
-  gem 'sidekiq', '~> 6.3.0'
-end
+  appraise 'sidekiq63' do
+    gem 'concurrent-ruby', '1.3.4'
+    gem 'sidekiq', '~> 6.3.0'
+  end
 
-appraise 'sidekiq64' do
-  gem 'sidekiq', '~> 6.4.0'
-end
+  appraise 'sidekiq64' do
+    gem 'concurrent-ruby', '1.3.4'
+    gem 'sidekiq', '~> 6.4.0'
+  end
 
-appraise 'sidekiq65' do
-  gem 'sidekiq', '~> 6.5.0'
+  appraise 'sidekiq65' do
+    gem 'concurrent-ruby', '1.3.4'
+    gem 'sidekiq', '~> 6.5.0'
+  end
 end
 
 appraise 'sidekiq70' do
+  gem 'concurrent-ruby', '1.3.4'
   gem 'sidekiq', '~> 7.0.0'
 end
 
 appraise 'sidekiq71' do
+  gem 'concurrent-ruby', '1.3.4'
   gem 'sidekiq', '~> 7.1.0'
 end
 
-appraise 'sidekiq7' do
-  gem 'sidekiq', '~> 7.0'
-end
-
 if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.2.0')
   appraise 'rails60' do
+    gem 'concurrent-ruby', '1.3.4'
     gem 'rails', '~> 6.0.0'
   end
 
   appraise 'rails61' do
+    gem 'concurrent-ruby', '1.3.4'
     gem 'rails', '~> 6.1.4.4'
   end
 end
 
 if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('3.0.0')
   appraise 'rails70' do
+    gem 'concurrent-ruby', '1.3.4'
     gem 'rails', '~> 7.0.0'
     gem 'base64'
     gem 'mutex_m'
   end
 
   appraise 'rails71' do
+    gem 'concurrent-ruby', '~> 1.3'
     gem 'rails', '~> 7.1.0'
     gem 'base64'
     gem 'mutex_m'
   end
 end
 
+if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('3.1.0')
+  appraise 'rails72' do
+    gem 'concurrent-ruby', '~> 1.3'
+    gem 'rails', '~> 7.2.0'
+    gem 'base64'
+    gem 'mutex_m'
+  end
+end
+
+if Gem::Version.new(RUBY_VERSION) > Gem::Version.new('3.2.0')
+  appraise 'rails80' do
+    gem 'concurrent-ruby', '~> 1.3'
+    gem 'rails', '~> 8.0.0'
+    gem 'base64'
+    gem 'mutex_m'
+  end
+
+  appraise 'sidekiq72' do
+    gem 'concurrent-ruby', '1.3.4'
+    gem 'sidekiq', '~> 7.2.0'
+  end
+
+  appraise 'sidekiq73' do
+    gem 'concurrent-ruby', '1.3.4'
+    gem 'sidekiq', '~> 7.3.0'
+  end
+
+  appraise 'sidekiq80' do
+    gem 'concurrent-ruby', '1.3.4'
+    gem 'sidekiq', '~> 8.0.0'
+  end
+end
+
 appraise 'unit' do
 end

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.9.0] - 2025-08-29
+### Added
+- Test against rails 7.2
+- Support for rails 8.0
+- Support for sidekiq 8
+### Fixed
+- Fix tests for ruby 3.4 and head
+
 ## [2.8.1] - 2023-02-12
 ### Added
 - Improve CI pipeline