Merge pull request #36 from kluhman/preview-support

Preview support

CHANGELOG.md

@@ -1,4 +1,7 @@
-<<<<<<< HEAD
+## v1.3.1
+
+* Fixes issue where preview content breaks due to use of a singleton UmbracoHelper. [#34]
+
 ## v1.3.0
 
 **New Feature: Independence from Web Context**

UmbracoVault/Extensions/DictionaryExtensions.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace UmbracoVault.Extensions
+{
+    internal static class DictionaryExtensions
+    {
+        public static object GetOrAddThreadSafe(this IDictionary dictionary, object key, Func<object, object> valueFactory)
+        {
+            if (!dictionary.Contains(key))
+            {
+                lock (key)
+                {
+                    if (!dictionary.Contains(key))
+                    {
+                        dictionary.Add(key, valueFactory(key));
+                    }
+                }
+            }
+
+            return dictionary[key];
+        }
+
+        public static object GetOrAddThreadSafe(this IDictionary dictionary, object key, object value)
+        {
+            return dictionary.GetOrAddThreadSafe(key, k => value);
+        }
+
+        public static T GetOrAddThreadSafe<T>(this IDictionary dictionary, object key, Func<object, T> valueFactory)
+        {
+            var factoryWrapper = new Func<object, object>(k => valueFactory(k));
+            return (T)dictionary.GetOrAddThreadSafe(key, factoryWrapper);
+        }
+
+        public static T GetOrAddThreadSafe<T>(this IDictionary dictionary, object key, T value)
+        {
+            return dictionary.GetOrAddThreadSafe(key, k => value);
+        }
+    }
+}

UmbracoVault/UmbracoContext.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Web;
 
 using Umbraco.Core;
 using Umbraco.Core.Logging;
@@ -28,8 +29,7 @@ public class UmbracoWebContext : BaseUmbracoContext
             //new SuperScriptTransformation()
         };
 
-        private UmbracoHelper _helper;
-        protected UmbracoHelper Helper => _helper ?? (_helper = new UmbracoHelper(UmbracoContext.Current));
+        protected UmbracoHelper Helper => GetUmbracoHelperForRequest();
 
         private IPublishedContent GetCurrentUmbracoContent()
         {
@@ -166,6 +166,12 @@ protected T GetItem<T>(IPublishedContent n)
             return result;
         }
 
+        private static UmbracoHelper GetUmbracoHelperForRequest()
+        {
+            const string umbracoHelperKey = "__vaultUmbracoHelper";
+            return HttpContext.Current?.Items.GetOrAddThreadSafe(string.Intern(umbracoHelperKey), new UmbracoHelper(UmbracoContext.Current));
+        }
+
         public static ReadOnlyCollection<string> GetUmbracoEntityAliasesFromType(Type type)
         {
             var results = new HashSet<string>();

UmbracoVault/UmbracoVault.csproj

@@ -87,6 +87,7 @@
     <Compile Include="Controllers\VaultDefaultGenericController.cs" />
     <Compile Include="Controllers\VaultRenderMvcController.cs" />
     <Compile Include="Exceptions\VaultNotImplementedException.cs" />
+    <Compile Include="Extensions\DictionaryExtensions.cs" />
     <Compile Include="Extensions\ObjectExtensions.cs" />
     <Compile Include="Models\NamedItem.cs" />
     <Compile Include="Proxy\ILazyResolverMixin.cs" />

UmbracoVault/UmbracoVault.nuspec

@@ -12,16 +12,7 @@
         <description>Vault for Umbraco is an easy-to-use, extensible ORM to quickly and easily get strongly-typed Umbraco CMS data into your views. It allows you to create lightly-decorated classes that Vault will understand how to hydrate. This gives you the full view model-style experience in Umbraco that you are accustomed to in MVC, complete with strongly-typed view properties (no more magic strings in your views).</description>
         <summary>Vault for Umbraco is an easy-to-use, extensible ORM to quickly and easily get strongly-typed Umbraco CMS data into your views.</summary>
         <releaseNotes>
-          **New Feature: Independence from Web Context**
-
-          Extended the current UmbracoContext implementation to include a secondary implementation that removes any dependency 
-          on `IPublishedContext`, `UmbracoHelper`, and the Umbraco WebContext.  Instead of using the WebContext as a vehicle 
-          for retrieving data from Umbraco, the [ServiceContext](https://our.umbraco.org/documentation/Reference/Management/Services/) 
-          is used. [#27]
-
-	        **Other**
-
-	          * Added `PropertyInfo` parameter to `FillClassProperties` to support additional behavior for libraries that extend Vault.[#25]
+          * Fixes issue where preview content breaks due to use of a singleton UmbracoHelper. [#34]
         </releaseNotes>
       <copyright>(c) The Nerdery LLC 2016. All Rights Reserved.</copyright>
       <tags>Umbraco UmbracoVault Mapping ObjectMapper ORM CMS</tags>

appveyor.yml

@@ -1,6 +1,6 @@
 environment:
-  CURRENT_VERSION: 1.3.0
-version: 1.3.0-{build}
+  CURRENT_VERSION: 1.3.1
+version: 1.3.1-{build}
 os: Visual Studio 2015
 assembly_info:
   patch: true