From 8f78afe92bb08ed05ef4f5ca8c2f50ede6936f8c Mon Sep 17 00:00:00 2001 From: ashmaroli Date: Thu, 12 Apr 2018 22:26:47 +0530 Subject: [PATCH] optimize computing filename in LiquidRenderer (#6841) Merge pull request 6841 --- lib/jekyll/liquid_renderer.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/jekyll/liquid_renderer.rb b/lib/jekyll/liquid_renderer.rb index d46c0cc2..55e4e0fb 100644 --- a/lib/jekyll/liquid_renderer.rb +++ b/lib/jekyll/liquid_renderer.rb @@ -7,8 +7,8 @@ module Jekyll class LiquidRenderer extend Forwardable - def_delegator :@site, :in_source_dir, :source_dir - def_delegator :@site, :in_theme_dir, :theme_dir + private def_delegator :@site, :in_source_dir, :source_dir + private def_delegator :@site, :in_theme_dir, :theme_dir def initialize(site) @site = site @@ -24,7 +24,7 @@ module Jekyll filename.match(filename_regex) filename = if Regexp.last_match(1) == theme_dir("") - ::File.join(Regexp.last_match(1).split("/")[-1], Regexp.last_match(2)) + ::File.join(::File.basename(Regexp.last_match(1)), Regexp.last_match(2)) else Regexp.last_match(2) end @@ -53,7 +53,7 @@ module Jekyll private def filename_regex - %r!\A(#{source_dir}/|#{theme_dir}/|\W*)(.*)!oi + @filename_regex ||= %r!\A(#{source_dir}/|#{theme_dir}/|\W*)(.*)!i end def new_profile_hash