From b42306e7418b0439359bf017a524207a8ee54bc6 Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Thu, 24 Apr 2014 10:20:50 +0100
Subject: [PATCH 01/19] Issue #AR-1_serialization: added msbuild (.NET)
 version, as we need this for VS < 2013,

- updated msbuild module
---
 Gruntfile.js | 1 +
 package.json | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Gruntfile.js b/Gruntfile.js
index e28eec5..3b51cd7 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -201,6 +201,7 @@ module.exports = function(grunt) {
         stdout: true,
         verbosity: 'quiet',
         maxCpuCount: 4,
+		version: 4.0,
         buildParameters: {
           WarningLevel: 2,
           NoWarn: 1607
diff --git a/package.json b/package.json
index 336ec4a..3312df6 100644
--- a/package.json
+++ b/package.json
@@ -27,5 +27,8 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/imulus/Archetype.git"
+  },
+  "devDependencies": {
+    "grunt-msbuild": "^0.1.12"
   }
 }

From 22d596e827d01da3e4755af62ee6c7b9dad8ba92 Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Thu, 24 Apr 2014 10:43:48 +0100
Subject: [PATCH 02/19] Issue #AR-1_serialization: initial commit of model
 serializer and tests.

---
 .../Archetype.Tests/Archetype.Tests.csproj    |   3 +
 .../ArchetypeJsonConverterTest.cs             | 371 ++++++++++++++++++
 .../Archetype.Tests/Serialization/Models.cs   |  71 ++++
 .../Archetype.Umbraco.csproj                  |   2 +
 .../Properties/VersionInfo.cs                 |   4 +-
 .../ArchetypeDatatypeAttribute.cs             |  14 +
 .../Serialization/ArchetypeJsonConverter.cs   | 212 ++++++++++
 7 files changed, 675 insertions(+), 2 deletions(-)
 create mode 100644 app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
 create mode 100644 app/Umbraco/Archetype.Tests/Serialization/Models.cs
 create mode 100644 app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeDatatypeAttribute.cs
 create mode 100644 app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs

diff --git a/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj b/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj
index e790eb8..dfeb829 100644
--- a/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj
+++ b/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj
@@ -202,6 +202,8 @@
     <Compile Include="Models\FieldsetTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyValueConverter\PropertyValueConverterTests.cs" />
+    <Compile Include="Serialization\ArchetypeJsonConverterTest.cs" />
+    <Compile Include="Serialization\Models.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -214,6 +216,7 @@
       <Name>Archetype.Umbraco</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
new file mode 100644
index 0000000..d6db31d
--- /dev/null
+++ b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
@@ -0,0 +1,371 @@
+using System.Collections.Generic;
+using Archetype.Umbraco.PropertyConverters;
+using Newtonsoft.Json;
+using NUnit.Framework;
+
+namespace Archetype.Tests.Serialization
+{
+    [TestFixture]
+    public class ArchetypeJsonConverterTest
+    {
+        private const string _CONTACT_DETAILS_JSON =
+@"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""contactDetails"",
+      ""properties"": [
+        {
+          ""alias"": ""name"",
+          ""value"": ""Test""
+        },
+        {
+          ""alias"": ""address"",
+          ""value"": ""Test Address""
+        },
+        {
+          ""alias"": ""telephone"",
+          ""value"": ""111""
+        },
+        {
+          ""alias"": ""mobile"",
+          ""value"": ""000""
+        },
+        {
+          ""alias"": ""fax"",
+          ""value"": ""000""
+        },
+        {
+          ""alias"": ""email"",
+          ""value"": ""test@test.com""
+        },
+        {
+          ""alias"": ""webSite"",
+          ""value"": ""http://test.com""
+        }
+      ]
+    }
+  ]
+}";
+
+        private const string _HUB_DETAILS_JSON =
+@"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""regionalHub"",
+      ""properties"": [
+        {
+          ""alias"": ""region"",
+          ""value"": ""Test Region""
+        },
+        {
+          ""alias"": ""contactDetails"",
+          ""value"": {
+            ""fieldsets"": [
+              {
+                ""alias"": ""contactDetails"",
+                ""properties"": [
+                  {
+                    ""alias"": ""name"",
+                    ""value"": ""Test""
+                  },
+                  {
+                    ""alias"": ""address"",
+                    ""value"": ""Test Address""
+                  },
+                  {
+                    ""alias"": ""telephone"",
+                    ""value"": ""111""
+                  },
+                  {
+                    ""alias"": ""mobile"",
+                    ""value"": ""000""
+                  },
+                  {
+                    ""alias"": ""fax"",
+                    ""value"": ""000""
+                  },
+                  {
+                    ""alias"": ""email"",
+                    ""value"": ""test@test.com""
+                  },
+                  {
+                    ""alias"": ""webSite"",
+                    ""value"": ""http://test.com""
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}";
+
+        private const string _NULL_VALUES_JSON = @"{""fieldsets"":[{""alias"":""contactDetails"",""properties"":[{""alias"":""name"",""value"":""""},{""alias"":""address"",""value"":""""},{""alias"":""telephone"",""value"":""""},{""alias"":""mobile"",""value"":""""},{""alias"":""fax"",""value"":""""},{""alias"":""email"",""value"":""""},{""alias"":""webSite"",""value"":""""}]}]}";
+
+        private ContactDetails _contactDetails;
+        private CompanyDetails _companyDetails;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _contactDetails = new ContactDetails
+            {
+                Address = "Test Address",
+                Email = "test@test.com",
+                Fax = "000",
+                Mobile = "000",
+                Name = "Test",
+                Telephone = "111",
+                WebSite = new UrlPicker
+                {
+                    Url = "http://test.com",
+                    Title = "The Test Company",
+                    OpenInNewWindow = true
+                }
+            };
+
+            _companyDetails = new CompanyDetails
+            {
+                Region = "Test Region",
+                ContactDetails = _contactDetails
+            };
+        }
+
+        #region serialization tests
+
+        [Test]
+        public void ContactDetailsModel_Serializes_To_Archetype_Property()
+        {
+            var result = JsonConvert.SerializeObject(_contactDetails, Formatting.Indented);
+            Assert.AreEqual(_CONTACT_DETAILS_JSON, result);
+        }
+
+        [Test]
+        public void RegionalModel_Fieldset_Serializes_As_Expected()
+        {
+            var result = JsonConvert.SerializeObject(_companyDetails, Formatting.Indented);
+
+            Assert.AreEqual(_HUB_DETAILS_JSON, result);
+
+        }
+
+        [Test]
+        public void NullValues_Serialize_To_Empty_String()
+        {
+            var result = JsonConvert.SerializeObject(new ContactDetails());
+
+            Assert.AreEqual(_NULL_VALUES_JSON, result);
+
+        }
+
+        [Test]
+        public void ConvertModelToArchetype()
+        {
+            var model = new ContactDetails
+            {
+                Address = "addr",
+                Email = "email"
+            };
+
+            var converter = new ArchetypeValueConverter();
+            var json = JsonConvert.SerializeObject(model);
+            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+
+            Assert.NotNull(archetype);
+        }
+
+        [Test]
+        public void ConvertCompoundModelToArchetype()
+        {
+            var item1 = new ContactDetails
+            {
+                Address = "addr",
+                Email = "email"
+            };
+
+            var item2 = new ContactDetails
+            {
+                Address = "addr1",
+                Name = "email2"
+            };
+
+            var model = new AllContactDetails
+            {
+                UserDetails = item1,
+                AdminDetails = item2
+            };
+
+            var converter = new ArchetypeValueConverter();
+            var json = JsonConvert.SerializeObject(model, Formatting.Indented);
+            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+
+            Assert.NotNull(archetype);
+        }
+
+        [Test]
+        public void ConvertEnumerableModelToArchetype()
+        {
+            var item1 = new ContactDetails
+            {
+                Address = "addr",
+                Email = "email"
+            };
+
+            var item2 = new ContactDetails
+            {
+                Address = "addr1",
+                Name = "email2"
+            };
+
+            var model = new ContactDetailsList
+            {
+                item1,
+                item2
+            };
+
+            var converter = new ArchetypeValueConverter();
+            var json = JsonConvert.SerializeObject(model, Formatting.Indented);
+            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+
+            Assert.NotNull(archetype);
+        }
+
+        [Test]
+        public void ConvertNestedModelToArchetype()
+        {
+            var model = new CompanyDetails
+            {
+                Region = "Test Region",
+                ContactDetails = new ContactDetails
+                {
+                    Address = "addr1",
+                    Name = "email2"
+                }
+            };
+
+            var converter = new ArchetypeValueConverter();
+            var json = JsonConvert.SerializeObject(model, Formatting.Indented);
+            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+
+            Assert.NotNull(archetype);
+        }
+
+        #endregion
+
+        #region deserialization tests
+
+        [Test]
+        public void ConvertArchetypeToModel()
+        {
+            var result = JsonConvert.DeserializeObject<ContactDetails>(_CONTACT_DETAILS_JSON);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<ContactDetails>(result);
+
+            Assert.AreEqual("Test Address", result.Address);
+            Assert.AreEqual("test@test.com", result.Email);
+            Assert.AreEqual("000", result.Fax);
+            Assert.AreEqual("000", result.Mobile);
+            Assert.AreEqual("Test", result.Name);
+            Assert.AreEqual("111", result.Telephone);
+            Assert.AreEqual("http://test.com", result.WebSite);
+        }
+
+        [Test]
+        public void DeserializeCompoundModelFromArchetype()
+        {
+            var item1 = new ContactDetails
+            {
+                Address = "addr",
+                Email = "email"
+            };
+
+            var item2 = new ContactDetails
+            {
+                Address = "addr1",
+                Name = "email2"
+            };
+
+            var model = new AllContactDetails
+            {
+                UserDetails = item1,
+                AdminDetails = item2
+            };
+
+            var json = JsonConvert.SerializeObject(model, Formatting.Indented);
+            var result = JsonConvert.DeserializeObject<AllContactDetails>(json);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<AllContactDetails>(result);
+
+            Assert.AreEqual(item1.Address, result.UserDetails.Address);
+            Assert.AreEqual(item1.Email, result.UserDetails.Email);
+            Assert.AreEqual(item2.Address, result.AdminDetails.Address);
+            Assert.AreEqual(item2.Name, result.AdminDetails.Name);
+        }
+
+        [Test]
+        public void DeserializeEnumerableModelFromArchetype()
+        {
+            var item1 = new ContactDetails
+            {
+                Address = "addr",
+                Email = "email"
+            };
+
+            var item2 = new ContactDetails
+            {
+                Address = "addr1",
+                Name = "email2"
+            };
+
+            var model = new ContactDetailsList
+            {
+                item1,
+                item2
+            };
+
+            var json = JsonConvert.SerializeObject(model, Formatting.Indented);
+
+            var result = JsonConvert.DeserializeObject<ContactDetailsList>(json);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<ContactDetailsList>(result);
+            Assert.AreEqual(result.Count, 2);
+
+            Assert.AreEqual(item1.Address, result[0].Address);
+            Assert.AreEqual(item1.Email, result[0].Email);
+            Assert.AreEqual(item2.Address, result[1].Address);
+            Assert.AreEqual(item2.Name, result[1].Name);
+        }
+
+        [Test]
+        public void DeserializeNestedModelFromArchetype()
+        {
+            var model = new CompanyDetails
+            {
+                Region = "Test Region",
+                ContactDetails = new ContactDetails
+                {
+                    Address = "addr1",
+                    Name = "email2"
+                }
+            };
+
+            var json = JsonConvert.SerializeObject(model, Formatting.Indented);
+            var result = JsonConvert.DeserializeObject<CompanyDetails>(json);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<CompanyDetails>(result);
+
+            Assert.AreEqual(model.Region, result.Region);
+            Assert.AreEqual(model.ContactDetails.Address, result.ContactDetails.Address);
+            Assert.AreEqual(model.ContactDetails.Name, result.ContactDetails.Name);
+        }
+
+        #endregion
+
+    }
+}
diff --git a/app/Umbraco/Archetype.Tests/Serialization/Models.cs b/app/Umbraco/Archetype.Tests/Serialization/Models.cs
new file mode 100644
index 0000000..95a0d6a
--- /dev/null
+++ b/app/Umbraco/Archetype.Tests/Serialization/Models.cs
@@ -0,0 +1,71 @@
+using System.Collections.Generic;
+using Archetype.Umbraco.Serialization;
+using Newtonsoft.Json;
+
+namespace Archetype.Tests.Serialization
+{
+    #region test Models
+
+    [ArchetypeDatatype("urlPicker")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<UrlPicker>))]
+    public class UrlPicker
+    {
+        [JsonProperty("title")]
+        public string Title { get; set; }
+        [JsonProperty("url")]
+        public string Url { get; set; }
+        [JsonProperty("content")]
+        public int? Content { get; set; }
+        [JsonProperty("media")]
+        public int? Media { get; set; }
+        [JsonProperty("openInNewWindow")]
+        public bool OpenInNewWindow { get; set; }
+    }
+
+    [ArchetypeDatatype("contactDetails")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<ContactDetails>))]
+    public class ContactDetails
+    {
+        [JsonProperty("name")]
+        public string Name { get; set; }
+        [JsonProperty("address")]
+        public string Address { get; set; }
+        [JsonProperty("telephone")]
+        public string Telephone { get; set; }
+        [JsonProperty("mobile")]
+        public string Mobile { get; set; }
+        [JsonProperty("fax")]
+        public string Fax { get; set; }
+        [JsonProperty("email")]
+        public string Email { get; set; }
+        [JsonProperty("webSite")]
+        public UrlPicker WebSite { get; set; }
+    }
+
+    [ArchetypeDatatype("companyDetails")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<CompanyDetails>))]
+    public class CompanyDetails
+    {
+        [JsonProperty("region")]
+        public string Region { get; set; }
+        [JsonProperty("contactDetails")]
+        public ContactDetails ContactDetails { get; set; }
+    }
+
+    [ArchetypeDatatype("allContactDetails")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<AllContactDetails>))]
+    public class AllContactDetails
+    {
+        public ContactDetails UserDetails { get; set; }
+        public ContactDetails AdminDetails { get; set; }
+
+    }
+
+    [ArchetypeDatatype("contactDetailsList")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<ContactDetailsList>))]
+    public class ContactDetailsList : List<ContactDetails>
+    {
+    }
+
+    #endregion
+}
diff --git a/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj b/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
index e86b51e..8b72610 100644
--- a/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
+++ b/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
@@ -241,6 +241,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\VersionInfo.cs" />
     <Compile Include="PropertyConverters\ArchetypeValueConverter.cs" />
+    <Compile Include="Serialization\ArchetypeDatatypeAttribute.cs" />
+    <Compile Include="Serialization\ArchetypeJsonConverter.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs b/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs
index 7a33150..2f3ebe8 100644
--- a/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs
+++ b/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("0.0.0.0")]
-[assembly: AssemblyFileVersion("0.0.0.0")]
\ No newline at end of file
+[assembly: AssemblyVersion("0.5.1")]
+[assembly: AssemblyFileVersion("0.5.1-alpha")]
\ No newline at end of file
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeDatatypeAttribute.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeDatatypeAttribute.cs
new file mode 100644
index 0000000..bbdacfc
--- /dev/null
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeDatatypeAttribute.cs
@@ -0,0 +1,14 @@
+using System;
+
+namespace Archetype.Umbraco.Serialization
+{
+    public class ArchetypeDatatypeAttribute : Attribute
+    {
+        public string FieldsetName { get; set; }
+
+        public ArchetypeDatatypeAttribute(string fieldsetname)
+        {
+            FieldsetName = fieldsetname;
+        }
+    }
+}
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
new file mode 100644
index 0000000..c273c78
--- /dev/null
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
@@ -0,0 +1,212 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace Archetype.Umbraco.Serialization
+{
+    public class ArchetypeJsonConverter<T> : JsonConverter
+        where T : class, new()
+    {
+        public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+        {
+            var fieldsets = (value as IList) ?? new List<T> { value as T };
+
+            if (fieldsets.Count == 1 && fieldsets[0] == null) 
+                return;
+
+            var jObj = new JObject
+            {
+                {
+                    "fieldsets", 
+                     new JArray( new JRaw(SerializeFieldsets(fieldsets)))
+                }
+            };
+
+            writer.WriteRaw(ApplyFormatting(jObj.ToString(), writer.Formatting));
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+        {
+            var jToken = JToken.ReadFrom(reader);
+
+            if (jToken == null)
+                return null;
+
+            var obj = Activator.CreateInstance(objectType);
+
+            if (null != obj as IEnumerable<object> 
+                && jToken["fieldsets"] != null && jToken["fieldsets"].Any())
+            {
+                var model = obj as IEnumerable<object>;
+                var fieldsets = jToken["fieldsets"];
+
+                var itemType = model.GetType().BaseType.GetGenericArguments().First();
+                foreach (var fs in fieldsets.Where(fs => fs["alias"].ToString().Equals(GetFieldsetName(itemType))))
+                {
+                    var item = JsonConvert.DeserializeObject(
+                        fs["properties"].ToString(), itemType, GetArchetypeDatatypeConverter(itemType));
+
+                    obj.GetType().GetMethod("Add").Invoke(obj, new [] {item});
+                }
+
+                return obj;
+            }
+
+            if (null == jToken as JArray)
+            {
+                jToken = jToken.SelectToken("fieldsets[0].properties");
+            }
+
+            var properties = obj.GetType()
+                .GetProperties(BindingFlags.Instance | BindingFlags.Public);
+
+            foreach (var propertyInfo in properties)
+            {
+                var propAlias = GetJsonPropertyName(propertyInfo);
+                var propJToken = jToken.Single(p => p.SelectToken("alias").ToString().Equals(propAlias));
+                var propValue = IsValueArchetypeDatatype(propertyInfo.PropertyType)
+                    ? JsonConvert.DeserializeObject(propJToken["value"].ToString(), propertyInfo.PropertyType, GetArchetypeDatatypeConverter(propertyInfo.PropertyType))
+                    : propJToken["value"].ToObject(propertyInfo.PropertyType);
+
+                propertyInfo.SetValue(obj, propValue);
+            }
+
+            return obj;
+        }
+
+        public override bool CanConvert(Type objectType)
+        {
+            return IsValueArchetypeDatatype(objectType);
+        }
+
+        #region private methods
+
+        private string ApplyFormatting(string json, Formatting formatting)
+        {
+            return JToken.Parse(json).ToString(formatting);
+        }
+
+        private IEnumerable SerializeFieldsets(IEnumerable fieldSets)
+        {
+            var fieldsetJson = (from object fs in fieldSets where null != fs select SerializeObject(fs)).ToList();
+
+            return String.Join(",", fieldsetJson);
+        }
+
+        private string SerializeObject(object value)
+        {
+            if (value == null)
+                return null;
+
+            var jObj = GetFieldsetJObject(value);
+
+            var fieldsetJson = new StringBuilder();
+            var fieldsetWriter = new StringWriter(fieldsetJson);
+
+            using (var jsonWriter = new JsonTextWriter(fieldsetWriter))
+            {
+                jObj.WriteTo(jsonWriter);
+            }
+
+            return fieldsetJson.ToString();
+        }
+
+        private JObject GetFieldsetJObject(object obj)
+        {
+            var jObj = new JObject
+                {
+                    {
+                        "alias",
+                        new JValue(GetFieldsetName(obj.GetType()))
+                    }
+                };
+
+            var properties = obj.GetType()
+                                .GetProperties(BindingFlags.Instance | BindingFlags.Public);
+
+            var fsProperties = new List<JObject>();
+
+            foreach (var propertyInfo in properties)
+            {
+                var fsProperty = new JObject();
+                var jProperty = new JProperty("alias", GetJsonPropertyName(propertyInfo));
+                fsProperty.Add(jProperty);
+
+                var propValue = propertyInfo.GetValue(obj, null);
+
+                fsProperty.Add(
+                    new JProperty("value",
+                                  IsValueArchetypeDatatype(propValue)
+                                      ? new JRaw(JsonConvert.SerializeObject(propValue,
+                                                                             GetArchetypeDatatypeConverter(propValue)))
+                                      : new JValue(GetPropertyValue(propValue))));
+
+                fsProperties.Add(fsProperty);
+            }
+
+            jObj.Add("properties", new JRaw(JsonConvert.SerializeObject(fsProperties)));
+
+            return jObj;
+        }
+
+        private string GetJsonPropertyName(PropertyInfo property)
+        {
+            var attributes = property.GetCustomAttributes(true);
+            var jsonPropAttribute = (JsonPropertyAttribute)attributes.FirstOrDefault(attr => attr is JsonPropertyAttribute);
+
+            return jsonPropAttribute != null ? jsonPropAttribute.PropertyName : property.Name;
+        }
+
+        private string GetFieldsetName(Type type)
+        {
+            var attributes = type.GetCustomAttributes(true);
+            var archetypeDatatypeAttribute = (ArchetypeDatatypeAttribute)attributes.FirstOrDefault(attr => attr is ArchetypeDatatypeAttribute);
+
+            return archetypeDatatypeAttribute != null ? archetypeDatatypeAttribute.FieldsetName : type.Name;
+        }
+
+        private bool IsValueArchetypeDatatype(object value)
+        {
+            return value != null &&
+                IsValueArchetypeDatatype(value.GetType());
+        }
+
+        private bool IsValueArchetypeDatatype(Type type)
+        {
+            return type.GetCustomAttributes(typeof(ArchetypeDatatypeAttribute), true).Length > 0;
+        }
+
+        private JsonConverter GetArchetypeDatatypeConverter(object value)
+        {
+            return GetArchetypeDatatypeConverter(value.GetType());
+        }
+
+        private JsonConverter GetArchetypeDatatypeConverter(Type type)
+        {
+            var converterType = typeof(ArchetypeJsonConverter<>);
+            Type[] typeArgs = { type };
+            var genericType = converterType.MakeGenericType(typeArgs);
+
+            return (JsonConverter)Activator.CreateInstance(genericType);
+        }
+
+        private string GetPropertyValue(object propValue)
+        {
+            if (propValue == null)
+                return String.Empty;
+
+            if (propValue is bool)
+                return (bool)propValue ? GetPropertyValue(1) : GetPropertyValue(0);
+
+            return String.Format("{0}", propValue);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

From 67311836c8b9bfcb567170462f86dc49331c7f5e Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Thu, 24 Apr 2014 10:49:04 +0100
Subject: [PATCH 03/19] Issue #AR-1_serialization: update json test input

---
 .../ArchetypeJsonConverterTest.cs             | 66 +++++++++++++++++--
 1 file changed, 61 insertions(+), 5 deletions(-)

diff --git a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
index d6db31d..ea794a8 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
@@ -40,18 +40,46 @@ namespace Archetype.Tests.Serialization
         },
         {
           ""alias"": ""webSite"",
-          ""value"": ""http://test.com""
+          ""value"": {
+            ""fieldsets"": [
+              {
+                ""alias"": ""urlPicker"",
+                ""properties"": [
+                  {
+                    ""alias"": ""title"",
+                    ""value"": ""The Test Company""
+                  },
+                  {
+                    ""alias"": ""url"",
+                    ""value"": ""http://test.com""
+                  },
+                  {
+                    ""alias"": ""content"",
+                    ""value"": """"
+                  },
+                  {
+                    ""alias"": ""media"",
+                    ""value"": """"
+                  },
+                  {
+                    ""alias"": ""openInNewWindow"",
+                    ""value"": ""1""
+                  }
+                ]
+              }
+            ]
+          }
         }
       ]
     }
   ]
 }";
 
-        private const string _HUB_DETAILS_JSON =
+        private const string _COMPANY_DETAILS_JSON =
 @"{
   ""fieldsets"": [
     {
-      ""alias"": ""regionalHub"",
+      ""alias"": ""companyDetails"",
       ""properties"": [
         {
           ""alias"": ""region"",
@@ -90,7 +118,35 @@ namespace Archetype.Tests.Serialization
                   },
                   {
                     ""alias"": ""webSite"",
-                    ""value"": ""http://test.com""
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""urlPicker"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""title"",
+                              ""value"": ""The Test Company""
+                            },
+                            {
+                              ""alias"": ""url"",
+                              ""value"": ""http://test.com""
+                            },
+                            {
+                              ""alias"": ""content"",
+                              ""value"": """"
+                            },
+                            {
+                              ""alias"": ""media"",
+                              ""value"": """"
+                            },
+                            {
+                              ""alias"": ""openInNewWindow"",
+                              ""value"": ""1""
+                            }
+                          ]
+                        }
+                      ]
+                    }
                   }
                 ]
               }
@@ -147,7 +203,7 @@ namespace Archetype.Tests.Serialization
         {
             var result = JsonConvert.SerializeObject(_companyDetails, Formatting.Indented);
 
-            Assert.AreEqual(_HUB_DETAILS_JSON, result);
+            Assert.AreEqual(_COMPANY_DETAILS_JSON, result);
 
         }
 

From ea0d641f257f28cefe65ca9846a2d3df4936f016 Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Thu, 24 Apr 2014 15:51:04 +0100
Subject: [PATCH 04/19] Issue #AR-1_serialization: add a numerical and date
 model test,

-  fix errors in deserializing nullable type values
---
 .../ArchetypeJsonConverterTest.cs             | 135 ++++++++++++++++--
 .../Archetype.Tests/Serialization/Models.cs   |  15 +-
 .../Serialization/ArchetypeJsonConverter.cs   |  34 ++++-
 3 files changed, 168 insertions(+), 16 deletions(-)

diff --git a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
index ea794a8..623ac44 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Archetype.Umbraco.PropertyConverters;
 using Newtonsoft.Json;
 using NUnit.Framework;
@@ -8,6 +9,41 @@ namespace Archetype.Tests.Serialization
     [TestFixture]
     public class ArchetypeJsonConverterTest
     {
+        private const string _ANNUAL_STATEMENT_JSON =
+@"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""annualStatement"",
+      ""properties"": [
+        {
+          ""alias"": ""FiscalYearStart"",
+          ""value"": ""01/09/2013 00:00:00""
+        },
+        {
+          ""alias"": ""FiscalYearEnd"",
+          ""value"": ""31/08/2014 00:00:00""
+        },
+        {
+          ""alias"": ""DividendPaymentDate"",
+          ""value"": """"
+        },
+        {
+          ""alias"": ""TotalShares"",
+          ""value"": ""345678""
+        },
+        {
+          ""alias"": ""Sales"",
+          ""value"": ""123456700.89""
+        },
+        {
+          ""alias"": ""Profit"",
+          ""value"": ""1123456.78""
+        }
+      ]
+    }
+  ]
+}";
+
         private const string _CONTACT_DETAILS_JSON =
 @"{
   ""fieldsets"": [
@@ -162,10 +198,19 @@ namespace Archetype.Tests.Serialization
 
         private ContactDetails _contactDetails;
         private CompanyDetails _companyDetails;
+        private AnnualStatement _annualStatement;
+        private UrlPicker _webSite;
 
         [SetUp]
         public void SetUp()
         {
+            _webSite = new UrlPicker
+            {
+                Url = "http://test.com",
+                Title = "The Test Company",
+                OpenInNewWindow = true
+            };
+            
             _contactDetails = new ContactDetails
             {
                 Address = "Test Address",
@@ -174,12 +219,7 @@ namespace Archetype.Tests.Serialization
                 Mobile = "000",
                 Name = "Test",
                 Telephone = "111",
-                WebSite = new UrlPicker
-                {
-                    Url = "http://test.com",
-                    Title = "The Test Company",
-                    OpenInNewWindow = true
-                }
+                WebSite = _webSite
             };
 
             _companyDetails = new CompanyDetails
@@ -187,6 +227,15 @@ namespace Archetype.Tests.Serialization
                 Region = "Test Region",
                 ContactDetails = _contactDetails
             };
+
+            _annualStatement = new AnnualStatement
+            {
+                FiscalYearStart = new DateTime(2013, 9, 1),
+                FiscalYearEnd = new DateTime(2014, 8, 31),
+                TotalShares = 345678,
+                Sales = 123456700.89,
+                Profit = 1123456.78m
+            };
         }
 
         #region serialization tests
@@ -199,7 +248,7 @@ namespace Archetype.Tests.Serialization
         }
 
         [Test]
-        public void RegionalModel_Fieldset_Serializes_As_Expected()
+        public void CompanyDetailsModel_Fieldset_Serializes_As_Expected()
         {
             var result = JsonConvert.SerializeObject(_companyDetails, Formatting.Indented);
 
@@ -207,6 +256,15 @@ namespace Archetype.Tests.Serialization
 
         }
 
+        [Test]
+        public void AnnualStatementModel_Fieldset_Serializes_As_Expected()
+        {
+            var result = JsonConvert.SerializeObject(_annualStatement, Formatting.Indented);
+
+            Assert.AreEqual(_ANNUAL_STATEMENT_JSON, result);
+
+        }
+
         [Test]
         public void NullValues_Serialize_To_Empty_String()
         {
@@ -232,6 +290,16 @@ namespace Archetype.Tests.Serialization
             Assert.NotNull(archetype);
         }
 
+        [Test]
+        public void ConvertNumericAndDateModelToArchetype()
+        {
+            var converter = new ArchetypeValueConverter();
+            var json = JsonConvert.SerializeObject(_annualStatement);
+            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+
+            Assert.NotNull(archetype);
+        }
+
         [Test]
         public void ConvertCompoundModelToArchetype()
         {
@@ -313,7 +381,7 @@ namespace Archetype.Tests.Serialization
         #region deserialization tests
 
         [Test]
-        public void ConvertArchetypeToModel()
+        public void DeserializeModelFromArchetype()
         {
             var result = JsonConvert.DeserializeObject<ContactDetails>(_CONTACT_DETAILS_JSON);
 
@@ -326,7 +394,54 @@ namespace Archetype.Tests.Serialization
             Assert.AreEqual("000", result.Mobile);
             Assert.AreEqual("Test", result.Name);
             Assert.AreEqual("111", result.Telephone);
-            Assert.AreEqual("http://test.com", result.WebSite);
+            Assert.AreEqual(_webSite.Content, result.WebSite.Content);
+            Assert.AreEqual(_webSite.Media, result.WebSite.Media);
+            Assert.AreEqual(_webSite.OpenInNewWindow, result.WebSite.OpenInNewWindow);
+            Assert.AreEqual(_webSite.Title, result.WebSite.Title);
+            Assert.AreEqual(_webSite.Url, result.WebSite.Url);
+        }
+
+        [Test]
+        public void DeserializeNumericAndDateModelFromArchetype()
+        {
+            var result = JsonConvert.DeserializeObject<AnnualStatement>(_ANNUAL_STATEMENT_JSON);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<AnnualStatement>(result);
+
+            Assert.AreEqual(new DateTime(2013, 9, 1), result.FiscalYearStart);
+            Assert.AreEqual(new DateTime(2014, 8, 31), result.FiscalYearEnd);
+            Assert.IsNull(result.DividendPaymentDate);
+            Assert.AreEqual(345678, result.TotalShares);
+            Assert.AreEqual(123456700.89, result.Sales);
+            Assert.AreEqual(1123456.78m, result.Profit);
+        }
+
+        [Test]
+        public void DeserializeNumericAndDateModel_NullableDate_HasValue_FromArchetype()
+        {
+            var annualStatement = new AnnualStatement
+            {
+                FiscalYearStart = new DateTime(2013, 9, 1),
+                FiscalYearEnd = new DateTime(2014, 8, 31),
+                DividendPaymentDate = new DateTime(2014,9,15,10,15,30),
+                TotalShares = 345678,
+                Sales = 123456700.89,
+                Profit = 1123456.78m
+            };
+
+            var json = JsonConvert.SerializeObject(annualStatement);
+            var result = JsonConvert.DeserializeObject<AnnualStatement>(json);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<AnnualStatement>(result);
+
+            Assert.AreEqual(annualStatement.FiscalYearStart, result.FiscalYearStart);
+            Assert.AreEqual(annualStatement.FiscalYearEnd, result.FiscalYearEnd);
+            Assert.AreEqual(annualStatement.DividendPaymentDate, result.DividendPaymentDate);
+            Assert.AreEqual(annualStatement.TotalShares, result.TotalShares);
+            Assert.AreEqual(annualStatement.Sales, result.Sales);
+            Assert.AreEqual(annualStatement.Profit, result.Profit);
         }
 
         [Test]
diff --git a/app/Umbraco/Archetype.Tests/Serialization/Models.cs b/app/Umbraco/Archetype.Tests/Serialization/Models.cs
index 95a0d6a..8a642d8 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/Models.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/Models.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Archetype.Umbraco.Serialization;
 using Newtonsoft.Json;
 
@@ -67,5 +68,17 @@ namespace Archetype.Tests.Serialization
     {
     }
 
+    [ArchetypeDatatype("annualStatement")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<AnnualStatement>))]
+    public class AnnualStatement
+    {
+        public DateTime FiscalYearStart { get; set; }
+        public DateTime FiscalYearEnd { get; set; }
+        public DateTime? DividendPaymentDate { get; set; }
+        public Int32 TotalShares { get; set; }
+        public Double Sales { get; set; }
+        public Decimal Profit { get; set; }
+    }
+
     #endregion
 }
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
index c273c78..6730bd7 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
@@ -69,10 +69,14 @@ namespace Archetype.Umbraco.Serialization
             foreach (var propertyInfo in properties)
             {
                 var propAlias = GetJsonPropertyName(propertyInfo);
-                var propJToken = jToken.Single(p => p.SelectToken("alias").ToString().Equals(propAlias));
+                var propJToken = jToken.SingleOrDefault(p => p.SelectToken("alias").ToString().Equals(propAlias));
+
+                if (propJToken == null)
+                    continue;
+
                 var propValue = IsValueArchetypeDatatype(propertyInfo.PropertyType)
                     ? JsonConvert.DeserializeObject(propJToken["value"].ToString(), propertyInfo.PropertyType, GetArchetypeDatatypeConverter(propertyInfo.PropertyType))
-                    : propJToken["value"].ToObject(propertyInfo.PropertyType);
+                    : GetDeserializedPropertyValue(propJToken["value"], propertyInfo.PropertyType);
 
                 propertyInfo.SetValue(obj, propValue);
             }
@@ -145,7 +149,7 @@ namespace Archetype.Umbraco.Serialization
                                   IsValueArchetypeDatatype(propValue)
                                       ? new JRaw(JsonConvert.SerializeObject(propValue,
                                                                              GetArchetypeDatatypeConverter(propValue)))
-                                      : new JValue(GetPropertyValue(propValue))));
+                                      : new JValue(GetSerializedPropertyValue(propValue))));
 
                 fsProperties.Add(fsProperty);
             }
@@ -196,17 +200,37 @@ namespace Archetype.Umbraco.Serialization
             return (JsonConverter)Activator.CreateInstance(genericType);
         }
 
-        private string GetPropertyValue(object propValue)
+        private string GetSerializedPropertyValue(object propValue)
         {
             if (propValue == null)
                 return String.Empty;
 
             if (propValue is bool)
-                return (bool)propValue ? GetPropertyValue(1) : GetPropertyValue(0);
+                return (bool)propValue ? GetSerializedPropertyValue(1) : GetSerializedPropertyValue(0);
 
             return String.Format("{0}", propValue);
         }
 
+        private object GetDeserializedPropertyValue(JToken jToken, Type type)
+        {            
+            if (String.IsNullOrEmpty(jToken.ToString()))
+                return GetDefault(type);
+
+            var localType = Nullable.GetUnderlyingType(type) ?? type;
+
+            if (localType == typeof(bool))
+                return jToken.ToString() == "1";
+
+            return localType == typeof(DateTime) 
+                ? Convert.ToDateTime(jToken.ToString())
+                : jToken.ToObject(localType);
+        }
+
+        private object GetDefault(Type type)
+        {
+            return type.IsValueType ? Activator.CreateInstance(type) : null;
+        }
+
         #endregion
     }
 }
\ No newline at end of file

From bfb1cc6abc582982c1b776d99004a1073d56cabc Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Thu, 24 Apr 2014 16:21:52 +0100
Subject: [PATCH 05/19] Issue #AR-1_serialization: add support for
 JsonIgnoreAttribute,

- re-factor names,
- move all test strings to separate class
---
 .../Archetype.Tests/Archetype.Tests.csproj    |   1 +
 .../ArchetypeJsonConverterTest.cs             | 216 ++----------------
 .../Serialization/JsonTestStrings.cs          | 207 +++++++++++++++++
 .../Archetype.Tests/Serialization/Models.cs   |   9 +
 .../Serialization/ArchetypeJsonConverter.cs   |  19 +-
 5 files changed, 248 insertions(+), 204 deletions(-)
 create mode 100644 app/Umbraco/Archetype.Tests/Serialization/JsonTestStrings.cs

diff --git a/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj b/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj
index dfeb829..fb90201 100644
--- a/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj
+++ b/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj
@@ -203,6 +203,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyValueConverter\PropertyValueConverterTests.cs" />
     <Compile Include="Serialization\ArchetypeJsonConverterTest.cs" />
+    <Compile Include="Serialization\JsonTestStrings.cs" />
     <Compile Include="Serialization\Models.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
index 623ac44..eff9a44 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using Archetype.Umbraco.PropertyConverters;
 using Newtonsoft.Json;
 using NUnit.Framework;
@@ -9,196 +8,10 @@ namespace Archetype.Tests.Serialization
     [TestFixture]
     public class ArchetypeJsonConverterTest
     {
-        private const string _ANNUAL_STATEMENT_JSON =
-@"{
-  ""fieldsets"": [
-    {
-      ""alias"": ""annualStatement"",
-      ""properties"": [
-        {
-          ""alias"": ""FiscalYearStart"",
-          ""value"": ""01/09/2013 00:00:00""
-        },
-        {
-          ""alias"": ""FiscalYearEnd"",
-          ""value"": ""31/08/2014 00:00:00""
-        },
-        {
-          ""alias"": ""DividendPaymentDate"",
-          ""value"": """"
-        },
-        {
-          ""alias"": ""TotalShares"",
-          ""value"": ""345678""
-        },
-        {
-          ""alias"": ""Sales"",
-          ""value"": ""123456700.89""
-        },
-        {
-          ""alias"": ""Profit"",
-          ""value"": ""1123456.78""
-        }
-      ]
-    }
-  ]
-}";
-
-        private const string _CONTACT_DETAILS_JSON =
-@"{
-  ""fieldsets"": [
-    {
-      ""alias"": ""contactDetails"",
-      ""properties"": [
-        {
-          ""alias"": ""name"",
-          ""value"": ""Test""
-        },
-        {
-          ""alias"": ""address"",
-          ""value"": ""Test Address""
-        },
-        {
-          ""alias"": ""telephone"",
-          ""value"": ""111""
-        },
-        {
-          ""alias"": ""mobile"",
-          ""value"": ""000""
-        },
-        {
-          ""alias"": ""fax"",
-          ""value"": ""000""
-        },
-        {
-          ""alias"": ""email"",
-          ""value"": ""test@test.com""
-        },
-        {
-          ""alias"": ""webSite"",
-          ""value"": {
-            ""fieldsets"": [
-              {
-                ""alias"": ""urlPicker"",
-                ""properties"": [
-                  {
-                    ""alias"": ""title"",
-                    ""value"": ""The Test Company""
-                  },
-                  {
-                    ""alias"": ""url"",
-                    ""value"": ""http://test.com""
-                  },
-                  {
-                    ""alias"": ""content"",
-                    ""value"": """"
-                  },
-                  {
-                    ""alias"": ""media"",
-                    ""value"": """"
-                  },
-                  {
-                    ""alias"": ""openInNewWindow"",
-                    ""value"": ""1""
-                  }
-                ]
-              }
-            ]
-          }
-        }
-      ]
-    }
-  ]
-}";
-
-        private const string _COMPANY_DETAILS_JSON =
-@"{
-  ""fieldsets"": [
-    {
-      ""alias"": ""companyDetails"",
-      ""properties"": [
-        {
-          ""alias"": ""region"",
-          ""value"": ""Test Region""
-        },
-        {
-          ""alias"": ""contactDetails"",
-          ""value"": {
-            ""fieldsets"": [
-              {
-                ""alias"": ""contactDetails"",
-                ""properties"": [
-                  {
-                    ""alias"": ""name"",
-                    ""value"": ""Test""
-                  },
-                  {
-                    ""alias"": ""address"",
-                    ""value"": ""Test Address""
-                  },
-                  {
-                    ""alias"": ""telephone"",
-                    ""value"": ""111""
-                  },
-                  {
-                    ""alias"": ""mobile"",
-                    ""value"": ""000""
-                  },
-                  {
-                    ""alias"": ""fax"",
-                    ""value"": ""000""
-                  },
-                  {
-                    ""alias"": ""email"",
-                    ""value"": ""test@test.com""
-                  },
-                  {
-                    ""alias"": ""webSite"",
-                    ""value"": {
-                      ""fieldsets"": [
-                        {
-                          ""alias"": ""urlPicker"",
-                          ""properties"": [
-                            {
-                              ""alias"": ""title"",
-                              ""value"": ""The Test Company""
-                            },
-                            {
-                              ""alias"": ""url"",
-                              ""value"": ""http://test.com""
-                            },
-                            {
-                              ""alias"": ""content"",
-                              ""value"": """"
-                            },
-                            {
-                              ""alias"": ""media"",
-                              ""value"": """"
-                            },
-                            {
-                              ""alias"": ""openInNewWindow"",
-                              ""value"": ""1""
-                            }
-                          ]
-                        }
-                      ]
-                    }
-                  }
-                ]
-              }
-            ]
-          }
-        }
-      ]
-    }
-  ]
-}";
-
-        private const string _NULL_VALUES_JSON = @"{""fieldsets"":[{""alias"":""contactDetails"",""properties"":[{""alias"":""name"",""value"":""""},{""alias"":""address"",""value"":""""},{""alias"":""telephone"",""value"":""""},{""alias"":""mobile"",""value"":""""},{""alias"":""fax"",""value"":""""},{""alias"":""email"",""value"":""""},{""alias"":""webSite"",""value"":""""}]}]}";
-
         private ContactDetails _contactDetails;
         private CompanyDetails _companyDetails;
         private AnnualStatement _annualStatement;
+        private MergerDetails _mergerDetails;
         private UrlPicker _webSite;
 
         [SetUp]
@@ -210,7 +23,13 @@ namespace Archetype.Tests.Serialization
                 Title = "The Test Company",
                 OpenInNewWindow = true
             };
-            
+
+            _mergerDetails = new MergerDetails
+            {
+                MergerDate = new DateTime(2014,6,7,8,9,10),
+                MergerValue = 12345676890.12m
+            };
+
             _contactDetails = new ContactDetails
             {
                 Address = "Test Address",
@@ -240,11 +59,18 @@ namespace Archetype.Tests.Serialization
 
         #region serialization tests
 
+        [Test]
+        public void MergerDetailsModel_Serializes_To_Archetype_Property()
+        {
+            var result = JsonConvert.SerializeObject(_mergerDetails, Formatting.Indented);
+            Assert.AreEqual(JsonTestStrings._MERGER_DETAILS_JSON, result);
+        }        
+        
         [Test]
         public void ContactDetailsModel_Serializes_To_Archetype_Property()
         {
             var result = JsonConvert.SerializeObject(_contactDetails, Formatting.Indented);
-            Assert.AreEqual(_CONTACT_DETAILS_JSON, result);
+            Assert.AreEqual(JsonTestStrings._CONTACT_DETAILS_JSON, result);
         }
 
         [Test]
@@ -252,7 +78,7 @@ namespace Archetype.Tests.Serialization
         {
             var result = JsonConvert.SerializeObject(_companyDetails, Formatting.Indented);
 
-            Assert.AreEqual(_COMPANY_DETAILS_JSON, result);
+            Assert.AreEqual(JsonTestStrings._COMPANY_DETAILS_JSON, result);
 
         }
 
@@ -261,7 +87,7 @@ namespace Archetype.Tests.Serialization
         {
             var result = JsonConvert.SerializeObject(_annualStatement, Formatting.Indented);
 
-            Assert.AreEqual(_ANNUAL_STATEMENT_JSON, result);
+            Assert.AreEqual(JsonTestStrings._ANNUAL_STATEMENT_JSON, result);
 
         }
 
@@ -270,7 +96,7 @@ namespace Archetype.Tests.Serialization
         {
             var result = JsonConvert.SerializeObject(new ContactDetails());
 
-            Assert.AreEqual(_NULL_VALUES_JSON, result);
+            Assert.AreEqual(JsonTestStrings._NULL_VALUES_JSON, result);
 
         }
 
@@ -383,7 +209,7 @@ namespace Archetype.Tests.Serialization
         [Test]
         public void DeserializeModelFromArchetype()
         {
-            var result = JsonConvert.DeserializeObject<ContactDetails>(_CONTACT_DETAILS_JSON);
+            var result = JsonConvert.DeserializeObject<ContactDetails>(JsonTestStrings._CONTACT_DETAILS_JSON);
 
             Assert.NotNull(result);
             Assert.IsInstanceOf<ContactDetails>(result);
@@ -404,7 +230,7 @@ namespace Archetype.Tests.Serialization
         [Test]
         public void DeserializeNumericAndDateModelFromArchetype()
         {
-            var result = JsonConvert.DeserializeObject<AnnualStatement>(_ANNUAL_STATEMENT_JSON);
+            var result = JsonConvert.DeserializeObject<AnnualStatement>(JsonTestStrings._ANNUAL_STATEMENT_JSON);
 
             Assert.NotNull(result);
             Assert.IsInstanceOf<AnnualStatement>(result);
diff --git a/app/Umbraco/Archetype.Tests/Serialization/JsonTestStrings.cs b/app/Umbraco/Archetype.Tests/Serialization/JsonTestStrings.cs
new file mode 100644
index 0000000..5a29ebc
--- /dev/null
+++ b/app/Umbraco/Archetype.Tests/Serialization/JsonTestStrings.cs
@@ -0,0 +1,207 @@
+namespace Archetype.Tests.Serialization
+{
+    public class JsonTestStrings
+    {
+        public const string _MERGER_DETAILS_JSON =
+            @"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""mergerDetails"",
+      ""properties"": [
+        {
+          ""alias"": ""MergerDate"",
+          ""value"": ""07/06/2014 08:09:10""
+        }
+      ]
+    }
+  ]
+}";
+
+        public const string _ANNUAL_STATEMENT_JSON =
+            @"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""annualStatement"",
+      ""properties"": [
+        {
+          ""alias"": ""FiscalYearStart"",
+          ""value"": ""01/09/2013 00:00:00""
+        },
+        {
+          ""alias"": ""FiscalYearEnd"",
+          ""value"": ""31/08/2014 00:00:00""
+        },
+        {
+          ""alias"": ""DividendPaymentDate"",
+          ""value"": """"
+        },
+        {
+          ""alias"": ""TotalShares"",
+          ""value"": ""345678""
+        },
+        {
+          ""alias"": ""Sales"",
+          ""value"": ""123456700.89""
+        },
+        {
+          ""alias"": ""Profit"",
+          ""value"": ""1123456.78""
+        }
+      ]
+    }
+  ]
+}";
+
+        public const string _CONTACT_DETAILS_JSON =
+            @"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""contactDetails"",
+      ""properties"": [
+        {
+          ""alias"": ""name"",
+          ""value"": ""Test""
+        },
+        {
+          ""alias"": ""address"",
+          ""value"": ""Test Address""
+        },
+        {
+          ""alias"": ""telephone"",
+          ""value"": ""111""
+        },
+        {
+          ""alias"": ""mobile"",
+          ""value"": ""000""
+        },
+        {
+          ""alias"": ""fax"",
+          ""value"": ""000""
+        },
+        {
+          ""alias"": ""email"",
+          ""value"": ""test@test.com""
+        },
+        {
+          ""alias"": ""webSite"",
+          ""value"": {
+            ""fieldsets"": [
+              {
+                ""alias"": ""urlPicker"",
+                ""properties"": [
+                  {
+                    ""alias"": ""title"",
+                    ""value"": ""The Test Company""
+                  },
+                  {
+                    ""alias"": ""url"",
+                    ""value"": ""http://test.com""
+                  },
+                  {
+                    ""alias"": ""content"",
+                    ""value"": """"
+                  },
+                  {
+                    ""alias"": ""media"",
+                    ""value"": """"
+                  },
+                  {
+                    ""alias"": ""openInNewWindow"",
+                    ""value"": ""1""
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}";
+
+        public const string _COMPANY_DETAILS_JSON =
+            @"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""companyDetails"",
+      ""properties"": [
+        {
+          ""alias"": ""region"",
+          ""value"": ""Test Region""
+        },
+        {
+          ""alias"": ""contactDetails"",
+          ""value"": {
+            ""fieldsets"": [
+              {
+                ""alias"": ""contactDetails"",
+                ""properties"": [
+                  {
+                    ""alias"": ""name"",
+                    ""value"": ""Test""
+                  },
+                  {
+                    ""alias"": ""address"",
+                    ""value"": ""Test Address""
+                  },
+                  {
+                    ""alias"": ""telephone"",
+                    ""value"": ""111""
+                  },
+                  {
+                    ""alias"": ""mobile"",
+                    ""value"": ""000""
+                  },
+                  {
+                    ""alias"": ""fax"",
+                    ""value"": ""000""
+                  },
+                  {
+                    ""alias"": ""email"",
+                    ""value"": ""test@test.com""
+                  },
+                  {
+                    ""alias"": ""webSite"",
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""urlPicker"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""title"",
+                              ""value"": ""The Test Company""
+                            },
+                            {
+                              ""alias"": ""url"",
+                              ""value"": ""http://test.com""
+                            },
+                            {
+                              ""alias"": ""content"",
+                              ""value"": """"
+                            },
+                            {
+                              ""alias"": ""media"",
+                              ""value"": """"
+                            },
+                            {
+                              ""alias"": ""openInNewWindow"",
+                              ""value"": ""1""
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}";
+
+        public const string _NULL_VALUES_JSON = @"{""fieldsets"":[{""alias"":""contactDetails"",""properties"":[{""alias"":""name"",""value"":""""},{""alias"":""address"",""value"":""""},{""alias"":""telephone"",""value"":""""},{""alias"":""mobile"",""value"":""""},{""alias"":""fax"",""value"":""""},{""alias"":""email"",""value"":""""},{""alias"":""webSite"",""value"":""""}]}]}";
+    }
+}
diff --git a/app/Umbraco/Archetype.Tests/Serialization/Models.cs b/app/Umbraco/Archetype.Tests/Serialization/Models.cs
index 8a642d8..0701539 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/Models.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/Models.cs
@@ -80,5 +80,14 @@ namespace Archetype.Tests.Serialization
         public Decimal Profit { get; set; }
     }
 
+    [ArchetypeDatatype("mergerDetails")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<MergerDetails>))]
+    public class MergerDetails
+    {
+        public DateTime MergerDate { get; set; }
+        [JsonIgnore]
+        public decimal MergerValue { get; set; }
+    }
+
     #endregion
 }
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
index 6730bd7..edfd28a 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
@@ -15,16 +15,16 @@ namespace Archetype.Umbraco.Serialization
     {
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
-            var fieldsets = (value as IList) ?? new List<T> { value as T };
+            var models = (value as IList) ?? new List<T> { value as T };
 
-            if (fieldsets.Count == 1 && fieldsets[0] == null) 
+            if (models.Count == 1 && models[0] == null) 
                 return;
 
             var jObj = new JObject
             {
                 {
                     "fieldsets", 
-                     new JArray( new JRaw(SerializeFieldsets(fieldsets)))
+                     new JArray( new JRaw(SerializeModels(models)))
                 }
             };
 
@@ -96,19 +96,19 @@ namespace Archetype.Umbraco.Serialization
             return JToken.Parse(json).ToString(formatting);
         }
 
-        private IEnumerable SerializeFieldsets(IEnumerable fieldSets)
+        private IEnumerable SerializeModels(IEnumerable models)
         {
-            var fieldsetJson = (from object fs in fieldSets where null != fs select SerializeObject(fs)).ToList();
+            var fieldsetJson = (from object model in models where null != model select SerializeModel(model)).ToList();
 
             return String.Join(",", fieldsetJson);
         }
 
-        private string SerializeObject(object value)
+        private string SerializeModel(object value)
         {
             if (value == null)
                 return null;
 
-            var jObj = GetFieldsetJObject(value);
+            var jObj = GetJObject(value);
 
             var fieldsetJson = new StringBuilder();
             var fieldsetWriter = new StringWriter(fieldsetJson);
@@ -121,7 +121,7 @@ namespace Archetype.Umbraco.Serialization
             return fieldsetJson.ToString();
         }
 
-        private JObject GetFieldsetJObject(object obj)
+        private JObject GetJObject(object obj)
         {
             var jObj = new JObject
                 {
@@ -132,7 +132,8 @@ namespace Archetype.Umbraco.Serialization
                 };
 
             var properties = obj.GetType()
-                                .GetProperties(BindingFlags.Instance | BindingFlags.Public);
+                                .GetProperties(BindingFlags.Instance | BindingFlags.Public)
+                                .Where(prop => !Attribute.IsDefined(prop, typeof(JsonIgnoreAttribute)));
 
             var fsProperties = new List<JObject>();
 

From 8c005b2ec9235c43b8a8cd66f85b9a63161a812d Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Thu, 24 Apr 2014 16:23:28 +0100
Subject: [PATCH 06/19] Issue #AR-1_serialization: rename test models file

---
 .../Serialization/{Models.cs => JsonTestModels.cs}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename app/Umbraco/Archetype.Tests/Serialization/{Models.cs => JsonTestModels.cs} (99%)

diff --git a/app/Umbraco/Archetype.Tests/Serialization/Models.cs b/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
similarity index 99%
rename from app/Umbraco/Archetype.Tests/Serialization/Models.cs
rename to app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
index 0701539..bee0693 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/Models.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
@@ -5,7 +5,7 @@ using Newtonsoft.Json;
 
 namespace Archetype.Tests.Serialization
 {
-    #region test Models
+    #region json test Models
 
     [ArchetypeDatatype("urlPicker")]
     [JsonConverter(typeof(ArchetypeJsonConverter<UrlPicker>))]

From 23735fdf59617fbce0346a682cdcdb7f34f76a86 Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Thu, 24 Apr 2014 17:03:30 +0100
Subject: [PATCH 07/19] Issue #AR-1_serialization: rename file

---
 app/Umbraco/Archetype.Tests/Archetype.Tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj b/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj
index fb90201..a9c5034 100644
--- a/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj
+++ b/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj
@@ -204,7 +204,7 @@
     <Compile Include="PropertyValueConverter\PropertyValueConverterTests.cs" />
     <Compile Include="Serialization\ArchetypeJsonConverterTest.cs" />
     <Compile Include="Serialization\JsonTestStrings.cs" />
-    <Compile Include="Serialization\Models.cs" />
+    <Compile Include="Serialization\JsonTestModels.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />

From cbec133186cdb5e8cbd765096228cda0d4384416 Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Fri, 25 Apr 2014 17:34:56 +0100
Subject: [PATCH 08/19] Issue #AR-1_serialization: added serialization
 wrappers, and support for complex model serialization,

- see test examples
---
 .../Archetype.Tests/Archetype.Tests.csproj    |  1 +
 .../ArchetypeJsonConverterComplexModelTest.cs | 50 +++++++++++++
 .../Serialization/JsonTestModels.cs           | 36 ++++++++++
 .../Serialization/JsonTestStrings.cs          | 63 ++++++++++++++++
 .../Archetype.Umbraco.csproj                  |  1 +
 .../Serialization/ArchetypeJsonConverter.cs   | 71 +++++++++++++++++--
 .../Serialization/SerializationExtensions.cs  | 32 +++++++++
 7 files changed, 249 insertions(+), 5 deletions(-)
 create mode 100644 app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
 create mode 100644 app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs

diff --git a/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj b/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj
index a9c5034..adf99ec 100644
--- a/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj
+++ b/app/Umbraco/Archetype.Tests/Archetype.Tests.csproj
@@ -202,6 +202,7 @@
     <Compile Include="Models\FieldsetTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyValueConverter\PropertyValueConverterTests.cs" />
+    <Compile Include="Serialization\ArchetypeJsonConverterComplexModelTest.cs" />
     <Compile Include="Serialization\ArchetypeJsonConverterTest.cs" />
     <Compile Include="Serialization\JsonTestStrings.cs" />
     <Compile Include="Serialization\JsonTestModels.cs" />
diff --git a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
new file mode 100644
index 0000000..8159a41
--- /dev/null
+++ b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using NUnit.Framework;
+
+namespace Archetype.Tests.Serialization
+{
+    [TestFixture]
+    public class ArchetypeJsonConverterComplexModelTest
+    {
+        private TextList _textList;
+        private Captions _captions;
+        private PageDetails _pageDetails;
+        
+        [SetUp]
+        public void SetUp()
+        {
+            _textList = new TextList
+            {
+                new TextItem{TextString = "First Page"},
+                new TextItem{TextString = "Second Page"},
+                new TextItem{TextString = "Third Page"},
+                new TextItem{TextString = "Fourth Page"}
+            };
+
+            _captions = new Captions {TextStringArray = _textList};
+
+            _pageDetails = new PageDetails
+            {
+                Captions = _captions,
+                Pages = "2439,2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453"
+            };
+        }
+
+        #region serialization tests
+
+        [Test]
+        public void PageDetailsModel_Serializes_To_Archetype_Property()
+        {
+            var result = JsonConvert.SerializeObject(_pageDetails, Formatting.Indented);
+            Assert.AreEqual(JsonTestStrings._PAGE_DETAILS_JSON, result);
+        }  
+
+        #endregion
+
+    }
+}
diff --git a/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs b/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
index bee0693..4bc26d3 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
@@ -90,4 +90,40 @@ namespace Archetype.Tests.Serialization
     }
 
     #endregion
+
+    #region complex nested model
+
+    [ArchetypeDatatype("pages")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<PageDetails>))]
+    public class PageDetails
+    {
+        [JsonProperty("pages")]
+        public string Pages { get; set; }
+        [JsonProperty("captions")]
+        public Captions Captions { get; set; }
+    }
+
+    [ArchetypeDatatype("captions")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<Captions>))]
+    public class Captions
+    {
+        [JsonProperty("captions")]
+        public TextList TextStringArray { get; set; }
+    }
+
+    [ArchetypeDatatype("textstringArray")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<TextList>))]
+    public class TextList : List<TextItem>
+    {
+    }
+
+    [ArchetypeDatatype("textstringArray")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<TextItem>))]
+    public class TextItem
+    {
+        [JsonProperty("textstring")]
+        public string TextString { get; set; }
+    }
+
+    #endregion
 }
diff --git a/app/Umbraco/Archetype.Tests/Serialization/JsonTestStrings.cs b/app/Umbraco/Archetype.Tests/Serialization/JsonTestStrings.cs
index 5a29ebc..83dce45 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/JsonTestStrings.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/JsonTestStrings.cs
@@ -202,6 +202,69 @@
   ]
 }";
 
+        public const string _PAGE_DETAILS_JSON =
+            @"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""pages"",
+      ""properties"": [
+        {
+          ""alias"": ""pages"",
+          ""value"": ""2439,2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453""
+        }
+      ]
+    },
+    {
+      ""alias"": ""captions"",
+      ""properties"": [
+        {
+          ""alias"": ""captions"",
+          ""value"": {
+            ""fieldsets"": [
+              {
+                ""alias"": ""textstringArray"",
+                ""properties"": [
+                  {
+                    ""alias"": ""textstring"",
+                    ""value"": ""First Page""
+                  }
+                ]
+              },
+              {
+                ""alias"": ""textstringArray"",
+                ""properties"": [
+                  {
+                    ""alias"": ""textstring"",
+                    ""value"": ""Second Page""
+                  }
+                ]
+              },
+              {
+                ""alias"": ""textstringArray"",
+                ""properties"": [
+                  {
+                    ""alias"": ""textstring"",
+                    ""value"": ""Third Page""
+                  }
+                ]
+              },
+              {
+                ""alias"": ""textstringArray"",
+                ""properties"": [
+                  {
+                    ""alias"": ""textstring"",
+                    ""value"": ""Fourth Page""
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}";
+
         public const string _NULL_VALUES_JSON = @"{""fieldsets"":[{""alias"":""contactDetails"",""properties"":[{""alias"":""name"",""value"":""""},{""alias"":""address"",""value"":""""},{""alias"":""telephone"",""value"":""""},{""alias"":""mobile"",""value"":""""},{""alias"":""fax"",""value"":""""},{""alias"":""email"",""value"":""""},{""alias"":""webSite"",""value"":""""}]}]}";
     }
 }
diff --git a/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj b/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
index 8b72610..29e1f14 100644
--- a/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
+++ b/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
@@ -243,6 +243,7 @@
     <Compile Include="PropertyConverters\ArchetypeValueConverter.cs" />
     <Compile Include="Serialization\ArchetypeDatatypeAttribute.cs" />
     <Compile Include="Serialization\ArchetypeJsonConverter.cs" />
+    <Compile Include="Serialization\SerializationExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
index edfd28a..7b81082 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Dynamic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -15,7 +16,10 @@ namespace Archetype.Umbraco.Serialization
     {
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
-            var models = (value as IList) ?? new List<T> { value as T };
+            var models = GenerateModels(value);
+
+            if (models.Count < 1)
+                return;
 
             if (models.Count == 1 && models[0] == null) 
                 return;
@@ -96,6 +100,30 @@ namespace Archetype.Umbraco.Serialization
             return JToken.Parse(json).ToString(formatting);
         }
 
+        private IList GenerateModels(object value)
+        {
+            var models = value as IList;
+
+            if (null != models)
+                return models;
+
+            models = GetPropertiesToSerialize(value)
+                        .Select(pInfo =>
+                        {
+                            if (pInfo.PropertyType.IsPrimitive || pInfo.PropertyType.IsValueType
+                                    || pInfo.PropertyType.Name.Equals(typeof(String).Name))
+                            {
+                                var dynamicModel = new ExpandoObject() as IDictionary<string, object>;
+                                dynamicModel.Add(GetJsonPropertyName(pInfo), pInfo.GetValue(value));
+                                return dynamicModel;
+                            }
+
+                            return pInfo.GetValue(value);
+                        }).ToList();
+
+            return models;
+        }
+
         private IEnumerable SerializeModels(IEnumerable models)
         {
             var fieldsetJson = (from object model in models where null != model select SerializeModel(model)).ToList();
@@ -108,7 +136,7 @@ namespace Archetype.Umbraco.Serialization
             if (value == null)
                 return null;
 
-            var jObj = GetJObject(value);
+            var jObj = IsExpandoObject(value) ? GetJObjectFromExpandoObject(value as IDictionary<string, object>) : GetJObject(value);
 
             var fieldsetJson = new StringBuilder();
             var fieldsetWriter = new StringWriter(fieldsetJson);
@@ -121,6 +149,34 @@ namespace Archetype.Umbraco.Serialization
             return fieldsetJson.ToString();
         }
 
+        private bool IsExpandoObject(object value)
+        {
+            return value.GetType().Name.Equals(typeof (ExpandoObject).Name);
+        }
+
+        private JObject GetJObjectFromExpandoObject(IEnumerable<KeyValuePair<string, object>> obj)
+        {
+            var property = obj.ElementAt(0);
+            var alias = property.Key;
+            var value = property.Value;
+
+            var jObj = new JObject
+                {
+                    {
+                        "alias",
+                        new JValue(alias)
+                    }
+                };
+
+            var fsProperties = new List<JObject>
+            {
+                new JObject {new JProperty("alias", alias), new JProperty("value", value)}
+            };
+            jObj.Add("properties", new JRaw(JsonConvert.SerializeObject(fsProperties)));
+
+            return jObj;
+        }
+
         private JObject GetJObject(object obj)
         {
             var jObj = new JObject
@@ -131,9 +187,7 @@ namespace Archetype.Umbraco.Serialization
                     }
                 };
 
-            var properties = obj.GetType()
-                                .GetProperties(BindingFlags.Instance | BindingFlags.Public)
-                                .Where(prop => !Attribute.IsDefined(prop, typeof(JsonIgnoreAttribute)));
+            var properties = GetPropertiesToSerialize(obj);
 
             var fsProperties = new List<JObject>();
 
@@ -160,6 +214,13 @@ namespace Archetype.Umbraco.Serialization
             return jObj;
         }
 
+        private IEnumerable<PropertyInfo> GetPropertiesToSerialize(object obj)
+        {
+            return obj.GetType()
+                .GetProperties(BindingFlags.Instance | BindingFlags.Public)
+                .Where(prop => !Attribute.IsDefined(prop, typeof(JsonIgnoreAttribute)));
+        }
+
         private string GetJsonPropertyName(PropertyInfo property)
         {
             var attributes = property.GetCustomAttributes(true);
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs b/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs
new file mode 100644
index 0000000..8ae37d0
--- /dev/null
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Umbraco.Core.Models;
+using Umbraco.Web;
+
+namespace Archetype.Umbraco.Serialization
+{
+    public static class SerializationExtensions
+    {
+        //temporary
+        public static string GetPropertyDataValue(this IPublishedContent contentPage, string propertyAlias)
+        {
+            if (contentPage == null || !contentPage.HasProperty(propertyAlias))
+                return null;
+
+            return (string)contentPage.Properties.Single(p => p.PropertyTypeAlias == propertyAlias).DataValue;
+        }
+
+        public static T GetModelFromArchetype<T>(this IPublishedContent content,
+            string cmsFieldAlias, bool returnInstanceIfNull = false)
+            where T : class, new()
+        {
+            var archetypeJson = content.GetPropertyDataValue(cmsFieldAlias);
+            return JsonConvert.DeserializeObject<T>(archetypeJson) ??
+                   (returnInstanceIfNull ? Activator.CreateInstance<T>() : default(T));
+        }
+    }
+}

From 43e1855b2cb8cb823f3658b4e5e1bf284cd4a075 Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Mon, 28 Apr 2014 12:45:30 +0100
Subject: [PATCH 09/19] Issue #AR-1_serialization: fix regression error, added
 AsFieldsetAttribute to help resolve ambiguous complex models, some renaming

---
 .../ArchetypeJsonConverterComplexModelTest.cs | 43 +++++++++++++++-
 .../Serialization/JsonTestModels.cs           | 23 +++++----
 .../Archetype.Umbraco.csproj                  |  3 +-
 .../Serialization/ArchetypeJsonConverter.cs   | 51 +++++++++++++------
 ...peAttribute.cs => AsArchetypeAttribute.cs} |  4 +-
 .../Serialization/AsFieldsetAttribute.cs      |  8 +++
 6 files changed, 102 insertions(+), 30 deletions(-)
 rename app/Umbraco/Umbraco.Archetype/Serialization/{ArchetypeDatatypeAttribute.cs => AsArchetypeAttribute.cs} (61%)
 create mode 100644 app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs

diff --git a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
index 8159a41..42b13cf 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Archetype.Umbraco.PropertyConverters;
 using Newtonsoft.Json;
 using NUnit.Framework;
 
@@ -42,8 +43,48 @@ namespace Archetype.Tests.Serialization
         {
             var result = JsonConvert.SerializeObject(_pageDetails, Formatting.Indented);
             Assert.AreEqual(JsonTestStrings._PAGE_DETAILS_JSON, result);
-        }  
+        }
 
+        [Test]
+        public void ConvertComplexModelToArchetype()
+        {
+            var converter = new ArchetypeValueConverter();
+            var json = JsonConvert.SerializeObject(_pageDetails, Formatting.Indented);
+            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+
+            Assert.NotNull(archetype);
+        }
+
+        [Test]
+        public void DeserializeComplexModelFromArchetype()
+        {
+            var result = JsonConvert.DeserializeObject<PageDetails>(JsonTestStrings._PAGE_DETAILS_JSON);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<PageDetails>(result);
+
+            Assert.AreEqual("2439,2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453", result.Pages);
+            Assert.AreEqual("First Page", result.Captions.TextStringArray.ElementAt(0));
+            Assert.AreEqual("Second Page", result.Captions.TextStringArray.ElementAt(1));
+            Assert.AreEqual("Third Page", result.Captions.TextStringArray.ElementAt(2));
+            Assert.AreEqual("Fourth Page", result.Captions.TextStringArray.ElementAt(3));
+        }
+
+        [Test]
+        public void SerializeThenDeserializeComplexModelFromArchetype()
+        {
+            var json = JsonConvert.SerializeObject(_pageDetails);
+            var result = JsonConvert.DeserializeObject<PageDetails>(json);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<PageDetails>(result);
+
+            Assert.AreEqual(_pageDetails.Pages, result.Pages);
+            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(0), result.Captions.TextStringArray.ElementAt(0));
+            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(1), result.Captions.TextStringArray.ElementAt(1));
+            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(2), result.Captions.TextStringArray.ElementAt(2));
+            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(3), result.Captions.TextStringArray.ElementAt(3));
+        }
         #endregion
 
     }
diff --git a/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs b/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
index 4bc26d3..24b13dd 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
@@ -7,7 +7,7 @@ namespace Archetype.Tests.Serialization
 {
     #region json test Models
 
-    [ArchetypeDatatype("urlPicker")]
+    [AsArchetype("urlPicker")]
     [JsonConverter(typeof(ArchetypeJsonConverter<UrlPicker>))]
     public class UrlPicker
     {
@@ -23,7 +23,7 @@ namespace Archetype.Tests.Serialization
         public bool OpenInNewWindow { get; set; }
     }
 
-    [ArchetypeDatatype("contactDetails")]
+    [AsArchetype("contactDetails")]
     [JsonConverter(typeof(ArchetypeJsonConverter<ContactDetails>))]
     public class ContactDetails
     {
@@ -43,7 +43,7 @@ namespace Archetype.Tests.Serialization
         public UrlPicker WebSite { get; set; }
     }
 
-    [ArchetypeDatatype("companyDetails")]
+    [AsArchetype("companyDetails")]
     [JsonConverter(typeof(ArchetypeJsonConverter<CompanyDetails>))]
     public class CompanyDetails
     {
@@ -53,7 +53,7 @@ namespace Archetype.Tests.Serialization
         public ContactDetails ContactDetails { get; set; }
     }
 
-    [ArchetypeDatatype("allContactDetails")]
+    [AsArchetype("allContactDetails")]
     [JsonConverter(typeof(ArchetypeJsonConverter<AllContactDetails>))]
     public class AllContactDetails
     {
@@ -62,13 +62,13 @@ namespace Archetype.Tests.Serialization
 
     }
 
-    [ArchetypeDatatype("contactDetailsList")]
+    [AsArchetype("contactDetailsList")]
     [JsonConverter(typeof(ArchetypeJsonConverter<ContactDetailsList>))]
     public class ContactDetailsList : List<ContactDetails>
     {
     }
 
-    [ArchetypeDatatype("annualStatement")]
+    [AsArchetype("annualStatement")]
     [JsonConverter(typeof(ArchetypeJsonConverter<AnnualStatement>))]
     public class AnnualStatement
     {
@@ -80,7 +80,7 @@ namespace Archetype.Tests.Serialization
         public Decimal Profit { get; set; }
     }
 
-    [ArchetypeDatatype("mergerDetails")]
+    [AsArchetype("mergerDetails")]
     [JsonConverter(typeof(ArchetypeJsonConverter<MergerDetails>))]
     public class MergerDetails
     {
@@ -93,17 +93,18 @@ namespace Archetype.Tests.Serialization
 
     #region complex nested model
 
-    [ArchetypeDatatype("pages")]
+    [AsArchetype("pages")]
     [JsonConverter(typeof(ArchetypeJsonConverter<PageDetails>))]
     public class PageDetails
     {
         [JsonProperty("pages")]
         public string Pages { get; set; }
+        [AsFieldset]
         [JsonProperty("captions")]
         public Captions Captions { get; set; }
     }
 
-    [ArchetypeDatatype("captions")]
+    [AsArchetype("captions")]
     [JsonConverter(typeof(ArchetypeJsonConverter<Captions>))]
     public class Captions
     {
@@ -111,13 +112,13 @@ namespace Archetype.Tests.Serialization
         public TextList TextStringArray { get; set; }
     }
 
-    [ArchetypeDatatype("textstringArray")]
+    [AsArchetype("textstringArray")]
     [JsonConverter(typeof(ArchetypeJsonConverter<TextList>))]
     public class TextList : List<TextItem>
     {
     }
 
-    [ArchetypeDatatype("textstringArray")]
+    [AsArchetype("textstringArray")]
     [JsonConverter(typeof(ArchetypeJsonConverter<TextItem>))]
     public class TextItem
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj b/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
index 29e1f14..cdd3a7a 100644
--- a/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
+++ b/app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
@@ -241,8 +241,9 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\VersionInfo.cs" />
     <Compile Include="PropertyConverters\ArchetypeValueConverter.cs" />
-    <Compile Include="Serialization\ArchetypeDatatypeAttribute.cs" />
+    <Compile Include="Serialization\AsArchetypeAttribute.cs" />
     <Compile Include="Serialization\ArchetypeJsonConverter.cs" />
+    <Compile Include="Serialization\AsFieldsetAttribute.cs" />
     <Compile Include="Serialization\SerializationExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
index 7b81082..b2f1694 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
@@ -107,23 +107,42 @@ namespace Archetype.Umbraco.Serialization
             if (null != models)
                 return models;
 
-            models = GetPropertiesToSerialize(value)
-                        .Select(pInfo =>
-                        {
-                            if (pInfo.PropertyType.IsPrimitive || pInfo.PropertyType.IsValueType
-                                    || pInfo.PropertyType.Name.Equals(typeof(String).Name))
-                            {
-                                var dynamicModel = new ExpandoObject() as IDictionary<string, object>;
-                                dynamicModel.Add(GetJsonPropertyName(pInfo), pInfo.GetValue(value));
-                                return dynamicModel;
-                            }
+            var properties = GetPropertiesToSerialize(value).ToList();
 
-                            return pInfo.GetValue(value);
-                        }).ToList();
+            if (!PropertyLayoutHasFieldsets(properties))
+                return new List<object>() { value };
+
+            var dynamicModel = new ExpandoObject() as IDictionary<string, object>;
+
+            foreach (var pInfo in properties.Where(pInfo => !HasAsFieldsetAttribute(pInfo)))
+            {
+                dynamicModel.Add(GetJsonPropertyName(pInfo), pInfo.GetValue(value));
+            }
+
+            var fieldsetModels = properties.Where(HasAsFieldsetAttribute)
+                .Select(pInfo => pInfo.GetValue(value));
+
+            models = new List<object>
+            {
+                dynamicModel,                
+            };
+
+            models = ((IEnumerable<object>)models).Concat(fieldsetModels).ToList();
 
             return models;
         }
 
+        private bool PropertyLayoutHasFieldsets(IEnumerable<PropertyInfo> properties)
+        {
+            return properties.Any(HasAsFieldsetAttribute);
+        }
+
+        private static bool HasAsFieldsetAttribute(PropertyInfo pInfo)
+        {
+            return pInfo
+                .GetCustomAttributes(typeof(AsFieldsetAttribute), true).Length > 0;
+        }
+
         private IEnumerable SerializeModels(IEnumerable models)
         {
             var fieldsetJson = (from object model in models where null != model select SerializeModel(model)).ToList();
@@ -136,7 +155,9 @@ namespace Archetype.Umbraco.Serialization
             if (value == null)
                 return null;
 
-            var jObj = IsExpandoObject(value) ? GetJObjectFromExpandoObject(value as IDictionary<string, object>) : GetJObject(value);
+            var jObj = IsExpandoObject(value) 
+                ? GetJObjectFromExpandoObject(value as IDictionary<string, object>) 
+                : GetJObject(value);
 
             var fieldsetJson = new StringBuilder();
             var fieldsetWriter = new StringWriter(fieldsetJson);
@@ -232,7 +253,7 @@ namespace Archetype.Umbraco.Serialization
         private string GetFieldsetName(Type type)
         {
             var attributes = type.GetCustomAttributes(true);
-            var archetypeDatatypeAttribute = (ArchetypeDatatypeAttribute)attributes.FirstOrDefault(attr => attr is ArchetypeDatatypeAttribute);
+            var archetypeDatatypeAttribute = (AsArchetypeAttribute)attributes.FirstOrDefault(attr => attr is AsArchetypeAttribute);
 
             return archetypeDatatypeAttribute != null ? archetypeDatatypeAttribute.FieldsetName : type.Name;
         }
@@ -245,7 +266,7 @@ namespace Archetype.Umbraco.Serialization
 
         private bool IsValueArchetypeDatatype(Type type)
         {
-            return type.GetCustomAttributes(typeof(ArchetypeDatatypeAttribute), true).Length > 0;
+            return type.GetCustomAttributes(typeof(AsArchetypeAttribute), true).Length > 0;
         }
 
         private JsonConverter GetArchetypeDatatypeConverter(object value)
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeDatatypeAttribute.cs b/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
similarity index 61%
rename from app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeDatatypeAttribute.cs
rename to app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
index bbdacfc..800bb36 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeDatatypeAttribute.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
@@ -2,11 +2,11 @@
 
 namespace Archetype.Umbraco.Serialization
 {
-    public class ArchetypeDatatypeAttribute : Attribute
+    public class AsArchetypeAttribute : Attribute
     {
         public string FieldsetName { get; set; }
 
-        public ArchetypeDatatypeAttribute(string fieldsetname)
+        public AsArchetypeAttribute(string fieldsetname)
         {
             FieldsetName = fieldsetname;
         }
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs b/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
new file mode 100644
index 0000000..bcee649
--- /dev/null
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace Archetype.Umbraco.Serialization
+{
+    public class AsFieldsetAttribute : Attribute
+    {
+    }
+}

From 766ae0a8dffedcbc2f8e7a9df8140bc27d2326f0 Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Mon, 28 Apr 2014 14:32:34 +0100
Subject: [PATCH 10/19] Issue #AR-1_serialization: removed hardcoded
 fieldsets[0].properties restriction

---
 .../ArchetypeJsonConverterTest.cs              |  1 -
 .../Serialization/ArchetypeJsonConverter.cs    | 18 +++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
index eff9a44..f5ad6bb 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
@@ -325,7 +325,6 @@ namespace Archetype.Tests.Serialization
             };
 
             var json = JsonConvert.SerializeObject(model, Formatting.Indented);
-
             var result = JsonConvert.DeserializeObject<ContactDetailsList>(json);
 
             Assert.NotNull(result);
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
index b2f1694..564aa44 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
@@ -44,14 +44,13 @@ namespace Archetype.Umbraco.Serialization
 
             var obj = Activator.CreateInstance(objectType);
 
-            if (null != obj as IEnumerable<object> 
+            if (null != obj as IEnumerable<object>
                 && jToken["fieldsets"] != null && jToken["fieldsets"].Any())
             {
                 var model = obj as IEnumerable<object>;
-                var fieldsets = jToken["fieldsets"];
 
                 var itemType = model.GetType().BaseType.GetGenericArguments().First();
-                foreach (var fs in fieldsets.Where(fs => fs["alias"].ToString().Equals(GetFieldsetName(itemType))))
+                foreach (var fs in jToken["fieldsets"].Where(fs => fs["alias"].ToString().Equals(GetFieldsetName(itemType))))
                 {
                     var item = JsonConvert.DeserializeObject(
                         fs["properties"].ToString(), itemType, GetArchetypeDatatypeConverter(itemType));
@@ -64,15 +63,16 @@ namespace Archetype.Umbraco.Serialization
 
             if (null == jToken as JArray)
             {
-                jToken = jToken.SelectToken("fieldsets[0].properties");
+                var objAlias = GetFieldsetName(objectType);
+                jToken = jToken["fieldsets"].Single(p => p.SelectToken("alias").ToString().Equals(objAlias)).SelectToken("properties");                
             }
 
-            var properties = obj.GetType()
-                .GetProperties(BindingFlags.Instance | BindingFlags.Public);
+            var properties = GetSerialiazableProperties(obj);
 
             foreach (var propertyInfo in properties)
             {
                 var propAlias = GetJsonPropertyName(propertyInfo);
+
                 var propJToken = jToken.SingleOrDefault(p => p.SelectToken("alias").ToString().Equals(propAlias));
 
                 if (propJToken == null)
@@ -107,7 +107,7 @@ namespace Archetype.Umbraco.Serialization
             if (null != models)
                 return models;
 
-            var properties = GetPropertiesToSerialize(value).ToList();
+            var properties = GetSerialiazableProperties(value).ToList();
 
             if (!PropertyLayoutHasFieldsets(properties))
                 return new List<object>() { value };
@@ -208,7 +208,7 @@ namespace Archetype.Umbraco.Serialization
                     }
                 };
 
-            var properties = GetPropertiesToSerialize(obj);
+            var properties = GetSerialiazableProperties(obj);
 
             var fsProperties = new List<JObject>();
 
@@ -235,7 +235,7 @@ namespace Archetype.Umbraco.Serialization
             return jObj;
         }
 
-        private IEnumerable<PropertyInfo> GetPropertiesToSerialize(object obj)
+        private IEnumerable<PropertyInfo> GetSerialiazableProperties(object obj)
         {
             return obj.GetType()
                 .GetProperties(BindingFlags.Instance | BindingFlags.Public)

From 7b5d9b4dd5a02da76aaccc09f5a41834941d1e37 Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Mon, 28 Apr 2014 14:54:47 +0100
Subject: [PATCH 11/19] Issue #AR-1_serialization: clarify deserialization
 logic

---
 .../Serialization/ArchetypeJsonConverter.cs   | 47 ++++++++++++-------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
index 564aa44..70c0c5b 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
@@ -47,26 +47,40 @@ namespace Archetype.Umbraco.Serialization
             if (null != obj as IEnumerable<object>
                 && jToken["fieldsets"] != null && jToken["fieldsets"].Any())
             {
-                var model = obj as IEnumerable<object>;
-
-                var itemType = model.GetType().BaseType.GetGenericArguments().First();
-                foreach (var fs in jToken["fieldsets"].Where(fs => fs["alias"].ToString().Equals(GetFieldsetName(itemType))))
-                {
-                    var item = JsonConvert.DeserializeObject(
-                        fs["properties"].ToString(), itemType, GetArchetypeDatatypeConverter(itemType));
-
-                    obj.GetType().GetMethod("Add").Invoke(obj, new [] {item});
-                }
-
-                return obj;
+                return DeserializeEnumerableObject(obj, jToken);
             }
 
-            if (null == jToken as JArray)
+            return null == jToken as JArray 
+                        ? DeserializeObject(obj, jToken) 
+                        : PopulateProperties(obj, jToken);
+        }
+
+        private object DeserializeEnumerableObject(object obj, JToken jToken)
+        {
+            var model = obj as IEnumerable<object>;
+
+            var itemType = model.GetType().BaseType.GetGenericArguments().First();
+            foreach (var fs in jToken["fieldsets"].Where(fs => fs["alias"].ToString().Equals(GetFieldsetName(itemType))))
             {
-                var objAlias = GetFieldsetName(objectType);
-                jToken = jToken["fieldsets"].Single(p => p.SelectToken("alias").ToString().Equals(objAlias)).SelectToken("properties");                
+                var item = JsonConvert.DeserializeObject(
+                    fs["properties"].ToString(), itemType, GetArchetypeDatatypeConverter(itemType));
+
+                obj.GetType().GetMethod("Add").Invoke(obj, new[] {item});
             }
 
+            return obj;
+        }
+
+        private object DeserializeObject(object obj, JToken jToken)
+        {
+            var objAlias = GetFieldsetName(obj.GetType());
+            jToken = jToken["fieldsets"].Single(p => p.SelectToken("alias").ToString().Equals(objAlias)).SelectToken("properties");
+
+            return PopulateProperties(obj, jToken);
+        }
+
+        private object PopulateProperties(object obj, JToken jToken)
+        {
             var properties = GetSerialiazableProperties(obj);
 
             foreach (var propertyInfo in properties)
@@ -79,7 +93,8 @@ namespace Archetype.Umbraco.Serialization
                     continue;
 
                 var propValue = IsValueArchetypeDatatype(propertyInfo.PropertyType)
-                    ? JsonConvert.DeserializeObject(propJToken["value"].ToString(), propertyInfo.PropertyType, GetArchetypeDatatypeConverter(propertyInfo.PropertyType))
+                    ? JsonConvert.DeserializeObject(propJToken["value"].ToString(), propertyInfo.PropertyType,
+                        GetArchetypeDatatypeConverter(propertyInfo.PropertyType))
                     : GetDeserializedPropertyValue(propJToken["value"], propertyInfo.PropertyType);
 
                 propertyInfo.SetValue(obj, propValue);

From 1e12b827427c571055dbd7abb3bcbe80f68fce57 Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Tue, 29 Apr 2014 10:06:22 +0100
Subject: [PATCH 12/19] Issue #AR-1_serialization: fix deserialization for
 complex models (i.e. models employing AsFiedlset hinting)

---
 .../ArchetypeJsonConverterComplexModelTest.cs | 16 +++----
 .../Serialization/ArchetypeJsonConverter.cs   | 44 ++++++++++++++++---
 2 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
index 42b13cf..23ab046 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
@@ -64,10 +64,10 @@ namespace Archetype.Tests.Serialization
             Assert.IsInstanceOf<PageDetails>(result);
 
             Assert.AreEqual("2439,2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453", result.Pages);
-            Assert.AreEqual("First Page", result.Captions.TextStringArray.ElementAt(0));
-            Assert.AreEqual("Second Page", result.Captions.TextStringArray.ElementAt(1));
-            Assert.AreEqual("Third Page", result.Captions.TextStringArray.ElementAt(2));
-            Assert.AreEqual("Fourth Page", result.Captions.TextStringArray.ElementAt(3));
+            Assert.AreEqual("First Page", result.Captions.TextStringArray.ElementAt(0).TextString);
+            Assert.AreEqual("Second Page", result.Captions.TextStringArray.ElementAt(1).TextString);
+            Assert.AreEqual("Third Page", result.Captions.TextStringArray.ElementAt(2).TextString);
+            Assert.AreEqual("Fourth Page", result.Captions.TextStringArray.ElementAt(3).TextString);
         }
 
         [Test]
@@ -80,10 +80,10 @@ namespace Archetype.Tests.Serialization
             Assert.IsInstanceOf<PageDetails>(result);
 
             Assert.AreEqual(_pageDetails.Pages, result.Pages);
-            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(0), result.Captions.TextStringArray.ElementAt(0));
-            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(1), result.Captions.TextStringArray.ElementAt(1));
-            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(2), result.Captions.TextStringArray.ElementAt(2));
-            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(3), result.Captions.TextStringArray.ElementAt(3));
+            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(0).TextString, result.Captions.TextStringArray.ElementAt(0).TextString);
+            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(1).TextString, result.Captions.TextStringArray.ElementAt(1).TextString);
+            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(2).TextString, result.Captions.TextStringArray.ElementAt(2).TextString);
+            Assert.AreEqual(_pageDetails.Captions.TextStringArray.ElementAt(3).TextString, result.Captions.TextStringArray.ElementAt(3).TextString);
         }
         #endregion
 
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
index 70c0c5b..1824a4f 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
@@ -73,10 +73,35 @@ namespace Archetype.Umbraco.Serialization
 
         private object DeserializeObject(object obj, JToken jToken)
         {
-            var objAlias = GetFieldsetName(obj.GetType());
-            jToken = jToken["fieldsets"].Single(p => p.SelectToken("alias").ToString().Equals(objAlias)).SelectToken("properties");
+            var properties = GetSerialiazableProperties(obj).ToList();
+            var asFieldset = properties.Where(HasAsFieldsetAttribute).ToList();
 
-            return PopulateProperties(obj, jToken);
+            foreach (var propInfo in asFieldset)
+            {
+                var propAlias = GetJsonPropertyName(propInfo);
+                var fsJToken = GetFieldsetProperties(propInfo.PropertyType, jToken);
+                var propJToken =
+                    fsJToken.Single(p => p.SelectToken("alias").ToString().Equals(propAlias));
+
+                if (propJToken == null)
+                    continue;
+
+                var propValue = IsValueArchetypeDatatype(propInfo.PropertyType)
+                ? JsonConvert.DeserializeObject(fsJToken.ToString(), propInfo.PropertyType,
+                    GetArchetypeDatatypeConverter(propInfo.PropertyType))
+                : GetDeserializedPropertyValue(fsJToken, propInfo.PropertyType); ;
+
+                propInfo.SetValue(obj, propValue);
+            }
+
+            return PopulateProperties(obj, GetFieldsetProperties(obj.GetType(), jToken));
+        }
+
+        private JToken GetFieldsetProperties(Type objType, JToken jToken)
+        {
+            var objAlias = GetFieldsetName(objType);
+            return
+                jToken["fieldsets"].Single(p => p.SelectToken("alias").ToString().Equals(objAlias)).SelectToken("properties");
         }
 
         private object PopulateProperties(object obj, JToken jToken)
@@ -92,10 +117,7 @@ namespace Archetype.Umbraco.Serialization
                 if (propJToken == null)
                     continue;
 
-                var propValue = IsValueArchetypeDatatype(propertyInfo.PropertyType)
-                    ? JsonConvert.DeserializeObject(propJToken["value"].ToString(), propertyInfo.PropertyType,
-                        GetArchetypeDatatypeConverter(propertyInfo.PropertyType))
-                    : GetDeserializedPropertyValue(propJToken["value"], propertyInfo.PropertyType);
+                var propValue = GetPropertyValue(propertyInfo, propJToken);
 
                 propertyInfo.SetValue(obj, propValue);
             }
@@ -103,6 +125,14 @@ namespace Archetype.Umbraco.Serialization
             return obj;
         }
 
+        private object GetPropertyValue(PropertyInfo propertyInfo, JToken propJToken)
+        {
+            return IsValueArchetypeDatatype(propertyInfo.PropertyType)
+                ? JsonConvert.DeserializeObject(propJToken["value"].ToString(), propertyInfo.PropertyType,
+                    GetArchetypeDatatypeConverter(propertyInfo.PropertyType))
+                : GetDeserializedPropertyValue(propJToken["value"], propertyInfo.PropertyType);
+        }
+
         public override bool CanConvert(Type objectType)
         {
             return IsValueArchetypeDatatype(objectType);

From cee7d73b01283bfd104b50173055dbfbea32c88d Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Tue, 29 Apr 2014 11:23:39 +0100
Subject: [PATCH 13/19] Issue #AR-1_serialization: finish tests for complex
 tree model use case

---
 .../ArchetypeJsonConverterComplexModelTest.cs | 166 +++++++++++++++---
 .../Serialization/JsonTestModels.cs           |  50 ++++++
 .../Serialization/JsonTestStrings.cs          | 165 +++++++++++++++++
 3 files changed, 361 insertions(+), 20 deletions(-)

diff --git a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
index 23ab046..dfd095a 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Archetype.Umbraco.PropertyConverters;
 using Newtonsoft.Json;
 using NUnit.Framework;
@@ -15,28 +12,20 @@ namespace Archetype.Tests.Serialization
         private TextList _textList;
         private Captions _captions;
         private PageDetails _pageDetails;
+
+        private SlideShow _slides;
+        private Seo _seo;
+        private TextPageList _textPages;
+        private PageList _pages;
         
         [SetUp]
         public void SetUp()
         {
-            _textList = new TextList
-            {
-                new TextItem{TextString = "First Page"},
-                new TextItem{TextString = "Second Page"},
-                new TextItem{TextString = "Third Page"},
-                new TextItem{TextString = "Fourth Page"}
-            };
-
-            _captions = new Captions {TextStringArray = _textList};
-
-            _pageDetails = new PageDetails
-            {
-                Captions = _captions,
-                Pages = "2439,2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453"
-            };
+            InitComplexModels();
+            InitComplexTreeModel();
         }
 
-        #region serialization tests
+        #region complex nested model tests
 
         [Test]
         public void PageDetailsModel_Serializes_To_Archetype_Property()
@@ -87,5 +76,142 @@ namespace Archetype.Tests.Serialization
         }
         #endregion
 
+        #region complex nested tree model tests
+
+        [Test]
+        public void ConvertComplexNestedModelToArchetype()
+        {
+            var converter = new ArchetypeValueConverter();
+            var json = JsonConvert.SerializeObject(_pages, Formatting.Indented);
+            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+
+            Assert.NotNull(archetype);
+        }
+
+        [Test]
+        public void PagesModel_Serializes_To_Archetype_Property()
+        {
+            var result = JsonConvert.SerializeObject(_pages, Formatting.Indented);
+            Assert.AreEqual(JsonTestStrings._PAGES_JSON, result);
+        }
+
+        [Test]
+        public void DeserializeComplexTreeModelFromArchetype()
+        {
+            var result = JsonConvert.DeserializeObject<PageList>(JsonTestStrings._PAGES_JSON);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<PageList>(result);
+
+            Assert.AreEqual("1,2,3,4,5,6,7,8", result.Pages.ElementAt(0).Media.Slides);
+            Assert.AreEqual("1,2,3,4,5,6,7,8", result.Pages.ElementAt(1).Media.Slides);
+            Assert.AreEqual("1,2,3,4,5,6,7,8", result.Pages.ElementAt(2).Media.Slides);
+
+            Assert.AreEqual("Test Meta Title", result.Pages.ElementAt(0).Seo.MetaTitle);
+            Assert.AreEqual("Test Meta Description", result.Pages.ElementAt(0).Seo.MetaDescription);
+            Assert.AreEqual("Test Meta Title", result.Pages.ElementAt(1).Seo.MetaTitle);
+            Assert.AreEqual("Test Meta Description", result.Pages.ElementAt(1).Seo.MetaDescription);
+            Assert.AreEqual("Test Meta Title", result.Pages.ElementAt(2).Seo.MetaTitle);
+            Assert.AreEqual("Test Meta Description", result.Pages.ElementAt(2).Seo.MetaDescription);
+
+            Assert.AreEqual("Home Page Body", result.Pages.ElementAt(0).BodyText);
+            Assert.AreEqual("Home Page", result.Pages.ElementAt(0).PageTitle);
+            Assert.AreEqual("About us Page Body", result.Pages.ElementAt(1).BodyText);
+            Assert.AreEqual("About us Page", result.Pages.ElementAt(1).PageTitle);
+            Assert.AreEqual("Contact us Page Body", result.Pages.ElementAt(2).BodyText);
+            Assert.AreEqual("Contact us Page", result.Pages.ElementAt(2).PageTitle);
+
+
+        }
+
+        [Test]
+        public void SerializeThenDeserializeComplexTreeModelFromArchetype()
+        {
+            var json = JsonConvert.SerializeObject(_pages);
+            var result = JsonConvert.DeserializeObject<PageList>(json);
+
+            Assert.NotNull(result);
+            Assert.IsInstanceOf<PageList>(result);
+
+            Assert.AreEqual(_pages.Pages.ElementAt(0).Media.Slides, result.Pages.ElementAt(0).Media.Slides);
+            Assert.AreEqual(_pages.Pages.ElementAt(1).Media.Slides, result.Pages.ElementAt(1).Media.Slides);
+            Assert.AreEqual(_pages.Pages.ElementAt(2).Media.Slides, result.Pages.ElementAt(2).Media.Slides);
+
+            Assert.AreEqual(_pages.Pages.ElementAt(0).Seo.MetaTitle, result.Pages.ElementAt(0).Seo.MetaTitle);
+            Assert.AreEqual(_pages.Pages.ElementAt(0).Seo.MetaDescription, result.Pages.ElementAt(0).Seo.MetaDescription);
+            Assert.AreEqual(_pages.Pages.ElementAt(1).Seo.MetaTitle, result.Pages.ElementAt(1).Seo.MetaTitle);
+            Assert.AreEqual(_pages.Pages.ElementAt(1).Seo.MetaDescription, result.Pages.ElementAt(1).Seo.MetaDescription);
+            Assert.AreEqual(_pages.Pages.ElementAt(2).Seo.MetaTitle, result.Pages.ElementAt(2).Seo.MetaTitle);
+            Assert.AreEqual(_pages.Pages.ElementAt(2).Seo.MetaDescription, result.Pages.ElementAt(2).Seo.MetaDescription);
+
+            Assert.AreEqual(_pages.Pages.ElementAt(0).BodyText, result.Pages.ElementAt(0).BodyText);
+            Assert.AreEqual(_pages.Pages.ElementAt(0).PageTitle, result.Pages.ElementAt(0).PageTitle);
+            Assert.AreEqual(_pages.Pages.ElementAt(1).BodyText, result.Pages.ElementAt(1).BodyText);
+            Assert.AreEqual(_pages.Pages.ElementAt(1).PageTitle, result.Pages.ElementAt(1).PageTitle);
+            Assert.AreEqual(_pages.Pages.ElementAt(2).BodyText, result.Pages.ElementAt(2).BodyText);
+            Assert.AreEqual(_pages.Pages.ElementAt(2).PageTitle, result.Pages.ElementAt(2).PageTitle);
+
+
+        }
+
+        #endregion
+
+        #region utility methods
+
+        private void InitComplexModels()
+        {
+            _textList = new TextList
+            {
+                new TextItem{TextString = "First Page"},
+                new TextItem{TextString = "Second Page"},
+                new TextItem{TextString = "Third Page"},
+                new TextItem{TextString = "Fourth Page"}
+            };
+
+            _captions = new Captions {TextStringArray = _textList};
+
+            _pageDetails = new PageDetails
+            {
+                Captions = _captions,
+                Pages = "2439,2440,2441,2442,2443,2444,2445,2446,2447,2448,2449,2450,2451,2452,2453"
+            };            
+        }
+
+        private void InitComplexTreeModel()
+        {
+            _slides = new SlideShow{Slides = "1,2,3,4,5,6,7,8"};
+            _seo = new Seo{MetaDescription = "Test Meta Description", MetaTitle = "Test Meta Title"};
+            _textPages = new TextPageList
+            {
+                new TextPage()
+                {
+                    PageTitle = "Home Page",
+                    BodyText = "Home Page Body",
+                    Media = _slides,
+                    Seo = _seo
+                },
+                new TextPage()
+                {
+                    PageTitle = "About us Page",
+                    BodyText = "About us Page Body",
+                    Media = _slides,
+                    Seo = _seo
+                },
+                new TextPage()
+                {
+                    PageTitle = "Contact us Page",
+                    BodyText = "Contact us Page Body",
+                    Media = _slides,
+                    Seo = _seo
+                }
+            };
+
+            _pages = new PageList
+            {
+                Pages = _textPages
+            };
+        }
+
+        #endregion
     }
 }
diff --git a/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs b/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
index 24b13dd..e09c3a7 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
@@ -127,4 +127,54 @@ namespace Archetype.Tests.Serialization
     }
 
     #endregion
+
+    #region complex nested tree model
+
+    public abstract class PageBase
+    {
+        public string PageTitle { get; set; }
+        public string BodyText { get; set; }
+    }
+
+    [AsArchetype("slideShow")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<SlideShow>))]
+    public class SlideShow
+    {
+        public string Slides { get; set; }
+    }
+
+    [AsArchetype("seo")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<Seo>))]
+    public class Seo
+    {
+        public string MetaTitle { get; set; }
+        public string MetaDescription { get; set; }
+    }
+
+    [AsArchetype("TextPage")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<TextPage>))]
+    public class TextPage : PageBase
+    {
+        [AsFieldset]
+        public SlideShow Media { get; set; }
+
+        [AsFieldset]
+        public Seo Seo { get; set; }
+    }
+
+    [AsArchetype("TextPageList")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<TextPageList>))]
+    public class TextPageList : List<TextPage>
+    {
+    }
+
+    [AsArchetype("Pages")]
+    [JsonConverter(typeof(ArchetypeJsonConverter<PageList>))]
+    public class PageList
+    {
+        [AsArchetype("Pages")]
+        public TextPageList Pages { get; set; }
+    }
+
+    #endregion
 }
diff --git a/app/Umbraco/Archetype.Tests/Serialization/JsonTestStrings.cs b/app/Umbraco/Archetype.Tests/Serialization/JsonTestStrings.cs
index 83dce45..5061e8c 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/JsonTestStrings.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/JsonTestStrings.cs
@@ -265,6 +265,171 @@
   ]
 }";
 
+        public const string _PAGES_JSON =
+            @"{
+  ""fieldsets"": [
+    {
+      ""alias"": ""Pages"",
+      ""properties"": [
+        {
+          ""alias"": ""Pages"",
+          ""value"": {
+            ""fieldsets"": [
+              {
+                ""alias"": ""TextPage"",
+                ""properties"": [
+                  {
+                    ""alias"": ""Media"",
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""slideShow"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""Slides"",
+                              ""value"": ""1,2,3,4,5,6,7,8""
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    ""alias"": ""Seo"",
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""seo"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""MetaTitle"",
+                              ""value"": ""Test Meta Title""
+                            },
+                            {
+                              ""alias"": ""MetaDescription"",
+                              ""value"": ""Test Meta Description""
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    ""alias"": ""PageTitle"",
+                    ""value"": ""Home Page""
+                  },
+                  {
+                    ""alias"": ""BodyText"",
+                    ""value"": ""Home Page Body""
+                  }
+                ]
+              },
+              {
+                ""alias"": ""TextPage"",
+                ""properties"": [
+                  {
+                    ""alias"": ""Media"",
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""slideShow"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""Slides"",
+                              ""value"": ""1,2,3,4,5,6,7,8""
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    ""alias"": ""Seo"",
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""seo"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""MetaTitle"",
+                              ""value"": ""Test Meta Title""
+                            },
+                            {
+                              ""alias"": ""MetaDescription"",
+                              ""value"": ""Test Meta Description""
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    ""alias"": ""PageTitle"",
+                    ""value"": ""About us Page""
+                  },
+                  {
+                    ""alias"": ""BodyText"",
+                    ""value"": ""About us Page Body""
+                  }
+                ]
+              },
+              {
+                ""alias"": ""TextPage"",
+                ""properties"": [
+                  {
+                    ""alias"": ""Media"",
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""slideShow"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""Slides"",
+                              ""value"": ""1,2,3,4,5,6,7,8""
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    ""alias"": ""Seo"",
+                    ""value"": {
+                      ""fieldsets"": [
+                        {
+                          ""alias"": ""seo"",
+                          ""properties"": [
+                            {
+                              ""alias"": ""MetaTitle"",
+                              ""value"": ""Test Meta Title""
+                            },
+                            {
+                              ""alias"": ""MetaDescription"",
+                              ""value"": ""Test Meta Description""
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  },
+                  {
+                    ""alias"": ""PageTitle"",
+                    ""value"": ""Contact us Page""
+                  },
+                  {
+                    ""alias"": ""BodyText"",
+                    ""value"": ""Contact us Page Body""
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}";
+
         public const string _NULL_VALUES_JSON = @"{""fieldsets"":[{""alias"":""contactDetails"",""properties"":[{""alias"":""name"",""value"":""""},{""alias"":""address"",""value"":""""},{""alias"":""telephone"",""value"":""""},{""alias"":""mobile"",""value"":""""},{""alias"":""fax"",""value"":""""},{""alias"":""email"",""value"":""""},{""alias"":""webSite"",""value"":""""}]}]}";
     }
 }

From 258b0859ab574f55626cae6811913d13802d335b Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Tue, 29 Apr 2014 11:28:30 +0100
Subject: [PATCH 14/19] Issue #AR-1_serialization: clean up

---
 .../ArchetypeJsonConverterComplexModelTest.cs |  3 +-
 .../Serialization/ArchetypeJsonConverter.cs   | 90 +++++++++----------
 2 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
index dfd095a..bda6b23 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
 using Archetype.Umbraco.PropertyConverters;
 using Newtonsoft.Json;
 using NUnit.Framework;
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
index 1824a4f..4ae7d19 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
@@ -55,6 +55,50 @@ namespace Archetype.Umbraco.Serialization
                         : PopulateProperties(obj, jToken);
         }
 
+        public override bool CanConvert(Type objectType)
+        {
+            return IsValueArchetypeDatatype(objectType);
+        }
+
+        #region private methods
+
+        private string ApplyFormatting(string json, Formatting formatting)
+        {
+            return JToken.Parse(json).ToString(formatting);
+        }
+
+        private IList GenerateModels(object value)
+        {
+            var models = value as IList;
+
+            if (null != models)
+                return models;
+
+            var properties = GetSerialiazableProperties(value).ToList();
+
+            if (!PropertyLayoutHasFieldsets(properties))
+                return new List<object>() { value };
+
+            var dynamicModel = new ExpandoObject() as IDictionary<string, object>;
+
+            foreach (var pInfo in properties.Where(pInfo => !HasAsFieldsetAttribute(pInfo)))
+            {
+                dynamicModel.Add(GetJsonPropertyName(pInfo), pInfo.GetValue(value));
+            }
+
+            var fieldsetModels = properties.Where(HasAsFieldsetAttribute)
+                .Select(pInfo => pInfo.GetValue(value));
+
+            models = new List<object>
+            {
+                dynamicModel,                
+            };
+
+            models = ((IEnumerable<object>)models).Concat(fieldsetModels).ToList();
+
+            return models;
+        }
+
         private object DeserializeEnumerableObject(object obj, JToken jToken)
         {
             var model = obj as IEnumerable<object>;
@@ -65,7 +109,7 @@ namespace Archetype.Umbraco.Serialization
                 var item = JsonConvert.DeserializeObject(
                     fs["properties"].ToString(), itemType, GetArchetypeDatatypeConverter(itemType));
 
-                obj.GetType().GetMethod("Add").Invoke(obj, new[] {item});
+                obj.GetType().GetMethod("Add").Invoke(obj, new[] { item });
             }
 
             return obj;
@@ -133,50 +177,6 @@ namespace Archetype.Umbraco.Serialization
                 : GetDeserializedPropertyValue(propJToken["value"], propertyInfo.PropertyType);
         }
 
-        public override bool CanConvert(Type objectType)
-        {
-            return IsValueArchetypeDatatype(objectType);
-        }
-
-        #region private methods
-
-        private string ApplyFormatting(string json, Formatting formatting)
-        {
-            return JToken.Parse(json).ToString(formatting);
-        }
-
-        private IList GenerateModels(object value)
-        {
-            var models = value as IList;
-
-            if (null != models)
-                return models;
-
-            var properties = GetSerialiazableProperties(value).ToList();
-
-            if (!PropertyLayoutHasFieldsets(properties))
-                return new List<object>() { value };
-
-            var dynamicModel = new ExpandoObject() as IDictionary<string, object>;
-
-            foreach (var pInfo in properties.Where(pInfo => !HasAsFieldsetAttribute(pInfo)))
-            {
-                dynamicModel.Add(GetJsonPropertyName(pInfo), pInfo.GetValue(value));
-            }
-
-            var fieldsetModels = properties.Where(HasAsFieldsetAttribute)
-                .Select(pInfo => pInfo.GetValue(value));
-
-            models = new List<object>
-            {
-                dynamicModel,                
-            };
-
-            models = ((IEnumerable<object>)models).Concat(fieldsetModels).ToList();
-
-            return models;
-        }
-
         private bool PropertyLayoutHasFieldsets(IEnumerable<PropertyInfo> properties)
         {
             return properties.Any(HasAsFieldsetAttribute);

From a6b1abaecc3952436f7543f3797bbbeee65b2d6d Mon Sep 17 00:00:00 2001
From: cankoluman <n2dbrx@gmail.com>
Date: Tue, 29 Apr 2014 11:47:59 +0100
Subject: [PATCH 15/19] Issue #AR-1_serialization: removed 
 ArchetypeJsonConverter type argument - which is no longer needed

---
 .../Serialization/JsonTestModels.cs           | 33 +++++++++----------
 .../Serialization/ArchetypeJsonConverter.cs   | 24 ++++----------
 2 files changed, 23 insertions(+), 34 deletions(-)

diff --git a/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs b/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
index e09c3a7..bb72c16 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
@@ -8,7 +8,7 @@ namespace Archetype.Tests.Serialization
     #region json test Models
 
     [AsArchetype("urlPicker")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<UrlPicker>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class UrlPicker
     {
         [JsonProperty("title")]
@@ -24,7 +24,7 @@ namespace Archetype.Tests.Serialization
     }
 
     [AsArchetype("contactDetails")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<ContactDetails>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class ContactDetails
     {
         [JsonProperty("name")]
@@ -44,7 +44,7 @@ namespace Archetype.Tests.Serialization
     }
 
     [AsArchetype("companyDetails")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<CompanyDetails>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class CompanyDetails
     {
         [JsonProperty("region")]
@@ -54,7 +54,7 @@ namespace Archetype.Tests.Serialization
     }
 
     [AsArchetype("allContactDetails")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<AllContactDetails>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class AllContactDetails
     {
         public ContactDetails UserDetails { get; set; }
@@ -63,13 +63,13 @@ namespace Archetype.Tests.Serialization
     }
 
     [AsArchetype("contactDetailsList")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<ContactDetailsList>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class ContactDetailsList : List<ContactDetails>
     {
     }
 
     [AsArchetype("annualStatement")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<AnnualStatement>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class AnnualStatement
     {
         public DateTime FiscalYearStart { get; set; }
@@ -81,7 +81,7 @@ namespace Archetype.Tests.Serialization
     }
 
     [AsArchetype("mergerDetails")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<MergerDetails>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class MergerDetails
     {
         public DateTime MergerDate { get; set; }
@@ -94,7 +94,7 @@ namespace Archetype.Tests.Serialization
     #region complex nested model
 
     [AsArchetype("pages")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<PageDetails>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class PageDetails
     {
         [JsonProperty("pages")]
@@ -105,7 +105,7 @@ namespace Archetype.Tests.Serialization
     }
 
     [AsArchetype("captions")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<Captions>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class Captions
     {
         [JsonProperty("captions")]
@@ -113,13 +113,13 @@ namespace Archetype.Tests.Serialization
     }
 
     [AsArchetype("textstringArray")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<TextList>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class TextList : List<TextItem>
     {
     }
 
     [AsArchetype("textstringArray")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<TextItem>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class TextItem
     {
         [JsonProperty("textstring")]
@@ -137,14 +137,14 @@ namespace Archetype.Tests.Serialization
     }
 
     [AsArchetype("slideShow")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<SlideShow>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class SlideShow
     {
         public string Slides { get; set; }
     }
 
     [AsArchetype("seo")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<Seo>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class Seo
     {
         public string MetaTitle { get; set; }
@@ -152,7 +152,7 @@ namespace Archetype.Tests.Serialization
     }
 
     [AsArchetype("TextPage")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<TextPage>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class TextPage : PageBase
     {
         [AsFieldset]
@@ -163,16 +163,15 @@ namespace Archetype.Tests.Serialization
     }
 
     [AsArchetype("TextPageList")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<TextPageList>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class TextPageList : List<TextPage>
     {
     }
 
     [AsArchetype("Pages")]
-    [JsonConverter(typeof(ArchetypeJsonConverter<PageList>))]
+    [JsonConverter(typeof(ArchetypeJsonConverter))]
     public class PageList
     {
-        [AsArchetype("Pages")]
         public TextPageList Pages { get; set; }
     }
 
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
index 4ae7d19..618b9aa 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
@@ -11,8 +11,7 @@ using Newtonsoft.Json.Linq;
 
 namespace Archetype.Umbraco.Serialization
 {
-    public class ArchetypeJsonConverter<T> : JsonConverter
-        where T : class, new()
+    public class ArchetypeJsonConverter : JsonConverter
     {
         public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
         {
@@ -107,7 +106,7 @@ namespace Archetype.Umbraco.Serialization
             foreach (var fs in jToken["fieldsets"].Where(fs => fs["alias"].ToString().Equals(GetFieldsetName(itemType))))
             {
                 var item = JsonConvert.DeserializeObject(
-                    fs["properties"].ToString(), itemType, GetArchetypeDatatypeConverter(itemType));
+                    fs["properties"].ToString(), itemType, GetArchetypeDatatypeConverter());
 
                 obj.GetType().GetMethod("Add").Invoke(obj, new[] { item });
             }
@@ -132,7 +131,7 @@ namespace Archetype.Umbraco.Serialization
 
                 var propValue = IsValueArchetypeDatatype(propInfo.PropertyType)
                 ? JsonConvert.DeserializeObject(fsJToken.ToString(), propInfo.PropertyType,
-                    GetArchetypeDatatypeConverter(propInfo.PropertyType))
+                    GetArchetypeDatatypeConverter())
                 : GetDeserializedPropertyValue(fsJToken, propInfo.PropertyType); ;
 
                 propInfo.SetValue(obj, propValue);
@@ -173,7 +172,7 @@ namespace Archetype.Umbraco.Serialization
         {
             return IsValueArchetypeDatatype(propertyInfo.PropertyType)
                 ? JsonConvert.DeserializeObject(propJToken["value"].ToString(), propertyInfo.PropertyType,
-                    GetArchetypeDatatypeConverter(propertyInfo.PropertyType))
+                    GetArchetypeDatatypeConverter())
                 : GetDeserializedPropertyValue(propJToken["value"], propertyInfo.PropertyType);
         }
 
@@ -269,7 +268,7 @@ namespace Archetype.Umbraco.Serialization
                     new JProperty("value",
                                   IsValueArchetypeDatatype(propValue)
                                       ? new JRaw(JsonConvert.SerializeObject(propValue,
-                                                                             GetArchetypeDatatypeConverter(propValue)))
+                                                                             GetArchetypeDatatypeConverter()))
                                       : new JValue(GetSerializedPropertyValue(propValue))));
 
                 fsProperties.Add(fsProperty);
@@ -314,18 +313,9 @@ namespace Archetype.Umbraco.Serialization
             return type.GetCustomAttributes(typeof(AsArchetypeAttribute), true).Length > 0;
         }
 
-        private JsonConverter GetArchetypeDatatypeConverter(object value)
+        private JsonConverter GetArchetypeDatatypeConverter()
         {
-            return GetArchetypeDatatypeConverter(value.GetType());
-        }
-
-        private JsonConverter GetArchetypeDatatypeConverter(Type type)
-        {
-            var converterType = typeof(ArchetypeJsonConverter<>);
-            Type[] typeArgs = { type };
-            var genericType = converterType.MakeGenericType(typeArgs);
-
-            return (JsonConverter)Activator.CreateInstance(genericType);
+            return (JsonConverter)Activator.CreateInstance(GetType());
         }
 
         private string GetSerializedPropertyValue(object propValue)

From 712ca3cd769e9827e96bdb6dfb04c0792540e152 Mon Sep 17 00:00:00 2001
From: Kevin Giszewski <kevin@giszewski.com>
Date: Thu, 15 May 2014 17:24:14 -0400
Subject: [PATCH 16/19] Add/move dynamic classes for targeting of custom
 behavior

---
 app/views/archetype.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/archetype.html b/app/views/archetype.html
index 2eb1c2d..d86f456 100644
--- a/app/views/archetype.html
+++ b/app/views/archetype.html
@@ -2,7 +2,7 @@
     <textarea class="archetypeDeveloperModel" ng-show="model.config.developerMode" ng-model="model.value"></textarea>
     <ul ui-sortable="sortableOptions" ng-model="model.value.fieldsets" ng-show="!showAddButton()">
         <li ng-repeat="fieldset in model.value.fieldsets">
-            <fieldset ng-class="{archetypeFieldsetError: !fieldset.isValid}" ng-init="fieldsetConfigModel = getConfigFieldsetByAlias(fieldset.alias)">
+            <fieldset class="ng-class:fieldset.alias" ng-class="{archetypeFieldsetError: !fieldset.isValid}" ng-init="fieldsetConfigModel = getConfigFieldsetByAlias(fieldset.alias)">
                 <div class="archetypeFieldsetLabel" ng-class="{enableCollapsing: model.config.enableCollapsing}">
                     <div ng-click="focusFieldset(fieldset)" class="label-sub module-label">
                         <span class="caret" ng-hide="fieldset.collapse || !model.config.enableCollapsing"></span>
@@ -28,7 +28,7 @@
                 </div>
                 <div class="archetypeCollapser animate-hide" ng-hide="isCollapsed(fieldset)">
                     <form class="form-inline">
-                        <div ng-class="{archetypePropertyError: getPropertyValidity($parent.$index, property.alias) === false}" class="archetypeProperty control-group" ng-repeat="property in fieldsetConfigModel.properties">
+                        <div ng-class="{archetypePropertyError: getPropertyValidity($parent.$index, property.alias) === false}" class="archetypeProperty control-group ng-class:property.alias" ng-repeat="property in fieldsetConfigModel.properties">
                             <label ng-hide="archetypeConfig.hidePropertyLabels == '1'" class="control-label" for="archetype-property-{{model.alias}}-{{$parent.$index}}-{{$index}}">
                                 <span>{{property.label}}</span>
                                 <div class="archetypeFieldsetHelpText" ng-show="property.helpText">
@@ -37,7 +37,7 @@
                             </label>
 
                             <div class="controls">
-                                <archetype-property class="archetypeEditor ng-class:property.alias" property="property" fieldset-index="$parent.$index" fieldset="fieldset" archetype-config="model.config" property-config-index="$index" archetype-render-model="model.value" umbraco-property-alias="model.alias" umbraco-form = "form"></archetype-property>
+                                <archetype-property class="archetypeEditor" property="property" fieldset-index="$parent.$index" fieldset="fieldset" archetype-config="model.config" property-config-index="$index" archetype-render-model="model.value" umbraco-property-alias="model.alias" umbraco-form = "form"></archetype-property>
                             </div>
                         </div>
                     </form>

From 0cbbd1c93e29cc7c859e302899a105a612dcec0d Mon Sep 17 00:00:00 2001
From: leekelleher <leekelleher@gmail.com>
Date: Thu, 22 May 2014 14:29:38 +0100
Subject: [PATCH 17/19] Adds null reference checks for `GetValue<T>`.

Fixes #134
---
 .../Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs b/app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs
index eb516e1..52d2c9b 100644
--- a/app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs
+++ b/app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs
@@ -29,7 +29,7 @@ namespace Archetype.Models
         {
             var property = GetProperty(propertyAlias);
 
-            if (property == null || string.IsNullOrEmpty(property.Value.ToString()))
+            if (property == null || property.Value == null || string.IsNullOrEmpty(property.Value.ToString()))
                 return default(T);
 
             return property.GetValue<T>();
@@ -43,7 +43,7 @@ namespace Archetype.Models
         public bool HasValue(string propertyAlias)
         {
             var property = GetProperty(propertyAlias);
-            if (property == null)
+            if (property == null || property.Value == null)
                 return false;
 
             return !string.IsNullOrEmpty(property.Value.ToString());
@@ -57,4 +57,4 @@ namespace Archetype.Models
         #endregion
 
     }
-}
+}
\ No newline at end of file

From 7499395807364cd07e83a4a1b91b2eed5db84259 Mon Sep 17 00:00:00 2001
From: Kevin Giszewski <kevin@giszewski.com>
Date: Thu, 22 May 2014 14:17:46 -0400
Subject: [PATCH 18/19] Fix WS

---
 .../PropertyEditors/ArcheTypePropertyEditor.cs                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs b/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs
index 9877119..e847ce8 100644
--- a/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs
+++ b/app/Umbraco/Umbraco.Archetype/PropertyEditors/ArcheTypePropertyEditor.cs
@@ -16,8 +16,7 @@ using Umbraco.Core.Logging;
 namespace Archetype.PropertyEditors
 {
 	[PropertyEditorAsset(ClientDependencyType.Javascript, "/App_Plugins/Archetype/js/archetype.js")]
-	[PropertyEditor("Imulus.Archetype", "Archetype", "/App_Plugins/Archetype/views/archetype.html",
-		ValueType = "JSON")]
+	[PropertyEditor("Imulus.Archetype", "Archetype", "/App_Plugins/Archetype/views/archetype.html", ValueType = "JSON")]
 	public class ArchetypePropertyEditor : PropertyEditor
 	{
 		#region Pre Value Editor

From 264208dcc760fcf932c5c2d303cea1f3d1e5be7f Mon Sep 17 00:00:00 2001
From: Kevin Giszewski <kevin@giszewski.com>
Date: Thu, 22 May 2014 15:01:55 -0400
Subject: [PATCH 19/19] Update namespaces

---
 .../ArchetypeJsonConverterComplexModelTest.cs        |  6 +++---
 .../Serialization/ArchetypeJsonConverterTest.cs      | 12 ++++++------
 .../Archetype.Tests/Serialization/JsonTestModels.cs  |  2 +-
 .../Serialization/ArchetypeJsonConverter.cs          |  2 +-
 .../Serialization/AsArchetypeAttribute.cs            |  2 +-
 .../Serialization/AsFieldsetAttribute.cs             |  2 +-
 .../Serialization/SerializationExtensions.cs         |  2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
index bda6b23..06f3ccd 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterComplexModelTest.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using Archetype.Umbraco.PropertyConverters;
+using Archetype.PropertyConverters;
 using Newtonsoft.Json;
 using NUnit.Framework;
 
@@ -38,7 +38,7 @@ namespace Archetype.Tests.Serialization
         {
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(_pageDetails, Formatting.Indented);
-            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
@@ -82,7 +82,7 @@ namespace Archetype.Tests.Serialization
         {
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(_pages, Formatting.Indented);
-            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
diff --git a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
index f5ad6bb..23c7062 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/ArchetypeJsonConverterTest.cs
@@ -1,5 +1,5 @@
 using System;
-using Archetype.Umbraco.PropertyConverters;
+using Archetype.PropertyConverters;
 using Newtonsoft.Json;
 using NUnit.Framework;
 
@@ -111,7 +111,7 @@ namespace Archetype.Tests.Serialization
 
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(model);
-            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
@@ -121,7 +121,7 @@ namespace Archetype.Tests.Serialization
         {
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(_annualStatement);
-            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
@@ -149,7 +149,7 @@ namespace Archetype.Tests.Serialization
 
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(model, Formatting.Indented);
-            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
@@ -177,7 +177,7 @@ namespace Archetype.Tests.Serialization
 
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(model, Formatting.Indented);
-            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
@@ -197,7 +197,7 @@ namespace Archetype.Tests.Serialization
 
             var converter = new ArchetypeValueConverter();
             var json = JsonConvert.SerializeObject(model, Formatting.Indented);
-            var archetype = (Archetype.Umbraco.Models.Archetype)converter.ConvertDataToSource(null, json, false);
+            var archetype = (Archetype.Models.ArchetypeModel)converter.ConvertDataToSource(null, json, false);
 
             Assert.NotNull(archetype);
         }
diff --git a/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs b/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
index bb72c16..c9a5129 100644
--- a/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
+++ b/app/Umbraco/Archetype.Tests/Serialization/JsonTestModels.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Archetype.Umbraco.Serialization;
+using Archetype.Serialization;
 using Newtonsoft.Json;
 
 namespace Archetype.Tests.Serialization
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
index 618b9aa..e31c89d 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
@@ -9,7 +9,7 @@ using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Archetype.Umbraco.Serialization
+namespace Archetype.Serialization
 {
     public class ArchetypeJsonConverter : JsonConverter
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs b/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
index 800bb36..b450a20 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Archetype.Umbraco.Serialization
+namespace Archetype.Serialization
 {
     public class AsArchetypeAttribute : Attribute
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs b/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
index bcee649..60c4c08 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Archetype.Umbraco.Serialization
+namespace Archetype.Serialization
 {
     public class AsFieldsetAttribute : Attribute
     {
diff --git a/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs b/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs
index 8ae37d0..31bab75 100644
--- a/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs
+++ b/app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs
@@ -7,7 +7,7 @@ using Newtonsoft.Json;
 using Umbraco.Core.Models;
 using Umbraco.Web;
 
-namespace Archetype.Umbraco.Serialization
+namespace Archetype.Serialization
 {
     public static class SerializationExtensions
     {