Merge pull request #119 from WebApiContrib/dev

Dev

Author: glennblock

src/CollectionJson/Collection.cs

@@ -38,6 +38,9 @@ public Collection()
 
         [DataMember(Name = "template")]
         public Template Template { get; private set; }
+
+        [DataMember(Name = "error")]
+        public Error Error { get; set; }
     }
 
 }

src/CollectionJson/CollectionJson.nuspec

@@ -14,6 +14,9 @@
         <copyright>2013 Glenn Block</copyright>
         <tags>collectionjson</tags>
     </metadata>
+     <dependencies>
+      <dependency id="DynamicUtils" version="1.0.1" />
+    </dependencies>
     <files>
         <file src="bin\Release\CollectionJson.dll" target="lib\portable-net40+sl50+win8+wpa81+wp8+monotouch+monoandroid" />
     </files>

test/CollectionJson.Client.Tests/CollectionJsonContentTest.cs

@@ -23,5 +23,26 @@ public async void WhenCreatingCollectionJsonContentObjectIsSerializedToCollectio
             var json = reader.ReadToEnd();
             json.ShouldContain("\"collection\"");
         }
+
+        [Fact]
+        public async void WhenCreatingCollectionJsonContentWithErrorObjectIsSerializedWithError()
+        {
+            var coll = new Collection()
+            {
+                Error = new Error()
+                {
+                    Code = "1234",
+                    Message = "Hello world",
+                    Title = "An error occurred"
+                }
+            };
+            var content = new CollectionJsonContent(coll);
+            var stream = new MemoryStream();
+            await content.CopyToAsync(stream);
+            var reader = new StreamReader(stream);
+            stream.Position = 0;
+            var json = reader.ReadToEnd();
+            json.ShouldContain("\"error\"");
+        }
     }
 }