Merge pull request SparkViewEngine#47 from bobpace/fixSharingGraph

Wired up the IPartialReferenceProvider so it can be provided via the container like the other services that feed the spark engine can

Author: RobertTheGrey

src/Spark.Tests/BatchCompilationTester.cs

@@ -13,6 +13,7 @@
 // limitations under the License.
 // 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;

src/Spark.Tests/PartialProviderTester.cs

@@ -0,0 +1,53 @@
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Spark.Tests
+{
+    [TestFixture]
+    public class PartialProviderTester
+    {
+        private SparkViewEngine _engine;
+        private IPartialProvider _partialProvider;
+        private string _viewPath;
+        private string[] _result;
+
+        [SetUp]
+        public void Init()
+        {
+            _viewPath = "fake/path";
+            _partialProvider = MockRepository.GenerateMock<IPartialProvider>();
+            _engine = new SparkViewEngine(new SparkSettings())
+            {
+                PartialProvider = _partialProvider
+            };
+            _result = new[] {"output"};
+        }
+
+        [Test]
+        public void DefaultPartialReferenceProviderWrapsPartialProvider()
+        {
+            _partialProvider.Expect(x => x.GetPaths(_viewPath)).Return(_result);
+            var output = _engine.PartialReferenceProvider.GetPaths(_viewPath, true);
+            _partialProvider.VerifyAllExpectations();
+            Assert.AreEqual(_result, output);
+        }
+
+        [Test]
+        public void SettingNewPartialProviderPropogatesToDefaultPartialProvider()
+        {
+            var differentPartialProvider = MockRepository.GenerateMock<IPartialProvider>();
+            _engine.PartialProvider = differentPartialProvider;
+
+            //should not call the original
+            _partialProvider.Expect(x => x.GetPaths(_viewPath)).Repeat.Never();
+
+            //should call the newly provided instance
+            differentPartialProvider.Expect(x => x.GetPaths(_viewPath)).Return(_result);
+
+            var output = _engine.PartialReferenceProvider.GetPaths(_viewPath, true);
+            _partialProvider.VerifyAllExpectations();
+            differentPartialProvider.VerifyAllExpectations();
+            Assert.AreEqual(_result, output);
+        }
+    }
+}

src/Spark.Tests/Spark.Tests.csproj

@@ -106,6 +106,7 @@
     <Compile Include="Parser\CharGrammarTester.cs" />
     <Compile Include="Parser\JavascriptAnonymousTypeGrammarTester.cs" />
     <Compile Include="Parser\OffsetGrammarTester.cs" />
+    <Compile Include="PartialProviderTester.cs" />
     <Compile Include="Precompiled\ComplexPrecompileController.cs" />
     <Compile Include="Precompiled\SimplePrecompileController.cs" />
     <Compile Include="Compiler\SourceMappingTester.cs" />

src/Spark.Tests/SparkServiceContainerTester.cs

@@ -43,6 +43,9 @@ public void ContainerCreatesDefaultServices()
 
             var partialProvider = container.GetService<IPartialProvider>();
             Assert.IsInstanceOf(typeof(DefaultPartialProvider), partialProvider);
+
+            var partialReferenceProvider = container.GetService<IPartialReferenceProvider>();
+            Assert.IsInstanceOf(typeof(DefaultPartialReferenceProvider), partialReferenceProvider);
         }
 
         [Test]

src/Spark/DefaultPartialReferenceProvider.cs

@@ -1,19 +1,26 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-
+using System;
+using System.Collections.Generic;
+
 namespace Spark
 {
     public class DefaultPartialReferenceProvider : IPartialReferenceProvider
-    {
-        private IPartialProvider _proxy;
-        public DefaultPartialReferenceProvider()
-        {
-            _proxy = new DefaultPartialProvider();
-        }
-        public IEnumerable<string> GetPaths(string viewPath, bool allowCustomReferencePath)
-        {
-            return _proxy.GetPaths(viewPath);
+    {
+        private readonly Func<IPartialProvider> _getProvider = () => null;
+
+        public DefaultPartialReferenceProvider(IPartialProvider partialProvider)
+            : this(() => partialProvider)
+        {
+        }
+
+        public DefaultPartialReferenceProvider(Func<IPartialProvider> getProvider)
+        {
+            _getProvider = getProvider;
+        }
+
+        public IEnumerable<string> GetPaths(string viewPath, bool allowCustomReferencePath)
+        {
+            var provider = _getProvider() ?? new DefaultPartialProvider();
+            return provider.GetPaths(viewPath);
         }
     }
 }

src/Spark/Parser/ViewLoader.cs

@@ -68,13 +68,14 @@ public IPartialProvider PartialProvider
             }
             set { partialProvider = value; }
         }
+
         public IPartialReferenceProvider PartialReferenceProvider
         {
             get
             {
                 if (partialReferenceProvider == null)
                 {
-                    partialReferenceProvider = new DefaultPartialReferenceProvider();
+                    partialReferenceProvider = new DefaultPartialReferenceProvider(() => PartialProvider);
                 };
                 return partialReferenceProvider;
             }

src/Spark/SparkServiceContainer.cs

@@ -54,6 +54,7 @@ public SparkServiceContainer(ISparkSettings settings)
                     {typeof (IViewFolder), CreateDefaultViewFolder},
                     {typeof (ICompiledViewHolder), c => new CompiledViewHolder()},
                     {typeof (IPartialProvider), c => new DefaultPartialProvider()},
+                    {typeof (IPartialReferenceProvider), c => new DefaultPartialReferenceProvider(c.GetService<IPartialProvider>())},
                 };
 
 

src/Spark/SparkViewEngine.cs

@@ -54,6 +54,7 @@ public void Initialize(ISparkServiceContainer container)
             TemplateLocator = container.GetService<ITemplateLocator>();
             CompiledViewHolder = container.GetService<ICompiledViewHolder>();
             PartialProvider = container.GetService<IPartialProvider>();
+            PartialReferenceProvider = container.GetService<IPartialReferenceProvider>();
             SetViewFolder(container.GetService<IViewFolder>());
         }
 
@@ -105,13 +106,14 @@ public IPartialProvider PartialProvider
             }
             set { _partialProvider = value; }
         }
+
         private IPartialReferenceProvider _partialReferenceProvider;
         public IPartialReferenceProvider PartialReferenceProvider
         {
             get
             {
                 if (_partialReferenceProvider == null)
-                    _partialReferenceProvider = new DefaultPartialReferenceProvider();
+                    _partialReferenceProvider = new DefaultPartialReferenceProvider(() => PartialProvider);
                 return _partialReferenceProvider;
             }
             set { _partialReferenceProvider = value; }