optimize computing filename in LiquidRenderer (#6841)
Merge pull request 6841
This commit is contained in:
parent
5da2b316eb
commit
8f78afe92b
|
@ -7,8 +7,8 @@ module Jekyll
|
||||||
class LiquidRenderer
|
class LiquidRenderer
|
||||||
extend Forwardable
|
extend Forwardable
|
||||||
|
|
||||||
def_delegator :@site, :in_source_dir, :source_dir
|
private def_delegator :@site, :in_source_dir, :source_dir
|
||||||
def_delegator :@site, :in_theme_dir, :theme_dir
|
private def_delegator :@site, :in_theme_dir, :theme_dir
|
||||||
|
|
||||||
def initialize(site)
|
def initialize(site)
|
||||||
@site = site
|
@site = site
|
||||||
|
@ -24,7 +24,7 @@ module Jekyll
|
||||||
filename.match(filename_regex)
|
filename.match(filename_regex)
|
||||||
filename =
|
filename =
|
||||||
if Regexp.last_match(1) == theme_dir("")
|
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
|
else
|
||||||
Regexp.last_match(2)
|
Regexp.last_match(2)
|
||||||
end
|
end
|
||||||
|
@ -53,7 +53,7 @@ module Jekyll
|
||||||
private
|
private
|
||||||
|
|
||||||
def filename_regex
|
def filename_regex
|
||||||
%r!\A(#{source_dir}/|#{theme_dir}/|\W*)(.*)!oi
|
@filename_regex ||= %r!\A(#{source_dir}/|#{theme_dir}/|\W*)(.*)!i
|
||||||
end
|
end
|
||||||
|
|
||||||
def new_profile_hash
|
def new_profile_hash
|
||||||
|
|
Loading…
Reference in New Issue