Merge pull request #111 from WebApiContrib/dev

glennblock · glennblock · commit 34596a465fce · 2014-11-29T20:10:10.000-08:00
Dev
diff --git a/readme.md b/readme.md
@@ -1,5 +1,7 @@
 # CollectionJson.NET
 
+[![collectionjson MyGet Build Status](https://www.myget.org/BuildSource/Badge/collectionjson?identifier=0f0fe557-4dbb-441d-bc44-6bf81c736ceb)](https://www.myget.org/)
+
 This library provides support for using the [Collection+JSON] (http://amundsen.com/media-types/collection/) hypermedia mediatype authored by [Mike Amundsen] (http://twitter.com/mamund).
 
 ## Features
diff --git a/samples/friendapi/FriendApi.csproj b/samples/friendapi/FriendApi.csproj
@@ -45,6 +45,9 @@
       <HintPath>packages\Autofac.WebApi2.3.3.3\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="DynamicUtils">
+      <HintPath>packages\DynamicUtils.1.0.1\lib\portable-net45+sl50+win+wp80\DynamicUtils.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
diff --git a/samples/friendapi/packages.config b/samples/friendapi/packages.config
@@ -2,6 +2,7 @@
 <packages>
   <package id="Autofac" version="3.5.0" targetFramework="net45" />
   <package id="Autofac.WebApi2" version="3.3.3" targetFramework="net45" />
+  <package id="DynamicUtils" version="1.0.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.SelfHost" version="5.2.0" targetFramework="net45" />
diff --git a/src/CollectionJson.Client/CollectionJson.Client.csproj b/src/CollectionJson.Client/CollectionJson.Client.csproj
@@ -37,6 +37,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DynamicUtils">
+      <HintPath>..\packages\DynamicUtils.1.0.1\lib\portable-net40+sl50+win8+wpa81+wp8+monotouch+monoandroid\DynamicUtils.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\portable-net45+wp80+win8+wpa81\Newtonsoft.Json.dll</HintPath>
     </Reference>
diff --git a/src/CollectionJson.Client/CollectionJson.Client.nuspec b/src/CollectionJson.Client/CollectionJson.Client.nuspec
@@ -19,6 +19,6 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="bin\Release\CollectionJson.Client.dll" target="lib\portable-net45+win8+wp8+monotouch+monoandroid" />
+        <file src="bin\Release\CollectionJson.Client.dll" target="lib\portable-net40+sl50+win8+wpa81+wp8+monotouch+monoandroid" />
     </files>
 </package>
diff --git a/src/CollectionJson.Client/CollectionJsonContent.cs b/src/CollectionJson.Client/CollectionJsonContent.cs
@@ -30,7 +30,7 @@ public CollectionJsonContent(Collection collection)
             _readDocument = new ReadDocument();
             _readDocument.Collection = collection;
 
-            Headers.ContentType = new MediaTypeHeaderValue("application/vnd.collection+json");
+            Headers.ContentType = new MediaTypeHeaderValue(Collection.MediaType);
         }
 
 
diff --git a/src/CollectionJson.Client/CollectionJsonFormatter.cs b/src/CollectionJson.Client/CollectionJsonFormatter.cs
@@ -1,5 +1,8 @@
-﻿using System.Reflection;
+﻿using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Reflection;
 using System.Runtime.InteropServices.WindowsRuntime;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
@@ -15,9 +18,9 @@ namespace CollectionJson.Client
 {
     public class CollectionJsonFormatter : JsonMediaTypeFormatter
     {
-        public CollectionJsonFormatter()
+         public CollectionJsonFormatter()
         {
-            SupportedMediaTypes.Add(new System.Net.Http.Headers.MediaTypeHeaderValue("application/vnd.collection+json"));
+            SupportedMediaTypes.Add(new System.Net.Http.Headers.MediaTypeHeaderValue(Collection.MediaType));
             SerializerSettings.NullValueHandling = NullValueHandling.Ignore;
             SerializerSettings.Formatting = Newtonsoft.Json.Formatting.Indented;
             SerializerSettings.ContractResolver =
@@ -53,6 +56,17 @@ public override System.Threading.Tasks.Task WriteToStreamAsync(Type type, object
             return base.WriteToStreamAsync(type, value, writeStream, content, transportContext);
         }
 
+
+        public override Task<object> ReadFromStreamAsync(Type type, Stream readStream, HttpContent content, IFormatterLogger formatterLogger)
+        {
+            if (typeof (IWriteDocument).GetTypeInfo().IsAssignableFrom(type.GetTypeInfo()) &
+                type != typeof (WriteDocument))
+            {
+                return base.ReadFromStreamAsync(typeof (WriteDocument), readStream, content, formatterLogger);
+            }
+            return base.ReadFromStreamAsync(type, readStream, content, formatterLogger);
+        }
+
         private class ReadDocumentDecorator : IReadDocument
         {
             private readonly IReadDocument _innerReadDocument;
diff --git a/src/CollectionJson.Client/packages.config b/src/CollectionJson.Client/packages.config
@@ -1,5 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="DynamicUtils" version="1.0.1" targetFramework="portable-net45+win+wpa81+wp80" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="portable-net45+win+wpa81+wp80+MonoAndroid10+MonoTouch10" />
diff --git a/src/CollectionJson/Collection.cs b/src/CollectionJson/Collection.cs
@@ -4,12 +4,15 @@
 using System.Runtime.Serialization;
 using System.Text;
 using System.Xml;
+using DynamicUtils;
 
 namespace CollectionJson
 {
     [DataContract]
     public class Collection : ExtensibleObject
     {
+        public const string MediaType = "application/vnd.collection+json";
+
         public Collection()
         {
             Links = new List<Link>();
diff --git a/src/CollectionJson/CollectionJson.csproj b/src/CollectionJson/CollectionJson.csproj
@@ -37,6 +37,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DynamicUtils">
+      <HintPath>..\packages\DynamicUtils.1.0.1\lib\portable-net40+sl50+win8+wpa81+wp8+monotouch+monoandroid\DynamicUtils.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
@@ -50,7 +53,6 @@
     <Compile Include="CollectionJsonDocumentWriterExtensions.cs" />
     <Compile Include="Data.cs" />
     <Compile Include="Error.cs" />
-    <Compile Include="ExtensibleObject.cs" />
     <Compile Include="ICollectionJsonDocumentReader_Of_T.cs" />
     <Compile Include="ICollectionJsonDocumentWriter_Of_T.cs" />
     <Compile Include="IEnumerable_Of_DataExtensions.cs" />
@@ -69,6 +71,7 @@
     <None Include="CollectionJson.nuspec">
       <SubType>Designer</SubType>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/CollectionJson/CollectionJson.nuspec b/src/CollectionJson/CollectionJson.nuspec
@@ -15,6 +15,6 @@
         <tags>collectionjson</tags>
     </metadata>
     <files>
-        <file src="bin\Release\CollectionJson.dll" target="lib\portable-net40+sl5+win8+wp8+monotouch+monoandroid" />
+        <file src="bin\Release\CollectionJson.dll" target="lib\portable-net40+sl50+win8+wpa81+wp8+monotouch+monoandroid" />
     </files>
 </package>
diff --git a/src/CollectionJson/CollectionJsonDocumentWriter_Of_T.cs b/src/CollectionJson/CollectionJsonDocumentWriter_Of_T.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/src/CollectionJson/Data.cs b/src/CollectionJson/Data.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/src/CollectionJson/Error.cs b/src/CollectionJson/Error.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/src/CollectionJson/ExtensibleObject.cs b/src/CollectionJson/ExtensibleObject.cs
diff --git a/src/CollectionJson/Item.cs b/src/CollectionJson/Item.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/src/CollectionJson/Link.cs b/src/CollectionJson/Link.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/src/CollectionJson/Query.cs b/src/CollectionJson/Query.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/src/CollectionJson/Template.cs b/src/CollectionJson/Template.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Runtime.Serialization;
 using System.Text;
+using DynamicUtils;
 
 namespace CollectionJson
 {
diff --git a/test/CollectionJson.Client.Tests/CollectionJson.Client.Tests.csproj b/test/CollectionJson.Client.Tests/CollectionJson.Client.Tests.csproj
@@ -35,6 +35,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DynamicUtils">
+      <HintPath>..\..\src\packages\DynamicUtils.1.0.1\lib\portable-net45+sl50+win+wp80\DynamicUtils.dll</HintPath>
+    </Reference>
     <Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\src\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
diff --git a/test/CollectionJson.Client.Tests/CollectionJsonFormatterTest.cs b/test/CollectionJson.Client.Tests/CollectionJsonFormatterTest.cs
@@ -4,7 +4,9 @@
 using System.Linq;
 using System.Net;
 using System.Net.Http;
+using System.Net.Http.Headers;
 using System.Text;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using CollectionJson;
@@ -80,11 +82,11 @@ public void WhenInitializedShouldIgnoreNulls()
         }
 
         [Fact]
-        public void WhenTypeImplementsIReadDocumentThenWriteToStreamAsyncWritesCollectionJson()
+        public async Task WhenTypeImplementsIReadDocumentThenWriteToStreamAsyncWritesCollectionJson()
         {
             var doc = new TestReadDocument();
             var stream = new MemoryStream();
-            formatter.WriteToStreamAsync(doc.GetType(), doc, stream, null, null).Wait();
+            await formatter.WriteToStreamAsync(doc.GetType(), doc, stream, null, null);
             var reader = new StreamReader(stream);
             stream.Position = 0;
             var content = reader.ReadToEnd();
@@ -93,17 +95,34 @@ public void WhenTypeImplementsIReadDocumentThenWriteToStreamAsyncWritesCollectio
         }
 
         [Fact]
-        public void WhenTypeImplementsIWriteDocumentThenWriteToStreamAsyncWritesCollectionJson()
+        public async Task WhenTypeImplementsIWriteDocumentThenWriteToStreamAsyncWritesCollectionJson()
         {
             var doc = new TestWriteDocument();
             var stream = new MemoryStream();
-            formatter.WriteToStreamAsync(doc.GetType(), doc, stream, null, null).Wait();
+            await formatter.WriteToStreamAsync(doc.GetType(), doc, stream, null, null);
             var reader = new StreamReader(stream);
             stream.Position = 0;
-            var content = reader.ReadToEnd();
+            var content = await reader.ReadToEndAsync();
             content.ShouldContain("\"TestValue\"");
         }
 
+        [Fact]
+        public async Task WhenTypeImplementsIWriteDocumentThenReadToStreamAsyncReturnsWriteDocument()
+        {
+            var stream = new MemoryStream();
+            var writer = new StreamWriter(stream);
+            await writer.WriteLineAsync("{\"template\":{\"data\":[{\"name\":\"value\"}]}}");
+            await writer.FlushAsync();
+            var content = new StreamContent(stream);
+            content.Headers.ContentLength = stream.Position-1;
+            stream.Position = 0;
+            content.Headers.ContentType = new MediaTypeHeaderValue(Collection.MediaType);
+            var doc = (IWriteDocument) await formatter.ReadFromStreamAsync(typeof (IWriteDocument), stream, content, null);
+            doc.ShouldNotBeNull();
+            doc.Template.ShouldNotBeNull();
+            doc.Template.Data.GetDataByName("value").ShouldNotBeNull();
+        }
+
         public class TestReadDocument : IReadDocument
         {
             public TestReadDocument()
diff --git a/test/CollectionJson.Client.Tests/packages.config b/test/CollectionJson.Client.Tests/packages.config
@@ -1,5 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="DynamicUtils" version="1.0.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
diff --git a/test/CollectionJson.Server.Tests/CollectionJson.Server.Tests.csproj b/test/CollectionJson.Server.Tests/CollectionJson.Server.Tests.csproj
@@ -35,6 +35,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DynamicUtils">
+      <HintPath>..\..\src\packages\DynamicUtils.1.0.1\lib\portable-net45+sl50+win+wp80\DynamicUtils.dll</HintPath>
+    </Reference>
     <Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\src\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
diff --git a/test/CollectionJson.Server.Tests/packages.config b/test/CollectionJson.Server.Tests/packages.config
@@ -1,5 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="DynamicUtils" version="1.0.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.0" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
diff --git a/test/CollectionJson.Tests/CollectionJson.Tests.csproj b/test/CollectionJson.Tests/CollectionJson.Tests.csproj
@@ -35,6 +35,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DynamicUtils">
+      <HintPath>..\..\src\packages\DynamicUtils.1.0.1\lib\portable-net45+sl50+win+wp80\DynamicUtils.dll</HintPath>
+    </Reference>
     <Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\src\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
@@ -56,7 +59,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ExtensibleObjectTest.cs" />
     <Compile Include="ExtensionsTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/test/CollectionJson.Tests/ExtensibleObjectTest.cs b/test/CollectionJson.Tests/ExtensibleObjectTest.cs
diff --git a/test/CollectionJson.Tests/packages.config b/test/CollectionJson.Tests/packages.config

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public CollectionJsonContent(Collection collection)`
`30`	`30`	`_readDocument = new ReadDocument();`
`31`	`31`	`_readDocument.Collection = collection;`
`32`	`32`
`33`		`- Headers.ContentType = new MediaTypeHeaderValue("application/vnd.collection+json");`
	`33`	`+ Headers.ContentType = new MediaTypeHeaderValue(Collection.MediaType);`
`34`	`34`	`}`
`35`	`35`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,15 @@`
`4`	`4`	`using System.Runtime.Serialization;`
`5`	`5`	`using System.Text;`
`6`	`6`	`using System.Xml;`
	`7`	`+using DynamicUtils;`
`7`	`8`
`8`	`9`	`namespace CollectionJson`
`9`	`10`	`{`
`10`	`11`	`[DataContract]`
`11`	`12`	`public class Collection : ExtensibleObject`
`12`	`13`	`{`
	`14`	`+ public const string MediaType = "application/vnd.collection+json";`
	`15`	`+`
`13`	`16`	`public Collection()`
`14`	`17`	`{`
`15`	`18`	`Links = new List<Link>();`