Skip to content

Add querystring defaults to route data before checking constraints #271

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

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

Add querystring defaults to route data before checking constraints #271

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
65e395f
Replace System.Web.Mvc reference with Microsoft.Aspnet.Mvc NuGet package
brantb Sep 30, 2013
9e4c743
Add querystring defaults to route data before checking constraints.
brantb Sep 30, 2013
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
5 changes: 4 additions & 1 deletion src/AttributeRouting.Specs/AttributeRouting.Specs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@
<Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.20710.0\lib\net40\System.Web.Http.WebHost.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.Mvc.3.0.20105.1\lib\net40\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Routing" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down
2 changes: 2 additions & 0 deletions src/AttributeRouting.Specs/Features/RouteConstraints.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,3 +164,5 @@ Scenario Outline: Matching inline route constraints in the querystring
| Querystring?x=abc | Querystring | is not |
| Querystring?y=hello | Querystring | is not |
| QuerystringOptional | QuerystringOptional | is |
| QuerystringDefault | QuerystringDefault | is |
| QuerystringDefault?x=123 | QuerystringDefault | is |
4 changes: 3 additions & 1 deletion src/AttributeRouting.Specs/Features/RouteConstraints.feature.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/AttributeRouting.Specs/Subjects/InlineRouteConstraintsControllers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@ public string QuerystringOptional(int x, string y)
return "";
}

[GET("QuerystringDefault?{x:int=1}")]
public string QuerystringDefault(int x)
{
return "";
}

[GET("Alpha/{x:alpha}")]
public string Alpha(string x)
{
Expand Down
1 change: 1 addition & 0 deletions src/AttributeRouting.Specs/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.AspNet.Mvc" version="3.0.20105.1" targetFramework="net40" />
<package id="Microsoft.AspNet.WebApi.Client" version="4.0.20710.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net40" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.20710.0" targetFramework="net40" />
Expand Down
3 changes: 3 additions & 0 deletions src/AttributeRouting.Web.Http/Framework/HttpAttributeRoute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,9 @@ public override IHttpRouteData GetRouteData(string virtualPathRoot, HttpRequestM
return null;
}

// Add querystring default values if applicable.
_visitor.AddQueryStringDefaultsToRouteValues(routeData.Values);

// Constrain by querystring param if there are any.
var routeValues = new HttpRouteValueDictionary(routeData.Values);
if (!_visitor.ProcessQueryStringConstraints((constraint, parameterName) => ProcessConstraint(request, constraint, parameterName, routeValues, HttpRouteDirection.UriResolution)))
Expand Down
5 changes: 4 additions & 1 deletion src/AttributeRouting.Web.Mvc/AttributeRouting.Web.Mvc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Microsoft.AspNet.Mvc.3.0.20105.1\lib\net40\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
Expand Down
3 changes: 3 additions & 0 deletions src/AttributeRouting.Web.Mvc/Framework/AttributeRoute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ public override RouteData GetRouteData(HttpContextBase httpContext)
return null;
}

// Add querystring default values if applicable.
_visitor.AddQueryStringDefaultsToRouteValues(routeData.Values);

// Constrain by querystring param if there are any.
if (!_visitor.ProcessQueryStringConstraints((constraint, parameterName) => ProcessConstraint(httpContext, constraint, parameterName, routeData.Values, RouteDirection.IncomingRequest)))
{
Expand Down
1 change: 1 addition & 0 deletions src/AttributeRouting.Web.Mvc/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.AspNet.Mvc" version="3.0.20105.1" targetFramework="net40" />
<package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net40" />
<package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net40" />
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
Expand Down