Rubocop fixes -A

Author: rsmithlal

app/concerns/better_together/categorizable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BetterTogether
   module Categorizable
     extend ::ActiveSupport::Concern

app/controllers/better_together/application_controller.rb

@@ -16,7 +16,7 @@ class ApplicationController < ActionController::Base
     # before the location can be stored.
 
     before_action do
-      Rack::MiniProfiler.authorize_request if current_user && current_user.permitted_to?('manage_platform')
+      Rack::MiniProfiler.authorize_request if current_user&.permitted_to?('manage_platform')
     end
 
     rescue_from ActiveRecord::RecordNotFound, with: :handle404

app/controllers/better_together/categories_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BetterTogether
   class CategoriesController < FriendlyResourceController
     before_action :set_model_instance, only: %i[show edit update destroy]

app/controllers/better_together/host_dashboard_controller.rb

@@ -36,9 +36,9 @@ def index # rubocop:todo Metrics/MethodLength
 
     def set_resource_variables(klass, prefix: nil)
       variable_name = klass.model_name.name.demodulize.underscore
-      instance_variable_set(:"@#{prefix + '_' if prefix}#{variable_name.pluralize}",
+      instance_variable_set(:"@#{"#{prefix}_" if prefix}#{variable_name.pluralize}",
                             klass.order(created_at: :desc).limit(3))
-      instance_variable_set(:"@#{prefix + '_' if prefix}#{variable_name}_count", klass.count)
+      instance_variable_set(:"@#{"#{prefix}_" if prefix}#{variable_name}_count", klass.count)
     end
   end
 end

app/controllers/better_together/metrics/link_clicks_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # app/controllers/better_together/metrics/link_clicks_controller.rb
 module BetterTogether
   module Metrics

app/controllers/better_together/metrics/reports_controller.rb

@@ -1,77 +1,81 @@
-module BetterTogether
-  class Metrics::ReportsController < ApplicationController
-    def index
-      # Group Page Views by `page_url` and sort by `page_url`
-      @page_views_by_url = BetterTogether::Metrics::PageView
-                           .group(:page_url)
-                           .order('count_all DESC')
-                           .limit(20)
-                           .count
+# frozen_string_literal: true
 
-      # Use group_by_day from groupdate to group daily Page Views, and sort them automatically by date
-      @page_views_daily = BetterTogether::Metrics::PageView
-                          .group_by_day(:viewed_at)
-                          .count
+module BetterTogether
+  module Metrics
+    class ReportsController < ApplicationController
+      def index
+        # Group Page Views by `page_url` and sort by `page_url`
+        @page_views_by_url = BetterTogether::Metrics::PageView
+                             .group(:page_url)
+                             .order('count_all DESC')
+                             .limit(20)
+                             .count
 
-      # Group Link Clicks by URL, sorting by URL first
-      @link_clicks_by_url = BetterTogether::Metrics::LinkClick
-                            .group(:url)
-                            .order('count_all DESC')
-                            .limit(20)
+        # Use group_by_day from groupdate to group daily Page Views, and sort them automatically by date
+        @page_views_daily = BetterTogether::Metrics::PageView
+                            .group_by_day(:viewed_at)
                             .count
 
-      # Group Link Clicks by internal/external, sorted by internal status first
-      @internal_vs_external = BetterTogether::Metrics::LinkClick
-                              .group(:internal)
+        # Group Link Clicks by URL, sorting by URL first
+        @link_clicks_by_url = BetterTogether::Metrics::LinkClick
+                              .group(:url)
+                              .order('count_all DESC')
+                              .limit(20)
                               .count
 
-      # Group Link Clicks by the page URL where the click occurred, sorted by `page_url`
-      @link_clicks_by_page = BetterTogether::Metrics::LinkClick
-                             .group(:page_url)
-                             .count
+        # Group Link Clicks by internal/external, sorted by internal status first
+        @internal_vs_external = BetterTogether::Metrics::LinkClick
+                                .group(:internal)
+                                .count
 
-      # Group Downloads by file name, sorted by file name first
-      @downloads_by_file = BetterTogether::Metrics::Download
-                           .group(:file_name)
-                           .count
+        # Group Link Clicks by the page URL where the click occurred, sorted by `page_url`
+        @link_clicks_by_page = BetterTogether::Metrics::LinkClick
+                               .group(:page_url)
+                               .count
 
-      # Group Shares by platform, sorted by platform first
-      @shares_by_platform = BetterTogether::Metrics::Share
-                            .group(:platform)
-                            .count
+        # Group Downloads by file name, sorted by file name first
+        @downloads_by_file = BetterTogether::Metrics::Download
+                             .group(:file_name)
+                             .count
 
-      # Group Shares by both URL and Platform, sorted by URL and Platform first
-      @shares_by_url_and_platform = BetterTogether::Metrics::Share
-                                    .group(:url, :platform)
-                                    .count
+        # Group Shares by platform, sorted by platform first
+        @shares_by_platform = BetterTogether::Metrics::Share
+                              .group(:platform)
+                              .count
 
-      # Transform the data for Chart.js
-      platforms = BetterTogether::Metrics::Share.distinct.pluck(:platform)
-      urls = @shares_by_url_and_platform.keys.map { |(url, _platform)| url }.uniq
+        # Group Shares by both URL and Platform, sorted by URL and Platform first
+        @shares_by_url_and_platform = BetterTogether::Metrics::Share
+                                      .group(:url, :platform)
+                                      .count
 
-      @shares_data = {
-        labels: urls,
-        datasets: platforms.map do |platform|
-          {
-            label: platform.capitalize,
-            backgroundColor: random_color_for_platform(platform),
-            data: urls.map { |url| @shares_by_url_and_platform.fetch([url, platform], 0) }
-          }
-        end
-      }
-    end
+        # Transform the data for Chart.js
+        platforms = BetterTogether::Metrics::Share.distinct.pluck(:platform)
+        urls = @shares_by_url_and_platform.keys.map { |(url, _platform)| url }.uniq
+
+        @shares_data = {
+          labels: urls,
+          datasets: platforms.map do |platform|
+            {
+              label: platform.capitalize,
+              backgroundColor: random_color_for_platform(platform),
+              data: urls.map { |url| @shares_by_url_and_platform.fetch([url, platform], 0) }
+            }
+          end
+        }
+      end
 
-    # A helper method to generate a random color for each platform (this can be customized).
-    def random_color_for_platform(platform)
-      colors = {
-        'facebook' => 'rgba(59, 89, 152, 0.5)',
-        'twitter' => 'rgba(29, 161, 242, 0.5)',
-        'linkedin' => 'rgba(0, 123, 182, 0.5)',
-        'pinterest' => 'rgba(189, 8, 28, 0.5)',
-        'reddit' => 'rgba(255, 69, 0, 0.5)',
-        'whatsapp' => 'rgba(37, 211, 102, 0.5)'
-      }
-      colors[platform] || 'rgba(75, 192, 192, 0.5)'
+      # A helper method to generate a random color for each platform (this can be customized).
+      def random_color_for_platform(platform)
+        colors = {
+          'facebook' => 'rgba(59, 89, 152, 0.5)',
+          'twitter' => 'rgba(29, 161, 242, 0.5)',
+          'linkedin' => 'rgba(0, 123, 182, 0.5)',
+          'pinterest' => 'rgba(189, 8, 28, 0.5)',
+          'reddit' => 'rgba(255, 69, 0, 0.5)',
+          'whatsapp' => 'rgba(37, 211, 102, 0.5)'
+        }
+        colors[platform] || 'rgba(75, 192, 192, 0.5)'
+      end
     end
   end
 end

app/controllers/better_together/metrics/shares_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # app/controllers/better_together/metrics/shares_controller.rb
 module BetterTogether
   module Metrics

app/controllers/better_together/navigation_items_controller.rb

@@ -102,7 +102,7 @@ def set_pages
     end
 
     def set_navigation_area
-      @navigation_area ||= find_by_translatable(
+      @set_navigation_area ||= find_by_translatable(
         translatable_type: ::BetterTogether::NavigationArea.name,
         friendly_id: params[:navigation_area_id]
       )

app/helpers/better_together/application_helper.rb

@@ -73,7 +73,7 @@ def host_setup_wizard
     # This allows for cleaner calls to named routes without prefixing with 'better_together.'
     def method_missing(method, *args, &)
       if better_together_url_helper?(method)
-        if args.any? and args.first.is_a? Hash
+        if args.any? && args.first.is_a?(Hash)
           args = [args.first.merge(ApplicationController.default_url_options)]
         else
           args << ApplicationController.default_url_options

app/helpers/better_together/contact_details_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BetterTogether
   module ContactDetailsHelper
     def render_contact_details(contactable, options = {})
@@ -23,7 +25,7 @@ def render_phone_numbers(contact_detail, options = {})
       phone_numbers = contact_detail.phone_numbers
       phone_numbers = phone_numbers.privacy_public unless include_private
 
-      return ''.html_safe if phone_numbers.size == 0
+      return ''.html_safe if phone_numbers.empty?
 
       render partial: 'better_together/phone_numbers/list', locals: { phone_numbers: phone_numbers }
     end
@@ -33,7 +35,7 @@ def render_email_addresses(contact_detail, options = {})
       email_addresses = contact_detail.email_addresses
       email_addresses = email_addresses.privacy_public unless include_private
 
-      return ''.html_safe if email_addresses.size == 0
+      return ''.html_safe if email_addresses.empty?
 
       render partial: 'better_together/email_addresses/list', locals: { email_addresses: email_addresses }
     end
@@ -43,7 +45,7 @@ def render_addresses(contact_detail, options = {})
       addresses = contact_detail.addresses
       addresses = addresses.privacy_public unless include_private
 
-      return ''.html_safe if addresses.size == 0
+      return ''.html_safe if addresses.empty?
 
       render partial: 'better_together/addresses/list', locals: { addresses: addresses }
     end
@@ -55,7 +57,7 @@ def render_social_media_accounts(contact_detail, options = {})
       social_media_accounts = contact_detail.social_media_accounts
       social_media_accounts = social_media_accounts.privacy_public unless include_private
 
-      return ''.html_safe if social_media_accounts.size == 0
+      return ''.html_safe if social_media_accounts.empty?
 
       render partial: 'better_together/social_media_accounts/list',
              locals: { social_media_accounts: social_media_accounts }
@@ -67,7 +69,7 @@ def render_host_community_social_media_accounts(include_private: false)
 
       social_media_accounts = contact_detail.social_media_accounts.to_a
       social_media_accounts = social_media_accounts.select(&:privacy_public?) unless include_private
-      return if social_media_accounts.size < 1
+      return if social_media_accounts.empty?
 
       render partial: 'better_together/social_media_accounts/navbar',
              locals: { social_media_accounts: social_media_accounts }
@@ -99,7 +101,7 @@ def render_website_links(contact_detail, options = {})
       website_links = contact_detail.website_links
       website_links = website_links.privacy_public unless include_private
 
-      return ''.html_safe if website_links.size == 0
+      return ''.html_safe if website_links.empty?
 
       render partial: 'better_together/website_links/list', locals: { website_links: website_links }
     end