Skip to content

Commit

Permalink
Prefer require_relative for internal requires
Browse files Browse the repository at this point in the history
`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:
- rubocop/rubocop#8748
  • Loading branch information
tagliala committed Sep 19, 2024
1 parent c98b63b commit 15f0bce
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 18 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## main / unreleased

* [ENHANCEMENT] Update QUnit to 2.22.0
* [ENHANCEMENT] Prefer `require_relative` for internal requires

## 22.2.0 / 2026-06-01

Expand Down
12 changes: 6 additions & 6 deletions lib/client_side_validations.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# frozen_string_literal: true

require 'client_side_validations/config'
require 'client_side_validations/active_model' if defined?(ActiveModel)
require 'client_side_validations/active_record' if defined?(ActiveRecord)
require 'client_side_validations/action_view' if defined?(ActionView)
require_relative 'client_side_validations/config'
require_relative 'client_side_validations/active_model' if defined?(ActiveModel)
require_relative 'client_side_validations/active_record' if defined?(ActiveRecord)
require_relative 'client_side_validations/action_view' if defined?(ActionView)

if defined?(Rails)
require 'client_side_validations/engine'
require 'client_side_validations/generators'
require_relative 'client_side_validations/engine'
require_relative 'client_side_validations/generators'
end
8 changes: 4 additions & 4 deletions lib/client_side_validations/action_view.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ module Helpers
end
end

require 'client_side_validations/core_ext'
require 'client_side_validations/action_view/form_helper'
require_relative 'core_ext'
require_relative 'action_view/form_helper'

if ActionView::Helpers::FormHelper.method_defined?(:form_with)
require 'client_side_validations/action_view/form_with_helper'
require_relative 'action_view/form_with_helper'
end

require 'client_side_validations/action_view/form_builder'
require_relative 'action_view/form_builder'

ActiveSupport.on_load(:action_view) { include ClientSideValidations::ActionView::Helpers::FormHelper }
ActionView::Helpers::FormBuilder.prepend ClientSideValidations::ActionView::Helpers::FormBuilder
6 changes: 3 additions & 3 deletions lib/client_side_validations/active_model.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# frozen_string_literal: true

require 'client_side_validations/core_ext'
require 'client_side_validations/extender'
require 'client_side_validations/active_model/conditionals'
require_relative 'core_ext'
require_relative 'extender'
require_relative 'active_model/conditionals'

module ClientSideValidations
module ActiveModel
Expand Down
3 changes: 1 addition & 2 deletions lib/client_side_validations/active_record.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# frozen_string_literal: true

require 'client_side_validations/active_model'
require 'client_side_validations/extender'
require_relative 'active_model'

ActiveSupport.on_load(:active_record) { include ClientSideValidations::ActiveModel::Validations }

Expand Down
5 changes: 3 additions & 2 deletions lib/client_side_validations/core_ext.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# frozen_string_literal: true

require 'active_support/json'
require 'client_side_validations/core_ext/range'
require 'client_side_validations/core_ext/regexp'

require_relative 'core_ext/range'
require_relative 'core_ext/regexp'
2 changes: 1 addition & 1 deletion lib/client_side_validations/generators.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ def self.assets
end
end

require 'client_side_validations/generators/rails_validations'
require_relative 'generators/rails_validations'

0 comments on commit 15f0bce

Please sign in to comment.