git merge master

jaredcnance · jaredcnance · commit 1d1ac7f750eb · 2016-08-29T19:56:22.000-05:00
diff --git a/JsonApiDotNetCore/Controllers/ControllerBuilder.cs b/JsonApiDotNetCore/Controllers/ControllerBuilder.cs
@@ -1,23 +1,17 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
 using System.Reflection;
+using System.Linq;
 using JsonApiDotNetCore.Abstractions;
 using JsonApiDotNetCore.Data;
 
 namespace JsonApiDotNetCore.Controllers
 {
-  public class ControllerBuilder
+  public class ControllerBuilder : IControllerBuilder
   {
-    private readonly JsonApiContext _context;
-
-    public ControllerBuilder(JsonApiContext context)
+    private JsonApiContext _context { get; set; }
+    public IJsonApiController BuildController(JsonApiContext context)
     {
       _context = context;
-    }
-
-    public IJsonApiController BuildController()
-    {
       var overrideController = GetOverrideController();
       return overrideController ?? new JsonApiController(_context, new ResourceRepository(_context));
     }
diff --git a/JsonApiDotNetCore/Controllers/IControllerBuilder.cs b/JsonApiDotNetCore/Controllers/IControllerBuilder.cs
@@ -0,0 +1,9 @@
+using JsonApiDotNetCore.Abstractions;
+
+namespace JsonApiDotNetCore.Controllers
+{
+  public interface IControllerBuilder
+  {
+    IJsonApiController BuildController(JsonApiContext context);
+  }
+}
diff --git a/JsonApiDotNetCore/Controllers/IJsonApiController.cs b/JsonApiDotNetCore/Controllers/IJsonApiController.cs
@@ -1,15 +1,15 @@
-﻿using System.Collections.Generic;
-using System.Reflection;
 using Microsoft.AspNetCore.Mvc;
+using System.Reflection;
+using System.Collections.Generic;
 
 namespace JsonApiDotNetCore.Controllers
 {
   public interface IJsonApiController
   {
-    ObjectResult Delete(string id);
     ObjectResult Get();
     ObjectResult Get(string id);
-    ObjectResult Patch(string id, Dictionary<PropertyInfo, object> entityPatch);
     ObjectResult Post(object entity);
+    ObjectResult Patch(string id, Dictionary<PropertyInfo, object> entityPatch);
+    ObjectResult Delete(string id);
   }
-}
+}
diff --git a/JsonApiDotNetCore/Data/ResourceRepository.cs b/JsonApiDotNetCore/Data/ResourceRepository.cs
@@ -1,9 +1,8 @@
 ﻿using System;
+using System.Reflection;
 using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
 using JsonApiDotNetCore.Abstractions;
-using System.Reflection;
 using JsonApiDotNetCore.Extensions;
 using JsonApiDotNetCore.Routing;
 using Microsoft.EntityFrameworkCore;
diff --git a/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs b/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using AutoMapper;
 using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -12,7 +13,7 @@ public static void AddJsonApi(this IServiceCollection services, Action<IJsonApiM
     {
       var configBuilder = new JsonApiConfigurationBuilder(configurationAction);
       var config = configBuilder.Build();
-      IRouter router = new Router(config);
+      IRouter router = new Router(config, new RouteBuilder(config), new ControllerBuilder());
       services.AddSingleton(_ => router);
     }
   }
diff --git a/JsonApiDotNetCore/Routing/IRouteBuilder.cs b/JsonApiDotNetCore/Routing/IRouteBuilder.cs
@@ -0,0 +1,9 @@
+using Microsoft.AspNetCore.Http;
+
+namespace JsonApiDotNetCore.Routing
+{
+  public interface IRouteBuilder
+  {
+    Route BuildFromRequest(HttpRequest request);
+  }
+}
diff --git a/JsonApiDotNetCore/Routing/RouteBuilder.cs b/JsonApiDotNetCore/Routing/RouteBuilder.cs
@@ -6,32 +6,30 @@
 
 namespace JsonApiDotNetCore.Routing
 {
-  public class RouteBuilder
+  public class RouteBuilder : IRouteBuilder
   {
     private RouteDefinition _baseRouteDefinition;
     private string _baseResourceId;
-    private readonly HttpRequest _request;
     private readonly JsonApiModelConfiguration _configuration;
 
-    public RouteBuilder(HttpRequest request, JsonApiModelConfiguration configuration)
+    public RouteBuilder(JsonApiModelConfiguration configuration)
     {
-      _request = request;
       _configuration = configuration;
     }
 
-    public Route BuildFromRequest()
+    public Route BuildFromRequest(HttpRequest request)
     {
-      var remainingPathString = SetBaseRouteDefinition();
+      var remainingPathString = SetBaseRouteDefinition(request.Path);
 
       if (PathStringIsEmpty(remainingPathString))
       { // {baseResource}
-        return new Route(_baseRouteDefinition.ModelType, _request.Method, null, _baseRouteDefinition);
+        return new Route(_baseRouteDefinition.ModelType, request.Method, null, _baseRouteDefinition);
       }
 
       remainingPathString = SetBaseResourceId(remainingPathString);
       if (PathStringIsEmpty(remainingPathString))
       { // {baseResource}/{baseResourceId}
-        return new Route(_baseRouteDefinition.ModelType, _request.Method, _baseResourceId, _baseRouteDefinition);
+        return new Route(_baseRouteDefinition.ModelType, request.Method, _baseResourceId, _baseRouteDefinition);
       }
 
       // { baseResource}/{ baseResourceId}/{relatedResourceName}
@@ -43,20 +41,20 @@ public Route BuildFromRequest()
       }
 
       var relationshipType = GetTypeOfRelatedResource(relatedResource);
-      return new RelationalRoute(_baseRouteDefinition.ModelType, _request.Method, _baseResourceId, _baseRouteDefinition, relationshipType, relatedResource);
+      return new RelationalRoute(_baseRouteDefinition.ModelType, request.Method, _baseResourceId, _baseRouteDefinition, relationshipType, relatedResource);
     }
 
     private bool PathStringIsEmpty(PathString pathString)
     {
       return pathString.HasValue ? string.IsNullOrEmpty(pathString.ToString().TrimStart('/')) : true;
     }
 
-    private PathString SetBaseRouteDefinition()
+    private PathString SetBaseRouteDefinition(PathString path)
     {
       foreach (var rte in _configuration.Routes)
       {
         PathString remainingPathString;
-        if (_request.Path.StartsWithSegments(new PathString(rte.PathString), StringComparison.OrdinalIgnoreCase, out remainingPathString))
+        if (path.StartsWithSegments(new PathString(rte.PathString), StringComparison.OrdinalIgnoreCase, out remainingPathString))
         {
           _baseRouteDefinition = rte;
           return remainingPathString;
@@ -76,7 +74,6 @@ private Type GetTypeOfRelatedResource(string relationshipName)
       return ModelAccessor.GetTypeFromModelRelationshipName(_baseRouteDefinition.ModelType, relationshipName);
     }
 
-
     // TODO: Why is this here?
     public static string BuildRoute(string nameSpace, string resourceCollectionName)
     {
diff --git a/JsonApiDotNetCore/Routing/Router.cs b/JsonApiDotNetCore/Routing/Router.cs
@@ -1,10 +1,12 @@
 using System;
+using System.Text;
 using JsonApiDotNetCore.Abstractions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 
 namespace JsonApiDotNetCore.Routing
 {
@@ -13,17 +15,21 @@ public class Router : IRouter
     private readonly JsonApiModelConfiguration _jsonApiModelConfiguration;
     private IServiceProvider _serviceProvider;
     private JsonApiContext _jsonApiContext;
+    private IRouteBuilder _routeBuilder;
+    private IControllerBuilder _controllerBuilder;
 
-    public Router(JsonApiModelConfiguration configuration)
+    public Router(JsonApiModelConfiguration configuration, IRouteBuilder routeBuilder, IControllerBuilder controllerBuilder)
     {
       _jsonApiModelConfiguration = configuration;
+      _routeBuilder = routeBuilder;
+      _controllerBuilder = controllerBuilder;
     }
 
     public bool HandleJsonApiRoute(HttpContext context, IServiceProvider serviceProvider)
     {
       _serviceProvider = serviceProvider;
 
-      var route = new RouteBuilder(context.Request, _jsonApiModelConfiguration).BuildFromRequest();
+      var route = _routeBuilder.BuildFromRequest(context.Request);
       if (route == null) return false;
 
       InitializeContext(context, route);
@@ -40,7 +46,8 @@ private void InitializeContext(HttpContext context, Route route)
 
     private void CallController()
     {
-      var controller = new ControllerBuilder(_jsonApiContext).BuildController();
+      var controller = _controllerBuilder.BuildController(_jsonApiContext);
+
       var result = ActivateControllerMethod(controller);
 
       result.Value = SerializeResult(result.Value);
@@ -76,7 +83,7 @@ private void SendResponse(ObjectResult result)
       var context = _jsonApiContext.HttpContext;
       context.Response.StatusCode = result.StatusCode ?? 500;
       context.Response.ContentType = "application/vnd.api+json";
-      context.Response.WriteAsync(result.Value == null ? "" : result.Value.ToString());
+      context.Response.WriteAsync(result.Value == null ? "" : result.Value.ToString(), Encoding.UTF8);
       context.Response.Body.Flush();
     }
   }
diff --git a/JsonApiDotNetCoreExample/appsettings.json b/JsonApiDotNetCoreExample/appsettings.json
@@ -1,6 +1,6 @@
 {
   "Data": {
-    "ConnectionString": "User ID=postgres;Password=postgres;Host=localhost;Port=5432;Database=JsonApiDotNetCoreExample;Pooling=true;"
+    "ConnectionString": "User ID=dotnet;Host=localhost;Port=5432;Database=JsonApiDotNetCoreExample;Pooling=true;"
   },
   "Logging": {
     "IncludeScopes": false,
diff --git a/JsonApiDotNetCoreTests/Extensions/IServiceCollectionExtensionsTests.cs b/JsonApiDotNetCoreTests/Extensions/IServiceCollectionExtensionsTests.cs
@@ -2,6 +2,7 @@
 using JsonApiDotNetCore.Routing;
 using JsonApiDotNetCore.Extensions;
 using JsonApiDotNetCoreTests.Helpers;
+using Microsoft.EntityFrameworkCore;
 
 namespace JsonApiDotNetCoreTests.Extensions.UnitTests
 {
@@ -16,10 +17,12 @@ public void AddJsonApi_AddsRouterToServiceCollection()
             var serviceCollection = new ServiceCollection();
 
             // act
-            serviceCollection.AddJsonApi(config => {});
+            serviceCollection.AddJsonApi(config => {
+              config.UseContext<DbContext>();
+            });
 
             // assert
-            Assert.True(serviceCollection.ContainsType(typeof(Router)));
+            Assert.True(serviceCollection.ContainsType(typeof(IRouter)));
         }
     }
 }
diff --git a/JsonApiDotNetCoreTests/Middleware/UnitTests/JsonApiMiddlewareTests.cs b/JsonApiDotNetCoreTests/Middleware/UnitTests/JsonApiMiddlewareTests.cs
@@ -8,8 +8,6 @@
 
 namespace JsonApiDotNetCoreTests.Middleware.UnitTests
 {
-    // see example explanation on xUnit.net website:
-    // https://xunit.github.io/docs/getting-started-dotnet-core.html
     public class JsonApiMiddlewareTests
     {
         [Fact]
diff --git a/JsonApiDotNetCoreTests/Routing/UnitTests/RouterTests.cs b/JsonApiDotNetCoreTests/Routing/UnitTests/RouterTests.cs
@@ -0,0 +1,104 @@
+using System;
+using Microsoft.AspNetCore.Http;
+using Moq;
+using Xunit;
+using JsonApiDotNetCore.Abstractions;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Routing;
+using JsonApiDotNetCore.Controllers;
+using Microsoft.AspNetCore.Mvc;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http.Internal;
+using System.IO;
+
+namespace JsonApiDotNetCoreTests.Routing.UnitTests
+{
+    public class RouterTests
+    {
+        [Fact]
+        public void HandleJsonApiRoute_ReturnsFalse_IfTheRouteCannotBeBuilt()
+        {
+          //--> arrange
+          var httpContextMock = new Mock<HttpContext>();
+          httpContextMock.SetupAllProperties();
+
+          // since this is an empty stub, IRouteBuilder.BuildFromRequest() will always return null
+          var routeBuilderMock = new Mock<IRouteBuilder>();
+
+          var router = new Router(null, routeBuilderMock.Object, null);
+
+          //--> act
+          var result = router.HandleJsonApiRoute(httpContextMock.Object, null);
+
+          //--> assert
+          Assert.False(result);
+        }
+
+        [Fact]
+        public void HandleJsonApiRoute_CallsGetMethod_ForGetRequest()
+        {
+          //--> arrange
+          var httpContextMock = new Mock<HttpContext>();
+          httpContextMock.SetupAllProperties();
+          var httpResponseMock = new Mock<HttpResponse>();
+          httpResponseMock.Setup(r => r.Body).Returns(new MemoryStream());
+          httpContextMock.Setup(c => c.Response).Returns(httpResponseMock.Object);
+
+          var route = new Route(null, "GET", null, null);
+
+          var routeBuilderMock = new Mock<IRouteBuilder>();
+          routeBuilderMock.Setup(rb => rb.BuildFromRequest(null)).Returns(route);
+
+          var serviceProviderMock = new Mock<IServiceProvider>();
+
+          var controllerMock = new Mock<IJsonApiController>();
+          controllerMock.Setup(c => c.Get()).Returns(new OkObjectResult(null));
+          var controllerBuilder = new Mock<IControllerBuilder>();
+          controllerBuilder.Setup(cb => cb.BuildController(It.IsAny<JsonApiContext>())).Returns(controllerMock.Object);
+
+          var router = new Router(new JsonApiModelConfiguration(), routeBuilderMock.Object, controllerBuilder.Object);
+
+          //--> act
+          var result = router.HandleJsonApiRoute(httpContextMock.Object, serviceProviderMock.Object);
+
+          //--> assert
+          Assert.True(result);
+          controllerMock.Verify(c => c.Get());
+        }
+
+        [Fact]
+        public void HandleJsonApiRoute_CallsGetIdMethod_ForGetIdRequest()
+        {
+          //--> arrange
+          const string resourceId = "1";
+          var httpContextMock = new Mock<HttpContext>();
+          httpContextMock.SetupAllProperties();
+          var httpResponseMock = new Mock<HttpResponse>();
+          httpResponseMock.Setup(r => r.Body).Returns(new MemoryStream());
+          httpContextMock.Setup(c => c.Response).Returns(httpResponseMock.Object);
+
+          var route = new Route(null, "GET", resourceId, null);
+
+          var routeBuilderMock = new Mock<IRouteBuilder>();
+          routeBuilderMock.Setup(rb => rb.BuildFromRequest(null)).Returns(route);
+
+          var serviceProviderMock = new Mock<IServiceProvider>();
+
+          var controllerMock = new Mock<IJsonApiController>();
+          controllerMock.Setup(c => c.Get(resourceId)).Returns(new OkObjectResult(null));
+          var controllerBuilder = new Mock<IControllerBuilder>();
+          controllerBuilder.Setup(cb => cb.BuildController(It.IsAny<JsonApiContext>())).Returns(controllerMock.Object);
+
+          var router = new Router(new JsonApiModelConfiguration(), routeBuilderMock.Object, controllerBuilder.Object);
+
+          //--> act
+          var result = router.HandleJsonApiRoute(httpContextMock.Object, serviceProviderMock.Object);
+
+          //--> assert
+          Assert.True(result);
+          controllerMock.Verify(c => c.Get(resourceId));
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using AutoMapper;`
`3`	`3`	`using JsonApiDotNetCore.Configuration;`
	`4`	`+using JsonApiDotNetCore.Controllers;`
`4`	`5`	`using JsonApiDotNetCore.Routing;`
`5`	`6`	`using Microsoft.Extensions.DependencyInjection;`
`6`	`7`
`@@ -12,7 +13,7 @@ public static void AddJsonApi(this IServiceCollection services, Action<IJsonApiM`
`12`	`13`	`{`
`13`	`14`	`var configBuilder = new JsonApiConfigurationBuilder(configurationAction);`
`14`	`15`	`var config = configBuilder.Build();`
`15`		`- IRouter router = new Router(config);`
	`16`	`+ IRouter router = new Router(config, new RouteBuilder(config), new ControllerBuilder());`
`16`	`17`	`services.AddSingleton(_ => router);`
`17`	`18`	`}`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,32 +6,30 @@`
`6`	`6`
`7`	`7`	`namespace JsonApiDotNetCore.Routing`
`8`	`8`	`{`
`9`		`- public class RouteBuilder`
	`9`	`+ public class RouteBuilder : IRouteBuilder`
`10`	`10`	`{`
`11`	`11`	`private RouteDefinition _baseRouteDefinition;`
`12`	`12`	`private string _baseResourceId;`
`13`		`- private readonly HttpRequest _request;`
`14`	`13`	`private readonly JsonApiModelConfiguration _configuration;`
`15`	`14`
`16`		`- public RouteBuilder(HttpRequest request, JsonApiModelConfiguration configuration)`
	`15`	`+ public RouteBuilder(JsonApiModelConfiguration configuration)`
`17`	`16`	`{`
`18`		`- _request = request;`
`19`	`17`	`_configuration = configuration;`
`20`	`18`	`}`
`21`	`19`
`22`		`- public Route BuildFromRequest()`
	`20`	`+ public Route BuildFromRequest(HttpRequest request)`
`23`	`21`	`{`
`24`		`- var remainingPathString = SetBaseRouteDefinition();`
	`22`	`+ var remainingPathString = SetBaseRouteDefinition(request.Path);`
`25`	`23`
`26`	`24`	`if (PathStringIsEmpty(remainingPathString))`
`27`	`25`	`{ // {baseResource}`
`28`		`- return new Route(_baseRouteDefinition.ModelType, _request.Method, null, _baseRouteDefinition);`
	`26`	`+ return new Route(_baseRouteDefinition.ModelType, request.Method, null, _baseRouteDefinition);`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`remainingPathString = SetBaseResourceId(remainingPathString);`
`32`	`30`	`if (PathStringIsEmpty(remainingPathString))`
`33`	`31`	`{ // {baseResource}/{baseResourceId}`
`34`		`- return new Route(_baseRouteDefinition.ModelType, _request.Method, _baseResourceId, _baseRouteDefinition);`
	`32`	`+ return new Route(_baseRouteDefinition.ModelType, request.Method, _baseResourceId, _baseRouteDefinition);`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`// { baseResource}/{ baseResourceId}/{relatedResourceName}`
`@@ -43,20 +41,20 @@ public Route BuildFromRequest()`
`43`	`41`	`}`
`44`	`42`
`45`	`43`	`var relationshipType = GetTypeOfRelatedResource(relatedResource);`
`46`		`- return new RelationalRoute(_baseRouteDefinition.ModelType, _request.Method, _baseResourceId, _baseRouteDefinition, relationshipType, relatedResource);`
	`44`	`+ return new RelationalRoute(_baseRouteDefinition.ModelType, request.Method, _baseResourceId, _baseRouteDefinition, relationshipType, relatedResource);`
`47`	`45`	`}`
`48`	`46`
`49`	`47`	`private bool PathStringIsEmpty(PathString pathString)`
`50`	`48`	`{`
`51`	`49`	`return pathString.HasValue ? string.IsNullOrEmpty(pathString.ToString().TrimStart('/')) : true;`
`52`	`50`	`}`
`53`	`51`
`54`		`- private PathString SetBaseRouteDefinition()`
	`52`	`+ private PathString SetBaseRouteDefinition(PathString path)`
`55`	`53`	`{`
`56`	`54`	`foreach (var rte in _configuration.Routes)`
`57`	`55`	`{`
`58`	`56`	`PathString remainingPathString;`
`59`		`- if (_request.Path.StartsWithSegments(new PathString(rte.PathString), StringComparison.OrdinalIgnoreCase, out remainingPathString))`
	`57`	`+ if (path.StartsWithSegments(new PathString(rte.PathString), StringComparison.OrdinalIgnoreCase, out remainingPathString))`
`60`	`58`	`{`
`61`	`59`	`_baseRouteDefinition = rte;`
`62`	`60`	`return remainingPathString;`
`@@ -76,7 +74,6 @@ private Type GetTypeOfRelatedResource(string relationshipName)`
`76`	`74`	`return ModelAccessor.GetTypeFromModelRelationshipName(_baseRouteDefinition.ModelType, relationshipName);`
`77`	`75`	`}`
`78`	`76`
`79`		`-`
`80`	`77`	`// TODO: Why is this here?`
`81`	`78`	`public static string BuildRoute(string nameSpace, string resourceCollectionName)`
`82`	`79`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"Data": {`
`3`		`- "ConnectionString": "User ID=postgres;Password=postgres;Host=localhost;Port=5432;Database=JsonApiDotNetCoreExample;Pooling=true;"`
	`3`	`+ "ConnectionString": "User ID=dotnet;Host=localhost;Port=5432;Database=JsonApiDotNetCoreExample;Pooling=true;"`
`4`	`4`	`},`
`5`	`5`	`"Logging": {`
`6`	`6`	`"IncludeScopes": false,`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using JsonApiDotNetCore.Routing;`
`3`	`3`	`using JsonApiDotNetCore.Extensions;`
`4`	`4`	`using JsonApiDotNetCoreTests.Helpers;`
	`5`	`+using Microsoft.EntityFrameworkCore;`
`5`	`6`
`6`	`7`	`namespace JsonApiDotNetCoreTests.Extensions.UnitTests`
`7`	`8`	`{`
`@@ -16,10 +17,12 @@ public void AddJsonApi_AddsRouterToServiceCollection()`
`16`	`17`	`var serviceCollection = new ServiceCollection();`
`17`	`18`
`18`	`19`	`// act`
`19`		`- serviceCollection.AddJsonApi(config => {});`
	`20`	`+ serviceCollection.AddJsonApi(config => {`
	`21`	`+ config.UseContext<DbContext>();`
	`22`	`+ });`
`20`	`23`
`21`	`24`	`// assert`
`22`		`- Assert.True(serviceCollection.ContainsType(typeof(Router)));`
	`25`	`+ Assert.True(serviceCollection.ContainsType(typeof(IRouter)));`
`23`	`26`	`}`
`24`	`27`	`}`
`25`	`28`	`}`