Merge pull request #3377 from AlchemyCMS/fix-linting-errors

Fix latest linting errors

Author: tvdeyen

app/controllers/concerns/alchemy/admin/resource_filter.rb

@@ -4,6 +4,7 @@ module Alchemy
   module Admin
     module ResourceFilter
       extend ActiveSupport::Concern
+
       COMMON_SEARCH_FILTER_EXCLUDES = %i[id utf8 _method _ format].freeze
 
       included do

app/helpers/alchemy/pages_helper.rb

@@ -163,7 +163,7 @@ def meta_keywords
     end
 
     def meta_robots
-      "#{@page.robot_index? ? "" : "no"}index, #{@page.robot_follow? ? "" : "no"}follow"
+      "#{"no" unless @page.robot_index?}index, #{"no" unless @page.robot_follow?}follow"
     end
 
     private

app/models/alchemy/page/page_naming.rb

@@ -5,6 +5,7 @@ class Page < BaseRecord
     module PageNaming
       extend ActiveSupport::Concern
       include NameConversions
+
       RESERVED_URLNAMES = %w[admin messages new]
 
       included do

app/models/alchemy/site/layout.rb

@@ -3,6 +3,7 @@
 module Alchemy
   module Site::Layout
     extend ActiveSupport::Concern
+
     SITE_DEFINITIONS_FILE = Rails.root.join("config/alchemy/site_layouts.yml")
 
     module ClassMethods

lib/alchemy/configurations/format_matchers.rb

@@ -4,7 +4,7 @@ module Alchemy
   module Configurations
     class FormatMatchers < Alchemy::Configuration
       option :email, :regexp, default: /\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/
-      option :url, :regexp, default: /\A[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix
+      option :url, :regexp, default: /\A[a-z0-9]+([-.]{1}[a-z0-9]+)*\.[a-z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix
       option :link_url, :regexp, default: /^(tel:|mailto:|\/|[a-z]+:\/\/)/
     end
   end

lib/tasks/alchemy/usage.rake

@@ -7,6 +7,7 @@ namespace :alchemy do
   desc "List Alchemy elements usage"
   task page_usage: :environment do
     include ActionView::Helpers::NumberHelper
+
     puts "\n  Alchemy pages usage"
     results = Alchemy::Tasks::Usage.pages_count_by_type
     if results.any?
@@ -24,6 +25,7 @@ namespace :alchemy do
   desc "List Alchemy elements usage"
   task element_usage: :environment do
     include ActionView::Helpers::NumberHelper
+
     puts "\n  Alchemy elements usage"
     results = Alchemy::Tasks::Usage.elements_count_by_name
     if results.any?

spec/models/alchemy/admin/resource_name_spec.rb

@@ -6,6 +6,7 @@
   let(:klass) do
     Class.new do
       include Alchemy::Admin::ResourceName
+
       attr_reader :controller_path
 
       def initialize(controller_path)