loga 2.8.1 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f60214dba9c061d960dfd2704ee5e99c6f56a07ce4c7cc6f96bbe515981243a
-  data.tar.gz: dd73dfe8323036995f6f65296ec0f9d3c753f58e1232a0a60b1702058313e00f
+  metadata.gz: 7e11fa37ae99b22da0660ae302429dd471c8100da3dddfe389ca6967f8e2ad00
+  data.tar.gz: bdb01a105b34001856b13142277ed132437e815a20c944951f5739d60a05634b
 SHA512:
-  metadata.gz: 1457fd34f8bf23f3d97fff90806e8cf5572c74232de2439ff4e0ba0a37fdab762da3ea599ca58dc0f9a5861f8743859723ca4c9852054d0b0e237b72e3d84d66
-  data.tar.gz: 51390e73c632c180f8d5f41d2bbd231c61bed119a5518eae01f57095b4b659bb5d50c0f1a4d199cfd065e20374f5270b8e549b9fe03dd8a3a32097fd16ce3abf
+  metadata.gz: 30b3faaa2bc499958f2d229a12e91e730b5917865546f0b4e2ac1c326d2ff0e854ee2bceef550ea20482fba418cb07888f9cee81a2518a7d56b73d5c43cb094d
+  data.tar.gz: dd5b678b54742064b8fe5e10c3ca03030db25a3daaf5d8699c6472211e7ee7d979fb6cf064be28f1be9c334e38a5142104b779bc80dc536fa800bf8136b8443e

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

@@ -3,8 +3,8 @@ run-name:  Build & Test - ${{ github.ref_name }}
 
 on:
   push:
-    branches:
-      - '**'
+    branches: [ master ]
+  pull_request:
 
 jobs:
   version-check:
@@ -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

data/.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

data/.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,6 +21,10 @@ Layout/ExtraSpacing:
 Layout/SpaceAroundOperators:
   Enabled: false
 
+Layout/LineLength:
+  Enabled: true
+  Max: 90
+
 Metrics/AbcSize:
   Enabled: false
 
@@ -28,10 +32,6 @@ 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
 

data/.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'

data/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

data/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

data/Gemfile

@@ -5,24 +5,26 @@ gemspec
 
 group :development do
   gem 'appraisal'
+  gem 'benchmark'
+  gem 'bigdecimal'
   gem 'bundler',   '>= 1.6'
   gem 'byebug'
-  gem 'guard'
+  gem 'fakeredis'
   gem 'guard-rspec'
   gem 'guard-rubocop'
+  gem 'guard'
+  gem 'net-imap'
+  gem 'net-pop'
+  gem 'net-smtp'
+  gem 'ostruct'
   gem 'pry'
+  gem 'psych'
   gem 'rack-test'
   gem 'rake'
-  gem 'fakeredis'
   gem 'rspec',    '~> 3.7'
-  gem 'rubocop'
   gem 'rubocop-rspec'
+  gem 'rubocop'
   gem 'timecop'
-  gem 'psych'
-  gem 'net-smtp'
-  gem 'net-pop'
-  gem 'net-imap'
-  gem 'bigdecimal'
 end
 
 group :test do

data/README.md

@@ -1,7 +1,7 @@
 # Loga
 
 [![Gem Version](https://badge.fury.io/rb/loga.svg)](https://badge.fury.io/rb/loga)
-[![Build Status](https://circleci.com/gh/FundingCircle/loga/tree/master.svg?style=shield&circle-token=9b81c3cf8468a8c3dc760f4c0398cf8914cb27d4)](https://circleci.com/gh/FundingCircle/loga/tree/master)
+![CI Build status](https://github.com/FundingCircle/loga/actions/workflows/build-and-test.yml/badge.svg?branch=master)
 [![Code Quality](https://codeclimate.com/repos/5563694f6956805723005d2f/badges/8eecb9144730614fb39e/gpa.svg)](https://codeclimate.com/repos/5563694f6956805723005d2f/feed)
 [![Test Coverage](https://codeclimate.com/repos/5563694f6956805723005d2f/badges/8eecb9144730614fb39e/coverage.svg)](https://codeclimate.com/repos/5563694f6956805723005d2f/coverage)
 [![Dependency Status](https://img.shields.io/librariesio/release/rubygems/loga)](https://libraries.io/rubygems/loga)

data/gemfiles/rails60.gemfile

@@ -2,28 +2,30 @@
 
 source "https://rubygems.org"
 
+gem "concurrent-ruby", "1.3.4"
 gem "rails", "~> 6.0.0"
 
 group :development do
   gem "appraisal"
+  gem "bigdecimal"
   gem "bundler", ">= 1.6"
   gem "byebug"
-  gem "guard"
+  gem "fakeredis"
   gem "guard-rspec"
   gem "guard-rubocop"
+  gem "guard"
+  gem "net-imap"
+  gem "net-pop"
+  gem "net-smtp"
+  gem "ostruct"
   gem "pry"
+  gem "psych"
   gem "rack-test"
   gem "rake"
-  gem "fakeredis"
   gem "rspec", "~> 3.7"
-  gem "rubocop"
   gem "rubocop-rspec"
+  gem "rubocop"
   gem "timecop"
-  gem "psych"
-  gem "net-smtp"
-  gem "net-pop"
-  gem "net-imap"
-  gem "bigdecimal"
 end
 
 group :test do

data/gemfiles/rails61.gemfile

@@ -2,28 +2,30 @@
 
 source "https://rubygems.org"
 
+gem "concurrent-ruby", "1.3.4"
 gem "rails", "~> 6.1.4.4"
 
 group :development do
   gem "appraisal"
+  gem "bigdecimal"
   gem "bundler", ">= 1.6"
   gem "byebug"
-  gem "guard"
+  gem "fakeredis"
   gem "guard-rspec"
   gem "guard-rubocop"
+  gem "guard"
+  gem "net-imap"
+  gem "net-pop"
+  gem "net-smtp"
+  gem "ostruct"
   gem "pry"
+  gem "psych"
   gem "rack-test"
   gem "rake"
-  gem "fakeredis"
   gem "rspec", "~> 3.7"
-  gem "rubocop"
   gem "rubocop-rspec"
+  gem "rubocop"
   gem "timecop"
-  gem "psych"
-  gem "net-smtp"
-  gem "net-pop"
-  gem "net-imap"
-  gem "bigdecimal"
 end
 
 group :test do

data/gemfiles/rails70.gemfile

@@ -2,30 +2,33 @@
 
 source "https://rubygems.org"
 
+gem "concurrent-ruby", "1.3.4"
 gem "rails", "~> 7.0.0"
 gem "base64"
 gem "mutex_m"
 
 group :development do
   gem "appraisal"
+  gem "benchmark"
+  gem "bigdecimal"
   gem "bundler", ">= 1.6"
   gem "byebug"
-  gem "guard"
+  gem "fakeredis"
   gem "guard-rspec"
   gem "guard-rubocop"
+  gem "guard"
+  gem "net-imap"
+  gem "net-pop"
+  gem "net-smtp"
+  gem "ostruct"
   gem "pry"
+  gem "psych"
   gem "rack-test"
   gem "rake"
-  gem "fakeredis"
   gem "rspec", "~> 3.7"
-  gem "rubocop"
   gem "rubocop-rspec"
+  gem "rubocop"
   gem "timecop"
-  gem "psych"
-  gem "net-smtp"
-  gem "net-pop"
-  gem "net-imap"
-  gem "bigdecimal"
 end
 
 group :test do

data/gemfiles/rails71.gemfile

@@ -2,30 +2,33 @@
 
 source "https://rubygems.org"
 
+gem "concurrent-ruby", "~> 1.3"
 gem "rails", "~> 7.1.0"
 gem "base64"
 gem "mutex_m"
 
 group :development do
   gem "appraisal"
+  gem "benchmark"
+  gem "bigdecimal"
   gem "bundler", ">= 1.6"
   gem "byebug"
-  gem "guard"
+  gem "fakeredis"
   gem "guard-rspec"
   gem "guard-rubocop"
+  gem "guard"
+  gem "net-imap"
+  gem "net-pop"
+  gem "net-smtp"
+  gem "ostruct"
   gem "pry"
+  gem "psych"
   gem "rack-test"
   gem "rake"
-  gem "fakeredis"
   gem "rspec", "~> 3.7"
-  gem "rubocop"
   gem "rubocop-rspec"
+  gem "rubocop"
   gem "timecop"
-  gem "psych"
-  gem "net-smtp"
-  gem "net-pop"
-  gem "net-imap"
-  gem "bigdecimal"
 end
 
 group :test do

data/gemfiles/rails72.gemfile

@@ -0,0 +1,38 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "concurrent-ruby", "~> 1.3"
+gem "rails", "~> 7.2.0"
+gem "base64"
+gem "mutex_m"
+
+group :development do
+  gem "appraisal"
+  gem "benchmark"
+  gem "bigdecimal"
+  gem "bundler", ">= 1.6"
+  gem "byebug"
+  gem "fakeredis"
+  gem "guard-rspec"
+  gem "guard-rubocop"
+  gem "guard"
+  gem "net-imap"
+  gem "net-pop"
+  gem "net-smtp"
+  gem "ostruct"
+  gem "pry"
+  gem "psych"
+  gem "rack-test"
+  gem "rake"
+  gem "rspec", "~> 3.7"
+  gem "rubocop-rspec"
+  gem "rubocop"
+  gem "timecop"
+end
+
+group :test do
+  gem "simplecov", "~> 0.17.0"
+end
+
+gemspec path: "../"