Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

typo in docs + failing unit test fix #38

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

typo in docs + failing unit test fix #38

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
cec80bc
typo - removed extra curly brace
razvangoga Nov 18, 2019
42b702a
Failing unit test fix : RazorFolderHostContainer error handling - exc…
razvangoga Nov 18, 2019
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
8 changes: 4 additions & 4 deletions Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,10 +299,10 @@ where the template might look like this:

@Model.Name @Model.Company @Model.Address.City @Model.Entered

@{for (int i = 0; i < 10; i++)
{
Response.WriteLine(i + ".");
}
@for (int i = 0; i < 10; i++)
{
Response.WriteLine(i + ".");
}

You can also render nested templates from string
@RenderTemplate("Child Template rendered from String. Name: @Model.Name",Model)
Expand Down
14 changes: 7 additions & 7 deletions Westwind.RazorHosting.Tests/FileTemplates/HelloWorldWithModelSyntax.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
<meta charset="utf-8" />
<title></title>
</head>
<body>
@Model.Name @Model.Company @Model.Address.City @Model.Entered
@{for (int i = 0; i < 10; i++)
{
Response.WriteLine(i + ".");
}
<body>
@Model.Name @Model.Company @Model.Address.City @Model.Entered

@for (int i = 0; i < 10; i++)
{
Response.WriteLine(i + ".");
}
</body>
</html>
10 changes: 5 additions & 5 deletions Westwind.RazorHosting.Tests/FileTemplates/TestPartial.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

@Model.Name @Model.Company @Model.Address.City @Model.Entered

@{for (int i = 0; i < 10; i++)
{
Response.WriteLine(i + ".");
}
</body>
@for (int i = 0; i < 10; i++)
{
Response.WriteLine(i + ".");
}
</body>
</html></html>
10 changes: 5 additions & 5 deletions Westwind.RazorHosting.Tests/FileTemplates/TestPartialAndLayout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@

@RenderPartial("~/Header_Partial.cshtml", Model)

@Model.Name @Model.Company @Model.Address.City @Model.Entered
@Model.Name @Model.Company @Model.Address.City @Model.Entered

@{for (int i = 0; i < 10; i++)
{
Response.WriteLine(i + ".");
}
@for (int i = 0; i < 10; i++)
{
Response.WriteLine(i + ".");
}

<div>Done</div>

1 change: 0 additions & 1 deletion Westwind.RazorHosting/HostContainers/RazorBaseHostContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,6 @@ protected virtual void SetError(string message)
return;
}


LastException = new RazorHostContainerException(message,
Utilities.GetTextWithLineNumbers(Engine?.LastGeneratedCode),
Engine?.LastException,
Expand Down
42 changes: 22 additions & 20 deletions Westwind.RazorHosting/HostContainers/RazorFolderHostContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public string RenderTemplate(string relativePath, object model = null, TextWrite
// Set configuration data that is to be passed to the template (any object)
Engine.TemplatePerRequestConfigurationData = new RazorFolderHostTemplateConfiguration()
{
TemplatePath = Path.Combine(TemplatePath, relativePath.Replace("~/","").Replace("~","")),
TemplatePath = Path.Combine(TemplatePath, relativePath.Replace("~/", "").Replace("~", "")),
TemplateRelativePath = relativePath,
LayoutPage = null,
IsLayoutPage = isLayoutPage
Expand All @@ -135,33 +135,35 @@ public string RenderTemplate(string relativePath, object model = null, TextWrite
result = Engine.RenderTemplateFromAssembly(item.AssemblyId, model, writer);

var config = Engine.TemplatePerRequestConfigurationData as RazorFolderHostTemplateConfiguration;

if (result == null)
{
LastException = new RazorHostContainerException($"Failed to render Page {relativePath}: " +
Engine.ErrorMessage,
SetErrorException(new RazorHostContainerException($"Failed to render Page {relativePath}: " +
Engine.ErrorMessage,
Engine.LastGeneratedCode,
Engine.LastException,
config.TemplatePath,
config);
config));

return null;
}


if (config != null && !config.IsLayoutPage && !string.IsNullOrEmpty(config.LayoutPage))
if (config != null && !config.IsLayoutPage && !string.IsNullOrEmpty(config.LayoutPage))
{
string layoutTemplate = config.LayoutPage;
string layoutTemplate = config.LayoutPage;
config.IsLayoutPage = false;
string layout = RenderTemplate(layoutTemplate, model, writer,isLayoutPage: true);

string layout = RenderTemplate(layoutTemplate, model, writer, isLayoutPage: true);
if (layout == null)
{
LastException = new RazorHostContainerException($"Failed to render Layout Page {layoutTemplate}: " +
Engine.ErrorMessage,
SetErrorException(new RazorHostContainerException($"Failed to render Layout Page {layoutTemplate}: " +
Engine.ErrorMessage,
Engine.LastGeneratedCode,
Engine.LastException,
Path.Combine(TemplatePath,layoutTemplate),
config);
Engine.LastException,
Path.Combine(TemplatePath, layoutTemplate),
config));

result = null;
}
else
Expand All @@ -172,10 +174,10 @@ public string RenderTemplate(string relativePath, object model = null, TextWrite
}
catch (Exception ex)
{
SetError(ex.Message);
this.SetError(ex.Message);
}
finally
{
{
writer?.Close();

// reset per request cache
Expand Down Expand Up @@ -222,15 +224,15 @@ protected virtual CompiledAssemblyItem GetAssemblyFromFileAndCache(string relati

var path = relativePath.Replace("/", "\\").Replace("~\\", "");

string filename = Path.Combine(TemplatePath,path).ToLower();
string filename = Path.Combine(TemplatePath, path).ToLower();
int fileNameHash = filename.GetHashCode();
if (!File.Exists(filename))
{
SetErrorException(new RazorHostContainerException(Westwind.RazorHosting.Properties.Resources.TemplateFileDoesnTExist + filename,
null,
null,
filename,
null));
null));
return null;
}

Expand Down Expand Up @@ -266,7 +268,7 @@ protected virtual CompiledAssemblyItem GetAssemblyFromFileAndCache(string relati
null,
null,
filename,
null));
null));
return null;
}
assemblyId = Engine.CompileTemplate(template);
Expand Down Expand Up @@ -364,6 +366,6 @@ public class CompiledAssemblyItem
public string SafeClassName { get; set; }
public string Namespace { get; set; }

public string LayoutPage { get; set; }
public string LayoutPage { get; set; }
}
}