From fde07187e666fa03cb8e92ef744b9faa08661049 Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Wed, 13 May 2026 08:58:06 -0500 Subject: [PATCH] Simplify expand_path --- .rubocop_todo.yml | 14 -------------- Gemfile | 2 +- lib/generators/blacklight/controller_generator.rb | 2 +- lib/generators/blacklight/document_generator.rb | 2 +- lib/generators/blacklight/install_generator.rb | 2 +- lib/generators/blacklight/models_generator.rb | 2 +- .../blacklight/search_builder_generator.rb | 2 +- lib/generators/blacklight/solr_generator.rb | 2 +- .../blacklight/test_support_generator.rb | 2 +- lib/generators/blacklight/user_generator.rb | 2 +- 10 files changed, 9 insertions(+), 23 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 23160d6a79..3378543799 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -407,20 +407,6 @@ Style/DocumentDynamicEvalDefinition: Style/Documentation: Enabled: false -# Offense count: 9 -# This cop supports safe autocorrection (--autocorrect). -Style/ExpandPathArguments: - Exclude: - - "Gemfile" - - "lib/generators/blacklight/controller_generator.rb" - - "lib/generators/blacklight/document_generator.rb" - - "lib/generators/blacklight/install_generator.rb" - - "lib/generators/blacklight/models_generator.rb" - - "lib/generators/blacklight/search_builder_generator.rb" - - "lib/generators/blacklight/solr_generator.rb" - - "lib/generators/blacklight/test_support_generator.rb" - - "lib/generators/blacklight/user_generator.rb" - # Offense count: 17 # This cop supports safe autocorrection (--autocorrect). # Configuration parameters: MaxUnannotatedPlaceholdersAllowed, Mode, AllowedMethods, AllowedPatterns. diff --git a/Gemfile b/Gemfile index 967e4fc25d..28b4cfb480 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' # Please see blacklight.gemspec for dependency information. -gemspec path: File.expand_path('..', __FILE__) +gemspec path: File.expand_path(__dir__) group :test do gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby diff --git a/lib/generators/blacklight/controller_generator.rb b/lib/generators/blacklight/controller_generator.rb index 8a47d54900..3963419593 100644 --- a/lib/generators/blacklight/controller_generator.rb +++ b/lib/generators/blacklight/controller_generator.rb @@ -2,7 +2,7 @@ module Blacklight class ControllerGenerator < Rails::Generators::Base - source_root File.expand_path('../templates', __FILE__) + source_root File.expand_path('templates', __dir__) argument :controller_name, type: :string, default: "catalog" diff --git a/lib/generators/blacklight/document_generator.rb b/lib/generators/blacklight/document_generator.rb index 96d54e5bb0..ae2e6d30c6 100644 --- a/lib/generators/blacklight/document_generator.rb +++ b/lib/generators/blacklight/document_generator.rb @@ -6,7 +6,7 @@ module Blacklight class DocumentGenerator < Rails::Generators::Base include Rails::Generators::Migration - source_root File.expand_path('../templates', __FILE__) + source_root File.expand_path('templates', __dir__) argument :model_name, type: :string, default: "solr_document" diff --git a/lib/generators/blacklight/install_generator.rb b/lib/generators/blacklight/install_generator.rb index 63b8c9ad86..e0bcd00f8a 100644 --- a/lib/generators/blacklight/install_generator.rb +++ b/lib/generators/blacklight/install_generator.rb @@ -2,7 +2,7 @@ module Blacklight class Install < Rails::Generators::Base - source_root File.expand_path('../templates', __FILE__) + source_root File.expand_path('templates', __dir__) argument :model_name, type: :string, default: "user" argument :controller_name, type: :string, default: "catalog" diff --git a/lib/generators/blacklight/models_generator.rb b/lib/generators/blacklight/models_generator.rb index 1cec1b1b87..25fd437c64 100644 --- a/lib/generators/blacklight/models_generator.rb +++ b/lib/generators/blacklight/models_generator.rb @@ -8,7 +8,7 @@ module Blacklight class ModelsGenerator < Rails::Generators::Base include Rails::Generators::Migration - source_root File.expand_path('../templates', __FILE__) + source_root File.expand_path('templates', __dir__) desc <<-EOS This generator makes the following changes to your application: diff --git a/lib/generators/blacklight/search_builder_generator.rb b/lib/generators/blacklight/search_builder_generator.rb index 4ae43491bd..126f9a61c1 100644 --- a/lib/generators/blacklight/search_builder_generator.rb +++ b/lib/generators/blacklight/search_builder_generator.rb @@ -6,7 +6,7 @@ module Blacklight class SearchBuilderGenerator < Rails::Generators::Base include Rails::Generators::Migration - source_root File.expand_path('../templates', __FILE__) + source_root File.expand_path('templates', __dir__) argument :model_name, type: :string, default: "search_builder" diff --git a/lib/generators/blacklight/solr_generator.rb b/lib/generators/blacklight/solr_generator.rb index 041f2c7169..76aca85f1a 100644 --- a/lib/generators/blacklight/solr_generator.rb +++ b/lib/generators/blacklight/solr_generator.rb @@ -4,7 +4,7 @@ module Blacklight class SolrGenerator < Rails::Generators::Base - source_root ::File.expand_path('../templates', __FILE__) + source_root ::File.expand_path('templates', __dir__) desc <<-EOF This generator makes the following changes to your application: diff --git a/lib/generators/blacklight/test_support_generator.rb b/lib/generators/blacklight/test_support_generator.rb index c2b74d89dc..b5ed21be43 100644 --- a/lib/generators/blacklight/test_support_generator.rb +++ b/lib/generators/blacklight/test_support_generator.rb @@ -8,7 +8,7 @@ require 'rails/generators/base' module Blacklight class TestSupport < Rails::Generators::Base - source_root File.expand_path('../templates', __FILE__) + source_root File.expand_path('templates', __dir__) desc <<-EOS Generate blacklight testing configurations for blacklight's own tests, or for blacklight plugins to use for testing diff --git a/lib/generators/blacklight/user_generator.rb b/lib/generators/blacklight/user_generator.rb index 389efca9cb..2ae6dc3ebc 100644 --- a/lib/generators/blacklight/user_generator.rb +++ b/lib/generators/blacklight/user_generator.rb @@ -7,7 +7,7 @@ module Blacklight class UserGenerator < Rails::Generators::Base include Rails::Generators::Migration - source_root File.expand_path('../templates', __FILE__) + source_root File.expand_path('templates', __dir__) argument :model_name, type: :string, default: "user" class_option :devise, type: :boolean, default: false, aliases: "-d", desc: "Use Devise as authentication logic (this is default)."