From 3c9afcf36028d32bb5886bac2ab69ddad9f1f48e Mon Sep 17 00:00:00 2001 From: Neal Chambers Date: Tue, 15 Aug 2023 16:41:54 +0900 Subject: [PATCH] Fix Rails/CompactBlank --- .rubocop_todo.yml | 12 ------------ app/controllers/spree/admin/users_controller.rb | 4 ++-- app/models/concerns/address_display.rb | 4 ++-- app/models/spree/zone.rb | 4 ++-- app/services/order_cycle_form.rb | 4 ++-- lib/reporting/report_headers_builder.rb | 4 ++-- lib/reporting/report_ruler.rb | 2 +- .../reports/enterprise_fee_summary/parameters.rb | 12 ++++++------ 8 files changed, 17 insertions(+), 29 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index f90c90381f..50cdb2ef99 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -420,18 +420,6 @@ Rails/ApplicationController: Exclude: - 'engines/dfc_provider/app/controllers/dfc_provider/base_controller.rb' -# Offense count: 17 -# This cop supports unsafe autocorrection (--autocorrect-all). -Rails/CompactBlank: - Exclude: - - 'app/controllers/spree/admin/users_controller.rb' - - 'app/models/concerns/address_display.rb' - - 'app/models/spree/zone.rb' - - 'app/services/order_cycle_form.rb' - - 'lib/reporting/report_headers_builder.rb' - - 'lib/reporting/report_ruler.rb' - - 'lib/reporting/reports/enterprise_fee_summary/parameters.rb' - # Offense count: 8 # Configuration parameters: Include. # Include: app/models/**/*.rb diff --git a/app/controllers/spree/admin/users_controller.rb b/app/controllers/spree/admin/users_controller.rb index 77368b2f1b..541fd7dbfb 100644 --- a/app/controllers/spree/admin/users_controller.rb +++ b/app/controllers/spree/admin/users_controller.rb @@ -28,7 +28,7 @@ module Spree if @user.save if roles - @user.spree_roles = roles.reject(&:blank?).collect{ |r| Spree::Role.find(r) } + @user.spree_roles = roles.compact_blank.collect{ |r| Spree::Role.find(r) } end flash.now[:success] = Spree.t(:created_successfully) @@ -45,7 +45,7 @@ module Spree if @user.update(user_params) if roles - @user.spree_roles = roles.reject(&:blank?).collect{ |r| Spree::Role.find(r) } + @user.spree_roles = roles.compact_blank.collect{ |r| Spree::Role.find(r) } end flash.now[:success] = update_message diff --git a/app/models/concerns/address_display.rb b/app/models/concerns/address_display.rb index 558e4542fe..64cc4b3906 100644 --- a/app/models/concerns/address_display.rb +++ b/app/models/concerns/address_display.rb @@ -2,10 +2,10 @@ module AddressDisplay def full_name_reverse - [lastname, firstname].reject(&:blank?).join(" ") + [lastname, firstname].compact_blank.join(" ") end def full_name_for_sorting - [last_name, first_name].reject(&:blank?).join(", ") + [last_name, first_name].compact_blank.join(", ") end end diff --git a/app/models/spree/zone.rb b/app/models/spree/zone.rb index 435cea10ef..4c413c163f 100644 --- a/app/models/spree/zone.rb +++ b/app/models/spree/zone.rb @@ -90,7 +90,7 @@ module Spree def country_ids=(ids) zone_members.destroy_all - ids.reject(&:blank?).map do |id| + ids.compact_blank.map do |id| member = ZoneMember.new member.zoneable_type = 'Spree::Country' member.zoneable_id = id @@ -100,7 +100,7 @@ module Spree def state_ids=(ids) zone_members.destroy_all - ids.reject(&:blank?).map do |id| + ids.compact_blank.map do |id| member = ZoneMember.new member.zoneable_type = 'Spree::State' member.zoneable_id = id diff --git a/app/services/order_cycle_form.rb b/app/services/order_cycle_form.rb index 4eb6327b4a..c25c589ce5 100644 --- a/app/services/order_cycle_form.rb +++ b/app/services/order_cycle_form.rb @@ -113,7 +113,7 @@ class OrderCycleForm def selected_distributor_payment_method_ids @selected_distributor_payment_method_ids = ( attachable_distributor_payment_method_ids & - @selected_distributor_payment_method_ids.reject(&:blank?).map(&:to_i) + @selected_distributor_payment_method_ids.compact_blank.map(&:to_i) ) if attachable_distributor_payment_method_ids.sort == @@ -131,7 +131,7 @@ class OrderCycleForm def selected_distributor_shipping_method_ids @selected_distributor_shipping_method_ids = ( attachable_distributor_shipping_method_ids & - @selected_distributor_shipping_method_ids.reject(&:blank?).map(&:to_i) + @selected_distributor_shipping_method_ids.compact_blank.map(&:to_i) ) if attachable_distributor_shipping_method_ids.sort == diff --git a/lib/reporting/report_headers_builder.rb b/lib/reporting/report_headers_builder.rb index 971e90700b..369757f9c6 100644 --- a/lib/reporting/report_headers_builder.rb +++ b/lib/reporting/report_headers_builder.rb @@ -22,7 +22,7 @@ module Reporting def fields_to_hide if report.display_header_row? - report.formatted_rules.map { |rule| rule[:fields_used_in_header] }.flatten.reject(&:blank?) + report.formatted_rules.map { |rule| rule[:fields_used_in_header] }.flatten.compact_blank else [] end.concat(params_fields_to_hide) @@ -32,7 +32,7 @@ module Reporting fields_in_headers = if report.display_header_row? report.formatted_rules.map { |rule| rule[:fields_used_in_header] - }.flatten.reject(&:blank?) + }.flatten.compact_blank else [] end diff --git a/lib/reporting/report_ruler.rb b/lib/reporting/report_ruler.rb index 448d600698..d24ea327ea 100644 --- a/lib/reporting/report_ruler.rb +++ b/lib/reporting/report_ruler.rb @@ -55,7 +55,7 @@ module Reporting rule[:fields_used_in_header] ||= rule[:header] fields = rule[:header] rule[:header] = proc do |_key, _items, rows| - fields.map { |field| rows.first[field] }.reject(&:blank?).join(' ') + fields.map { |field| rows.first[field] }.compact_blank.join(' ') end end end diff --git a/lib/reporting/reports/enterprise_fee_summary/parameters.rb b/lib/reporting/reports/enterprise_fee_summary/parameters.rb index de74521af0..26c0b1dc06 100644 --- a/lib/reporting/reports/enterprise_fee_summary/parameters.rb +++ b/lib/reporting/reports/enterprise_fee_summary/parameters.rb @@ -46,12 +46,12 @@ module Reporting # # https://api.rubyonrails.org/classes/ActionView/Helpers/FormOptionsHelper.html#method-i-select def cleanup_arrays - distributor_ids.reject!(&:blank?) - producer_ids.reject!(&:blank?) - order_cycle_ids.reject!(&:blank?) - enterprise_fee_ids.reject!(&:blank?) - shipping_method_ids.reject!(&:blank?) - payment_method_ids.reject!(&:blank?) + distributor_ids.compact_blank! + producer_ids.compact_blank! + order_cycle_ids.compact_blank! + enterprise_fee_ids.compact_blank! + shipping_method_ids.compact_blank! + payment_method_ids.compact_blank! end end end