Merge pull request #69 from candela-software/master

Author: RehanSaeed

Source/Schema.NET.Tool/ViewModels/Enumeration.cs

@@ -23,6 +23,8 @@ public override string ToString()
 
             // Using statements
             stringBuilder.AppendIndentLine(4, "using System.Runtime.Serialization;");
+            stringBuilder.AppendIndentLine(4, "using Newtonsoft.Json;");
+            stringBuilder.AppendIndentLine(4, "using Newtonsoft.Json.Converters;");
             stringBuilder.AppendLine();
 
             // Comment
@@ -31,6 +33,7 @@ public override string ToString()
             stringBuilder.AppendIndentLine(4, "/// </summary>");
 
             // Enum
+            stringBuilder.AppendIndentLine(4, $"[JsonConverter(typeof(StringEnumConverter))]");
             stringBuilder.AppendIndentLine(4, $"public enum {this.Name}");
             stringBuilder.AppendIndentLine(4, "{");
 

Source/Schema.NET/ValuesJsonConverter.cs

@@ -163,12 +163,14 @@ public virtual void WriteObject(JsonWriter writer, object value, JsonSerializer
 
         private static object ParseTokenArguments(JToken token, JsonToken tokenType, Type type, object value)
         {
+            const string SCHEMA_ORG = "http://schema.org/";
             const int SCHEMA_ORG_LENGTH = 18; // equivalent to "http://schema.org/".Length
             object args = null;
             var unwrappedType = type.GetUnderlyingTypeFromNullable();
             if (unwrappedType.GetTypeInfo().IsEnum)
             {
-                var enumString = token.ToString().Substring(SCHEMA_ORG_LENGTH);
+                var en = token.ToString();
+                var enumString = en.Contains(SCHEMA_ORG) ? en.Substring(SCHEMA_ORG_LENGTH) : en;
                 args = Enum.Parse(unwrappedType, enumString);
             }
             else

Tests/Schema.NET.Test/core/MusicAlbumTest.cs

@@ -24,6 +24,12 @@ public class MusicAlbumTest
             },
             SameAs = new Uri("https://music.apple.com/us/album/hail-to-the-thief/1097863576"), // Recommended
             Url = new Uri("https://open.spotify.com/album/1oW3v5Har9mvXnGk0x4fHm"), // Recommended
+            AggregateRating = new AggregateRating() // Recommended
+            {
+                BestRating = 100, // Required
+                RatingValue = 60, // Required
+                WorstRating = 0 // Required
+            },
             DatePublished = new DateTime(2003, 5, 26), // Recommended
             Offers = new Offer() // Recommended
             {
@@ -64,6 +70,13 @@ public class MusicAlbumTest
             "]," +
             "\"sameAs\": \"https://music.apple.com/us/album/hail-to-the-thief/1097863576\"," +
             "\"url\": \"https://open.spotify.com/album/1oW3v5Har9mvXnGk0x4fHm\"," +
+            "\"aggregateRating\": {" +
+                "\"@context\": \"http://schema.org\"," +
+                "\"@type\": \"AggregateRating\"," +
+                "\"bestRating\": 100," +
+                "\"ratingValue\": 60," +
+                "\"worstRating\": 0" +
+            "}," +
             "\"datePublished\": \"2003-05-26\"," +
             "\"offers\": {" +
                 "\"@context\": \"http://schema.org\"," +