Merge pull request #3 from csantero/serialize-enums

SphtKr · SphtKr · commit 5fcd61e33278 · 2015-01-16T09:19:21.000+01:00
serialize enums
diff --git a/JSONAPI.Tests/Json/JsonApiMediaFormaterTests.cs b/JSONAPI.Tests/Json/JsonApiMediaFormaterTests.cs
@@ -73,6 +73,11 @@ public void SetupModels()
 
         }
 
+        private enum TestEnum
+        {
+            
+        }
+
         [TestMethod]
         public void CanWritePrimitiveTest()
         {
@@ -89,6 +94,8 @@ public void CanWritePrimitiveTest()
             Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(DateTime?)), "CanWriteTypeAsPrimitive returned wrong answer for nullable DateTime!");
             Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(DateTimeOffset?)), "CanWriteTypeAsPrimitive returned wrong answer for nullable DateTimeOffset!");
             Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(Guid?)), "CanWriteTypeAsPrimitive returned wrong answer for nullable Guid!");
+            Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(TestEnum)), "CanWriteTypeAsPrimitive returned wrong answer for enum!");
+            Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(TestEnum?)), "CanWriteTypeAsPrimitive returned wrong answer for nullable enum!");
             Assert.IsFalse(formatter.CanWriteTypeAsPrimitive(typeof(Object)), "CanWriteTypeAsPrimitive returned wrong answer for Object!");
         }
 
diff --git a/JSONAPI/Json/JsonApiFormatter.cs b/JSONAPI/Json/JsonApiFormatter.cs
@@ -55,6 +55,10 @@ public bool CanWriteTypeAsPrimitive(Type objectType)
                 || typeof(System.DateTime?).IsAssignableFrom(objectType)
                 || typeof(System.DateTimeOffset?).IsAssignableFrom(objectType)
                 || typeof(String).IsAssignableFrom(objectType)
+                || objectType.IsEnum
+                || (objectType.IsGenericType &&
+                    objectType.GetGenericTypeDefinition() == typeof(Nullable<>) &&
+                    objectType.GetGenericArguments()[0].IsEnum)
                 )
                 return true;
             else return false;

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,11 @@ public void SetupModels()`
`73`	`73`
`74`	`74`	`}`
`75`	`75`
	`76`	`+ private enum TestEnum`
	`77`	`+ {`
	`78`	`+`
	`79`	`+ }`
	`80`	`+`
`76`	`81`	`[TestMethod]`
`77`	`82`	`public void CanWritePrimitiveTest()`
`78`	`83`	`{`
`@@ -89,6 +94,8 @@ public void CanWritePrimitiveTest()`
`89`	`94`	`Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(DateTime?)), "CanWriteTypeAsPrimitive returned wrong answer for nullable DateTime!");`
`90`	`95`	`Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(DateTimeOffset?)), "CanWriteTypeAsPrimitive returned wrong answer for nullable DateTimeOffset!");`
`91`	`96`	`Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(Guid?)), "CanWriteTypeAsPrimitive returned wrong answer for nullable Guid!");`
	`97`	`+ Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(TestEnum)), "CanWriteTypeAsPrimitive returned wrong answer for enum!");`
	`98`	`+ Assert.IsTrue(formatter.CanWriteTypeAsPrimitive(typeof(TestEnum?)), "CanWriteTypeAsPrimitive returned wrong answer for nullable enum!");`
`92`	`99`	`Assert.IsFalse(formatter.CanWriteTypeAsPrimitive(typeof(Object)), "CanWriteTypeAsPrimitive returned wrong answer for Object!");`
`93`	`100`	`}`
`94`	`101`