From 0bc5e588f7ba8bd0426727a9f3af9f2788e3bd4d Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 10:46:31 +0100 Subject: [PATCH] =?UTF-8?q?Update=20rubocop=20=E2=86=92=201.60.1=20(unknow?= =?UTF-8?q?n)=20(#216)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update rubocop to version 1.60.1 * Apply new rules --------- Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Co-authored-by: Konstantin Munteanu --- api_valve.gemspec | 2 +- lib/api_valve/forwarder.rb | 4 ++-- lib/api_valve/middleware/logging.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api_valve.gemspec b/api_valve.gemspec index c5151e8..ce817d6 100644 --- a/api_valve.gemspec +++ b/api_valve.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'rack-test', '~> 2.0' s.add_development_dependency 'rackup' s.add_development_dependency 'rspec', '~> 3.7' - s.add_development_dependency 'rubocop', '1.57.2' + s.add_development_dependency 'rubocop', '1.60.1' s.add_development_dependency 'rubocop-rspec', '2.26.1' s.add_development_dependency 'simplecov', '~> 0.16' s.add_development_dependency 'timecop', '~> 0.9' diff --git a/lib/api_valve/forwarder.rb b/lib/api_valve/forwarder.rb index aa07caa..ec23992 100644 --- a/lib/api_valve/forwarder.rb +++ b/lib/api_valve/forwarder.rb @@ -49,11 +49,11 @@ def build_response(original_request, original_response, options) end def request_options - (@options[:request] || {}) + @options[:request] || {} end def response_options - (@options[:response] || {}) + @options[:response] || {} end def run_request(request) diff --git a/lib/api_valve/middleware/logging.rb b/lib/api_valve/middleware/logging.rb index 29a6273..0947b49 100644 --- a/lib/api_valve/middleware/logging.rb +++ b/lib/api_valve/middleware/logging.rb @@ -45,7 +45,7 @@ def log_request logger.info INCOMING % [ env['REQUEST_METHOD'], [env['PATH_INFO'], env['QUERY_STRING'].presence].compact.join('?'), - (env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_ADDR']), + env['HTTP_X_FORWARDED_FOR'] || env['REMOTE_ADDR'], began_at.strftime('%Y-%m-%d %H:%M:%S %z') ] end