Add RealpathCache and make require_relative to require via realpath

Author: ojab

lib/bootsnap/load_path_cache.rb

@@ -21,12 +21,14 @@ module LoadPathCache
     CACHED_EXTENSIONS = DLEXT2 ? [DOT_RB, DLEXT, DLEXT2] : [DOT_RB, DLEXT]
 
     class << self
-      attr_reader :load_path_cache, :autoload_paths_cache, :loaded_features_index
+      attr_reader :load_path_cache, :autoload_paths_cache,
+                  :loaded_features_index, :realpath_cache
 
       def setup(cache_path:, development_mode:, active_support: true)
         store = Store.new(cache_path)
 
         @loaded_features_index = LoadedFeaturesIndex.new
+        @realpath_cache = RealpathCache.new
 
         @load_path_cache = Cache.new(store, $LOAD_PATH, development_mode: development_mode)
         require_relative 'load_path_cache/core_ext/kernel_require'
@@ -53,3 +55,4 @@ def setup(cache_path:, development_mode:, active_support: true)
 require_relative 'load_path_cache/store'
 require_relative 'load_path_cache/change_observer'
 require_relative 'load_path_cache/loaded_features_index'
+require_relative 'load_path_cache/realpath_cache'

lib/bootsnap/load_path_cache/core_ext/kernel_require.rb

@@ -36,6 +36,14 @@ def require(path)
     require_with_bootsnap_lfi(path)
   end
 
+  alias_method :require_relative_without_bootsnap, :require_relative
+  def require_relative(path)
+    realpath = Bootsnap::LoadPathCache.realpath_cache.call(
+      caller_locations(1..1).first.absolute_path, path
+    )
+    require(realpath)
+  end
+
   alias_method :load_without_bootsnap, :load
   def load(path, wrap = false)
     if resolved = Bootsnap::LoadPathCache.load_path_cache.find(path)
@@ -78,6 +86,14 @@ def require(path)
     require_with_bootsnap_lfi(path)
   end
 
+  alias_method :require_relative_without_bootsnap, :require_relative
+  def require_relative(path)
+    realpath = Bootsnap::LoadPathCache.realpath_cache.call(
+      caller_locations(1..1).first.absolute_path, path
+    )
+    require(realpath)
+  end
+
   alias_method :load_without_bootsnap, :load
   def load(path, wrap = false)
     if resolved = Bootsnap::LoadPathCache.load_path_cache.find(path)

lib/bootsnap/load_path_cache/realpath_cache.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Bootsnap
+  module LoadPathCache
+    class RealpathCache
+      def initialize
+        @cache = Hash.new { |h, k| h[k] = realpath(*k) }
+      end
+
+      def call(*key)
+        @cache[key]
+      end
+
+      private
+
+      def realpath(caller_location, path)
+        base = File.dirname(caller_location)
+        file = File.realpath(File.expand_path(path, base))
+        dir = File.dirname(file)
+        File.join(dir, File.basename(file))
+      end
+    end
+  end
+end

test/load_path_cache/realpath_cache_test.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+module Bootsnap
+  module LoadPathCache
+    class RealpathCacheTest < MiniTest::Test
+      def setup
+        @cache = RealpathCache.new
+        @base_dir = Dir.mktmpdir
+        @absolute_dir = "#{@base_dir}/absolute"
+        Dir.mkdir(@absolute_dir)
+
+        @real_caller = File.new("#{@absolute_dir}/real_caller.rb", 'w').path
+        @real_required = File.new("#{@absolute_dir}/real_required.rb", 'w').path
+
+        @symlinked_dir = "#{@base_dir}/symlink"
+        FileUtils.ln_s(@absolute_dir, @symlinked_dir)
+
+        @symlinked_caller = "#{@absolute_dir}/symlinked_caller.rb"
+        FileUtils.ln_s(@real_caller, @symlinked_caller)
+
+        @symlinked_required = "#{@absolute_dir}/symlinked_required.rb"
+        FileUtils.ln_s(@real_required, @symlinked_required)
+      end
+
+      def teardown
+        FileUtils.remove_entry(@base_dir)
+      end
+
+      variants = %w(absolute symlink).product(%w(absolute symlink),
+        %w(real_caller symlinked_caller),
+        %w(real_required symlinked_required))
+
+      variants.each do |caller_dir, required_dir, caller_file, required_file|
+        method_name = "test_with_#{caller_dir}_caller_dir_" \
+                      "#{required_dir}_require_dir_" \
+                      "#{caller_file}_#{required_file}"
+        define_method(method_name) do
+          caller_path = "#{@base_dir}/#{caller_dir}/#{caller_file}"
+          require_path = "../#{required_dir}/#{required_file}.rb"
+          assert @cache.call(caller_path, require_path).eql?(@real_required)
+        end
+      end
+    end
+  end
+end