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

New file path stuff

This commit is contained in:
Kyle Jessup 2016-08-17 11:38:12 -04:00
parent 60c7ccb1a5
commit c437b76310
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Sources/Mustache.swift
View File

@ -23,17 +23,6 @@ import PerfectHTTP
import Foundation import Foundation
extension String {
var lastPathComponent: String {
return URL(fileURLWithPath: self).lastPathComponent ?? ""
}
var deletingLastPathComponent: String {
let pth = try? URL(fileURLWithPath: self).deletingLastPathComponent()
return pth?.path ?? ""
}
}
let mustacheExtension = "mustache" let mustacheExtension = "mustache"
private var mustacheTemplateCache = [String: (Int, MustacheTemplate)]() private var mustacheTemplateCache = [String: (Int, MustacheTemplate)]()
@ -145,7 +134,7 @@ public class MustacheEvaluationContext {
/// Returns the name of the current template file. /// Returns the name of the current template file.
public var templateName: String? { public var templateName: String? {
let nam = templatePath?.lastPathComponent let nam = templatePath?.lastFilePathComponent
return nam return nam
} }
@ -172,7 +161,7 @@ public class MustacheEvaluationContext {
if let templatePath = self.templatePath { if let templatePath = self.templatePath {
maybeTemplate = try getTemplateFromCache(templatePath) maybeTemplate = try getTemplateFromCache(templatePath)
maybeTemplate?.templateName = templatePath.lastPathComponent maybeTemplate?.templateName = templatePath.lastFilePathComponent
} else if let templateContent = self.templateContent { } else if let templateContent = self.templateContent {
let parser = MustacheParser() let parser = MustacheParser()
maybeTemplate = try parser.parse(string: templateContent) maybeTemplate = try parser.parse(string: templateContent)
@ -421,7 +410,7 @@ public class MustachePartialTag : MustacheTag {
print("Exception while executing partial \(tag): unable to find template root directory") print("Exception while executing partial \(tag): unable to find template root directory")
return return
} }
let withoutLast = page.deletingLastPathComponent let withoutLast = page.deletingLastFilePathComponent
let slash = withoutLast[withoutLast.startIndex] == "/" ? "/" : "" let slash = withoutLast[withoutLast.startIndex] == "/" ? "/" : ""
let pageDir = slash + withoutLast.characters.split(separator: "/").map(String.init).joined(separator: "/") let pageDir = slash + withoutLast.characters.split(separator: "/").map(String.init).joined(separator: "/")
let fullPath = pageDir + "/" + self.tag + "." + mustacheExtension let fullPath = pageDir + "/" + self.tag + "." + mustacheExtension