Skip to content

Simplify expand_path #3822

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cjcolvar merged 1 commit into from
May 13, 2026
Merged

Simplify expand_path #3822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions .rubocop_todo.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/blacklight/controller_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion lib/generators/blacklight/document_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion lib/generators/blacklight/install_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/blacklight/models_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/blacklight/search_builder_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion lib/generators/blacklight/solr_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/blacklight/test_support_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/generators/blacklight/user_generator.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)."
Expand Down
Loading