8000 Prefer `require_relative` for internal requires (#8482) · activeadmin/activeadmin@e6ecf5b · GitHub
[go: up one dir, main page]
Skip to content

Commit e6ecf5b

Browse files
taglialatagliala
authored
Prefer require_relative for internal requires (#8482)
`require_relative` is preferred over `require` for files within the same project because it uses paths relative to the current file, making code more portable and less dependent on the load path. This change updates internal requires to use `require_relative` for consistency, performance, and improved portability. Ref: - activeadmin/arbre#622 - activeadmin/inherited_resources#939
1 parent 50489c2 commit e6ecf5b

26 files changed

+60
-60
lines changed

‎lib/active_admin.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ def wrap_block_for_active_support_notifications block
125125
end
126126

127127
# Require things that don't support autoload
128-
require "active_admin/engine"
129-
require "active_admin/error"
128+
require_relative "active_admin/engine"
129+
require_relative "active_admin/error"
130130

131131
# Require internal plugins
132-
require "active_admin/batch_actions"
133-
require "active_admin/filters"
132+
require_relative "active_admin/batch_actions"
133+
require_relative "active_admin/filters"
134134

135135
# Require ORM-specific plugins
136-
require "active_admin/orm/active_record" if defined? ActiveRecord
136+
require_relative "active_admin/orm/active_record" if defined? ActiveRecord

‎lib/active_admin/application.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
2-
require "active_admin/router"
3-
require "active_admin/application_settings"
4-
require "active_admin/namespace_settings"
2+
require_relative "router"
3+
require_relative "application_settings"
4+
require_relative "namespace_settings"
55

66
module ActiveAdmin
77
class Application

‎lib/active_admin/application_settings.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
require "active_admin/settings_node"
2+
require_relative "settings_node"
33

44
module ActiveAdmin
55
class ApplicationSettings < SettingsNode

‎lib/active_admin/batch_actions.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# frozen_string_literal: true
22
ActiveAdmin.before_load do |app|
3-
require "active_admin/batch_actions/resource_extension"
4-
require "active_admin/batch_actions/controller"
3+
require_relative "batch_actions/resource_extension"
4+
require_relative "batch_actions/controller"
55

66
# Add our Extensions
77
ActiveAdmin::Resource.send :include, ActiveAdmin::BatchActions::ResourceExtension
88
ActiveAdmin::ResourceController.send :include, ActiveAdmin::BatchActions::Controller
99

10-
require "active_admin/batch_actions/views/batch_action_form"
11-
require "active_admin/batch_actions/views/selection_cells"
10+
require_relative "batch_actions/views/batch_action_form"
11+
require_relative "batch_actions/views/selection_cells"
1212
end

‎lib/active_admin/batch_actions/views/batch_action_form.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
require "active_admin/component"
2+
require_relative "../../component"
33

44
module ActiveAdmin
55
module BatchActions

‎lib/active_admin/batch_actions/views/selection_cells.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
require "active_admin/component"
2+
require_relative "../../component"
33

44
module ActiveAdmin
55
module BatchActions

‎lib/active_admin/dynamic_settings_node.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# frozen_string_literal: true
2-
require "active_admin/dynamic_setting"
3-
require "active_admin/settings_node"
2+
require_relative "dynamic_setting"
3+
require_relative "settings_node"
44

55
module ActiveAdmin
66

‎lib/active_admin/engine.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class Engine < ::Rails::Engine
3535
end
3636

3737
initializer "active_admin.routes" do
38-
require "active_admin/helpers/routes/url_helpers"
38+
require_relative "helpers/routes/url_helpers"
3939
end
4040

4141
initializer "active_admin.deprecator" do |app|

‎lib/active_admin/filters.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# frozen_string_literal: true
2-
require "active_admin/filters/dsl"
3-
require "active_admin/filters/resource_extension"
4-
require "active_admin/filters/formtastic_addons"
5-
require "active_admin/filters/forms"
6-
require "active_admin/helpers/optional_display"
2+
require_relative "filters/dsl"
3+
require_relative "filters/resource_extension"
4+
require_relative "filters/formtastic_addons"
5+
require_relative "filters/forms"
6+
require_relative "helpers/optional_display"
77

88
# Add our Extensions
99
ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Filters::DSL

‎lib/active_admin/filters/active.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
require "active_admin/filters/active_filter"
2+
require_relative "active_filter"
33

44
module ActiveAdmin
55
module Filters

0 commit comments

Comments
 (0)
0