Skip to content
This repository has been archived by the owner on Jun 25, 2020. It is now read-only.

Adds .htm extension for layouts #213

Merged
merged 2 commits into from
Feb 15, 2015
Merged

Adds .htm extension for layouts #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49ce926
fix for test not using invariant culture
Feb 15, 2015
e211979
Adds .htm extension for layouts
Feb 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions src/Pretzel.Logic/Templating/JekyllEngineBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,9 @@ private void ProcessFile(string outputDirectory, Page page, Page previous, Page
if ((string)layout == "nil" || layout == null)
break;

var path = Path.Combine(Context.SourceFolder, "_layouts", layout + LayoutExtension);
var path = FindLayoutPath(layout.ToString());

if (!FileSystem.File.Exists(path))
if (path == null)
break;

try
Expand Down Expand Up @@ -246,9 +246,10 @@ private void CreateOutputDirectory(string outputFile)
FileSystem.Directory.CreateDirectory(directory);
}

protected virtual string LayoutExtension
private static readonly string[] layoutExtensions = { ".html", ".htm" };
protected virtual string[] LayoutExtensions
{
get { return ".html"; }
get { return layoutExtensions; }
}

private IDictionary<string, object> ProcessTemplate(PageContext pageContext, string path)
Expand All @@ -272,5 +273,18 @@ public bool CanProcess(SiteContext context)
if (engineInfo == null) return false;
return context.Engine == engineInfo.Engine;
}


private string FindLayoutPath(string layout)
{
foreach (var extension in LayoutExtensions)
{
var path = Path.Combine(Context.SourceFolder, "_layouts", layout + extension);
if (FileSystem.File.Exists(path))
return path;
}

return null;
}
}
}
5 changes: 3 additions & 2 deletions src/Pretzel.Logic/Templating/Razor/RazorSiteEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ protected override void PreProcess()
{
}

protected override string LayoutExtension
private static readonly string[] layoutExtensions = { ".cshtml" };
protected override string[] LayoutExtensions
{
get { return ".cshtml"; }
get { return layoutExtensions; }
}

protected override string RenderTemplate(string content, PageContext pageData)
Expand Down
1 change: 1 addition & 0 deletions src/Pretzel.Tests/Templating/Context/SiteContextGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,7 @@ public void post_with_date_in_title()
[Fact]
public void post_with_false_date_in_title()
{
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
var currentDate = new DateTime(2015, 1, 26).ToShortDateString();
var filePath = string.Format(@"C:\TestSite\_posts\{0}SomeFile.md", currentDate.Replace("/", "-"));
fileSystem.AddFile(filePath, new MockFileData(string.Format(@"---
Expand Down
28 changes: 28 additions & 0 deletions src/Pretzel.Tests/Templating/Jekyll/LiquidEngineTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,34 @@ public void The_Output_Should_Have_The_Page_Layout()
}
}

public class Given_Page_Has_A_Layout_With_An_Alternative_Extension : BakingEnvironment<LiquidEngine>
{
private const string TemplateContents = "<html><body>{{ content }}</body></html>";
private const string PageContents = "---\r\n layout: default \r\n---\r\n\r\n## Hello World!\r\n{{ page.layout }}";
private const string ExpectedfileContents = "<html><body><h2>Hello World!</h2><p>default</p></body></html>";

public override LiquidEngine Given()
{
return new LiquidEngine();
}

public override void When()
{
FileSystem.AddFile(@"C:\website\_layouts\default.htm", new MockFileData(TemplateContents));
FileSystem.AddFile(@"C:\website\index.md", new MockFileData(PageContents));
var generator = new SiteContextGenerator(FileSystem, Enumerable.Empty<IContentTransform>());
var context = generator.BuildContext(@"C:\website\", false);
Subject.FileSystem = FileSystem;
Subject.Process(context);
}

[Fact]
public void The_Output_Should_Have_The_Page_Layout()
{
Assert.Equal(ExpectedfileContents, FileSystem.File.ReadAllText(@"C:\website\_site\index.html").RemoveWhiteSpace());
}
}

public class Given_Page_Has_Comments_Metadata : BakingEnvironment<LiquidEngine>
{
private const string TemplateContents = "<html><body>{{ content }}</body></html>";
Expand Down