From b0ee1a63e916265a03fd58ddb98a93f679b6e1f8 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Fri, 5 Aug 2016 13:41:43 -0400 Subject: [PATCH 1/8] Fixing issue related to salt-to-byte conversion --- .../Cryptography/AesHmacCryptoService.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Jabberwocky.Core/Cryptography/AesHmacCryptoService.cs b/Jabberwocky.Core/Cryptography/AesHmacCryptoService.cs index 219bdde..f777314 100644 --- a/Jabberwocky.Core/Cryptography/AesHmacCryptoService.cs +++ b/Jabberwocky.Core/Cryptography/AesHmacCryptoService.cs @@ -45,6 +45,7 @@ public static AesHmacCryptoService Create(string secretKey, string digestKey, st public AesHmacCryptoService(CryptoConfiguration config, ISerializationProvider serializationProvider) { if (serializationProvider == null) throw new ArgumentNullException(nameof(serializationProvider)); + if (!IsCryptoConfigurationValid(config)) throw new ArgumentException("All configuration properties must be valid.", nameof(config)); SerializationProvider = serializationProvider; _lazyDerivedBytes = new Lazy(() => GenerateDerivedBytes(config)); @@ -147,7 +148,9 @@ protected virtual byte[] ComputeHash(byte[] content) private static KeySaltPair GenerateDerivedBytes(CryptoConfiguration config) { var saltBytes = new byte[SaltSize]; - Encoding.UTF8.GetBytes(config.InitializationVector, 0, config.InitializationVector.Length, saltBytes, 0); + var charSizeInBytes = sizeof(char); + var characterCount = Math.Min(SaltSize / charSizeInBytes, config.InitializationVector.Length); + Encoding.UTF8.GetBytes(config.InitializationVector, 0, characterCount, saltBytes, 0); using (var derivePassword = new Rfc2898DeriveBytes(config.SecretKey, saltBytes)) { @@ -163,6 +166,13 @@ private static KeySaltPair GenerateDerivedBytes(CryptoConfiguration config) } } + private static bool IsCryptoConfigurationValid(CryptoConfiguration config) + { + return !string.IsNullOrEmpty(config.DigestKey) + && !string.IsNullOrEmpty(config.InitializationVector) + && !string.IsNullOrEmpty(config.SecretKey); + } + #endregion protected struct KeySaltPair From 7be1bdc6c709ce39472c68b0fdfd9dd15c8671c0 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Fri, 5 Aug 2016 14:17:21 -0400 Subject: [PATCH 2/8] Fixing generated nonce length in AesHmacCryptoService being too long --- .../Cryptography/AesHmacCryptoService.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Jabberwocky.Core/Cryptography/AesHmacCryptoService.cs b/Jabberwocky.Core/Cryptography/AesHmacCryptoService.cs index f777314..8316f19 100644 --- a/Jabberwocky.Core/Cryptography/AesHmacCryptoService.cs +++ b/Jabberwocky.Core/Cryptography/AesHmacCryptoService.cs @@ -18,15 +18,15 @@ public class AesHmacCryptoService : IHmacCryptoService protected ISerializationProvider SerializationProvider { get; } /// - /// Symmetric Key size for 256-bit cipher + /// Symmetric Key size for 256-bit cipher (in bytes) /// private const int KeySize = 32; /// - /// AES cipher block-size + /// AES cipher block-size (in bytes) /// - private const int BlockSize = 128; + private const int BlockSize = 16; /// - /// Initialization Vector size + /// Initialization Vector size (in bytes) /// private const int SaltSize = 16; @@ -123,9 +123,11 @@ protected virtual byte[] GenerateNonce() protected virtual byte[] CryptContent(byte[] contentBytes, Func cryptorFunc) { + const int blockSizeInBits = BlockSize * 8; + using (var aes = new RijndaelManaged()) { - aes.BlockSize = BlockSize; + aes.BlockSize = blockSizeInBits; aes.Mode = CipherMode.CBC; aes.Key = SymmetricKey; aes.IV = Salt; From 40cc5813155ab959d43928427ccc54f971bee07e Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Fri, 2 Sep 2016 15:46:28 -0400 Subject: [PATCH 3/8] Adding support for nested interface definitions for the Glass Interface Factory --- .../Factory/GlassInterfaceFactoryTests.cs | 44 ++++++++++++++++++- .../Interceptors/FallbackInterceptor.cs | 35 +++++++++++---- 2 files changed, 69 insertions(+), 10 deletions(-) diff --git a/Jabberwocky.Glass.Tests/Factory/GlassInterfaceFactoryTests.cs b/Jabberwocky.Glass.Tests/Factory/GlassInterfaceFactoryTests.cs index 332a903..0365370 100644 --- a/Jabberwocky.Glass.Tests/Factory/GlassInterfaceFactoryTests.cs +++ b/Jabberwocky.Glass.Tests/Factory/GlassInterfaceFactoryTests.cs @@ -76,6 +76,26 @@ public void Initialize() ZIndex = 0 } } + }, + { + typeof(INestedTestInterface), new[] + { + new GlassInterfaceMetadata + { + GlassType = typeof (IIntermediateTemplate), + ImplementationType = typeof(IIntermediateTemplateModel), + IsFallback = false, + ZIndex = 0 + }, + // Base Type, matches no direct template + new GlassInterfaceMetadata + { + GlassType = typeof (IBaseType), + ImplementationType = typeof (IBaseTypeModel), + IsFallback = true, + ZIndex = 0 + }, + } } }; @@ -289,6 +309,20 @@ public void GlassFactory_ZIndexBehavior_WillHigherPriorityImplementation() Assert.AreEqual("IInheritedTemplateModel", testItem.ZIndexTest); // Should fallback to IInheritedTemplateModel -> BaseType } + [Test] + public void GlassFactory_FallbackBehavior_WorksWithNestedInterfaces() + { + + var mockItem = Substitute.For(); + mockItem._Id = Guid.NewGuid(); + mockItem._TemplateId.Returns(new Guid(FakeIntermediateTemplate)); // matching template + mockItem._BaseTemplates.Returns(new Guid[0]); + + var testItem = _glassFactory.GetItem(mockItem); + Assert.IsNotNull(testItem); + Assert.AreEqual("IBaseTypeModel", testItem.ZIndexTest); // Should fallback to IIntermediateTemplateModel -> BaseType + } + private ITestInterface GetItemWithFallback() { var mockItem = Substitute.For(); @@ -350,6 +384,12 @@ private interface ITestInterface string ZIndexTest { get; } } + [GlassFactoryInterface] + private interface INestedTestInterface : ITestInterface + { + + } + [GlassFactoryType(typeof (IInheritedTemplate), ZIndex = 1)] public abstract class IInheritedTemplateModel : ITestInterface { @@ -415,7 +455,7 @@ public object DontCallMe() } [GlassFactoryType(typeof (IBaseType))] - public abstract class IBaseTypeModel : ITestInterface + public abstract class IBaseTypeModel : ITestInterface, INestedTestInterface { private readonly IBaseType _innerItem; protected IBaseTypeModel(IBaseType innerItem) @@ -452,7 +492,7 @@ public object DontCallMe() } [GlassFactoryType(typeof(IIntermediateTemplate))] - public abstract class IIntermediateTemplateModel : ITestInterface + public abstract class IIntermediateTemplateModel : INestedTestInterface { public abstract bool IsNotFallback { get; } public abstract bool IsFallback { get; } diff --git a/Jabberwocky.Glass/Factory/Interceptors/FallbackInterceptor.cs b/Jabberwocky.Glass/Factory/Interceptors/FallbackInterceptor.cs index 25391d4..b30d8a2 100644 --- a/Jabberwocky.Glass/Factory/Interceptors/FallbackInterceptor.cs +++ b/Jabberwocky.Glass/Factory/Interceptors/FallbackInterceptor.cs @@ -1,7 +1,9 @@ using System; +using System.Linq; using System.Reflection; using Castle.DynamicProxy; using Glass.Mapper.Sc.Configuration.Attributes; +using Jabberwocky.Core.Utils.Extensions; using Jabberwocky.Glass.Factory.Attributes; using Jabberwocky.Glass.Factory.Caching; using Jabberwocky.Glass.Factory.Implementation; @@ -78,17 +80,34 @@ private void ResolveInvocation(IInvocation invocation, GlassFactoryTypeAttribute ? invocationTarget.GetGenericMethodDefinition() : invocationTarget; - var map = invocation.TargetType.GetInterfaceMap(_interfaceType); - var index = Array.IndexOf(map.TargetMethods, targetMethod); + var fallbackMethod = GetFallbackInterfaceMethod(invocation, _interfaceType, invocationTarget, targetMethod); + if (fallbackMethod != null) + { + invocation.ReturnValue = fallbackMethod.Invoke(fallbackImpl, invocation.Arguments); + } + } - if (index == -1) return; + private static MethodInfo GetFallbackInterfaceMethod(IInvocation invocation, Type targetInterfaceType, + MethodInfo invocationTarget, MethodInfo targetMethod) + { + var interfaceCandidates = new[] { targetInterfaceType }.Concat(targetInterfaceType.GetInterfaces()); - MethodInfo interfaceMethod = map.InterfaceMethods[index]; - interfaceMethod = interfaceMethod.IsGenericMethod - ? interfaceMethod.MakeGenericMethod(invocationTarget.GetGenericArguments()) - : interfaceMethod; + foreach (var interfaceType in interfaceCandidates) + { + var map = invocation.TargetType.GetInterfaceMap(interfaceType); + var index = Array.IndexOf(map.TargetMethods, targetMethod); + + if (index == -1) continue; + + MethodInfo interfaceMethod = map.InterfaceMethods[index]; + interfaceMethod = interfaceMethod.IsGenericMethod + ? interfaceMethod.MakeGenericMethod(invocationTarget.GetGenericArguments()) + : interfaceMethod; + + return interfaceMethod; + } - invocation.ReturnValue = interfaceMethod.Invoke(fallbackImpl, invocation.Arguments); + return null; } } } From bb5bcb8320359fc671f1bc34114fdcb190c36a0a Mon Sep 17 00:00:00 2001 From: Kevin Mazzoni Date: Fri, 24 Jun 2016 12:02:01 -0400 Subject: [PATCH 4/8] Refactoring Jabberwocky.Glass.Autofac.Mvc into two separate projects. Created Jabberwocky.Glass.Mvc and Jabberwocky.Glass.Mvc.Tests projects. Moved, MVC code with no Autofac dependencies to new projects. --- ...Jabberwocky.Glass.Autofac.Mvc.Tests.csproj | 26 +- .../Factory/AutofacViewModelFactoryTests.cs | 2 +- .../Extensions/MvcRegistrationExtensions.cs | 3 +- .../Jabberwocky.Glass.Autofac.Mvc.csproj | 12 +- .../Models/Factory/AutofacViewModelFactory.cs | 3 +- .../Models/GlassViewModel.cs | 11 +- .../Models/InjectableGlassViewModelBase.cs | 4 +- .../Processors/GetModelFromViewProcessor.cs | 2 +- .../Pipelines/Processors/GetModelProcessor.cs | 2 +- .../Services/IRenderingContextService.cs | 24 - Jabberwocky.Glass.Mvc.Tests/Class1.cs | 12 + .../Fakes/Sitecore.Kernel.fakes | Bin .../Sitecore.Kernel.7.0.0.0.Fakes.dll | Bin 0 -> 37376 bytes .../Sitecore.Kernel.7.0.0.0.Fakes.fakesconfig | Bin 0 -> 54 bytes .../Sitecore.Kernel.7.0.0.0.Fakes.xml | 653 ++++++++++++++++++ .../Jabberwocky.Glass.Mvc.Tests.csproj | 117 ++++ .../Properties/AssemblyInfo.cs | 36 + .../Services/RenderingContextServiceTests.cs | 6 +- Jabberwocky.Glass.Mvc.Tests/app.config | 11 + Jabberwocky.Glass.Mvc.Tests/packages.config | 7 + .../HttpGetOrInvalidHttpPostAttribute.cs | 4 +- .../Attributes/ValidHttpPostAttribute.cs | 2 +- .../ValidateFormHandlerAttribute.cs | 2 +- .../Jabberwocky.Glass.Mvc.csproj | 122 ++++ .../Models/Factory/IViewModelFactory.cs | 4 +- .../Properties/AssemblyInfo.cs | 36 + .../Services/DatasourceNestingOptions.cs | 9 + .../Services/IRenderingContextService.cs | 17 + .../Services/RenderingContextService.cs | 8 +- .../Util/CustomSitecoreHelper.cs | 6 +- .../Views/CustomGlassView.cs | 6 +- Jabberwocky.Glass.Mvc/app.config | 11 + Jabberwocky.Glass.Mvc/packages.config | 9 + .../Jabberwocky.Glass.Tests.csproj | 7 + Jabberwocky.sln | 14 + 35 files changed, 1104 insertions(+), 84 deletions(-) delete mode 100644 Jabberwocky.Glass.Autofac.Mvc/Services/IRenderingContextService.cs create mode 100644 Jabberwocky.Glass.Mvc.Tests/Class1.cs rename {Jabberwocky.Glass.Autofac.Mvc.Tests => Jabberwocky.Glass.Mvc.Tests}/Fakes/Sitecore.Kernel.fakes (100%) create mode 100644 Jabberwocky.Glass.Mvc.Tests/FakesAssemblies/Sitecore.Kernel.7.0.0.0.Fakes.dll create mode 100644 Jabberwocky.Glass.Mvc.Tests/FakesAssemblies/Sitecore.Kernel.7.0.0.0.Fakes.fakesconfig create mode 100644 Jabberwocky.Glass.Mvc.Tests/FakesAssemblies/Sitecore.Kernel.7.0.0.0.Fakes.xml create mode 100644 Jabberwocky.Glass.Mvc.Tests/Jabberwocky.Glass.Mvc.Tests.csproj create mode 100644 Jabberwocky.Glass.Mvc.Tests/Properties/AssemblyInfo.cs rename {Jabberwocky.Glass.Autofac.Mvc.Tests => Jabberwocky.Glass.Mvc.Tests}/Services/RenderingContextServiceTests.cs (98%) create mode 100644 Jabberwocky.Glass.Mvc.Tests/app.config create mode 100644 Jabberwocky.Glass.Mvc.Tests/packages.config rename {Jabberwocky.Glass.Autofac.Mvc => Jabberwocky.Glass.Mvc}/Attributes/HttpGetOrInvalidHttpPostAttribute.cs (91%) rename {Jabberwocky.Glass.Autofac.Mvc => Jabberwocky.Glass.Mvc}/Attributes/ValidHttpPostAttribute.cs (92%) rename {Jabberwocky.Glass.Autofac.Mvc => Jabberwocky.Glass.Mvc}/Attributes/ValidateFormHandlerAttribute.cs (95%) create mode 100644 Jabberwocky.Glass.Mvc/Jabberwocky.Glass.Mvc.csproj rename {Jabberwocky.Glass.Autofac.Mvc => Jabberwocky.Glass.Mvc}/Models/Factory/IViewModelFactory.cs (63%) create mode 100644 Jabberwocky.Glass.Mvc/Properties/AssemblyInfo.cs create mode 100644 Jabberwocky.Glass.Mvc/Services/DatasourceNestingOptions.cs create mode 100644 Jabberwocky.Glass.Mvc/Services/IRenderingContextService.cs rename {Jabberwocky.Glass.Autofac.Mvc => Jabberwocky.Glass.Mvc}/Services/RenderingContextService.cs (98%) rename {Jabberwocky.Glass.Autofac.Mvc => Jabberwocky.Glass.Mvc}/Util/CustomSitecoreHelper.cs (88%) rename {Jabberwocky.Glass.Autofac.Mvc => Jabberwocky.Glass.Mvc}/Views/CustomGlassView.cs (85%) create mode 100644 Jabberwocky.Glass.Mvc/app.config create mode 100644 Jabberwocky.Glass.Mvc/packages.config diff --git a/Jabberwocky.Glass.Autofac.Mvc.Tests/Jabberwocky.Glass.Autofac.Mvc.Tests.csproj b/Jabberwocky.Glass.Autofac.Mvc.Tests/Jabberwocky.Glass.Autofac.Mvc.Tests.csproj index fa180c0..18d3df2 100644 --- a/Jabberwocky.Glass.Autofac.Mvc.Tests/Jabberwocky.Glass.Autofac.Mvc.Tests.csproj +++ b/Jabberwocky.Glass.Autofac.Mvc.Tests/Jabberwocky.Glass.Autofac.Mvc.Tests.csproj @@ -51,19 +51,7 @@ False ..\packages\Glass.Mapper.Sc.4.0.3.51\lib\72\Glass.Mapper.Sc.dll - - ..\lib\Sitecore\Testing\HtmlAgilityPack.dll - - - ..\lib\Sitecore\Testing\ITHit.WebDAV.Server.dll - - - ..\lib\Sitecore\Testing\Lucene.Net.dll - - - False - ..\lib\Sitecore\Testing\Mvp.Xml.dll @@ -79,13 +67,6 @@ False ..\lib\Sitecore\Sitecore.Kernel.dll - - FakesAssemblies\Sitecore.Kernel.7.0.0.0.Fakes.dll - - - False - ..\lib\Sitecore\Testing\Sitecore.Logging.dll - False ..\lib\Sitecore\Sitecore.Mvc.dll @@ -103,11 +84,9 @@ - - @@ -119,11 +98,16 @@ {5EAD110F-F074-47E4-8B93-C0EECB9FC27A} Jabberwocky.Glass.Autofac.Mvc + + {dd17db22-247c-44a6-b0dd-091786863626} + Jabberwocky.Glass.Mvc + {13E08D30-B2A4-45EF-A28E-C916EB80B70D} Jabberwocky.Glass + diff --git a/Jabberwocky.Glass.Autofac.Mvc.Tests/Models/Factory/AutofacViewModelFactoryTests.cs b/Jabberwocky.Glass.Autofac.Mvc.Tests/Models/Factory/AutofacViewModelFactoryTests.cs index 9517c57..c96d898 100644 --- a/Jabberwocky.Glass.Autofac.Mvc.Tests/Models/Factory/AutofacViewModelFactoryTests.cs +++ b/Jabberwocky.Glass.Autofac.Mvc.Tests/Models/Factory/AutofacViewModelFactoryTests.cs @@ -3,8 +3,8 @@ using Jabberwocky.Glass.Autofac.Mvc.Models; using Jabberwocky.Glass.Autofac.Mvc.Models.Attributes; using Jabberwocky.Glass.Autofac.Mvc.Models.Factory; -using Jabberwocky.Glass.Autofac.Mvc.Services; using Jabberwocky.Glass.Models; +using Jabberwocky.Glass.Mvc.Services; using NSubstitute; using NUnit.Framework; using Sitecore.Mvc.Presentation; diff --git a/Jabberwocky.Glass.Autofac.Mvc/Extensions/MvcRegistrationExtensions.cs b/Jabberwocky.Glass.Autofac.Mvc/Extensions/MvcRegistrationExtensions.cs index e8605e7..b048a71 100644 --- a/Jabberwocky.Glass.Autofac.Mvc/Extensions/MvcRegistrationExtensions.cs +++ b/Jabberwocky.Glass.Autofac.Mvc/Extensions/MvcRegistrationExtensions.cs @@ -5,7 +5,8 @@ using Glass.Mapper.Sc.ModelCache; using Jabberwocky.Glass.Autofac.Mvc.Models; using Jabberwocky.Glass.Autofac.Mvc.Models.Factory; -using Jabberwocky.Glass.Autofac.Mvc.Services; +using Jabberwocky.Glass.Mvc.Models.Factory; +using Jabberwocky.Glass.Mvc.Services; namespace Jabberwocky.Glass.Autofac.Mvc.Extensions { diff --git a/Jabberwocky.Glass.Autofac.Mvc/Jabberwocky.Glass.Autofac.Mvc.csproj b/Jabberwocky.Glass.Autofac.Mvc/Jabberwocky.Glass.Autofac.Mvc.csproj index 6c26c35..db9ee74 100644 --- a/Jabberwocky.Glass.Autofac.Mvc/Jabberwocky.Glass.Autofac.Mvc.csproj +++ b/Jabberwocky.Glass.Autofac.Mvc/Jabberwocky.Glass.Autofac.Mvc.csproj @@ -99,14 +99,10 @@ - - - - @@ -114,10 +110,6 @@ - - - - @@ -130,6 +122,10 @@ {EA620F62-8D08-4031-BAC4-1C60D5C5CBC9} Jabberwocky.Glass.Autofac + + {dd17db22-247c-44a6-b0dd-091786863626} + Jabberwocky.Glass.Mvc + {13E08D30-B2A4-45EF-A28E-C916EB80B70D} Jabberwocky.Glass diff --git a/Jabberwocky.Glass.Autofac.Mvc/Models/Factory/AutofacViewModelFactory.cs b/Jabberwocky.Glass.Autofac.Mvc/Models/Factory/AutofacViewModelFactory.cs index 2d8bb51..63eb9c1 100644 --- a/Jabberwocky.Glass.Autofac.Mvc/Models/Factory/AutofacViewModelFactory.cs +++ b/Jabberwocky.Glass.Autofac.Mvc/Models/Factory/AutofacViewModelFactory.cs @@ -5,8 +5,9 @@ using Autofac; using Autofac.Core; using Jabberwocky.Glass.Autofac.Mvc.Models.Attributes; -using Jabberwocky.Glass.Autofac.Mvc.Services; using Jabberwocky.Glass.Models; +using Jabberwocky.Glass.Mvc.Models.Factory; +using Jabberwocky.Glass.Mvc.Services; namespace Jabberwocky.Glass.Autofac.Mvc.Models.Factory { diff --git a/Jabberwocky.Glass.Autofac.Mvc/Models/GlassViewModel.cs b/Jabberwocky.Glass.Autofac.Mvc/Models/GlassViewModel.cs index 2b54f28..d29a661 100644 --- a/Jabberwocky.Glass.Autofac.Mvc/Models/GlassViewModel.cs +++ b/Jabberwocky.Glass.Autofac.Mvc/Models/GlassViewModel.cs @@ -1,4 +1,5 @@ using Jabberwocky.Glass.Models; +using Jabberwocky.Glass.Mvc.Models; namespace Jabberwocky.Glass.Autofac.Mvc.Models { @@ -7,9 +8,9 @@ public abstract class GlassViewModel : InjectableGlassViewModelBase public virtual TGlassModel GlassModel => InternalDatasourceModel as TGlassModel; } - public abstract class GlassViewModel : GlassViewModel - where TDatasource : class, IGlassBase where TRenderingParameter : class - { - public virtual TRenderingParameter RenderingParameters => InternalRenderingParameterModel as TRenderingParameter; - } + public abstract class GlassViewModel : GlassViewModel + where TDatasource : class, IGlassBase where TRenderingParameter : class + { + public virtual TRenderingParameter RenderingParameters => InternalRenderingParameterModel as TRenderingParameter; + } } diff --git a/Jabberwocky.Glass.Autofac.Mvc/Models/InjectableGlassViewModelBase.cs b/Jabberwocky.Glass.Autofac.Mvc/Models/InjectableGlassViewModelBase.cs index de38c10..4cfa1d8 100644 --- a/Jabberwocky.Glass.Autofac.Mvc/Models/InjectableGlassViewModelBase.cs +++ b/Jabberwocky.Glass.Autofac.Mvc/Models/InjectableGlassViewModelBase.cs @@ -1,9 +1,9 @@ -namespace Jabberwocky.Glass.Autofac.Mvc.Models +namespace Jabberwocky.Glass.Autofac.Mvc.Models { public abstract class InjectableGlassViewModelBase { internal object InternalDatasourceModel; - internal object InternalRenderingParameterModel; + internal object InternalRenderingParameterModel; } } diff --git a/Jabberwocky.Glass.Autofac.Mvc/Pipelines/Processors/GetModelFromViewProcessor.cs b/Jabberwocky.Glass.Autofac.Mvc/Pipelines/Processors/GetModelFromViewProcessor.cs index a6fda69..8f793c1 100644 --- a/Jabberwocky.Glass.Autofac.Mvc/Pipelines/Processors/GetModelFromViewProcessor.cs +++ b/Jabberwocky.Glass.Autofac.Mvc/Pipelines/Processors/GetModelFromViewProcessor.cs @@ -6,7 +6,7 @@ using Sitecore.Diagnostics; using Sitecore.Mvc.Pipelines.Response.GetModel; using Glass.Mapper; -using Jabberwocky.Glass.Autofac.Mvc.Models.Factory; +using Jabberwocky.Glass.Mvc.Models.Factory; using Sitecore.Data.Items; namespace Jabberwocky.Glass.Autofac.Mvc.Pipelines.Processors diff --git a/Jabberwocky.Glass.Autofac.Mvc/Pipelines/Processors/GetModelProcessor.cs b/Jabberwocky.Glass.Autofac.Mvc/Pipelines/Processors/GetModelProcessor.cs index d7d9d0c..61b6208 100644 --- a/Jabberwocky.Glass.Autofac.Mvc/Pipelines/Processors/GetModelProcessor.cs +++ b/Jabberwocky.Glass.Autofac.Mvc/Pipelines/Processors/GetModelProcessor.cs @@ -1,7 +1,7 @@ using System; using Glass.Mapper.Sc.Configuration.Attributes; -using Jabberwocky.Glass.Autofac.Mvc.Models.Factory; using Jabberwocky.Glass.Autofac.Pipelines.Processors; +using Jabberwocky.Glass.Mvc.Models.Factory; using Sitecore.Data; using Sitecore.Data.Items; using Sitecore.Mvc.Configuration; diff --git a/Jabberwocky.Glass.Autofac.Mvc/Services/IRenderingContextService.cs b/Jabberwocky.Glass.Autofac.Mvc/Services/IRenderingContextService.cs deleted file mode 100644 index e8f100c..0000000 --- a/Jabberwocky.Glass.Autofac.Mvc/Services/IRenderingContextService.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System; -using Jabberwocky.Glass.Models; -using Sitecore.Mvc.Presentation; - -namespace Jabberwocky.Glass.Autofac.Mvc.Services -{ - public interface IRenderingContextService - { - Rendering GetCurrentRendering(); - - T GetCurrentRenderingDatasource(DatasourceNestingOptions options = DatasourceNestingOptions.Default) where T : class, IGlassBase; - - T GetCurrentRenderingParameters() where T : class; - - object GetCurrentRenderingParameters(Type renderingParamType); - } - - public enum DatasourceNestingOptions - { - Default, - Never, - Always - } -} diff --git a/Jabberwocky.Glass.Mvc.Tests/Class1.cs b/Jabberwocky.Glass.Mvc.Tests/Class1.cs new file mode 100644 index 0000000..6423e81 --- /dev/null +++ b/Jabberwocky.Glass.Mvc.Tests/Class1.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Jabberwocky.Glass.Mvc.Tests +{ + public class Class1 + { + } +} diff --git a/Jabberwocky.Glass.Autofac.Mvc.Tests/Fakes/Sitecore.Kernel.fakes b/Jabberwocky.Glass.Mvc.Tests/Fakes/Sitecore.Kernel.fakes similarity index 100% rename from Jabberwocky.Glass.Autofac.Mvc.Tests/Fakes/Sitecore.Kernel.fakes rename to Jabberwocky.Glass.Mvc.Tests/Fakes/Sitecore.Kernel.fakes diff --git a/Jabberwocky.Glass.Mvc.Tests/FakesAssemblies/Sitecore.Kernel.7.0.0.0.Fakes.dll b/Jabberwocky.Glass.Mvc.Tests/FakesAssemblies/Sitecore.Kernel.7.0.0.0.Fakes.dll new file mode 100644 index 0000000000000000000000000000000000000000..cfe165fc2504f918f5a92600be5a25d2ea4bf2e8 GIT binary patch literal 37376 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 literal 0 HcmV?d00001 diff --git a/Jabberwocky.Glass.Mvc.Tests/FakesAssemblies/Sitecore.Kernel.7.0.0.0.Fakes.fakesconfig b/Jabberwocky.Glass.Mvc.Tests/FakesAssemblies/Sitecore.Kernel.7.0.0.0.Fakes.fakesconfig new file mode 100644 index 0000000000000000000000000000000000000000..8bae71b464271bc6c83b448cb05e92df03ac367c GIT binary patch literal 54 tcmezWFPI^dp@booA( + + + Sitecore.Kernel.7.0.0.0.Fakes + + + +

Shim type of Sitecore.Data.Items.Item + + + Initializes a new shim instance + + + Initializes a new shim for the given instance + + + Sets the shim of Item.get_Access() + + + Sets the shim of Item.Add(String name, BranchId branchId) + + + Sets the shim of Item.Add(String name, BranchItem branch) + + + Sets the shim of Item.Add(String name, TemplateID templateID) + + + Sets the shim of Item.Add(String name, TemplateItem template) + + + Sets the shim of Item.AddToItemCloningRelationsCache(Item item, ItemUri uri) + + + Define shims for all instances members + + + Sets the shim of Item.get_Access() + + + Sets the shim of Item.Add(String name, BranchId branchId) + + + Sets the shim of Item.Add(String name, BranchItem branch) + + + Sets the shim of Item.Add(String name, TemplateID templateID) + + + Sets the shim of Item.Add(String name, TemplateItem template) + + + Sets the shim of Item.get_Appearance() + + + Sets the shim of Item.get_Axes() + + + Sets the shim of Item.BeginEdit() + + + Sets the shim of Item.get_Branch() + + + Sets the shim of Item.get_BranchId() + + + Sets the shim of Item.set_BranchId(ID value) + + + Sets the shim of Item.get_Branches() + + + Sets the shim of Item.ChangeTemplate(TemplateItem template) + + + Sets the shim of Item.get_Children() + + + Sets the shim of Item.Clone(ID cloneID, Database ownerDatabase) + + + Sets the shim of Item.Clone(Item item) + + + Sets the shim of Item.CloneTo(Item destination) + + + Sets the shim of Item.CloneTo(Item destination, Boolean deep) + + + Sets the shim of Item.CloneTo(Item destination, String name, Boolean deep) + + + Sets the shim of Item.CopyTo(Item destination, String copyName) + + + Sets the shim of Item.CopyTo(Item destination, String copyName, ID copyID, Boolean deep) + + + Sets the shim of Item.get_Database() + + + Sets the shim of Item.Delete() + + + Sets the shim of Item.Delete(Boolean removeBlobs) + + + Sets the shim of Item.DeleteChildren() + + + Sets the shim of Item.get_DisplayName() + + + Sets the shim of Item.Duplicate() + + + Sets the shim of Item.Duplicate(String copyName) + + + Sets the shim of Item.get_Editing() + + + Sets the shim of Item.get_Empty() + + + Sets the shim of Item.EndEdit() + + + Sets the shim of Item.get_Fields() + + + Sets the shim of Item.GetChanges(Boolean force) + + + Sets the shim of Item.GetChildren() + + + Sets the shim of Item.GetChildren(ChildListOptions options) + + + Sets the shim of Item.GetClones() + + + Sets the shim of Item.GetClones(Boolean processChildren) + + + Sets the shim of Item.GetFullChanges() + + + Sets the shim of Item.GetOuterXml(Boolean includeSubitems) + + + Sets the shim of Item.GetOuterXml(ItemSerializerOptions options) + + + Sets the shim of Item.GetProperty(String name) + + + Sets the shim of Item.GetUniqueId() + + + Sets the shim of Item.get_HasChildren() + + + Sets the shim of Item.get_HasClones() + + + Sets the shim of Item.get_Help() + + + Sets the shim of Item.get_ID() + + + Sets the shim of Item.get_InnerData() + + + Sets the shim of Item.get_IsClone() + + + Sets the shim of Item.get_IsEditing() + + + Sets the shim of Item.get_IsItemClone() + + + Sets the shim of Item.get_Key() + + + Sets the shim of Item.get_Language() + + + Sets the shim of Item.get_Languages() + + + Sets the shim of Item.get_Links() + + + Sets the shim of Item.get_Locking() + + + Sets the shim of Item.get_Master() + + + Sets the shim of Item.get_MasterID() + + + Sets the shim of Item.set_MasterID(ID value) + + + Sets the shim of Item.get_Masters() + + + Sets the shim of Item.get_Modified() + + + Sets the shim of Item.MoveTo(Item destination) + + + Sets the shim of Item.get_Name() + + + Sets the shim of Item.set_Name(String value) + + + Sets the shim of Item.get_OriginatorId() + + + Sets the shim of Item.get_Parent() + + + Sets the shim of Item.get_ParentID() + + + Sets the shim of Item.PasteItem(String xml, Boolean changeIDs, PasteMode mode) + + + Sets the shim of Item.Paste(String xml, Boolean changeIDs, PasteMode mode) + + + Sets the shim of Item.get_Paths() + + + Sets the shim of Item.get_Publishing() + + + Sets the shim of Item.Recycle() + + + Sets the shim of Item.RecycleChildren() + + + Sets the shim of Item.RecycleVersion() + + + Sets the shim of Item.RejectChanges() + + + Sets the shim of Item.Reload() + + + Sets the shim of Item.get_RuntimeSettings() + + + Sets the shim of Item.get_Security() + + + Sets the shim of Item.set_Security(ItemSecurity value) + + + Sets the shim of Item.SetChanges(ItemChanges changes) + + + Sets the shim of Item.SetDatabase(Database database) + + + Sets the shim of Item.SetInnerData(Item item) + + + Sets the shim of Item.SetProperty(String name, ID value, ID originalValue) + + + Sets the shim of Item.SetProperty(String name, String value, String originalValue) + + + Sets the shim of Item.get_SharedFieldsSource() + + + Sets the shim of Item.get_Source() + + + Sets the shim of Item.get_SourceUri() + + + Sets the shim of Item.get_State() + + + Sets the shim of Item.get_Statistics() + + + Sets the shim of Item.get_SyncRoot() + + + Sets the shim of Item.get_Template() + + + Sets the shim of Item.get_TemplateID() + + + Sets the shim of Item.set_TemplateID(ID value) + + + Sets the shim of Item.get_TemplateName() + + + Sets the shim of Item.get_Uri() + + + Sets the shim of Item.get_Version() + + + Sets the shim of Item.get_Versions() + + + Sets the shim of Item.get_Visualization() + + + Sets the shim of Item.<Delete>b__1b(ID id) + + + Sets the shim of Item.get_Appearance() + + + Sets the shim of Item.get_Axes() + + + Sets the shim of Item.BeginEdit() + + + Assigns the 'Current' behavior for all methods of the shimmed type + + + Assigns the 'NotImplemented' behavior for all methods of the shimmed type + + + Assigns the behavior for all methods of the shimmed type + + + Binds the members of the interface to the shim. + + + Sets the shim of Item.get_Branch() + + + Sets the shim of Item.get_BranchId() + + + Sets the shim of Item.set_BranchId(ID value) + + + Sets the shim of Item.get_Branches() + + + Sets the shim of Item.ChangeTemplate(TemplateItem template) + + + Sets the shim of Item.get_Children() + + + Sets the shim of Item.Clone(ID cloneID, Database ownerDatabase) + + + Sets the shim of Item.Clone(Item item) + + + Sets the shim of Item.CloneTo(Item destination) + + + Sets the shim of Item.CloneTo(Item destination, Boolean deep) + + + Sets the shim of Item.CloneTo(Item destination, String name, Boolean deep) + + + Sets the shim of Item.Item(ID itemID, ItemData data, Database database) + + + Sets the shim of Item.CopyTo(Item destination, String copyName) + + + Sets the shim of Item.CopyTo(Item destination, String copyName, ID copyID, Boolean deep) + + + Sets the shim of Item.get_Database() + + + Sets the shim of Item.Delete() + + + Sets the shim of Item.Delete(Boolean removeBlobs) + + + Sets the shim of Item.DeleteChildren() + + + Sets the shim of Item.get_DisplayName() + + + Sets the shim of Item.Duplicate() + + + Sets the shim of Item.Duplicate(String copyName) + + + Sets the shim of Item.get_Editing() + + + Sets the shim of Item.get_Empty() + + + Sets the shim of Item.EndEdit() + + + Sets the shim of Item.get_Fields() + + + Sets the shim of Item.GetCacheKey(Item item) + + + Sets the shim of Item.GetChanges(Boolean force) + + + Sets the shim of Item.GetChildren() + + + Sets the shim of Item.GetChildren(ChildListOptions options) + + + Sets the shim of Item.GetClones() + + + Sets the shim of Item.GetClones(Boolean processChildren) + + + Sets the shim of Item.GetClonesInternal(Item item, Boolean processChildren) + + + Sets the shim of Item.GetFullChanges() + + + Sets the shim of Item.GetOuterXml(Boolean includeSubitems) + + + Sets the shim of Item.GetOuterXml(ItemSerializerOptions options) + + + Sets the shim of Item.GetProperty(String name) + + + Sets the shim of Item.GetUniqueId() + + + Sets the shim of Item.get_HasChildren() + + + Sets the shim of Item.get_HasClones() + + + Sets the shim of Item.get_Help() + + + Sets the shim of Item.get_ID() + + + Sets the shim of Item.get_InnerData() + + + Sets the shim of Item.get_IsClone() + + + Sets the shim of Item.get_IsEditing() + + + Sets the shim of Item.IsEmpty(ID itemID, Database database) + + + Sets the shim of Item.get_IsItemClone() + + + Sets the shim of Item.get_Key() + + + Sets the shim of Item.get_Language() + + + Sets the shim of Item.get_Languages() + + + Sets the shim of Item.get_Links() + + + Sets the shim of Item.get_Locking() + + + Sets the shim of Item.get_Master() + + + Sets the shim of Item.get_MasterID() + + + Sets the shim of Item.set_MasterID(ID value) + + + Sets the shim of Item.get_Masters() + + + Sets the shim of Item.get_Modified() + + + Sets the shim of Item.MoveTo(Item destination) + + + Sets the shim of Item.get_Name() + + + Sets the shim of Item.set_Name(String value) + + + Sets the shim of Item.get_OriginatorId() + + + Sets the shim of Item.get_Parent() + + + Sets the shim of Item.get_ParentID() + + + Sets the shim of Item.PasteItem(String xml, Boolean changeIDs, PasteMode mode) + + + Sets the shim of Item.Paste(String xml, Boolean changeIDs, PasteMode mode) + + + Sets the shim of Item.get_Paths() + + + Sets the shim of Item.get_Publishing() + + + Sets the shim of Item.Recycle() + + + Sets the shim of Item.RecycleChildren() + + + Sets the shim of Item.RecycleVersion() + + + Sets the shim of Item.RejectChanges() + + + Sets the shim of Item.Reload() + + + Sets the shim of Item.RemoveItemFromCloningCache(Item item) + + + Sets the shim of Item.get_RuntimeSettings() + + + Sets the shim of Item.get_Security() + + + Sets the shim of Item.set_Security(ItemSecurity value) + + + Sets the shim of Item.SetChanges(ItemChanges changes) + + + Sets the shim of Item.SetDatabase(Database database) + + + Sets the shim of Item.SetInnerData(Item item) + + + Sets the shim of Item.SetProperty(String name, ID value, ID originalValue) + + + Sets the shim of Item.SetProperty(String name, String value, String originalValue) + + + Sets the shim of Item.get_SharedFieldsSource() + + + Sets the shim of Item.get_Source() + + + Sets the shim of Item.get_SourceUri() + + + Sets the shim of Item.get_State() + + + Sets the shim of Item.Item() + + + Sets the shim of Item.get_Statistics() + + + Sets the shim of Item.get_SyncRoot() + + + Sets the shim of Item.get_Template() + + + Sets the shim of Item.get_TemplateID() + + + Sets the shim of Item.set_TemplateID(ID value) + + + Sets the shim of Item.get_TemplateName() + + + Sets the shim of Item.TryGetCacheValue(Item item, ItemUri& itemUri) + + + Sets the shim of Item.get_Uri() + + + Sets the shim of Item.get_Version() + + + Sets the shim of Item.get_Versions() + + + Sets the shim of Item.get_Visualization() + + + Sets the shim of Item.<Delete>b__19(TemplateField f) + + + Sets the shim of Item.<Delete>b__1a(TemplateField f) + + + Sets the shim of Item.<Delete>b__1b(ID id) + + + Sets the shim of Item.<Delete>b__1c(Guid guid) + + + diff --git a/Jabberwocky.Glass.Mvc.Tests/Jabberwocky.Glass.Mvc.Tests.csproj b/Jabberwocky.Glass.Mvc.Tests/Jabberwocky.Glass.Mvc.Tests.csproj new file mode 100644 index 0000000..780dfb5 --- /dev/null +++ b/Jabberwocky.Glass.Mvc.Tests/Jabberwocky.Glass.Mvc.Tests.csproj @@ -0,0 +1,117 @@ + + + + + Debug + AnyCPU + {949B682F-643F-4422-B598-9F5176DB8E2A} + Library + Properties + Jabberwocky.Glass.Mvc.Tests + Jabberwocky.Glass.Mvc.Tests + v4.5.2 + 512 + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll + True + + + ..\packages\Glass.Mapper.Sc.4.0.3.51\lib\net45\Glass.Mapper.dll + True + + + ..\packages\Glass.Mapper.Sc.4.0.3.51\lib\72\Glass.Mapper.Sc.dll + + + ..\packages\Glass.Mapper.Sc.4.0.3.51\lib\Mvc5\Glass.Mapper.Sc.Mvc.dll + + + ..\lib\Sitecore\Testing\HtmlAgilityPack.dll + + + ..\lib\Sitecore\Testing\ITHit.WebDAV.Server.dll + + + ..\lib\Sitecore\Testing\Lucene.Net.dll + + + + ..\lib\Sitecore\Testing\Mvp.Xml.dll + + + ..\packages\NSubstitute.1.8.1.0\lib\net45\NSubstitute.dll + True + + + ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + True + + + ..\lib\Sitecore\Sitecore.Kernel.dll + + + FakesAssemblies\Sitecore.Kernel.7.0.0.0.Fakes.dll + + + ..\lib\Sitecore\Testing\Sitecore.Logging.dll + + + ..\lib\Sitecore\Sitecore.Mvc.dll + + + + + + + + + + + + + + + + + + {dd17db22-247c-44a6-b0dd-091786863626} + Jabberwocky.Glass.Mvc + + + {13e08d30-b2a4-45ef-a28e-c916eb80b70d} + Jabberwocky.Glass + + + + + + + + + + \ No newline at end of file diff --git a/Jabberwocky.Glass.Mvc.Tests/Properties/AssemblyInfo.cs b/Jabberwocky.Glass.Mvc.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..dcc89a0 --- /dev/null +++ b/Jabberwocky.Glass.Mvc.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Jabberwocky.Glass.Mvc.Tests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Jabberwocky.Glass.Mvc.Tests")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("949b682f-643f-4422-b598-9f5176db8e2a")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Jabberwocky.Glass.Autofac.Mvc.Tests/Services/RenderingContextServiceTests.cs b/Jabberwocky.Glass.Mvc.Tests/Services/RenderingContextServiceTests.cs similarity index 98% rename from Jabberwocky.Glass.Autofac.Mvc.Tests/Services/RenderingContextServiceTests.cs rename to Jabberwocky.Glass.Mvc.Tests/Services/RenderingContextServiceTests.cs index f70389c..34c3faa 100644 --- a/Jabberwocky.Glass.Autofac.Mvc.Tests/Services/RenderingContextServiceTests.cs +++ b/Jabberwocky.Glass.Mvc.Tests/Services/RenderingContextServiceTests.cs @@ -1,7 +1,7 @@ -using System; +using System; using Glass.Mapper.Sc; -using Jabberwocky.Glass.Autofac.Mvc.Services; using Jabberwocky.Glass.Models; +using Jabberwocky.Glass.Mvc.Services; using Microsoft.QualityTools.Testing.Fakes; using NSubstitute; using NUnit.Framework; @@ -10,7 +10,7 @@ using Sitecore.Mvc.Common; using Sitecore.Mvc.Presentation; -namespace Jabberwocky.Glass.Autofac.Mvc.Tests.Services +namespace Jabberwocky.Glass.Mvc.Tests.Services { [TestFixture] public class RenderingContextServiceTests diff --git a/Jabberwocky.Glass.Mvc.Tests/app.config b/Jabberwocky.Glass.Mvc.Tests/app.config new file mode 100644 index 0000000..d7256aa --- /dev/null +++ b/Jabberwocky.Glass.Mvc.Tests/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Jabberwocky.Glass.Mvc.Tests/packages.config b/Jabberwocky.Glass.Mvc.Tests/packages.config new file mode 100644 index 0000000..7cc1878 --- /dev/null +++ b/Jabberwocky.Glass.Mvc.Tests/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/Jabberwocky.Glass.Autofac.Mvc/Attributes/HttpGetOrInvalidHttpPostAttribute.cs b/Jabberwocky.Glass.Mvc/Attributes/HttpGetOrInvalidHttpPostAttribute.cs similarity index 91% rename from Jabberwocky.Glass.Autofac.Mvc/Attributes/HttpGetOrInvalidHttpPostAttribute.cs rename to Jabberwocky.Glass.Mvc/Attributes/HttpGetOrInvalidHttpPostAttribute.cs index a837044..302b029 100644 --- a/Jabberwocky.Glass.Autofac.Mvc/Attributes/HttpGetOrInvalidHttpPostAttribute.cs +++ b/Jabberwocky.Glass.Mvc/Attributes/HttpGetOrInvalidHttpPostAttribute.cs @@ -1,8 +1,8 @@ -using System; +using System; using System.Reflection; using System.Web.Mvc; -namespace Jabberwocky.Glass.Autofac.Mvc.Attributes +namespace Jabberwocky.Glass.Mvc.Attributes { [AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = true)] public class HttpGetOrInvalidHttpPostAttribute : ActionMethodSelectorAttribute diff --git a/Jabberwocky.Glass.Autofac.Mvc/Attributes/ValidHttpPostAttribute.cs b/Jabberwocky.Glass.Mvc/Attributes/ValidHttpPostAttribute.cs similarity index 92% rename from Jabberwocky.Glass.Autofac.Mvc/Attributes/ValidHttpPostAttribute.cs rename to Jabberwocky.Glass.Mvc/Attributes/ValidHttpPostAttribute.cs index ae5f698..24444e9 100644 --- a/Jabberwocky.Glass.Autofac.Mvc/Attributes/ValidHttpPostAttribute.cs +++ b/Jabberwocky.Glass.Mvc/Attributes/ValidHttpPostAttribute.cs @@ -1,7 +1,7 @@ using System.Reflection; using System.Web.Mvc; -namespace Jabberwocky.Glass.Autofac.Mvc.Attributes +namespace Jabberwocky.Glass.Mvc.Attributes { public class ValidHttpPostAttribute : ActionMethodSelectorAttribute { diff --git a/Jabberwocky.Glass.Autofac.Mvc/Attributes/ValidateFormHandlerAttribute.cs b/Jabberwocky.Glass.Mvc/Attributes/ValidateFormHandlerAttribute.cs similarity index 95% rename from Jabberwocky.Glass.Autofac.Mvc/Attributes/ValidateFormHandlerAttribute.cs rename to Jabberwocky.Glass.Mvc/Attributes/ValidateFormHandlerAttribute.cs index 98d1a84..96a2dd4 100644 --- a/Jabberwocky.Glass.Autofac.Mvc/Attributes/ValidateFormHandlerAttribute.cs +++ b/Jabberwocky.Glass.Mvc/Attributes/ValidateFormHandlerAttribute.cs @@ -2,7 +2,7 @@ using System.Reflection; using System.Web.Mvc; -namespace Jabberwocky.Glass.Autofac.Mvc.Attributes +namespace Jabberwocky.Glass.Mvc.Attributes { public class ValidateFormHandlerAttribute : ActionMethodSelectorAttribute { diff --git a/Jabberwocky.Glass.Mvc/Jabberwocky.Glass.Mvc.csproj b/Jabberwocky.Glass.Mvc/Jabberwocky.Glass.Mvc.csproj new file mode 100644 index 0000000..59a8208 --- /dev/null +++ b/Jabberwocky.Glass.Mvc/Jabberwocky.Glass.Mvc.csproj @@ -0,0 +1,122 @@ + + + + + Debug + AnyCPU + {DD17DB22-247C-44A6-B0DD-091786863626} + Library + Properties + Jabberwocky.Glass.Mvc + Jabberwocky.Glass.Mvc + v4.5 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll + True + + + ..\packages\Glass.Mapper.Sc.4.0.3.51\lib\net45\Glass.Mapper.dll + True + + + ..\packages\Glass.Mapper.Sc.4.0.3.51\lib\80\Glass.Mapper.Sc.dll + + + ..\packages\Glass.Mapper.Sc.4.0.3.51\lib\Mvc5\Glass.Mapper.Sc.Mvc.dll + + + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + True + + + ..\lib\Sitecore\Sitecore.Kernel.dll + + + ..\lib\Sitecore\Sitecore.Mvc.dll + + + + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll + True + + + ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll + True + + + ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll + True + + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll + True + + + + + + + + + + + + + + + + + + + + + + + + + + + {13e08d30-b2a4-45ef-a28e-c916eb80b70d} + Jabberwocky.Glass + + + + + \ No newline at end of file diff --git a/Jabberwocky.Glass.Autofac.Mvc/Models/Factory/IViewModelFactory.cs b/Jabberwocky.Glass.Mvc/Models/Factory/IViewModelFactory.cs similarity index 63% rename from Jabberwocky.Glass.Autofac.Mvc/Models/Factory/IViewModelFactory.cs rename to Jabberwocky.Glass.Mvc/Models/Factory/IViewModelFactory.cs index 5ca9850..a45e224 100644 --- a/Jabberwocky.Glass.Autofac.Mvc/Models/Factory/IViewModelFactory.cs +++ b/Jabberwocky.Glass.Mvc/Models/Factory/IViewModelFactory.cs @@ -1,6 +1,6 @@ -using System; +using System; -namespace Jabberwocky.Glass.Autofac.Mvc.Models.Factory +namespace Jabberwocky.Glass.Mvc.Models.Factory { public interface IViewModelFactory { diff --git a/Jabberwocky.Glass.Mvc/Properties/AssemblyInfo.cs b/Jabberwocky.Glass.Mvc/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..b7df09a --- /dev/null +++ b/Jabberwocky.Glass.Mvc/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("Jabberwocky.Glass.Mvc")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("Jabberwocky.Glass.Mvc")] +[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("dd17db22-247c-44a6-b0dd-091786863626")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Jabberwocky.Glass.Mvc/Services/DatasourceNestingOptions.cs b/Jabberwocky.Glass.Mvc/Services/DatasourceNestingOptions.cs new file mode 100644 index 0000000..7483ade --- /dev/null +++ b/Jabberwocky.Glass.Mvc/Services/DatasourceNestingOptions.cs @@ -0,0 +1,9 @@ +namespace Jabberwocky.Glass.Mvc.Services +{ + public enum DatasourceNestingOptions + { + Default, + Never, + Always + } +} diff --git a/Jabberwocky.Glass.Mvc/Services/IRenderingContextService.cs b/Jabberwocky.Glass.Mvc/Services/IRenderingContextService.cs new file mode 100644 index 0000000..7e82f94 --- /dev/null +++ b/Jabberwocky.Glass.Mvc/Services/IRenderingContextService.cs @@ -0,0 +1,17 @@ +using System; +using Jabberwocky.Glass.Models; +using Sitecore.Mvc.Presentation; + +namespace Jabberwocky.Glass.Mvc.Services +{ + public interface IRenderingContextService + { + Rendering GetCurrentRendering(); + + T GetCurrentRenderingDatasource(DatasourceNestingOptions options = DatasourceNestingOptions.Default) where T : class, IGlassBase; + + T GetCurrentRenderingParameters() where T : class; + + object GetCurrentRenderingParameters(Type renderingParamType); + } +} \ No newline at end of file diff --git a/Jabberwocky.Glass.Autofac.Mvc/Services/RenderingContextService.cs b/Jabberwocky.Glass.Mvc/Services/RenderingContextService.cs similarity index 98% rename from Jabberwocky.Glass.Autofac.Mvc/Services/RenderingContextService.cs rename to Jabberwocky.Glass.Mvc/Services/RenderingContextService.cs index 39550bc..b94b95f 100644 --- a/Jabberwocky.Glass.Autofac.Mvc/Services/RenderingContextService.cs +++ b/Jabberwocky.Glass.Mvc/Services/RenderingContextService.cs @@ -1,12 +1,12 @@ -using System; +using System; using System.Collections.Concurrent; +using System.Linq; using System.Reflection; -using Sitecore.Mvc.Presentation; using Glass.Mapper.Sc; -using System.Linq; using Jabberwocky.Glass.Models; +using Sitecore.Mvc.Presentation; -namespace Jabberwocky.Glass.Autofac.Mvc.Services +namespace Jabberwocky.Glass.Mvc.Services { public class RenderingContextService : IRenderingContextService { diff --git a/Jabberwocky.Glass.Autofac.Mvc/Util/CustomSitecoreHelper.cs b/Jabberwocky.Glass.Mvc/Util/CustomSitecoreHelper.cs similarity index 88% rename from Jabberwocky.Glass.Autofac.Mvc/Util/CustomSitecoreHelper.cs rename to Jabberwocky.Glass.Mvc/Util/CustomSitecoreHelper.cs index e8f4fa1..3ac4806 100644 --- a/Jabberwocky.Glass.Autofac.Mvc/Util/CustomSitecoreHelper.cs +++ b/Jabberwocky.Glass.Mvc/Util/CustomSitecoreHelper.cs @@ -1,11 +1,11 @@ -using System.Web; +using System.Web; using System.Web.Mvc; using System.Web.Mvc.Html; -using Jabberwocky.Glass.Autofac.Mvc.Attributes; +using Jabberwocky.Glass.Mvc.Attributes; using Sitecore.Mvc.Extensions; using Sitecore.Mvc.Helpers; -namespace Jabberwocky.Glass.Autofac.Mvc.Util +namespace Jabberwocky.Glass.Mvc.Util { public class CustomSitecoreHelper : SitecoreHelper { diff --git a/Jabberwocky.Glass.Autofac.Mvc/Views/CustomGlassView.cs b/Jabberwocky.Glass.Mvc/Views/CustomGlassView.cs similarity index 85% rename from Jabberwocky.Glass.Autofac.Mvc/Views/CustomGlassView.cs rename to Jabberwocky.Glass.Mvc/Views/CustomGlassView.cs index c9cfa1c..e968623 100644 --- a/Jabberwocky.Glass.Autofac.Mvc/Views/CustomGlassView.cs +++ b/Jabberwocky.Glass.Mvc/Views/CustomGlassView.cs @@ -1,9 +1,9 @@ -using System.Web.Mvc; +using System.Web.Mvc; using Glass.Mapper.Sc.Configuration.Attributes; using Glass.Mapper.Sc.Web.Mvc; -using Jabberwocky.Glass.Autofac.Mvc.Models.Factory; +using Jabberwocky.Glass.Mvc.Models.Factory; -namespace Jabberwocky.Glass.Autofac.Mvc.Views +namespace Jabberwocky.Glass.Mvc.Views { public abstract class CustomGlassView : GlassView where TModel : class { diff --git a/Jabberwocky.Glass.Mvc/app.config b/Jabberwocky.Glass.Mvc/app.config new file mode 100644 index 0000000..22b850b --- /dev/null +++ b/Jabberwocky.Glass.Mvc/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/Jabberwocky.Glass.Mvc/packages.config b/Jabberwocky.Glass.Mvc/packages.config new file mode 100644 index 0000000..d1679b0 --- /dev/null +++ b/Jabberwocky.Glass.Mvc/packages.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Jabberwocky.Glass.Tests/Jabberwocky.Glass.Tests.csproj b/Jabberwocky.Glass.Tests/Jabberwocky.Glass.Tests.csproj index 84eb1f5..fe6eb66 100644 --- a/Jabberwocky.Glass.Tests/Jabberwocky.Glass.Tests.csproj +++ b/Jabberwocky.Glass.Tests/Jabberwocky.Glass.Tests.csproj @@ -57,6 +57,13 @@ False ..\packages\NUnit.2.6.4\lib\nunit.framework.dll + + False + ..\lib\Sitecore\Sitecore.Kernel.dll + + + ..\lib\Sitecore\Sitecore.Mvc.dll + diff --git a/Jabberwocky.sln b/Jabberwocky.sln index 4491bc7..d1c859e 100644 --- a/Jabberwocky.sln +++ b/Jabberwocky.sln @@ -60,6 +60,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jabberwocky.Glass.Autofac.W EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jabberwocky.Autofac.Tests", "Jabberwocky.Autofac.Tests\Jabberwocky.Autofac.Tests.csproj", "{87913926-895A-422B-B462-EF685DCAE215}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jabberwocky.Glass.Mvc", "Jabberwocky.Glass.Mvc\Jabberwocky.Glass.Mvc.csproj", "{DD17DB22-247C-44A6-B0DD-091786863626}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Jabberwocky.Glass.Mvc.Tests", "Jabberwocky.Glass.Mvc.Tests\Jabberwocky.Glass.Mvc.Tests.csproj", "{949B682F-643F-4422-B598-9F5176DB8E2A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -142,6 +146,14 @@ Global {87913926-895A-422B-B462-EF685DCAE215}.Debug|Any CPU.Build.0 = Debug|Any CPU {87913926-895A-422B-B462-EF685DCAE215}.Release|Any CPU.ActiveCfg = Release|Any CPU {87913926-895A-422B-B462-EF685DCAE215}.Release|Any CPU.Build.0 = Release|Any CPU + {DD17DB22-247C-44A6-B0DD-091786863626}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD17DB22-247C-44A6-B0DD-091786863626}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD17DB22-247C-44A6-B0DD-091786863626}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD17DB22-247C-44A6-B0DD-091786863626}.Release|Any CPU.Build.0 = Release|Any CPU + {949B682F-643F-4422-B598-9F5176DB8E2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {949B682F-643F-4422-B598-9F5176DB8E2A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {949B682F-643F-4422-B598-9F5176DB8E2A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {949B682F-643F-4422-B598-9F5176DB8E2A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -169,5 +181,7 @@ Global {44DB88AB-C38E-4CAE-ADA0-BC64778A1D4A} = {338A9D71-3ED1-4E69-AC1B-E5033846B3A4} {86B4E810-DCA7-4510-BA2B-EC1DDA9CB7FE} = {FF1D41BA-5DE4-49CC-8CFF-08B1BF700C3D} {87913926-895A-422B-B462-EF685DCAE215} = {7EF6690B-FB53-4BC9-A915-93E893FE3225} + {DD17DB22-247C-44A6-B0DD-091786863626} = {FF1D41BA-5DE4-49CC-8CFF-08B1BF700C3D} + {949B682F-643F-4422-B598-9F5176DB8E2A} = {7EF6690B-FB53-4BC9-A915-93E893FE3225} EndGlobalSection EndGlobal From b951826fea7fdc084d9ca62c21db5ceec54e157d Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Mon, 27 Jun 2016 16:06:34 -0400 Subject: [PATCH 5/8] Removing unnecessary class from the new test project. --- Jabberwocky.Glass.Mvc.Tests/Class1.cs | 12 ------------ .../Jabberwocky.Glass.Mvc.Tests.csproj | 4 +++- 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 Jabberwocky.Glass.Mvc.Tests/Class1.cs diff --git a/Jabberwocky.Glass.Mvc.Tests/Class1.cs b/Jabberwocky.Glass.Mvc.Tests/Class1.cs deleted file mode 100644 index 6423e81..0000000 --- a/Jabberwocky.Glass.Mvc.Tests/Class1.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Jabberwocky.Glass.Mvc.Tests -{ - public class Class1 - { - } -} diff --git a/Jabberwocky.Glass.Mvc.Tests/Jabberwocky.Glass.Mvc.Tests.csproj b/Jabberwocky.Glass.Mvc.Tests/Jabberwocky.Glass.Mvc.Tests.csproj index 780dfb5..91c85db 100644 --- a/Jabberwocky.Glass.Mvc.Tests/Jabberwocky.Glass.Mvc.Tests.csproj +++ b/Jabberwocky.Glass.Mvc.Tests/Jabberwocky.Glass.Mvc.Tests.csproj @@ -87,7 +87,6 @@ - @@ -106,6 +105,9 @@ + + +