Merge branch 'master' of https://github.com/SphtKr/JSONAPI.NET

SphtKr · SphtKr · commit 10c753706dd4 · 2015-01-16T11:57:34.000+01:00
diff --git a/JSONAPI/Json/JsonApiFormatter.cs b/JSONAPI/Json/JsonApiFormatter.cs
@@ -151,6 +151,9 @@ protected void Serialize(object value, Stream writeStream, JsonWriter writer, Js
 
                 if (this.CanWriteTypeAsPrimitive(prop.PropertyType))
                 {
+                    if (prop.GetCustomAttributes().Any(attr => attr is JsonIgnoreAttribute))
+                        continue;
+
                     // numbers, strings, dates...
                     writer.WritePropertyName(FormatPropertyName(prop.Name));
                     serializer.Serialize(writer, prop.GetValue(value, null));

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,9 @@ protected void Serialize(object value, Stream writeStream, JsonWriter writer, Js`
`151`	`151`
`152`	`152`	`if (this.CanWriteTypeAsPrimitive(prop.PropertyType))`
`153`	`153`	`{`
	`154`	`+ if (prop.GetCustomAttributes().Any(attr => attr is JsonIgnoreAttribute))`
	`155`	`+ continue;`
	`156`	`+`
`154`	`157`	`// numbers, strings, dates...`
`155`	`158`	`writer.WritePropertyName(FormatPropertyName(prop.Name));`
`156`	`159`	`serializer.Serialize(writer, prop.GetValue(value, null));`