Fix Rails/CompactBlank

.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

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

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

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

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 ==

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

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

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