From 5da625cadb632ad92693ad29158ec1f146326b5f Mon Sep 17 00:00:00 2001 From: Michael Kohl Date: Tue, 28 Dec 2021 22:11:41 +0700 Subject: [PATCH] Rubocop fixes (#15892) * Add missing spaces * Use filter_map over map + reject/compact * Simplify FactoryBot calls * Use to_h with block instead of map + to_h * Use guard clause --- app/controllers/application_controller.rb | 4 ++-- app/liquid_tags/codepen_tag.rb | 2 +- app/liquid_tags/glitch_tag.rb | 2 +- app/liquid_tags/js_fiddle_tag.rb | 2 +- app/liquid_tags/stackblitz_tag.rb | 2 +- app/services/articles/destroyer.rb | 6 +++--- app/services/color/compare_hex.rb | 4 ++-- app/services/loggers/log_worker_queue_stats.rb | 4 ++-- spec/system/admin/admin_bans_or_warns_user_spec.rb | 2 +- spec/workers/organizations/bust_cache_worker_spec.rb | 2 +- spec/workers/podcast_episodes/bust_cache_worker_spec.rb | 6 +++--- spec/workers/users/bust_cache_worker_spec.rb | 2 +- .../users/subscribe_to_mailchimp_newsletter_worker_spec.rb | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index a314faff7..0e38c2ead 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -74,12 +74,12 @@ class ApplicationController < ActionController::Base end def not_authorized - render json: {error: "Error: not authorized"}, status: :unauthorized + render json: { error: "Error: not authorized" }, status: :unauthorized raise NotAuthorizedError, "Unauthorized" end def bad_request - render json: {error: "Error: Bad Request"}, status: :bad_request + render json: { error: "Error: Bad Request" }, status: :bad_request end def error_too_many_requests(exc) diff --git a/app/liquid_tags/codepen_tag.rb b/app/liquid_tags/codepen_tag.rb index 1186e1b29..f1ed8a718 100644 --- a/app/liquid_tags/codepen_tag.rb +++ b/app/liquid_tags/codepen_tag.rb @@ -31,7 +31,7 @@ class CodepenTag < LiquidTagBase _, *options = stripped_link.split # Validation - validated_options = options.map { |option| valid_option(option) }.reject(&:nil?) + validated_options = options.filter_map { |option| valid_option(option) } raise StandardError, "Invalid Options" unless options.empty? || !validated_options.empty? option = validated_options.join("&") diff --git a/app/liquid_tags/glitch_tag.rb b/app/liquid_tags/glitch_tag.rb index ebe69dcba..31aece265 100644 --- a/app/liquid_tags/glitch_tag.rb +++ b/app/liquid_tags/glitch_tag.rb @@ -67,7 +67,7 @@ class GlitchTag < LiquidTagBase options -= %w[app code] if (options & %w[app code]) == %w[app code] # Validation - validated_options = options.map { |option| valid_option(option) }.reject(&:nil?) + validated_options = options.filter_map { |option| valid_option(option) } raise StandardError, "Invalid Options" unless options.empty? || !validated_options.empty? build_options(options) diff --git a/app/liquid_tags/js_fiddle_tag.rb b/app/liquid_tags/js_fiddle_tag.rb index e6c2782ad..c2161b5b0 100644 --- a/app/liquid_tags/js_fiddle_tag.rb +++ b/app/liquid_tags/js_fiddle_tag.rb @@ -31,7 +31,7 @@ class JsFiddleTag < LiquidTagBase _, *options = stripped_link.split # Validation - validated_options = options.map { |option| valid_option(option) }.reject(&:nil?) + validated_options = options.filter_map { |option| valid_option(option) } raise StandardError, "Invalid Options" unless options.empty? || !validated_options.empty? validated_options.length.zero? ? "" : validated_options.join(",").concat("/") diff --git a/app/liquid_tags/stackblitz_tag.rb b/app/liquid_tags/stackblitz_tag.rb index 711ef5b77..5fc2a600c 100644 --- a/app/liquid_tags/stackblitz_tag.rb +++ b/app/liquid_tags/stackblitz_tag.rb @@ -41,7 +41,7 @@ class StackblitzTag < LiquidTagBase inputs = input.split # Validation - validated_views = inputs.map { |input_option| validator.call(input_option) }.reject(&:nil?) + validated_views = inputs.filter_map { |input_option| validator.call(input_option) } raise StandardError, "Invalid Options" unless validated_views.length.between?(0, 1) validated_views.length.zero? ? "" : validated_views.join.to_s diff --git a/app/services/articles/destroyer.rb b/app/services/articles/destroyer.rb index 1e764836a..03c4ecddf 100644 --- a/app/services/articles/destroyer.rb +++ b/app/services/articles/destroyer.rb @@ -12,9 +12,9 @@ module Articles Notification.remove_all_without_delay(notifiable_ids: article.id, notifiable_type: "Article") - if article_comments_ids.present? - Notification.remove_all(notifiable_ids: article_comments_ids, notifiable_type: "Comment") - end + return if article_comments_ids.blank? + + Notification.remove_all(notifiable_ids: article_comments_ids, notifiable_type: "Comment") end end end diff --git a/app/services/color/compare_hex.rb b/app/services/color/compare_hex.rb index 467cfb551..afdef4598 100644 --- a/app/services/color/compare_hex.rb +++ b/app/services/color/compare_hex.rb @@ -42,9 +42,9 @@ module Color private def hex_to_rgb_hash(hex) - hex.match(RGB_REGEX).named_captures.map do |key, color| + hex.match(RGB_REGEX).named_captures.to_h do |key, color| [key.to_sym, color.hex] - end.to_h + end end attr_accessor :hexes diff --git a/app/services/loggers/log_worker_queue_stats.rb b/app/services/loggers/log_worker_queue_stats.rb index 76747816d..ddd31a427 100644 --- a/app/services/loggers/log_worker_queue_stats.rb +++ b/app/services/loggers/log_worker_queue_stats.rb @@ -15,9 +15,9 @@ module Loggers end def record_queue_stats(queues) - queue_hash = queues.map do |queue| + queue_hash = queues.to_h do |queue| [queue.name, { size: queue.size, latency: queue.latency }] - end.to_h + end queue_hash.each do |queue_name, queue_values| latency = queue_values.fetch(:latency, 0) size = queue_values.fetch(:size, 0) diff --git a/spec/system/admin/admin_bans_or_warns_user_spec.rb b/spec/system/admin/admin_bans_or_warns_user_spec.rb index 5be0f0f39..e9d086266 100644 --- a/spec/system/admin/admin_bans_or_warns_user_spec.rb +++ b/spec/system/admin/admin_bans_or_warns_user_spec.rb @@ -26,7 +26,7 @@ RSpec.describe "Admin bans user", type: :system do end def add_tag_moderator_role - tag = FactoryBot.create(:tag) + tag = create(:tag) user.add_role(:tag_moderator, tag) end diff --git a/spec/workers/organizations/bust_cache_worker_spec.rb b/spec/workers/organizations/bust_cache_worker_spec.rb index 950c0efab..a6bfeb76f 100644 --- a/spec/workers/organizations/bust_cache_worker_spec.rb +++ b/spec/workers/organizations/bust_cache_worker_spec.rb @@ -2,7 +2,7 @@ require "rails_helper" RSpec.describe Organizations::BustCacheWorker, type: :worker do describe "#perform" do - let!(:organization) { FactoryBot.create(:organization) } + let!(:organization) { create(:organization) } let(:worker) { subject } before do diff --git a/spec/workers/podcast_episodes/bust_cache_worker_spec.rb b/spec/workers/podcast_episodes/bust_cache_worker_spec.rb index 3aa8e28c5..606da5a62 100644 --- a/spec/workers/podcast_episodes/bust_cache_worker_spec.rb +++ b/spec/workers/podcast_episodes/bust_cache_worker_spec.rb @@ -17,7 +17,7 @@ RSpec.describe PodcastEpisodes::BustCacheWorker, type: :worker do context "when a path is not provided" do let(:podcast) { create(:podcast) } - let(:podcast_episode) { FactoryBot.create(:podcast_episode, podcast_id: podcast.id) } + let(:podcast_episode) { create(:podcast_episode, podcast_id: podcast.id) } it "does not call the service" do worker.perform(podcast_episode.id, nil, "SlUg") @@ -27,7 +27,7 @@ RSpec.describe PodcastEpisodes::BustCacheWorker, type: :worker do context "when a slug is not provided" do let(:podcast) { create(:podcast) } - let(:podcast_episode) { FactoryBot.create(:podcast_episode, podcast_id: podcast.id) } + let(:podcast_episode) { create(:podcast_episode, podcast_id: podcast.id) } it "does not call the service" do worker.perform(podcast_episode.id, "/PodCAst/SlUg", nil) @@ -37,7 +37,7 @@ RSpec.describe PodcastEpisodes::BustCacheWorker, type: :worker do context "when podcast episode is found" do let(:podcast) { create(:podcast) } - let(:podcast_episode) { FactoryBot.create(:podcast_episode, podcast_id: podcast.id) } + let(:podcast_episode) { create(:podcast_episode, podcast_id: podcast.id) } it "busts cache" do worker.perform(podcast_episode.id, "/PodCAst/SlUg", "SlUg") diff --git a/spec/workers/users/bust_cache_worker_spec.rb b/spec/workers/users/bust_cache_worker_spec.rb index 0ee1a0601..cc55291d8 100644 --- a/spec/workers/users/bust_cache_worker_spec.rb +++ b/spec/workers/users/bust_cache_worker_spec.rb @@ -2,7 +2,7 @@ require "rails_helper" RSpec.describe Users::BustCacheWorker, type: :worker do describe "#perform" do - let(:user) { FactoryBot.create(:user) } + let(:user) { create(:user) } let(:worker) { subject } it "busts cache" do diff --git a/spec/workers/users/subscribe_to_mailchimp_newsletter_worker_spec.rb b/spec/workers/users/subscribe_to_mailchimp_newsletter_worker_spec.rb index ab0810b1b..850318525 100644 --- a/spec/workers/users/subscribe_to_mailchimp_newsletter_worker_spec.rb +++ b/spec/workers/users/subscribe_to_mailchimp_newsletter_worker_spec.rb @@ -5,7 +5,7 @@ RSpec.describe Users::SubscribeToMailchimpNewsletterWorker, type: :worker do describe "#perform_now" do let(:worker) { subject } - let(:user) { FactoryBot.create(:user) } + let(:user) { create(:user) } it "subscribes user to mailchimp newsletter" do mailchimp_bot = double