Rubocop fixes

Author: rsmithlal

app/concerns/better_together/searchable.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 # app/models/concerns/searchable.rb
 
 module BetterTogether
   # Enables ElasticSearch
   module Searchable
     extend ActiveSupport::Concern
-  
+
     included do
       include Elasticsearch::Model
       include Elasticsearch::Model::Callbacks
@@ -27,4 +29,4 @@ def index_document
       __elasticsearch__.index_document
     end
   end
-end
+end

app/controllers/better_together/search_controller.rb

@@ -1,12 +1,15 @@
- module BetterTogether
+# frozen_string_literal: true
+
+module BetterTogether
+  # Handles dispatching search queries to elasticsearch and displaying the results
   class SearchController < ApplicationController
     def search
       @query = params[:q]
-      if @query.present?
-        @results = BetterTogether::Page.search(@query).records
-      else
-        @results = []
-      end
+      @results = if @query.present?
+                   BetterTogether::Page.search(@query).records
+                 else
+                   []
+                 end
     end
   end
- end
+end

app/models/better_together/navigation_item.rb

@@ -118,14 +118,14 @@ def title=(arg)
     end
 
     def url
-      _url = '#'
+      fallback_url = '#'
 
       if linkable.present?
         linkable.url
       elsif route_name.present? # If the route_name is present, use the dynamic route
         retrieve_route(route_name)
       else
-        read_attribute(:url) or _url
+        read_attribute(:url) or fallback_url
       end
     end
 

app/models/better_together/page.rb

@@ -16,7 +16,9 @@ class Page < ApplicationRecord
     has_many :page_blocks, -> { positioned }, dependent: :destroy, class_name: 'BetterTogether::Content::PageBlock'
     has_many :blocks, through: :page_blocks
     has_many :image_blocks, -> { where(type: 'BetterTogether::Content::Image') }, through: :page_blocks, source: :block
-    has_many :rich_text_blocks, -> { where(type: 'BetterTogether::Content::RichText') }, through: :page_blocks, source: :block
+    has_many :rich_text_blocks, lambda {
+      where(type: 'BetterTogether::Content::RichText')
+    }, through: :page_blocks, source: :block
 
     accepts_nested_attributes_for :page_blocks, allow_destroy: true
 
@@ -53,15 +55,13 @@ class Page < ApplicationRecord
     scope :by_publication_date, -> { order(published_at: :desc) }
 
     # Customize the data sent to Elasticsearch for indexing
-    def as_indexed_json(options = {})
-      self.as_json(
+    def as_indexed_json(_options = {}) # rubocop:todo Metrics/MethodLength
+      as_json(
         methods: [:title, :content, *self.class.localized_attribute_list],
-        
+
         include: {
           rich_text_content: { only: :body },
-          image_blocks: {
-
-          },
+          image_blocks: {},
           rich_text_blocks: {
             include: {
               rich_text_content: { only: :body }

config/initializers/elasticsearch.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 # config/initializers/elasticsearch.rb
 Elasticsearch::Model.client = Elasticsearch::Client.new(
-  port: ENV.fetch('ES_PORT') { 9200 },
-  host: ENV.fetch('ES_HOST') { 'http://es' },
-  url: ENV.fetch('ELASTICSEARCH_URL') { 'http://elasticsearch:9201' }
+  port: ENV.fetch('ES_PORT', 9200),
+  host: ENV.fetch('ES_HOST', 'http://es'),
+  url: ENV.fetch('ELASTICSEARCH_URL', 'http://elasticsearch:9201')
 )

config/routes.rb

@@ -30,7 +30,7 @@
                    sign_up: 'sign-up'
                  },
                  defaults: { format: :html, locale: I18n.locale }
-      
+
       get 'search', to: 'search#search'
       authenticated :user do # rubocop:todo Metrics/BlockLength
         resources :communities, only: %i[index show]