dnrops
/
perfect-mustache
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partials path handling fixes

This commit is contained in:
Kyle Jessup 2016-10-07 11:03:50 -04:00
parent e919ded2ee
commit 6df2ee38a6
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -66,3 +66,4 @@ fastlane/test_output
Packages/ Packages/
*.xcodeproj/ *.xcodeproj/
.DS_Store

10
Sources/Mustache.swift
View File

@ -411,8 +411,14 @@ public class MustachePartialTag : MustacheTag {
return return
} }
let withoutLast = page.deletingLastFilePathComponent let withoutLast = page.deletingLastFilePathComponent
let slash = withoutLast[withoutLast.startIndex] == "/" ? "/" : "" let pageDir: String
let pageDir = slash + withoutLast.characters.split(separator: "/").map(String.init).joined(separator: "/") if withoutLast.isEmpty { // foo.mustache
pageDir = "."
} else if withoutLast.hasSuffix("/") {
pageDir = withoutLast
} else {
pageDir = "."
}
let fullPath = pageDir + "/" + self.tag + "." + mustacheExtension let fullPath = pageDir + "/" + self.tag + "." + mustacheExtension
do { do {
let template = try getTemplateFromCache(fullPath) let template = try getTemplateFromCache(fullPath)