Fix handling of relative paths in OWIN. References #253.

Author: Daniel15

src/React.Owin/EntryAssemblyFileSystem.cs

@@ -17,10 +17,41 @@ namespace React.Owin
 	/// </summary>
 	internal class EntryAssemblyFileSystem : FileSystemBase
 	{
+		private readonly string _rootPath;
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="EntryAssemblyFileSystem"/> class, using the
+		/// entry assembly's location as the root directory.
+		/// </summary>
+		public EntryAssemblyFileSystem()
+			: this(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location))
+		{
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="EntryAssemblyFileSystem"/> class, using the 
+		/// specified path as the root directory.
+		/// </summary>
+		/// <param name="rootPath">The root path.</param>
+		public EntryAssemblyFileSystem(string rootPath)
+		{
+			_rootPath = rootPath;
+		}
+
+		/// <summary>
+		/// Converts a path from an application relative path (~/...) to a full filesystem path
+		/// </summary>
+		/// <param name="relativePath">App-relative path of the file</param>
+		/// <returns>Full path of the file</returns>
 		public override string MapPath(string relativePath)
 		{
 			if (relativePath.StartsWith("~"))
-				return Path.Combine(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location), relativePath.Replace("~", string.Empty));
+			{
+				relativePath = relativePath
+					.Replace("~/", string.Empty)
+					.Replace('/', '\\');
+				return Path.Combine(_rootPath, relativePath);
+			}
 
 			return relativePath;
 		}

src/React.Tests/Owin/EntryAssemblyFileSystemTests.cs

@@ -0,0 +1,27 @@
+/*
+ *  Copyright (c) 2016-present, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant 
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+using NUnit.Framework;
+using React.Owin;
+
+namespace React.Tests.Owin
+{
+	[TestFixture]
+	public class EntryAssemblyFileSystemTests
+	{
+		[TestCase("C:\\", "~/", "C:\\")]
+		[TestCase("C:\\", "~/foo/bar.js", "C:\\foo\\bar.js")]
+		public void MapPath(string rootPath, string relativePath, string expected)
+		{
+			var fileSystem = new EntryAssemblyFileSystem(rootPath);
+			var result = fileSystem.MapPath(relativePath);
+			Assert.AreEqual(expected, result);
+		}
+	}
+}

src/React.Tests/React.Tests.csproj

@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>React.Tests</RootNamespace>
     <AssemblyName>React.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -22,6 +23,7 @@
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <NoWarn>1607</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,6 +34,7 @@
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <NoWarn>1607</NoWarn>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -105,13 +108,18 @@
     <Compile Include="Core\BabelTransformerTests.cs" />
     <Compile Include="Core\ReactComponentTest.cs" />
     <Compile Include="Mvc\HtmlHelperExtensionsTests.cs" />
+    <Compile Include="Owin\EntryAssemblyFileSystemTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Core\ReactEnvironmentTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\React.Owin\React.Owin.csproj">
+      <Project>{c3bf8d49-b7cc-4d7f-b0f0-a94347c595ea}</Project>
+      <Name>React.Owin</Name>
+    </ProjectReference>
     <ProjectReference Include="..\React.Web.Mvc4\React.Web.Mvc4.csproj">
       <Project>{662d52ac-1ee9-4372-bd74-379f9ac56451}</Project>
       <Name>React.Web.Mvc4</Name>