Merge branch 'master' into 0-4-0

Chris Santero · Chris Santero · commit ea0368a110ef · 2015-02-26T16:14:11.000-05:00
diff --git a/JSONAPI.EntityFramework/EntityFrameworkMaterializer.cs b/JSONAPI.EntityFramework/EntityFrameworkMaterializer.cs
@@ -9,6 +9,7 @@
 using System.Reflection;
 using System.Collections;
 using System.Data.Entity.Core;
+using JSONAPI.Extensions;
 
 namespace JSONAPI.EntityFramework
 {
@@ -170,15 +171,7 @@ private bool IsMany(Type type)
 
         public bool IsModel(Type objectType)
         {
-            if (objectType.IsPrimitive
-                || typeof(System.Guid).IsAssignableFrom(objectType)
-                || typeof(System.DateTime).IsAssignableFrom(objectType)
-                || typeof(System.DateTimeOffset).IsAssignableFrom(objectType)
-                || typeof(System.Guid?).IsAssignableFrom(objectType)
-                || typeof(System.DateTime?).IsAssignableFrom(objectType)
-                || typeof(System.DateTimeOffset?).IsAssignableFrom(objectType)
-                || typeof(String).IsAssignableFrom(objectType)
-                )
+            if (objectType.CanWriteAsJsonApiAttribute())
                 return false;
             else return true;
         }
diff --git a/JSONAPI/Extensions/TypeExtensions.cs b/JSONAPI/Extensions/TypeExtensions.cs
@@ -2,9 +2,9 @@
 
 namespace JSONAPI.Extensions
 {
-    internal static class TypeExtensions
+    public static class TypeExtensions
     {
-        internal static bool CanWriteAsJsonApiAttribute(this Type objectType)
+        public static bool CanWriteAsJsonApiAttribute(this Type objectType)
         {
             if (objectType.IsGenericType && objectType.GetGenericTypeDefinition() == typeof (Nullable<>))
                 objectType = objectType.GetGenericArguments()[0];

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@`
`2`	`2`
`3`	`3`	`namespace JSONAPI.Extensions`
`4`	`4`	`{`
`5`		`- internal static class TypeExtensions`
	`5`	`+ public static class TypeExtensions`
`6`	`6`	`{`
`7`		`- internal static bool CanWriteAsJsonApiAttribute(this Type objectType)`
	`7`	`+ public static bool CanWriteAsJsonApiAttribute(this Type objectType)`
`8`	`8`	`{`
`9`	`9`	`if (objectType.IsGenericType && objectType.GetGenericTypeDefinition() == typeof (Nullable<>))`
`10`	`10`	`objectType = objectType.GetGenericArguments()[0];`