dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Layout: set relative_path without using Pathname 

Presently, on a Windows machine, you get an ArgumentError on Windows:

     Generating...
C:/Ruby23-x64/lib/ruby/2.3.0/pathname.rb:520:in `relative_path_from':
    different prefix: "/" and "C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/minima-1.0.1" (ArgumentError)
    from C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/jekyll-3.2.0/lib/jekyll/layout.rb:61:in `relative_path'
    from C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/jekyll-3.2.0/lib/jekyll/renderer.rb:161:in `place_in_layouts'
    from C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/jekyll-3.2.0/lib/jekyll/renderer.rb:71:in `run'

This doesn't affect filesystems which do not use drive names.
This commit is contained in:
Parker Moore 2016-07-29 12:16:06 -07:00
parent 94af8ca75a
commit d4e18fc979
No known key found for this signature in database
GPG Key ID: 193CDEBA72063C58
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/jekyll/layout.rb
View File

@ -11,6 +11,9 @@ module Jekyll
# Gets the path to this layout. # Gets the path to this layout.
attr_reader :path attr_reader :path
# Gets the path to this layout relative to its base
attr_reader :relative_path
# Gets/Sets the extension of this layout. # Gets/Sets the extension of this layout.
attr_accessor :ext attr_accessor :ext
@ -37,6 +40,7 @@ module Jekyll
@base_dir = site.source @base_dir = site.source
@path = site.in_source_dir(base, name) @path = site.in_source_dir(base, name)
end end
@relative_path = @path.sub(@base_dir, "")
self.data = {} self.data = {}
@ -52,15 +56,5 @@ module Jekyll
def process(name) def process(name)
self.ext = File.extname(name) self.ext = File.extname(name)
end end
# The path to the layout, relative to the site source.
#
# Returns a String path which represents the relative path
# from the site source to this layout
def relative_path
@relative_path ||= Pathname.new(path).relative_path_from(
Pathname.new(@base_dir)
).to_s
end
end end
end end