Bump version number to v1.4.1

Fix for #158
Merge pull request #195 from imulus/feature/fix193
2014-08-06 09:22:08 -04:00 · 2014-08-06 09:20:17 -04:00 · 2014-08-06 08:55:47 -04:00 · 2014-08-06 08:55:10 -04:00 · 2014-08-06 08:45:55 -04:00 · 2014-08-05 13:17:34 +02:00
21 changed files with 449 additions and 74 deletions
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{FE8BE437-8B11-4E49-9B02-F45994E6D723}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Archetype.Courier</RootNamespace>
+    <AssemblyName>Archetype.Courier</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <RestorePackages>true</RestorePackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="businesslogic">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\businesslogic.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="cms">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\cms.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="interfaces">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\interfaces.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="log4net">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\log4net.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.6.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Xml" />
+    <Reference Include="umbraco">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Umbraco.Core">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\Umbraco.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Umbraco.Courier.Core">
+      <HintPath>lib\Umbraco.Courier.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Umbraco.Courier.DataResolvers">
+      <HintPath>lib\Umbraco.Courier.DataResolvers.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Umbraco.Courier.Providers">
+      <HintPath>lib\Umbraco.Courier.Providers.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="umbraco.providers">
+      <HintPath>..\packages\UmbracoCms.Core.7.1.2\lib\umbraco.providers.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\Umbraco.Archetype\Properties\VersionInfo.cs">
+      <Link>Properties\VersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="DataResolvers\ArchetypeDataResolver.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Archetype\Archetype.Umbraco.csproj">
+      <Project>{7d185d41-4228-4978-acb8-83f9a48ad94f}</Project>
+      <Name>Archetype.Umbraco</Name>
+      <Private>True</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
+  </Target>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
@@ -0,0 +1,176 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Archetype.Models;
+using Archetype.PropertyConverters;
+using Newtonsoft.Json;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Courier.Core;
+using Umbraco.Courier.DataResolvers;
+using Umbraco.Courier.ItemProviders;
+
+namespace Archetype.Courier.DataResolvers
+{
+	public class ArchetypeDataResolver : PropertyDataResolverProvider
+	{
+		private enum Direction
+		{
+			Extracting,
+			Packaging
+		}
+
+		public override string EditorAlias
+		{
+			get
+			{
+				return Archetype.Constants.PropertyEditorAlias;
+			}
+		}
+
+		public override void ExtractingDataType(DataType item)
+		{
+			// No longer need to extract the DataType (int) Ids as they now reference the Guid [LK]
+		}
+
+		public override void ExtractingProperty(Item item, ContentProperty propertyData)
+		{
+			ReplacePropertyDataIds(item, propertyData, Direction.Extracting);
+		}
+
+		public override void PackagingDataType(DataType item)
+		{
+			AddDataTypeDependencies(item);
+		}
+
+		public override void PackagingProperty(Item item, ContentProperty propertyData)
+		{
+			ReplacePropertyDataIds(item, propertyData, Direction.Packaging);
+		}
+
+		private void AddDataTypeDependencies(DataType item)
+		{
+			if (item.Prevalues != null && item.Prevalues.Count > 0)
+			{
+				var prevalue = item.Prevalues[0];
+				if (prevalue.Alias.InvariantEquals(Archetype.Constants.PreValueAlias) && !string.IsNullOrWhiteSpace(prevalue.Value))
+				{
+					var config = JsonConvert.DeserializeObject<ArchetypePreValue>(prevalue.Value);
+
+					if (config != null && config.Fieldsets != null)
+					{
+						foreach (var property in config.Fieldsets.SelectMany(x => x.Properties))
+						{
+							item.Dependencies.Add(property.DataTypeGuid.ToString(), ProviderIDCollection.dataTypeItemProviderGuid);
+						}
+
+						item.Prevalues[0].Value = JsonConvert.SerializeObject(config, Formatting.None);
+					}
+				}
+			}
+		}
+
+		private void ReplacePropertyDataIds(Item item, ContentProperty propertyData, Direction direction)
+		{
+			if (propertyData != null && propertyData.Value != null)
+			{
+				// just look at the amount of dancing around we have to do in order to fake a `PublishedPropertyType`?!
+				var dataTypeId = PersistenceManager.Default.GetNodeId(propertyData.DataType, NodeObjectTypes.DataType);
+				var fakePropertyType = this.CreateDummyPropertyType(dataTypeId, this.EditorAlias);
+
+				var converter = new ArchetypeValueConverter();
+				var archetype = (ArchetypeModel)converter.ConvertDataToSource(fakePropertyType, propertyData.Value, false);
+
+				if (archetype != null)
+				{
+					// create a 'fake' provider, as ultimately only the 'Packaging' enum will be referenced.
+					var fakeItemProvider = new PropertyItemProvider();
+
+					foreach (var property in archetype.Fieldsets.SelectMany(x => x.Properties))
+					{
+						if (property == null || string.IsNullOrWhiteSpace(property.PropertyEditorAlias))
+							continue;
+
+						// create a 'fake' item for Courier to process
+						var fakeItem = new ContentPropertyData()
+						{
+							ItemId = item.ItemId,
+							Name = string.Format("{0} [{1}: Nested {2} ({3})]", new[] { item.Name, this.EditorAlias, property.PropertyEditorAlias, property.Alias }),
+							Data = new List<ContentProperty>
+							{
+								new ContentProperty
+								{
+									Alias = property.Alias,
+									DataType = PersistenceManager.Default.GetUniqueId(property.DataTypeId, NodeObjectTypes.DataType),
+									PropertyEditorAlias = property.PropertyEditorAlias,
+									Value = property.Value
+								}
+							}
+						};
+
+						if (direction == Direction.Packaging)
+						{
+							try
+							{
+								// run the 'fake' item through Courier's data resolvers
+								ResolutionManager.Instance.PackagingItem(fakeItem, fakeItemProvider);
+							}
+							catch (Exception ex)
+							{
+								LogHelper.Error<ArchetypeDataResolver>(string.Concat("Error packaging data value: ", fakeItem.Name), ex);
+							}
+
+							// pass up the dependencies and resources
+							item.Dependencies.AddRange(fakeItem.Dependencies);
+							item.Resources.AddRange(fakeItem.Resources);
+						}
+						else if (direction == Direction.Extracting)
+						{
+							try
+							{
+								// run the 'fake' item through Courier's data resolvers
+								ResolutionManager.Instance.ExtractingItem(fakeItem, fakeItemProvider);
+							}
+							catch (Exception ex)
+							{
+								LogHelper.Error<ArchetypeDataResolver>(string.Concat("Error extracting data value: ", fakeItem.Name), ex);
+							}
+						}
+
+						if (fakeItem.Data != null && fakeItem.Data.Any())
+						{
+							var firstDataType = fakeItem.Data.FirstOrDefault();
+							if (firstDataType != null)
+							{
+								// set the resolved property data value
+								property.Value = firstDataType.Value;
+
+								// (if packaging) add a dependency for the property's data-type
+								if (direction == Direction.Packaging)
+									item.Dependencies.Add(firstDataType.DataType.ToString(), ProviderIDCollection.dataTypeItemProviderGuid);
+							}
+						}
+					}
+
+					if (item.Name.Contains(string.Concat(this.EditorAlias, ": Nested")))
+					{
+						// if the Archetype is nested, then we only want to return the object itself - not a serialized string
+						propertyData.Value = archetype;
+					}
+					else
+					{
+						// if the Archetype is the root/container, then we can serialize it to a string
+						propertyData.Value = archetype.SerializeForPersistence();
+					}
+				}
+			}
+		}
+
+		private PublishedPropertyType CreateDummyPropertyType(int dataTypeId, string propertyEditorAlias)
+		{
+			return new PublishedPropertyType(null, new PropertyType(new DataTypeDefinition(-1, propertyEditorAlias) { Id = dataTypeId }));
+		}
+	}
+}
@@ -0,0 +1,14 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Archetype.Courier")]
+[assembly: AssemblyDescription("A set of tools to support Archetype with Umbraco Courier")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Umbrella Inc Ltd")]
+[assembly: AssemblyProduct("Archetype.Courier")]
+[assembly: AssemblyCopyright("Copyright \xa9 Lee Kelleher, Umbrella Inc Ltd 2014")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+[assembly: ComVisible(false)]
+[assembly: Guid("6F05C431-ABBF-4D77-9D3D-5AF6C8E318AF")]
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AutoMapper" version="3.0.0" targetFramework="net45" />
+  <package id="ClientDependency" version="1.7.1.2" targetFramework="net45" />
+  <package id="ClientDependency-Mvc" version="1.7.0.4" targetFramework="net45" />
+  <package id="HtmlAgilityPack" version="1.4.6" targetFramework="net45" />
+  <package id="ImageProcessor" version="1.8.7.0" targetFramework="net45" />
+  <package id="ImageProcessor.Web" version="3.2.1.0" targetFramework="net45" />
+  <package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc" version="4.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="2.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="4.0.30506.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="4.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.WebHost" version="4.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="2.0.20710.0" targetFramework="net45" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
+  <package id="MiniProfiler" version="2.1.0" targetFramework="net45" />
+  <package id="MySql.Data" version="6.6.5" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.2" targetFramework="net45" />
+  <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
+  <package id="UmbracoCms.Core" version="7.1.2" targetFramework="net45" />
+  <package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
+</packages>
@@ -14,6 +14,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archetype.Tests", "Archetyp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DatabaseSizer", "DatabaseSizer\DatabaseSizer.csproj", "{0114C963-C514-49C1-B7AB-DCB1825F498C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Archetype.Courier", "Archetype.Courier\Archetype.Courier.csproj", "{FE8BE437-8B11-4E49-9B02-F45994E6D723}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -32,6 +34,10 @@ Global
 		{0114C963-C514-49C1-B7AB-DCB1825F498C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0114C963-C514-49C1-B7AB-DCB1825F498C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0114C963-C514-49C1-B7AB-DCB1825F498C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE8BE437-8B11-4E49-9B02-F45994E6D723}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FE8BE437-8B11-4E49-9B02-F45994E6D723}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE8BE437-8B11-4E49-9B02-F45994E6D723}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FE8BE437-8B11-4E49-9B02-F45994E6D723}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -28,7 +28,7 @@ namespace Archetype.Api
            return dataTypes.Select(t => new { guid = t.Key, name = t.Name });
        }

-        public object GetByGuid(Guid guid)
+        public object GetByGuid(Guid guid, string contentTypeAlias, string propertyTypeAlias, string archetypeAlias, int nodeId)
        {
            var dataType = Services.DataTypeService.GetDataTypeDefinitionById(guid);
            if (dataType == null)
@@ -36,7 +36,7 @@ namespace Archetype.Api
                throw new HttpResponseException(HttpStatusCode.NotFound);
            }
            var dataTypeDisplay = Mapper.Map<IDataTypeDefinition, DataTypeDisplay>(dataType);
-            return new { selectedEditor = dataTypeDisplay.SelectedEditor, preValues = dataTypeDisplay.PreValues };
+            return new { selectedEditor = dataTypeDisplay.SelectedEditor, preValues = dataTypeDisplay.PreValues, contentTypeAlias = contentTypeAlias, propertyTypeAlias = propertyTypeAlias, archetypeAlias = archetypeAlias, nodeId = nodeId };
        }
    }
 }
@@ -232,7 +232,9 @@
    <Compile Include="Constants.cs" />
    <Compile Include="Events\ExpireCache.cs" />
    <Compile Include="Extensions\ArchetypeHelper.cs" />
-    <Compile Include="Extensions\Extensions.cs" />
+    <Compile Include="Extensions\HtmlHelperExtensions.cs" />
+    <Compile Include="Extensions\ArchetypePropertyModelExtensions.cs" />
+    <Compile Include="Extensions\StringExtensions.cs" />
    <Compile Include="Models\ArchetypeModel.cs" />
    <Compile Include="Models\ArchetypePreValue.cs" />
    <Compile Include="Models\ArchetypePreValueFieldset.cs" />
@@ -26,11 +26,11 @@ namespace Archetype.Extensions
            _app = ApplicationContext.Current;
        }

-        internal Models.ArchetypeModel DeserializeJsonToArchetype(string sourceJson, PreValueCollection dataTypePreValues)
+        internal ArchetypeModel DeserializeJsonToArchetype(string sourceJson, PreValueCollection dataTypePreValues)
        {
            try
            {
-                var archetype = JsonConvert.DeserializeObject<Models.ArchetypeModel>(sourceJson, _jsonSettings);
+                var archetype = JsonConvert.DeserializeObject<ArchetypeModel>(sourceJson, _jsonSettings);

                try
                {
@@ -46,15 +46,15 @@ namespace Archetype.Extensions
            }
            catch
            {
-                return new Models.ArchetypeModel();
+                return new ArchetypeModel();
            }
        }

-        internal Models.ArchetypeModel DeserializeJsonToArchetype(string sourceJson, int dataTypeId, PublishedContentType hostContentType = null)
+        internal ArchetypeModel DeserializeJsonToArchetype(string sourceJson, int dataTypeId, PublishedContentType hostContentType = null)
        {
            try
            {
-                var archetype = JsonConvert.DeserializeObject<Models.ArchetypeModel>(sourceJson, _jsonSettings);
+                var archetype = JsonConvert.DeserializeObject<ArchetypeModel>(sourceJson, _jsonSettings);

                try
                {
@@ -70,7 +70,7 @@ namespace Archetype.Extensions
            }
            catch
            {
-                return new Models.ArchetypeModel();
+                return new ArchetypeModel();
            }
        }

@@ -113,7 +113,7 @@ namespace Archetype.Extensions
        /// </summary>
        /// <param name="archetype">The Archetype to add the additional metadata to</param>
        /// <param name="preValue">The configuration of the Archetype</param>
-        private void RetrieveAdditionalProperties(ref Models.ArchetypeModel archetype, ArchetypePreValue preValue, PublishedContentType hostContentType = null)
+        private void RetrieveAdditionalProperties(ref ArchetypeModel archetype, ArchetypePreValue preValue, PublishedContentType hostContentType = null)
        {
            foreach (var fieldset in preValue.Fieldsets)
            {
@@ -140,7 +140,7 @@ namespace Archetype.Extensions
        /// </summary>
        /// <param name="archetype">The Archetype to add the additional metadata to</param>
        /// <param name="preValue">The configuration of the Archetype</param>
-        private void RetrieveAdditionalProperties(ref Models.ArchetypePreValue preValue)
+        private void RetrieveAdditionalProperties(ref ArchetypePreValue preValue)
        {
            foreach (var fieldset in preValue.Fieldsets)
            {
@@ -0,0 +1,20 @@
+using Archetype.Models;
+using Umbraco.Core;
+using Umbraco.Core.Models;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Archetype.Extensions
+{
+    public static class ArchetypePropertyModelExtensions
+    {
+        public static bool IsArchetype(this ArchetypePropertyModel prop)
+        {
+            return prop.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditorAlias);
+        }
+
+        internal static PublishedPropertyType CreateDummyPropertyType(this ArchetypePropertyModel prop)
+        {
+            return new PublishedPropertyType(prop.HostContentType, new PropertyType(new DataTypeDefinition(-1, prop.PropertyEditorAlias) { Id = prop.DataTypeId }));
+        }
+    }
+}
@@ -1,32 +1,14 @@
-using System;
+using System.Text;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Mvc.Html;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections.Generic;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Web;
 using Archetype.Models;
+using Umbraco.Core.Logging;

 namespace Archetype.Extensions
 {
-    public static class Extensions
+    public static class HtmlHelperExtensions
    {
-        //lifted from the core as it is marked 'internal'
-        public static bool DetectIsJson(this string input)
-        {
-            input = input.Trim();
-            return input.StartsWith("{") && input.EndsWith("}")
-                   || input.StartsWith("[") && input.EndsWith("]");
-        }
-
-        public static bool IsArchetype(this ArchetypePropertyModel prop)
-        {
-            return prop.PropertyEditorAlias.InvariantEquals(Constants.PropertyEditorAlias);
-        }
-
        public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel)
        {
            return RenderPartials(htmlHelper, archetypeModel, null, null);
@@ -44,10 +26,10 @@ namespace Archetype.Extensions

        public static IHtmlString RenderArchetypePartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath, ViewDataDictionary viewDataDictionary)
        {
-            return RenderPartials(htmlHelper, archetypeModel, partialPath, viewDataDictionary);
+            return htmlHelper.RenderPartials(archetypeModel, partialPath, viewDataDictionary);
        }

-        private static IHtmlString RenderPartials(HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath, ViewDataDictionary viewDataDictionary)
+        private static IHtmlString RenderPartials(this HtmlHelper htmlHelper, ArchetypeModel archetypeModel, string partialPath, ViewDataDictionary viewDataDictionary)
        {
            var context = HttpContext.Current;

@@ -57,7 +39,7 @@ namespace Archetype.Extensions
            }

            var sb = new StringBuilder();
-            
+
            var pathToPartials = "~/Views/Partials/Archetype/";
            if (!string.IsNullOrEmpty(partialPath))
            {
@@ -81,4 +63,4 @@ namespace Archetype.Extensions
            return new HtmlString(sb.ToString());
        }
    }
-}
+}
@@ -0,0 +1,13 @@
+namespace Archetype.Extensions
+{
+    public static class StringExtensions
+    {
+        //lifted from the core as it is marked 'internal'
+        public static bool DetectIsJson(this string input)
+        {
+            input = input.Trim();
+            return input.StartsWith("{") && input.EndsWith("}")
+                   || input.StartsWith("[") && input.EndsWith("]");
+        }
+    }
+}
@@ -1,15 +1,16 @@
 using System.Collections.Generic;
 using System.Linq;
+using Archetype.Extensions;
 using Newtonsoft.Json;
 using Umbraco.Core;
-using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.PropertyEditors;
 using Umbraco.Web;

 namespace Archetype.Models
 {
-    public class ArchetypePropertyModel {
+    public class ArchetypePropertyModel
+    {
        [JsonProperty("alias")]
        public string Alias { get; internal set; }

@@ -54,7 +55,7 @@ namespace Archetype.Models

        private Attempt<T> TryConvertWithPropertyValueConverters<T>(object value, IEnumerable<IPropertyValueConverter> converters)
        {
-            var properyType = CreateDummyPropertyType(DataTypeId, PropertyEditorAlias);
+            var properyType = this.CreateDummyPropertyType();

            // In umbraco, there are default value converters that try to convert the 
            // value if all else fails. The problem is, they are also in the list of
@@ -72,6 +73,13 @@ namespace Archetype.Models
                if (value2 is T)
                    return Attempt<T>.Succeed((T)value2);

+                // If ConvertDataToSource failed try ConvertSourceToObject.
+                var value3 = converter.ConvertSourceToObject(properyType, value, false);
+
+                // If the value is of type T, just return it
+                if (value3 is T)
+                    return Attempt<T>.Succeed((T)value3);
+
                // Value is not final value type, so try a regular type conversion aswell
                var convertAttempt = value2.TryConvertTo<T>();
                if (convertAttempt.Success)
@@ -80,14 +88,5 @@ namespace Archetype.Models

            return Attempt<T>.Fail();
        }
-
-        private PublishedPropertyType CreateDummyPropertyType(int dataTypeId, string propertyEditorAlias)
-        {
-            return new PublishedPropertyType(this.HostContentType,
-                new PropertyType(new DataTypeDefinition(-1, propertyEditorAlias)
-                {
-                    Id = dataTypeId
-                }));
-        }
    }
 }
@@ -1,4 +1,4 @@
 using System.Reflection;

-[assembly: AssemblyVersion("1.3.1")]
-[assembly: AssemblyFileVersion("1.3.1-beta")]
+[assembly: AssemblyVersion("1.4.1")]
+[assembly: AssemblyFileVersion("1.4.1-beta")]
@@ -1,4 +1,4 @@
-angular.module("umbraco.directives").directive('archetypeProperty', function ($compile, $http, archetypePropertyEditorResource, umbPropEditorHelper, $timeout, $rootScope, $q) {
+angular.module("umbraco.directives").directive('archetypeProperty', function ($compile, $http, archetypePropertyEditorResource, umbPropEditorHelper, $timeout, $rootScope, $q, editorState) {

    function getFieldsetByAlias(fieldsets, alias)
    {
@@ -66,7 +66,7 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
        defaultValue = jsonOrString(defaultValue, scope.archetypeConfig.developerMode, "defaultValue");

        //grab info for the selected datatype, prepare for view
-        archetypePropertyEditorResource.getDataType(dataTypeGuid).then(function (data) {
+        archetypePropertyEditorResource.getDataType(dataTypeGuid, editorState.current.contentTypeAlias, scope.propertyEditorAlias, alias, editorState.current.id).then(function (data) {
            //transform preValues array into object expected by propertyeditor views
            var configObj = {};
            _.each(data.preValues, function(p) {
@@ -129,25 +129,23 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
            }

            // handle nested fieldset validation by storing the identifier of all invalid fieldset properties 
-            var fieldsetIdentifier = scope.umbracoPropertyAlias + "_" + scope.fieldsetIndex;
-            var propertyIdentifier = fieldsetIdentifier + "_" + property.alias;
-            var propertyIdentifierIndex = ngModelCtrl.invalidProperties.indexOf(propertyIdentifier);
+            var propertyAliasIndex = ngModelCtrl.invalidProperties.indexOf(propertyAlias);
            if (valid == false) {
-                if (propertyIdentifierIndex == -1) {
-                    ngModelCtrl.invalidProperties.push(propertyIdentifier);
+                if (propertyAliasIndex == -1) {
+                    ngModelCtrl.invalidProperties.push(propertyAlias);
                }
            }
            else {
-                if (propertyIdentifierIndex != -1) {
-                    ngModelCtrl.invalidProperties.splice(propertyIdentifierIndex, 1);
+                if (propertyAliasIndex != -1) {
+                    ngModelCtrl.invalidProperties.splice(propertyAliasIndex, 1);
                }
            }
            
            if (markAsInvalid) {
                // mark the entire fieldset as invalid if there are any invalid properties in the fieldset, otherwise mark it as valid
                fieldset.isValid =
-                    _.find(ngModelCtrl.invalidProperties, function (item) {
-                        return item.indexOf(fieldsetIdentifier) == 0
+                    _.find(fieldset.properties, function (property) {
+                        return property.isValid == false
                    }) == null;
            }

@@ -204,6 +202,23 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                    //set the config from the prevalues
                    scope.model.config = config;

+                    /*
+                        Property Specific Hacks
+
+                        Preference is to not do these, but unless we figure out core issues, this is quickest fix.
+                    */
+
+                    //MNTP *single* hack
+                    if(scope.model.config.maxNumber && scope.model.config.multiPicker)
+                    {
+                        if(scope.model.config.maxNumber == "1")
+                        {
+                            scope.model.config.multiPicker = "0";
+                        }
+                    }
+
+                    //console.log(scope.model.config);
+
                    //some items need an alias
                    scope.model.alias = "archetype-property-" + propertyAlias;

@@ -237,6 +252,7 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
        scope: {
            property: '=',
            propertyConfigIndex: '=',
+            propertyEditorAlias: '=',
            archetypeConfig: '=',
            fieldset: '=',
            fieldsetIndex: '=',
@@ -245,4 +261,4 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
            umbracoForm: '='
        }
    }
-});
+});
@@ -8,6 +8,10 @@
    .controls-no-label {
        padding: 10px;
    }
+
+    a+ul.dropdown-menu {
+        margin-left: 25px;
+    }
 }

 .archetypeEditor fieldset{
@@ -22,7 +26,7 @@

 .archetypeEditor .archetypeFieldsetLabel {
    position: relative;
-    width: 100%%;
+    width: 100%;

    .label-sub {
        padding: 8px 0;
@@ -33,11 +37,12 @@
    }

    .dropdown-menu {
+        position: relative;
        padding: 0;
        border-radius: 0;
        box-shadow: none;
        margin-top: -10px;
-        margin-left: -200px;
+        /*margin-left: -200px;*/
    }

    span {
@@ -95,6 +100,7 @@
    background-color: #fff;
    border-top: 1px solid silver;
    border-radius: 0 0 0 5px;
+    overflow: hidden;
 }

 .archetypeEditor .multiPropertyTextbox{
@@ -144,7 +150,7 @@

 .archetypeEditor .archetypeProperty{
    clear: both;
-    overflow: hidden;
+    overflow: visible;
    margin-top: 3px;
 }

@@ -6,9 +6,9 @@ angular.module('umbraco.resources').factory('archetypePropertyEditorResource', f
                $http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetAll"), 'Failed to retrieve datatypes from tree service'
            );
        },
-        getDataType: function(guid) {
+        getDataType: function (guid, contentTypeAlias, propertyTypeAlias, archetypeAlias, nodeId) {
        	return umbRequestHelper.resourcePromise(
-        		$http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetByGuid?guid=" + guid), 'Failed to retrieve datatype'
+        		$http.get("/umbraco/backoffice/ArchetypeApi/ArchetypeDataType/GetByGuid?guid=" + guid + "&contentTypeAlias=" + contentTypeAlias + "&propertyTypeAlias=" + propertyTypeAlias + "&archetypeAlias=" + archetypeAlias + "&nodeId=" + nodeId), 'Failed to retrieve datatype'
    		);
        },
        getPropertyEditorMapping: function(alias) {
@@ -26,4 +26,4 @@ angular.module('umbraco.resources').factory('archetypePropertyEditorResource', f
            });
        }
    }
-}); 
+}); 
@@ -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="[fieldset.alias, (getFieldsetValidity(fieldset) == false ? 'archetypeFieldsetError' : '')]" ng-init="fieldsetConfigModel = getConfigFieldsetByAlias(fieldset.alias)">
+            <fieldset ng-class="['archetype-fieldset-' + fieldset.alias, (getFieldsetValidity(fieldset) == false ? 'archetypeFieldsetError' : '')]" 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>
@@ -27,18 +27,18 @@
                        <i class="icon icon-navigation handle" ng-show="canSort()"></i>
                    </div>
                </div>
-                <div class="archetypeCollapser animate-hide" ng-hide="isCollapsed(fieldset)">
+                <div class="archetypeCollapser animate-hide" ng-hide="model.config.enableCollapsing && isCollapsed(fieldset)">
                    <form class="form-inline">
                        <div ng-class="[property.alias, (getPropertyValidity($parent.$index, property.alias) === false ? 'archetypePropertyError' : '')]" class="archetypeProperty control-group" ng-repeat="property in fieldsetConfigModel.properties">
-                            <label ng-hide="archetypeConfig.hidePropertyLabels == '1'" class="control-label" for="archetype-property-{{umbracoHostPropertyAlias}}-f{{$parent.$index}}-{{property.alias}}-p{{$index}}">
+                            <label ng-hide="model.config.hidePropertyLabels == '1'" class="control-label" for="archetype-property-{{model.alias}}-{{$parent.$index}}-{{$index}}">
                                <span>{{property.label}}</span>
                                <div class="archetypeFieldsetHelpText" ng-show="property.helpText">
                                    <small>{{property.helpText}}</small>
                                </div>
                            </label>

-                            <div class="controls">
-                                <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-form = "form"></archetype-property>
+                            <div ng-class="[(model.config.hidePropertyLabels == '1' ? 'controls-no-label' : 'controls')]">
+                                <archetype-property class="archetypeEditor" property="property" property-editor-alias="model.alias" fieldset-index="$parent.$index" fieldset="fieldset" archetype-config="model.config" property-config-index="$index" archetype-render-model="model.value" umbraco-form="form"></archetype-property>
                            </div>
                        </div>
                    </form>
@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "1.3.1-beta",
+	"version": "1.4.1-beta",
 	"url": "http://github.com/imulus/archetype/",
 	"author": "Imulus",
 	"authorUrl": "http://imulus.com/",
Author	SHA1	Message	Date
Kevin Giszewski	5725c0770e	Bump version number to v1.4.1	2014-08-06 09:22:08 -04:00
Kevin Giszewski	210fbb8230	Fix for #158	2014-08-06 09:20:17 -04:00
Kevin Giszewski	c8e398c726	Merge pull request #195 from imulus/feature/fix193 Fix for #193	2014-08-06 08:55:47 -04:00
Kevin Giszewski	bfa882fa01	Fix for #193	2014-08-06 08:55:10 -04:00
Kevin Giszewski	876aea4007	Merge branch 'pr/186' into develop	2014-08-06 08:45:55 -04:00
Jeroen Breuer	07750c7537	Run ConvertDataToSource before ConvertSourceToObject	2014-08-05 13:17:34 +02:00
Kevin Giszewski	17a1577d09	Merge branch 'master' of github.com:imulus/Archetype	2014-07-31 13:55:07 -04:00
Kevin Giszewski	987f383139	Merge pull request #184 from imulus/fix/class-conflicts Prefix fieldset class names to help avoid conflicts	2014-07-31 13:54:58 -04:00
Kevin Giszewski	dc14f11f83	Merge pull request #191 from jbreuer/patch-5 Fix 4 for #187	2014-07-31 13:54:48 -04:00
Kevin Giszewski	500f4c4dee	Merge pull request #190 from jbreuer/patch-4 Fix 3 for #187	2014-07-31 13:53:41 -04:00
Kevin Giszewski	a16451df1f	Merge pull request #189 from jbreuer/patch-3 Fix 2 for #187	2014-07-31 13:53:34 -04:00
Kevin Giszewski	9ac7877174	Merge pull request #188 from jbreuer/patch-2 Fix 1 for #187	2014-07-31 13:53:10 -04:00
Kevin Giszewski	4d3bcb68b3	Merge branch 'pr/188' into develop	2014-07-31 13:44:43 -04:00
Kevin Giszewski	30074fe198	Merge branch 'pr/191' into pr/188	2014-07-31 13:37:01 -04:00
Kevin Giszewski	7f0bd45a9d	Merge branch 'pr/190' into pr/188	2014-07-31 13:36:59 -04:00
Kevin Giszewski	6045eed5c5	Merge branch 'pr/189' into pr/188	2014-07-31 13:36:55 -04:00
Jeroen Breuer	57ffa69ff5	Added node id	2014-07-31 12:12:35 +02:00
Jeroen Breuer	6b61dc978a	Added node id	2014-07-31 12:11:51 +02:00
Jeroen Breuer	c20aa64af2	Added node id	2014-07-31 12:11:02 +02:00
Jeroen Breuer	25826958a3	Fix 4 for #187	2014-07-30 16:34:33 +02:00
Jeroen Breuer	b5bfbb5c25	Fix 3 for #187	2014-07-30 16:33:01 +02:00
Jeroen Breuer	9afaa024c0	Fix 2 for #187	2014-07-30 16:30:42 +02:00
Jeroen Breuer	c58dcd80ff	Fix 1 for #187	2014-07-30 16:26:42 +02:00
Jeroen Breuer	b7c16ee6ef	Fix for #185	2014-07-29 16:24:14 +02:00
tomfulton	786c547e0b	Prefix fieldset class names to help avoid conflicts	2014-07-24 06:35:33 -06:00
Kevin Giszewski	fbf686f559	Bump Version Number to v1.4.0	2014-07-11 10:38:08 -04:00
Kevin Giszewski	42b4076700	Merge branch 'pr/174'	2014-07-11 10:19:00 -04:00
Kevin Giszewski	5feb415093	Update some dropdown css	2014-07-11 10:17:49 -04:00
Kevin Giszewski	79c85cf86b	Merge branch 'master' into pr/174	2014-07-09 16:42:18 -04:00
Kevin Giszewski	a0f65370c9	Few CSS tweaks	2014-07-09 16:40:29 -04:00
Kevin Giszewski	029d17c428	Merge branch 'master' of github.com:imulus/Archetype	2014-07-09 15:46:17 -04:00
Kevin Giszewski	e262d7b0c9	Re-fix the 'hide label' issue - appears to have been undone	2014-07-09 15:46:05 -04:00
kjac	44ea6c56f5	Use propertyAlias in fieldset validation As described in #162 the umbracoPropertyAlias has been removed in favor of a more unique propertyAlias. This propertyAlias should be used for property identification in the validation.	2014-07-01 22:28:20 +02:00
leekelleher	d7477eaf6d	Moved the `ArchetypePropertyModel.CreateDummyPropertyType` to an extension method. With a view to re-use in the Courier DataResolver (as it does the same function).	2014-07-01 21:46:25 +02:00
leekelleher	c33649201f	Separated out the extension methods into their own grouped classes. Implements #172	2014-07-01 21:46:25 +02:00
leekelleher	3940955360	Code tidy-up; correct method naming; removed unused references	2014-07-01 21:46:24 +02:00
leekelleher	03f66a35f7	Refactored the DataResolver, as the underlying JSON value for the property had been modified (fields removed).	2014-07-01 21:46:24 +02:00
leekelleher	b4b60dd89c	Add the 'Archetype.Courier' project. Includes the Courier DataResolver for Archetype.	2014-07-01 21:46:23 +02:00
leekelleher	4105912394	Code tidy-up: removed the "Models" namespace from the type name.	2014-07-01 21:46:22 +02:00
Kevin Giszewski	7b3d31f897	Merge pull request #173 from leekelleher/feature/issues/172 Separated out the extension methods into their own grouped classes	2014-07-01 11:52:43 -04:00
leekelleher	50861badf1	Moved the `ArchetypePropertyModel.CreateDummyPropertyType` to an extension method. With a view to re-use in the Courier DataResolver (as it does the same function).	2014-07-01 16:49:20 +01:00
leekelleher	fa682c3717	Separated out the extension methods into their own grouped classes. Implements #172	2014-07-01 16:48:13 +01:00
Kevin Giszewski	d18d1ff0b1	Merge pull request #171 from leekelleher/feature/courier-resolver Includes Courier DataResolver project	2014-07-01 11:27:21 -04:00
leekelleher	247491187a	Code tidy-up; correct method naming; removed unused references	2014-07-01 16:09:34 +01:00
leekelleher	80194786a1	Refactored the DataResolver, as the underlying JSON value for the property had been modified (fields removed).	2014-07-01 15:42:41 +01:00
Kevin Giszewski	72ee7b3d09	Merge pull request #170 from leekelleher/master Code tidy-up: removed the "Models" namespace from the type name.	2014-07-01 10:20:18 -04:00
leekelleher	284b1d93dc	Add the 'Archetype.Courier' project. Includes the Courier DataResolver for Archetype.	2014-07-01 14:28:02 +01:00
leekelleher	7c5a3c34e2	Code tidy-up: removed the "Models" namespace from the type name.	2014-07-01 13:54:18 +01:00