Skip to content
This repository has been archived by the owner on Jan 24, 2021. It is now read-only.

re-ordered default view location and added new module path conventions #771

Merged
merged 2 commits into from
Oct 4, 2012
Merged

re-ordered default view location and added new module path conventions #771

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
dce9d24
re-ordered default view location and added new module path conventions
phillip-haydon Oct 2, 2012
c130f04
added curly braces to if statements
phillip-haydon Oct 2, 2012
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
84 changes: 76 additions & 8 deletions src/Nancy.Tests/Unit/Conventions/DefaultViewLocationConventionsFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public void Should_define_convention_that_returns_viewname()
{
// Given
this.viewLocationConventions.Initialise(this.conventions);
var convention = this.conventions.ViewLocationConventions[5];
var convention = this.conventions.ViewLocationConventions[7];

// When
var result = convention.Invoke(
Expand All @@ -139,7 +139,7 @@ public void Should_define_convention_that_returns_viewname_in_views_folder()
{
// Given
this.viewLocationConventions.Initialise(this.conventions);
var convention = this.conventions.ViewLocationConventions[4];
var convention = this.conventions.ViewLocationConventions[6];

// When
var result = convention.Invoke(
Expand All @@ -156,7 +156,7 @@ public void Should_define_convention_that_returns_viewname_in_modulepath_subfold
{
// Given
this.viewLocationConventions.Initialise(this.conventions);
var convention = this.conventions.ViewLocationConventions[0];
var convention = this.conventions.ViewLocationConventions[2];

// When
var result = convention.Invoke(
Expand All @@ -173,7 +173,7 @@ public void Should_define_convention_that_returns_viewname_in_modulepath_subfold
{
// Given
this.viewLocationConventions.Initialise(this.conventions);
var convention = this.conventions.ViewLocationConventions[0];
var convention = this.conventions.ViewLocationConventions[2];

// When
var result = convention.Invoke(
Expand Down Expand Up @@ -224,7 +224,7 @@ public void Should_define_convention_that_returns_viewname_in_modulepath_folder(
{
// Given
this.viewLocationConventions.Initialise(this.conventions);
var convention = this.conventions.ViewLocationConventions[2];
var convention = this.conventions.ViewLocationConventions[3];

// When
var result = convention.Invoke(
Expand Down Expand Up @@ -275,7 +275,7 @@ public void Should_define_convention_that_returns_viewname_in_modulepath_folder_
{
// Given
this.viewLocationConventions.Initialise(this.conventions);
var convention = this.conventions.ViewLocationConventions[2];
var convention = this.conventions.ViewLocationConventions[3];

// When
var result = convention.Invoke(
Expand All @@ -292,7 +292,7 @@ public void Should_define_convention_that_returns_viewname_in_modulename_subfold
{
// Given
this.viewLocationConventions.Initialise(this.conventions);
var convention = this.conventions.ViewLocationConventions[1];
var convention = this.conventions.ViewLocationConventions[4];

// When
var result = convention.Invoke(
Expand All @@ -309,7 +309,7 @@ public void Should_define_convention_that_returns_viewname_in_modulename_folder(
{
// Given
this.viewLocationConventions.Initialise(this.conventions);
var convention = this.conventions.ViewLocationConventions[3];
var convention = this.conventions.ViewLocationConventions[5];

// When
var result = convention.Invoke(
Expand All @@ -320,5 +320,73 @@ public void Should_define_convention_that_returns_viewname_in_modulename_folder(
// Then
result.ShouldEqual("modulename/viewname");
}

[Fact]
public void Should_define_convention_that_returns_viewname_in_modulename_folder_in_modulepath_folder()
{
// Given
this.viewLocationConventions.Initialise(this.conventions);
var convention = this.conventions.ViewLocationConventions[1];

// When
var result = convention.Invoke(
"viewname",
null,
new ViewLocationContext { ModuleName = "modulename", ModulePath = "modulepath" });

// Then
result.ShouldEqual("modulepath/modulename/viewname");
}

[Fact]
public void Should_define_convention_that_returns_viewname_in_modulename_folder_in_modulepath_folder_in_views_folder()
{
// Given
this.viewLocationConventions.Initialise(this.conventions);
var convention = this.conventions.ViewLocationConventions[0];

// When
var result = convention.Invoke(
"viewname",
null,
new ViewLocationContext { ModuleName = "modulename", ModulePath = "modulepath" });

// Then
result.ShouldEqual("views/modulepath/modulename/viewname");
}

[Fact]
public void Should_define_convention_that_returns_viewname_in_modulename_folder_in_modulepath_folder_when_modulepath_contains_leading_slash()
{
// Given
this.viewLocationConventions.Initialise(this.conventions);
var convention = this.conventions.ViewLocationConventions[1];

// When
var result = convention.Invoke(
"viewname",
null,
new ViewLocationContext { ModuleName = "modulename", ModulePath = "/modulepath" });

// Then
result.ShouldEqual("modulepath/modulename/viewname");
}

[Fact]
public void Should_define_convention_that_returns_viewname_in_modulename_folder_in_modulepath_folder_in_views_folder_when_modulepath_contains_leading_slash()
{
// Given
this.viewLocationConventions.Initialise(this.conventions);
var convention = this.conventions.ViewLocationConventions[0];

// When
var result = convention.Invoke(
"viewname",
null,
new ViewLocationContext { ModuleName = "modulename", ModulePath = "/modulepath" });

// Then
result.ShouldEqual("views/modulepath/modulename/viewname");
}
}
}
38 changes: 34 additions & 4 deletions src/Nancy/Conventions/DefaultViewLocationConventions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,29 +39,59 @@ private static void ConfigureViewLocationConventions(NancyConventions convention
{
conventions.ViewLocationConventions = new List<Func<string, object, ViewLocationContext, string>>
{
// 0 Handles: views / *modulepath* / *modulename* / *viewname*
(viewName, model, viewLocationContext) =>{
return string.IsNullOrEmpty(viewLocationContext.ModulePath) ? string.Empty : string.Concat("views/", viewLocationContext.ModulePath.TrimStart(new[] {'/'}), "/", viewName);
if (string.IsNullOrEmpty(viewLocationContext.ModulePath))
{
return string.Empty;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Single-line if blocks should be wrapped in curly braces

}

var path = viewLocationContext.ModulePath.TrimStart(new[] { '/' });

return string.Concat("views/", path, "/", viewLocationContext.ModuleName, "/", viewName);
},

(viewName, model, viewLocationContext) => {
return string.Concat("views/", viewLocationContext.ModuleName, "/", viewName);
// 1 Handles: *modulepath* / *modulename* / *viewname*
(viewName, model, viewLocationContext) =>{
if (string.IsNullOrEmpty(viewLocationContext.ModulePath))
{
return string.Empty;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Single-line if blocks should be wrapped in curly braces

}

var path = viewLocationContext.ModulePath.TrimStart(new[] { '/' });

return string.Concat(path, "/", viewLocationContext.ModuleName, "/", viewName);
},

// 2 Handles: views / *modulepath* / *viewname*
(viewName, model, viewLocationContext) =>{
return string.IsNullOrEmpty(viewLocationContext.ModulePath) ? string.Empty : string.Concat("views/", viewLocationContext.ModulePath.TrimStart(new[] {'/'}), "/", viewName);
},

// 3 Handles: *modulepath* / *viewname*
(viewName, model, viewLocationContext) =>{
return string.IsNullOrEmpty(viewLocationContext.ModulePath) ? string.Empty : string.Concat(viewLocationContext.ModulePath.TrimStart(new[] { '/' }), "/", viewName);
},

// 4 Handles: views / *modulename* / *viewname*
(viewName, model, viewLocationContext) => {
return string.Concat("views/", viewLocationContext.ModuleName, "/", viewName);
},

// 5 Handles: *modulename* / *viewname*
(viewName, model, viewLocationContext) => {
return string.Concat(viewLocationContext.ModuleName, "/", viewName);
},

// 6 Handles: views / *viewname*
(viewName, model, viewLocationContext) => {
return string.Concat("views/", viewName);
},

// 7 Handles: *viewname*
(viewName, model, viewLocationContext) => {
return viewName;
},
}
};
}
}
Expand Down