grape_logging 2.1.1 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c221ae5f7be5a9f4a5818689a276d1637144cf5c0a3845e3fd1d20a15455a5e7
-  data.tar.gz: 1208a13208efba0ef1ddd1ee9e6e5306a35acbe0bd623603fbda16ad1821eee1
+  metadata.gz: 812a02e3c1b1f55003d060c5d31887be91cd73115cdb366c36c4e29c8e5507a0
+  data.tar.gz: 929dec60825b2aa8ec50c349506f383cd58a01d987bc8eb8b02990c225279e34
 SHA512:
-  metadata.gz: 82f1f1e940a7ace4f9e30f8623b56d4a2880bb4a2eeee1a8d654382662b5efe336a875e2e501275dc48594cc1ded59204e9eee44e43fb62204c84d0978e9a525
-  data.tar.gz: 866d9f113fdfd414f48c710814902eae481982e5cf8a453b840904410eae3d368a09423bb6489e3ec455b21b348cadd2023082224e604db493f816d040532958
+  metadata.gz: 3043a583d5b227f2fb474a1e036ad0f27589dafa1a11d428b0e93c3441e6cc6204001bfe26dbd6f925ea2fe2a6a681ff3e6c2853979e458f19c43ece1696e0ec
+  data.tar.gz: 9ea303723891185798f23494e53c542c73ceee318f4fa72c073277e263e72e1f1dac885729126eda13c3aee89893488d88b4173eff877b2ff30998d77c944435

data/.github/workflows/ci.yml

@@ -9,15 +9,28 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ["3.0", "3.1", "3.2", "3.3", "3.4"]
+        ruby-version: ["3.0", "3.1", "3.2", "3.3", "3.4", "4.0"]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
           bundler-cache: true
       - name: Install dependencies
-        run: bundle install
+        run: bundle install --jobs 4 --retry 3
       - name: Run tests
-        run: bundle exec rspec spec/
+        run: bundle exec rake spec
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "4.0"
+          bundler-cache: true
+      - name: Install dependencies
+        run: bundle install
+      - name: Run RuboCop
+        run: bundle exec rake rubocop

data/.rubocop.yml

@@ -0,0 +1,17 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  NewCops: enable
+  TargetRubyVersion: 3.0
+
+Metrics/BlockLength:
+  CountAsOne: [array, hash, heredoc, method_call]
+  Exclude:
+    - 'spec/**/*'
+
+Metrics/ClassLength:
+  CountAsOne: [array, hash, heredoc, method_call]
+
+Metrics/MethodLength:
+  CountAsOne: [array, hash, heredoc, method_call]
+  Max: 20

data/.rubocop_todo.yml

@@ -0,0 +1,160 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2025-07-10 10:25:51 UTC using RuboCop version 1.77.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: 3
+# Configuration parameters: EnforcedStyle, AllowedGems, Include.
+# SupportedStyles: Gemfile, gems.rb, gemspec
+# Include: **/*.gemspec, **/Gemfile, **/gems.rb
+Gemspec/DevelopmentDependencies:
+  Exclude:
+    - "grape_logging.gemspec"
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Severity, Include.
+# Include: **/*.gemspec
+Gemspec/RequireMFA:
+  Exclude:
+    - "grape_logging.gemspec"
+
+# Offense count: 1
+# Configuration parameters: Severity, Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - "grape_logging.gemspec"
+
+# Offense count: 1
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
+Lint/DuplicateBranch:
+  Exclude:
+    - "lib/grape_logging/util/parameter_filter.rb"
+
+# Offense count: 1
+# Configuration parameters: AllowedParentClasses.
+Lint/MissingSuper:
+  Exclude:
+    - "lib/grape_logging/loggers/filter_parameters.rb"
+
+# Offense count: 3
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
+Metrics/AbcSize:
+  Max: 38
+
+# Offense count: 8
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+# AllowedMethods: refine
+Metrics/BlockLength:
+  Max: 90
+
+# Offense count: 3
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/CyclomaticComplexity:
+  Max: 18
+
+# Offense count: 2
+# Configuration parameters: AllowedMethods, AllowedPatterns.
+Metrics/PerceivedComplexity:
+  Max: 19
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
+# SupportedStyles: snake_case, normalcase, non_integer
+# AllowedIdentifiers: TLS1_1, TLS1_2, capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
+Naming/VariableNumber:
+  Exclude:
+    - "spec/lib/grape_logging/formatters/rails_spec.rb"
+
+# Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: MinBranchesCount.
+Style/CaseLikeIf:
+  Exclude:
+    - "lib/grape_logging/formatters/default.rb"
+    - "lib/grape_logging/formatters/logstash.rb"
+    - "lib/grape_logging/formatters/rails.rb"
+
+# Offense count: 17
+# Configuration parameters: AllowedConstants.
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 29
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/GlobalStdStream:
+  Exclude:
+    - "lib/grape_logging/reporters/logger_reporter.rb"
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: literals, strict
+Style/MutableConstant:
+  Exclude:
+    - "lib/grape_logging/version.rb"
+
+# Offense count: 10
+Style/OpenStructUse:
+  Exclude:
+    - "spec/lib/grape_logging/loggers/client_env_spec.rb"
+    - "spec/lib/grape_logging/loggers/filter_parameters_spec.rb"
+    - "spec/lib/grape_logging/loggers/request_headers_spec.rb"
+    - "spec/lib/grape_logging/loggers/response_spec.rb"
+
+# Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
+# AllowedMethods: present?, blank?, presence, try, try!
+Style/SafeNavigation:
+  Exclude:
+    - "lib/grape_logging/formatters/rails.rb"
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/SlicingWithRange:
+  Exclude:
+    - "lib/grape_logging/loggers/request_headers.rb"
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: RequireEnglish, EnforcedStyle.
+# SupportedStyles: use_perl_names, use_english_names, use_builtin_english_names
+Style/SpecialGlobalVars:
+  Exclude:
+    - "spec/spec_helper.rb"
+
+# Offense count: 3
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Mode.
+Style/StringConcatenation:
+  Exclude:
+    - "lib/grape_logging/formatters/json.rb"
+    - "lib/grape_logging/formatters/lograge.rb"
+    - "lib/grape_logging/formatters/logstash.rb"
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
+# AllowedMethods: define_method
+Style/SymbolProc:
+  Exclude:
+    - "lib/grape_logging/util/parameter_filter.rb"
+
+# Offense count: 11
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 203

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## [3.0.1] - 2026-09-11
+
+### Added
+- [#98](https://github.com/aserafin/grape_logging/pull/98) Adapt to new Grape::Exceptions::ErrorResponse throwable for Grape 3.3.0 support - [@leoarnold](https://github.com/leoarnold).
+
+### Changed
+- [#96](https://github.com/aserafin/grape_logging/pull/96) Move dev dependencies to Gemfile and use zeitwerk to load files - [@n-rodriguez](https://github.com/n-rodriguez).
+
+[3.0.1]: https://github.com/aserafin/grape_logging/compare/v3.0.0...v3.0.1
+
+## [3.0.0] - 2025-08-07
+
+### Changed
+- [#93](https://github.com/aserafin/grape_logging/pull/93) RequestLogger middleware to handle Grape 2.4 breaking change - [@devsigner](https://github.com/devsigner) and [@samsonjs](https://github.com/samsonjs).
+
+[3.0.0]: https://github.com/aserafin/grape_logging/compare/v2.1.1...v3.0.0
+
 ## [2.1.1] - 2025-07-09
 
 ### Fixed

data/Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in grape_logging.gemspec
 gemspec
+
+gem 'rake', '~> 13.3'
+gem 'rspec', '~> 3.5'
+
+# This is pinned to an exact version otherwise we can't know which rules
+# are in play at any given time in different environments.
+gem 'rubocop', '1.77.0'

data/README.md

@@ -209,8 +209,8 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release` to create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
-For maintainers releasing a new version, please see [Releasing.md](Releasing.md).
+For maintainers releasing a new version, please see [RELEASING.md](RELEASING.md).
 
 ## Contributing
 
-See [Contributing.md](Contributing.md).
+See [CONTRIBUTING.md](CONTRIBUTING.md).

data/Rakefile

@@ -1,9 +1,17 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.rspec_opts = ['-fd -c']
+  spec.pattern = FileList['spec/**/*_spec.rb']
+end
+
+RuboCop::RakeTask.new(:rubocop) do |t|
+  t.patterns = ['lib/**/*.rb', 'spec/**/*.rb', 'Rakefile', 'Gemfile', 'grape_logging.gemspec']
+end
 
-task default: :spec
+task default: %i[spec rubocop]
 
 desc 'Release gem and create GitHub release'
 task github_release: :release do
@@ -14,9 +22,9 @@ task github_release: :release do
   # Check if gh CLI is available
   unless system('which gh > /dev/null 2>&1')
     puts "\n⚠️  GitHub CLI (gh) not found"
-    puts "To create a GitHub release with auto-generated changelog, install gh:"
-    puts "  brew install gh  # macOS with Homebrew"
-    puts "  # or visit: https://github.com/cli/cli#installation"
+    puts 'To create a GitHub release with auto-generated changelog, install gh:'
+    puts '  brew install gh  # macOS with Homebrew'
+    puts '  # or visit: https://github.com/cli/cli#installation'
     puts "\nYou can manually create the release with:"
     puts "  gh release create v#{GrapeLogging::VERSION} --generate-notes"
     next
@@ -28,8 +36,8 @@ task github_release: :release do
   if system('gh', 'release', 'create', version, '--generate-notes', '--verify-tag')
     puts "✅ GitHub release #{version} created successfully"
   else
-    puts "❌ Failed to create GitHub release"
-    puts "You can manually create it with:"
+    puts '❌ Failed to create GitHub release'
+    puts 'You can manually create it with:'
     puts "  gh release create '#{version}' --generate-notes --verify-tag"
   end
 end

data/grape_logging.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'grape_logging/version'
 
@@ -16,13 +16,11 @@ Gem::Specification.new do |spec|
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'grape', '< 2.4.0'
+  spec.add_dependency 'grape', '>= 2.4.0'
   spec.add_dependency 'rack'
-
-  spec.add_development_dependency 'rake', '~> 13.3'
-  spec.add_development_dependency 'rspec', '~> 3.5'
+  spec.add_dependency 'zeitwerk'
 end

data/lib/grape_logging/formatters/default.rb

@@ -18,6 +18,7 @@ module GrapeLogging
       end
 
       private
+
       def format_hash(hash)
         hash.keys.sort.map { |key| "#{key}=#{hash[key]}" }.join(' ')
       end

data/lib/grape_logging/formatters/logstash.rb

@@ -3,9 +3,9 @@ module GrapeLogging
     class Logstash
       def call(severity, datetime, _, data)
         {
-          :'@timestamp' => datetime.iso8601,
-          :'@version' => '1',
-          :severity => severity
+          '@timestamp': datetime.iso8601,
+          '@version': '1',
+          severity: severity
         }.merge!(format(data)).to_json + "\n"
       end
 

data/lib/grape_logging/formatters/rails.rb

@@ -1,9 +1,6 @@
-require 'rack/utils'
-
 module GrapeLogging
   module Formatters
     class Rails
-
       def call(severity, datetime, _, data)
         if data.is_a?(String)
           "#{severity[0..0]} [#{datetime}] #{severity} -- : #{data}\n"
@@ -24,7 +21,7 @@ module GrapeLogging
         [
           "#{exception.message} (#{exception.class})",
           backtrace_array.join("\n")
-        ].reject{|line| line == ""}.join("\n")
+        ].reject { |line| line == '' }.join("\n")
       end
 
       def format_hash(hash)
@@ -32,7 +29,7 @@ module GrapeLogging
         # Completed 200 OK in 958ms (Views: 951.1ms | ActiveRecord: 3.8ms)
         # See: actionpack/lib/action_controller/log_subscriber.rb
 
-        message = ""
+        message = ''
         additions = []
         status = hash.delete(:status)
         params = hash.delete(:params)
@@ -47,13 +44,12 @@ module GrapeLogging
         message << "  Parameters: #{params.inspect}\n" if params
 
         message << "Completed #{status} #{::Rack::Utils::HTTP_STATUS_CODES[status]} in #{total_time}ms"
-        message << " (#{additions.join(" | ".freeze)})" if additions.size > 0
+        message << " (#{additions.join(' | '.freeze)})" unless additions.empty?
         message << "\n"
         message << "\n" if defined?(::Rails.env) && ::Rails.env.development?
 
         message
       end
-
     end
   end
 end

data/lib/grape_logging/loggers/base.rb

@@ -1,7 +1,7 @@
 module GrapeLogging
   module Loggers
     class Base
-      def parameters(request, response)
+      def parameters(_request, _response)
         {}
       end
     end

data/lib/grape_logging/loggers/client_env.rb

@@ -2,7 +2,7 @@ module GrapeLogging
   module Loggers
     class ClientEnv < GrapeLogging::Loggers::Base
       def parameters(request, _)
-        { ip: request.env["HTTP_X_FORWARDED_FOR"] || request.env["REMOTE_ADDR"], ua: request.env["HTTP_USER_AGENT"] }
+        { ip: request.env['HTTP_X_FORWARDED_FOR'] || request.env['REMOTE_ADDR'], ua: request.env['HTTP_USER_AGENT'] }
       end
     end
   end

data/lib/grape_logging/loggers/filter_parameters.rb

@@ -3,7 +3,7 @@ module GrapeLogging
     class FilterParameters < GrapeLogging::Loggers::Base
       AD_PARAMS = 'action_dispatch.request.parameters'.freeze
 
-      def initialize(filter_parameters = nil, replacement = nil, exceptions = %w(controller action format))
+      def initialize(filter_parameters = nil, replacement = nil, exceptions = %w[controller action format])
         @filter_parameters = filter_parameters || (defined?(::Rails.application) ? ::Rails.application.config.filter_parameters : [])
         @replacement = replacement || '[FILTERED]'
         @exceptions = exceptions
@@ -16,7 +16,7 @@ module GrapeLogging
       private
 
       def parameter_filter
-        @parameter_filter ||= ParameterFilter.new(@replacement, @filter_parameters)
+        @parameter_filter ||= GrapeLogging::Util::ParameterFilter.new(@replacement, @filter_parameters)
       end
 
       def safe_parameters(request)
@@ -30,8 +30,8 @@ module GrapeLogging
 
       def clean_parameters(parameters)
         original_encoding_map = build_encoding_map(parameters)
-        params = transform_key_encoding(parameters, Hash.new{ |h, _| [Encoding::ASCII_8BIT, h] })
-        cleaned_params = parameter_filter.filter(params).reject{ |key, _value| @exceptions.include?(key) }
+        params = transform_key_encoding(parameters, Hash.new { |h, _| [Encoding::ASCII_8BIT, h] })
+        cleaned_params = parameter_filter.filter(params).except(*@exceptions)
         transform_key_encoding(cleaned_params, original_encoding_map)
       end
 

data/lib/grape_logging/loggers/request_headers.rb

@@ -1,7 +1,6 @@
 module GrapeLogging
   module Loggers
     class RequestHeaders < GrapeLogging::Loggers::Base
-
       HTTP_PREFIX = 'HTTP_'.freeze
 
       def parameters(request, _)
@@ -16,7 +15,6 @@ module GrapeLogging
 
         { headers: headers }
       end
-
     end
   end
 end

data/lib/grape_logging/loggers/response.rb

@@ -11,12 +11,11 @@ module GrapeLogging
       # For example, if you POST on a PUT endpoint, response.body is egal to """".
       # It's strange, but it's the Grape behavior...
       def serialized_response_body(response)
-
         if response.respond_to?(:body)
           # Rack responses
           begin
-            response.body.map{ |body| JSON.parse(body.to_s) }
-          rescue # No reason to have "=> e" here when we don't use it..
+            response.body.map { |body| JSON.parse(body.to_s) }
+          rescue StandardError # No reason to have "=> e" here when we don't use it..
             response.body
           end
         else

data/lib/grape_logging/middleware/request_logger.rb

@@ -1,27 +1,27 @@
-require 'grape'
-
 module GrapeLogging
   module Middleware
     class RequestLogger < Grape::Middleware::Base
-
-      ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
-        event = ActiveSupport::Notifications::Event.new(*args)
-        GrapeLogging::Timings.append_db_runtime(event)
-      end if defined?(ActiveRecord)
+      if defined?(ActiveRecord)
+        ActiveSupport::Notifications.subscribe('sql.active_record') do |*args|
+          event = ActiveSupport::Notifications::Event.new(*args)
+          GrapeLogging::Timings.append_db_runtime(event)
+        end
+      end
 
       # Persist response status & response (body)
       # to use int in parameters
       attr_accessor :response_status, :response_body
 
-      def initialize(app, options = {})
+      def initialize(app, **options)
         super
 
         @included_loggers = @options[:include] || []
-        @reporter = if options[:instrumentation_key]
-          Reporters::ActiveSupportReporter.new(@options[:instrumentation_key])
-        else
-          Reporters::LoggerReporter.new(@options[:logger], @options[:formatter], @options[:log_level])
-        end
+        @reporter =
+          if options[:instrumentation_key]
+            Reporters::ActiveSupportReporter.new(@options[:instrumentation_key])
+          else
+            Reporters::LoggerReporter.new(@options[:logger], @options[:formatter], @options[:log_level])
+          end
       end
 
       def before
@@ -70,7 +70,9 @@ module GrapeLogging
         # when no error occurs.
         if error
           # Call with error & response
-          after(error[:status], error[:message])
+          status, message = status_and_message(error)
+
+          after(status, message)
 
           # Throw again
           throw(:error, error)
@@ -99,7 +101,7 @@ module GrapeLogging
           path: request.path,
           params: request.params,
           host: request.host,
-          request_id: env['action_dispatch.request_id'],
+          request_id: env['action_dispatch.request_id']
         }
       end
 
@@ -148,6 +150,17 @@ module GrapeLogging
           logger.send(method_name) if logger.respond_to?(method_name)
         end
       end
+
+      def status_and_message(error)
+        case Gem::Version.new(Grape::VERSION)
+        when Gem::Requirement.new('>= 3.3.0')
+          # `error` is a `Grape::Exceptions::ErrorResponse`
+          [error.status, error.message]
+        else
+          # `error` is a `Hash`
+          [error[:status], error[:message]]
+        end
+      end
     end
   end
 end

data/lib/grape_logging/multi_io.rb

@@ -5,11 +5,11 @@ module GrapeLogging
     end
 
     def write(*args)
-      @targets.each {|t| t.write(*args)}
+      @targets.each { |t| t.write(*args) }
     end
 
     def close
       @targets.each(&:close)
     end
   end
-end
+end

data/lib/grape_logging/reporters/active_support_reporter.rb

@@ -1,11 +1,13 @@
-module Reporters
-  class ActiveSupportReporter
-    def initialize(instrumentation_key)
-      @instrumentation_key = instrumentation_key
-    end
+module GrapeLogging
+  module Reporters
+    class ActiveSupportReporter
+      def initialize(instrumentation_key)
+        @instrumentation_key = instrumentation_key
+      end
 
-    def perform(params)
-      ActiveSupport::Notifications.instrument @instrumentation_key, params
+      def perform(params)
+        ActiveSupport::Notifications.instrument @instrumentation_key, params
+      end
     end
   end
-end
+end

data/lib/grape_logging/reporters/logger_reporter.rb

@@ -1,15 +1,15 @@
-module Reporters
-  class LoggerReporter
-    def initialize(logger, formatter, log_level)
-      @logger = logger.clone || Logger.new(STDOUT)
-      @log_level = log_level || :info
-      if @logger.respond_to?(:formatter=)
-        @logger.formatter = formatter || @logger.formatter || GrapeLogging::Formatters::Default.new
+module GrapeLogging
+  module Reporters
+    class LoggerReporter
+      def initialize(logger, formatter, log_level)
+        @logger = logger.clone || Logger.new(STDOUT)
+        @log_level = log_level || :info
+        @logger.formatter = formatter || @logger.formatter || GrapeLogging::Formatters::Default.new if @logger.respond_to?(:formatter=)
       end
-    end
 
-    def perform(params)
-      @logger.send(@log_level, params)
+      def perform(params)
+        @logger.send(@log_level, params)
+      end
     end
   end
 end

data/lib/grape_logging/timings.rb

@@ -1,21 +1,19 @@
 module GrapeLogging
   module Timings
-    extend self
-
-    def db_runtime=(value)
+    def self.db_runtime=(value)
       Thread.current[:grape_db_runtime] = value
     end
 
-    def db_runtime
+    def self.db_runtime
       Thread.current[:grape_db_runtime] ||= 0
     end
 
-    def reset_db_runtime
+    def self.reset_db_runtime
       self.db_runtime = 0
     end
 
-    def append_db_runtime(event)
+    def self.append_db_runtime(event)
       self.db_runtime += event.duration
     end
   end
-end
+end

data/lib/grape_logging/util/parameter_filter.rb

@@ -1,99 +1,105 @@
-if defined?(::Rails.application)
-  if Gem::Version.new(Rails.version) < Gem::Version.new('6.0.0')
-    class ParameterFilter < ActionDispatch::Http::ParameterFilter
-      def initialize(_replacement, filter_parameters)
-        super(filter_parameters)
-      end
-    end
-  else
-    require "active_support/parameter_filter"
+module GrapeLogging
+  module Util
+    if defined?(Rails.application)
+      if Gem::Version.new(Rails.version) < Gem::Version.new('6.0.0')
+        class ParameterFilter < ActionDispatch::Http::ParameterFilter
+          def initialize(_replacement, filter_parameters)
+            super(filter_parameters)
+          end
+        end
+      else
+        require 'active_support/parameter_filter'
 
-    class ParameterFilter < ActiveSupport::ParameterFilter
-      def initialize(_replacement, filter_parameters)
-        super(filter_parameters)
+        class ParameterFilter < ActiveSupport::ParameterFilter
+          def initialize(_replacement, filter_parameters)
+            super(filter_parameters)
+          end
+        end
       end
-    end
-  end
-else
-  #
-  # lifted from https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/http/parameter_filter.rb
-  # we could depend on Rails specifically, but that would us way to hefty!
-  #
-  class ParameterFilter
-    def initialize(replacement, filters = [])
-      @replacement = replacement
-      @filters = filters
-    end
-
-    def filter(params)
-      compiled_filter.call(params)
-    end
+    else
+      #
+      # lifted from https://github.com/rails/rails/blob/master/actionpack/lib/action_dispatch/http/parameter_filter.rb
+      # we could depend on Rails specifically, but that would us way to hefty!
+      #
+      class ParameterFilter
+        def initialize(replacement, filters = [])
+          @replacement = replacement
+          @filters = filters
+        end
 
-    private
+        def filter(params)
+          compiled_filter.call(params)
+        end
 
-    def compiled_filter
-      @compiled_filter ||= CompiledFilter.compile(@replacement, @filters)
-    end
+        private
 
-    class CompiledFilter # :nodoc:
-      def self.compile(replacement, filters)
-        return lambda { |params| params.dup } if filters.empty?
+        def compiled_filter
+          @compiled_filter ||= CompiledFilter.compile(@replacement, @filters)
+        end
 
-        strings, regexps, blocks = [], [], []
+        class CompiledFilter # :nodoc:
+          def self.compile(replacement, filters)
+            return ->(params) { params.dup } if filters.empty?
 
-        filters.each do |item|
-          case item
-          when Proc
-            blocks << item
-          when Regexp
-            regexps << item
-          else
-            strings << Regexp.escape(item.to_s)
-          end
-        end
+            strings = []
+            regexps = []
+            blocks = []
 
-        deep_regexps, regexps = regexps.partition { |r| r.to_s.include?("\\.".freeze) }
-        deep_strings, strings = strings.partition { |s| s.include?("\\.".freeze) }
+            filters.each do |item|
+              case item
+              when Proc
+                blocks << item
+              when Regexp
+                regexps << item
+              else
+                strings << Regexp.escape(item.to_s)
+              end
+            end
 
-        regexps << Regexp.new(strings.join('|'.freeze), true) unless strings.empty?
-        deep_regexps << Regexp.new(deep_strings.join('|'.freeze), true) unless deep_strings.empty?
+            deep_regexps, regexps = regexps.partition { |r| r.to_s.include?('\\.'.freeze) }
+            deep_strings, strings = strings.partition { |s| s.include?('\\.'.freeze) }
 
-        new replacement, regexps, deep_regexps, blocks
-      end
+            regexps << Regexp.new(strings.join('|'.freeze), true) unless strings.empty?
+            deep_regexps << Regexp.new(deep_strings.join('|'.freeze), true) unless deep_strings.empty?
 
-      attr_reader :regexps, :deep_regexps, :blocks
+            new replacement, regexps, deep_regexps, blocks
+          end
 
-      def initialize(replacement, regexps, deep_regexps, blocks)
-        @replacement = replacement
-        @regexps = regexps
-        @deep_regexps = deep_regexps.any? ? deep_regexps : nil
-        @blocks  = blocks
-      end
+          attr_reader :regexps, :deep_regexps, :blocks
 
-      def call(original_params, parents = [])
-        filtered_params = {}
-
-        original_params.each do |key, value|
-          parents.push(key) if deep_regexps
-          if regexps.any? { |r| key =~ r }
-            value = @replacement
-          elsif deep_regexps && (joined = parents.join('.')) && deep_regexps.any? { |r| joined =~ r }
-            value = @replacement
-          elsif value.is_a?(Hash)
-            value = call(value, parents)
-          elsif value.is_a?(Array)
-            value = value.map { |v| v.is_a?(Hash) ? call(v, parents) : v }
-          elsif blocks.any?
-            key = key.dup if key.duplicable?
-            value = value.dup if value.duplicable?
-            blocks.each { |b| b.call(key, value) }
+          def initialize(replacement, regexps, deep_regexps, blocks)
+            @replacement = replacement
+            @regexps = regexps
+            @deep_regexps = deep_regexps.any? ? deep_regexps : nil
+            @blocks = blocks
           end
-          parents.pop if deep_regexps
 
-          filtered_params[key] = value
+          def call(original_params, parents = [])
+            filtered_params = {}
+
+            original_params.each do |key, value|
+              parents.push(key) if deep_regexps
+              if regexps.any? { |r| key =~ r }
+                value = @replacement
+              elsif deep_regexps && (joined = parents.join('.')) && deep_regexps.any? { |r| joined =~ r }
+                value = @replacement
+              elsif value.is_a?(Hash)
+                value = call(value, parents)
+              elsif value.is_a?(Array)
+                value = value.map { |v| v.is_a?(Hash) ? call(v, parents) : v }
+              elsif blocks.any?
+                key = key.dup if key.duplicable?
+                value = value.dup if value.duplicable?
+                blocks.each { |b| b.call(key, value) }
+              end
+              parents.pop if deep_regexps
+
+              filtered_params[key] = value
+            end
+
+            filtered_params
+          end
         end
-
-        filtered_params
       end
     end
   end

data/lib/grape_logging/version.rb

@@ -1,3 +1,3 @@
 module GrapeLogging
-  VERSION = '2.1.1'
+  VERSION = '3.0.1'
 end

data/lib/grape_logging.rb

@@ -1,17 +1,12 @@
-require 'grape_logging/multi_io'
-require 'grape_logging/version'
-require 'grape_logging/formatters/default'
-require 'grape_logging/formatters/json'
-require 'grape_logging/formatters/lograge'
-require 'grape_logging/formatters/logstash'
-require 'grape_logging/formatters/rails'
-require 'grape_logging/loggers/base'
-require 'grape_logging/loggers/response'
-require 'grape_logging/loggers/filter_parameters'
-require 'grape_logging/loggers/client_env'
-require 'grape_logging/loggers/request_headers'
-require 'grape_logging/reporters/active_support_reporter'
-require 'grape_logging/reporters/logger_reporter'
-require 'grape_logging/timings'
-require 'grape_logging/middleware/request_logger'
-require 'grape_logging/util/parameter_filter'
+require 'grape'
+require 'rack/utils'
+require 'zeitwerk'
+
+# load zeitwerk
+Zeitwerk::Loader.for_gem.tap do |loader|
+  loader.inflector.inflect 'multi_io' => 'MultiIO'
+  loader.setup
+end
+
+module GrapeLogging
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grape_logging
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.1
 platform: ruby
 authors:
 - aserafin
@@ -14,14 +14,14 @@ dependencies:
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
@@ -39,33 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.3'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '0'
 description: This gem provides simple request logging for Grape with just few lines
   of code you have to put in your project! In return you will get response codes,
   paths, parameters and more!
@@ -78,6 +64,8 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -124,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Out of the box request logging for Grape!
 test_files: []