From edbf4c15a9378cd938bb5839c282006086c14297 Mon Sep 17 00:00:00 2001 From: Neal Chambers Date: Fri, 17 Nov 2023 09:00:50 +0900 Subject: [PATCH] Safely autocorrect Style/RedundantReturn Inspecting 1513 files .........................................................................................................................................................................................................................................................................................................C......................................................C............................................................................................................................................................................................................................................................................................................................................................................................................................................C.........................................................C.......C......................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................... Offenses: app/models/product_import/entry_validator.rb:200:7: C: [Corrected] Style/RedundantReturn: Redundant return detected. return true unless Float(value, exception: false).nil? ^^^^^^ app/models/spree/stock/availability_validator.rb:30:9: C: [Corrected] Layout/EmptyLineAfterGuardClause: Add empty line after guard clause. return line_item.target_shipment if line_item.target_shipment ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ app/models/spree/stock/availability_validator.rb:31:9: C: [Corrected] Style/RedundantReturn: Redundant return detected. return line_item.order.shipments.first if line_item.order&.shipments&.any? ^^^^^^ lib/reporting/reports/enterprise_fee_summary/summarizer.rb:41:11: C: [Corrected] Layout/EmptyLineAfterGuardClause: Add empty line after guard clause. return DataRepresentations::IncomingExchangeLineItemFee if for_incoming_exchange? ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ lib/reporting/reports/enterprise_fee_summary/summarizer.rb:42:11: C: [Corrected] Style/RedundantReturn: Redundant return detected. return DataRepresentations::OutgoingExchangeLineItemFee if for_outgoing_exchange? ^^^^^^ lib/stripe/authorize_response_patcher.rb:31:7: C: [Corrected] Style/RedundantReturn: Redundant return detected. return url if url.match(%r{https?://\S+}) && url.include?("stripe.com") ^^^^^^ lib/tasks/data.rake:99:7: C: [Corrected] Style/RedundantReturn: Redundant return detected. return true if Integer(value) ^^^^^^ 1513 files inspected, 7 offenses detected, 7 offenses corrected --- .rubocop_todo.yml | 11 ----------- app/models/product_import/entry_validator.rb | 2 +- app/models/spree/stock/availability_validator.rb | 3 ++- .../reports/enterprise_fee_summary/summarizer.rb | 3 ++- lib/stripe/authorize_response_patcher.rb | 2 +- lib/tasks/data.rake | 2 +- 6 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 7bb5fa3079..b7fa6eacda 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -937,17 +937,6 @@ Style/RedundantInterpolation: - 'lib/tasks/karma.rake' - 'spec/base_spec_helper.rb' -# Offense count: 5 -# This cop supports safe autocorrection (--autocorrect). -# Configuration parameters: AllowMultipleReturnValues. -Style/RedundantReturn: - Exclude: - - 'app/models/product_import/entry_validator.rb' - - 'app/models/spree/stock/availability_validator.rb' - - 'lib/reporting/reports/enterprise_fee_summary/summarizer.rb' - - 'lib/stripe/authorize_response_patcher.rb' - - 'lib/tasks/data.rake' - # Offense count: 1 # This cop supports safe autocorrection (--autocorrect). Style/RedundantSelf: diff --git a/app/models/product_import/entry_validator.rb b/app/models/product_import/entry_validator.rb index 1e4e6be649..9eaed6034a 100644 --- a/app/models/product_import/entry_validator.rb +++ b/app/models/product_import/entry_validator.rb @@ -197,7 +197,7 @@ module ProductImport end def is_numeric(value) - return true unless Float(value, exception: false).nil? + true unless Float(value, exception: false).nil? end def price_validation(entry) diff --git a/app/models/spree/stock/availability_validator.rb b/app/models/spree/stock/availability_validator.rb index 513b9fbc61..cdbcebe47b 100644 --- a/app/models/spree/stock/availability_validator.rb +++ b/app/models/spree/stock/availability_validator.rb @@ -28,7 +28,8 @@ module Spree def line_item_shipment(line_item) return line_item.target_shipment if line_item.target_shipment - return line_item.order.shipments.first if line_item.order&.shipments&.any? + + line_item.order.shipments.first if line_item.order&.shipments&.any? end # Overrides Spree v2.0.4 validate method version to: diff --git a/lib/reporting/reports/enterprise_fee_summary/summarizer.rb b/lib/reporting/reports/enterprise_fee_summary/summarizer.rb index d7651f69d4..98ec391fa8 100644 --- a/lib/reporting/reports/enterprise_fee_summary/summarizer.rb +++ b/lib/reporting/reports/enterprise_fee_summary/summarizer.rb @@ -39,7 +39,8 @@ module Reporting return DataRepresentations::ExchangeOrderFee if for_order_adjustment_source? return unless for_line_item_adjustment_source? return DataRepresentations::IncomingExchangeLineItemFee if for_incoming_exchange? - return DataRepresentations::OutgoingExchangeLineItemFee if for_outgoing_exchange? + + DataRepresentations::OutgoingExchangeLineItemFee if for_outgoing_exchange? end def for_payment_method? diff --git a/lib/stripe/authorize_response_patcher.rb b/lib/stripe/authorize_response_patcher.rb index 3ddac6ee51..4128bf6577 100644 --- a/lib/stripe/authorize_response_patcher.rb +++ b/lib/stripe/authorize_response_patcher.rb @@ -28,7 +28,7 @@ module Stripe return unless %w(authorize_with_url redirect_to_url).include?(next_action_type) url = next_action[next_action_type]["url"] - return url if url.match(%r{https?://\S+}) && url.include?("stripe.com") + url if url.match(%r{https?://\S+}) && url.include?("stripe.com") end # This field is used because the Spree code recognizes and stores it diff --git a/lib/tasks/data.rake b/lib/tasks/data.rake index 1162a94896..da55b3580e 100644 --- a/lib/tasks/data.rake +++ b/lib/tasks/data.rake @@ -96,7 +96,7 @@ namespace :ofn do end def is_integer?(value) - return true if Integer(value) + true if Integer(value) rescue StandardError false end