Skip to content

Commit cd3b183

Browse files
committed
Prefer require_relative for internal requires
`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: - ruby/psych#522 - ruby/logger#20 - ruby/rdoc#658 - rubocop/rubocop#8748
1 parent 3841f56 commit cd3b183

21 files changed

+75
-66
lines changed

lib/haml.rb

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# frozen_string_literal: true
2-
require 'haml/engine'
3-
require 'haml/error'
4-
require 'haml/version'
5-
require 'haml/template'
2+
require_relative 'haml/engine'
3+
require_relative 'haml/error'
4+
require_relative 'haml/version'
5+
require_relative 'haml/template'
66

77
if File.basename($0) != 'haml'
88
begin
99
require 'rails'
10-
require 'haml/railtie'
10+
11+
require_relative 'haml/railtie'
1112
rescue LoadError
1213
end
1314
end

lib/haml/attribute_builder.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 'haml/object_ref'
2+
require_relative 'object_ref'
33

44
module Haml::AttributeBuilder
55
class << self

lib/haml/attribute_compiler.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 'haml/attribute_builder'
3-
require 'haml/attribute_parser'
4-
require 'haml/ruby_expression'
2+
require_relative 'attribute_builder'
3+
require_relative 'attribute_parser'
4+
require_relative 'ruby_expression'
55

66
module Haml
77
# The list of boolean attributes. You may add custom attributes to this constant.

lib/haml/attribute_parser.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 'haml/ruby_expression'
2+
require_relative 'ruby_expression'
33

44
module Haml
55
class AttributeParser

lib/haml/cli.rb

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# frozen_string_literal: true
2-
require 'haml'
2+
require_relative '../haml'
3+
34
require 'thor'
45

56
module Haml
@@ -76,7 +77,9 @@ def generate_code(file)
7677
if options[:actionview]
7778
require 'action_view'
7879
require 'action_view/base'
79-
require 'haml/rails_template'
80+
81+
require_relative 'rails_template'
82+
8083
handler = Haml::RailsTemplate.new
8184
template = ActionView::Template.new(template, 'inline template', handler, { locals: [] })
8285
code = handler.call(template)

lib/haml/compiler.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# frozen_string_literal: true
2-
require 'haml/compiler/children_compiler'
3-
require 'haml/compiler/comment_compiler'
4-
require 'haml/compiler/doctype_compiler'
5-
require 'haml/compiler/script_compiler'
6-
require 'haml/compiler/silent_script_compiler'
7-
require 'haml/compiler/tag_compiler'
8-
require 'haml/filters'
9-
require 'haml/identity'
2+
require_relative 'compiler/children_compiler'
3+
require_relative 'compiler/comment_compiler'
4+
require_relative 'compiler/doctype_compiler'
5+
require_relative 'compiler/script_compiler'
6+
require_relative 'compiler/silent_script_compiler'
7+
require_relative 'compiler/tag_compiler'
8+
require_relative 'filters'
9+
require_relative 'identity'
1010

1111
module Haml
1212
class Compiler

lib/haml/compiler/children_compiler.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 'haml/temple_line_counter'
2+
require_relative '../temple_line_counter'
33

44
module Haml
55
class Compiler

lib/haml/compiler/script_compiler.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# frozen_string_literal: true
22
require 'temple/static_analyzer'
3-
require 'haml/ruby_expression'
4-
require 'haml/string_splitter'
3+
4+
require_relative '../ruby_expression'
5+
require_relative '../string_splitter'
56

67
module Haml
78
class Compiler

lib/haml/compiler/tag_compiler.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 'haml/util'
3-
require 'haml/attribute_compiler'
4-
require 'haml/string_splitter'
2+
require_relative '../util'
3+
require_relative '../attribute_compiler'
4+
require_relative '../string_splitter'
55

66
module Haml
77
class Compiler

lib/haml/engine.rb

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
# frozen_string_literal: true
22
require 'temple'
3-
require 'haml/parser'
4-
require 'haml/compiler'
5-
require 'haml/html'
6-
require 'haml/string_splitter'
7-
require 'haml/escape'
8-
require 'haml/escape_any'
9-
require 'haml/force_escape'
10-
require 'haml/dynamic_merger'
11-
require 'haml/ambles'
12-
require 'haml/whitespace'
3+
4+
require_relative 'parser'
5+
require_relative 'compiler'
6+
require_relative 'html'
7+
require_relative 'string_splitter'
8+
require_relative 'escape'
9+
require_relative 'escape_any'
10+
require_relative 'force_escape'
11+
require_relative 'dynamic_merger'
12+
require_relative 'ambles'
13+
require_relative 'whitespace'
1314

1415
module Haml
1516
class Engine < Temple::Engine

lib/haml/escape.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 'haml/util'
2+
require_relative 'util'
33

44
module Haml
55
class Escape < Temple::Filters::Escapable

lib/haml/escape_any.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 'haml/escape'
2+
require_relative 'escape'
33

44
module Haml
55
# This module allows Temple::Filter to dispatch :fescape on `#compile`.

lib/haml/filters.rb

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
# frozen_string_literal: true
2-
require 'haml/filters/base'
3-
require 'haml/filters/text_base'
4-
require 'haml/filters/tilt_base'
5-
require 'haml/filters/coffee'
6-
require 'haml/filters/css'
7-
require 'haml/filters/erb'
8-
require 'haml/filters/escaped'
9-
require 'haml/filters/javascript'
10-
require 'haml/filters/less'
11-
require 'haml/filters/markdown'
12-
require 'haml/filters/plain'
13-
require 'haml/filters/preserve'
14-
require 'haml/filters/ruby'
15-
require 'haml/filters/sass'
16-
require 'haml/filters/scss'
17-
require 'haml/filters/cdata'
2+
require_relative 'filters/base'
3+
require_relative 'filters/text_base'
4+
require_relative 'filters/tilt_base'
5+
require_relative 'filters/coffee'
6+
require_relative 'filters/css'
7+
require_relative 'filters/erb'
8+
require_relative 'filters/escaped'
9+
require_relative 'filters/javascript'
10+
require_relative 'filters/less'
11+
require_relative 'filters/markdown'
12+
require_relative 'filters/plain'
13+
require_relative 'filters/preserve'
14+
require_relative 'filters/ruby'
15+
require_relative 'filters/sass'
16+
require_relative 'filters/scss'
17+
require_relative 'filters/cdata'
1818

1919
module Haml
2020
class Filters

lib/haml/filters/base.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 'haml/util'
2+
require_relative '../util'
33

44
module Haml
55
class Filters

lib/haml/filters/plain.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 'haml/string_splitter'
2+
require_relative '../string_splitter'
33

44
module Haml
55
class Filters

lib/haml/force_escape.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 'haml/escape'
2+
require_relative 'escape'
33

44
module Haml
55
# This module allows Temple::Filter to dispatch :fescape on `#compile`.

lib/haml/parser.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
require 'ripper'
44
require 'strscan'
5-
require 'haml/error'
6-
require 'haml/util'
5+
6+
require_relative 'error'
7+
require_relative 'util'
78

89
module Haml
910
class Parser

lib/haml/rails_helpers.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: false
2-
require 'haml/helpers'
2+
require_relative 'helpers'
33

44
# There are only helpers that depend on ActionView internals.
55
module Haml

lib/haml/rails_template.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# frozen_string_literal: true
22
require 'temple'
3-
require 'haml/engine'
4-
require 'haml/rails_helpers'
5-
require 'haml/util'
3+
4+
require_relative 'engine'
5+
require_relative 'rails_helpers'
6+
require_relative 'util'
67

78
module Haml
89
class RailsTemplate

lib/haml/railtie.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
module Haml
55
class Railtie < ::Rails::Railtie
66
initializer :haml, before: :load_config_initializers do |app|
7-
require 'haml/rails_template'
7+
require_relative 'rails_template'
88
end
99
end
1010
end

lib/haml/template.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# frozen_string_literal: false
22
require 'temple'
3-
require 'haml/engine'
4-
require 'haml/helpers'
3+
4+
require_relative 'engine'
5+
require_relative 'helpers'
56

67
module Haml
78
Template = Temple::Templates::Tilt.create(

0 commit comments

Comments
 (0)