Fixed: 'Action' and 'Controller' was left undashed if they are not me…

…ntioned in @Url.RouteUrl
salarcode · Jan 6, 2017 · 308bf1e · 308bf1e
1 parent 3514cd0
commit 308bf1e
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 13 deletions.
diff --git a/LowercaseDashedRouting/LowercaseDashedRoute.cs b/LowercaseDashedRouting/LowercaseDashedRoute.cs
@@ -115,26 +115,52 @@ public override VirtualPathData GetVirtualPath(RequestContext requestContext, Ro
 			var originalController = values["controller"] as string;
 			string dashedAction = originalAction, dashedController = originalController;
 
-			if (originalAction != null)
-				values["action"] = dashedAction = AddDashesBeforeCapitals(originalAction).ToLowerInvariant();
-			if (originalController != null)
-				values["controller"] = dashedController = AddDashesBeforeCapitals(originalController).ToLowerInvariant();
-
 			// FIX: for when the 'action' is not mentioned and the default value which is stored in the RouteData is about to be used!
 			var currentValues = requestContext.RouteData.Values;
 			object current;
 
-			if (currentValues.TryGetValue("action", out current) &&
-				(current as string) == originalAction)
+			// Dashing the 'Action'
+			if (originalAction != null)
+			{
+				values["action"] = dashedAction = AddDashesBeforeCapitals(originalAction).ToLowerInvariant();
+
+				if (currentValues.TryGetValue("action", out current) &&
+					(current as string) == originalAction)
+				{
+					currentValues["action"] = dashedAction;
+				}
+			}
+			else
+			{
+				// Applying dash to route values
+				if (currentValues.TryGetValue("action", out current))
+				{
+					currentValues["action"] = AddDashesBeforeCapitals(current as string).ToLowerInvariant();
+				}
+			}
+
+			// Aash the 'Controller'
+			if (originalController != null)
 			{
-				currentValues["action"] = dashedAction;
+				values["controller"] = dashedController = AddDashesBeforeCapitals(originalController).ToLowerInvariant();
+
+				if (currentValues.TryGetValue("controller", out current) &&
+					(current as string) == originalController)
+				{
+					currentValues["controller"] = dashedController;
+				}
 			}
-			if (currentValues.TryGetValue("controller", out current) &&
-				(current as string) == originalController)
+			else
 			{
-				currentValues["controller"] = dashedController;
+				// Applying dash to route values
+				if (currentValues.TryGetValue("controller", out current))
+				{
+					currentValues["controller"] = AddDashesBeforeCapitals(current as string).ToLowerInvariant();
+				}
 			}
 
+
+
 			if (DataTokens["LowercaseDashedRoute"] == null)
 			{
 				Url = AddDashesForMatchingUrl(Url);

diff --git a/LowercaseDashedRouting/Properties/AssemblyInfo.cs b/LowercaseDashedRouting/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.3.0")]
-[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]