Fix CreateTag method not public

And add tests
Code52 · Nov 9, 2015 · 4d13480 · 4d13480
1 parent 276934e
commit 4d13480
Show file tree

Hide file tree

Showing 5 changed files with 143 additions and 4 deletions.
diff --git a/src/Pretzel.Logic/Extensibility/Extensions/PostUrlTag.cs b/src/Pretzel.Logic/Extensibility/Extensions/PostUrlTag.cs
@@ -61,7 +61,7 @@ public PostUrlTagFactory()
             : base("PostUrl")
         { }
 
-        internal override ITag CreateTag()
+        public override ITag CreateTag()
         {
             return new PostUrlTag(SiteContext);
         }

diff --git a/src/Pretzel.Logic/Extensibility/TagFactoryBase.cs b/src/Pretzel.Logic/Extensibility/TagFactoryBase.cs
@@ -29,7 +29,7 @@ public DotLiquid.Tag Create()
             return (DotLiquid.Tag)CreateTag();
         }
 
-        internal abstract ITag CreateTag();
+        public abstract ITag CreateTag();
 
         internal void Initialize(SiteContext siteContext)
         {

diff --git a/src/Pretzel.Tests/Templating/Jekyll/LiquidEngineTests.cs b/src/Pretzel.Tests/Templating/Jekyll/LiquidEngineTests.cs
@@ -2124,5 +2124,70 @@ public void Mkd_File_Should_Be_Rendered()
                 Assert.Equal("<h1>Title</h1>", FileSystem.File.ReadAllText(@"D:\Result\_site\2012\01\04\SomeFile.html"));
             }
         }
+        public class Given_Engine_Has_Custom_TagFactory : BakingEnvironment<LiquidEngine>
+        {
+            private const string ConfigContents = "---\r\n title: Site Title\r\n---";
+            private const string PageContent = "---\r\n \r\n---\r\n{% custom %}";
+            private const string ExpectedPageContents = "<p>custom tag: Site Title</p>";
+
+            public override LiquidEngine Given()
+            {
+                return new LiquidEngine();
+            }
+
+            public override void When()
+            {
+                FileSystem.AddFile(@"C:\website\_config.yml", new MockFileData(ConfigContents));
+                FileSystem.AddFile(@"C:\website\index.md", new MockFileData(PageContent));
+                var generator = GetSiteContextGenerator(FileSystem);
+                var context = generator.BuildContext(@"C:\website\", @"C:\website\_site", false);
+                Subject.FileSystem = FileSystem;
+
+                Subject.TagFactories = new List<TagFactoryBase> { new CustomTagFactory() };
+
+                Subject.Process(context);
+            }
+
+            [Fact]
+            public void Page_should_contain_custom_tag()
+            {
+                Assert.Equal(ExpectedPageContents, FileSystem.File.ReadAllText(@"C:\website\_site\index.html").RemoveWhiteSpace());
+            }
+
+            public class CustomTag : DotLiquid.Tag, ITag
+            {
+                private SiteContext _siteContext;
+
+                public new string Name { get { return "Custom"; } }
+
+                public CustomTag(SiteContext siteContext)
+                {
+                    _siteContext = siteContext;
+                }
+
+                public string Custom()
+                {
+                    return string.Format("custom tag: {0}", _siteContext.Config["title"]);
+                }
+
+                public override void Render(DotLiquid.Context context, TextWriter result)
+                {
+                    result.WriteLine(Custom());
+                }
+            }
+
+            public class CustomTagFactory : TagFactoryBase
+            {
+                public CustomTagFactory():base("Custom")
+                {
+
+                }
+
+                public override ITag CreateTag()
+                {
+                    return new CustomTag(this.SiteContext);
+                }
+            }
+        }
     }
 }
diff --git a/src/Pretzel.Tests/Templating/Razor/RazorEngineTests.cs b/src/Pretzel.Tests/Templating/Razor/RazorEngineTests.cs
@@ -309,4 +309,70 @@ public void Posts_Properly_Paginated()
                          FileSystem.File.ReadAllText(@"C:\website\_site\blog\page4\index.html").RemoveWhiteSpace());
         }
     }
+
+    public class Given_Engine_Has_Custom_TagFactory : BakingEnvironment<RazorSiteEngine>
+    {
+        private const string ConfigContents = "---\r\n title: Site Title\r\n---";
+        private const string PageContent = "---\r\n \r\n---\r\n@Tag.Custom()";
+        private const string ExpectedPageContents = "<p>custom tag: Site Title</p>";
+
+        public override RazorSiteEngine Given()
+        {
+            return new RazorSiteEngine();
+        }
+
+        public override void When()
+        {
+            FileSystem.AddFile(@"C:\website\_config.yml", new MockFileData(ConfigContents));
+            FileSystem.AddFile(@"C:\website\index.md", new MockFileData(PageContent));
+            var generator = new SiteContextGenerator(FileSystem, new LinkHelper());
+            var context = generator.BuildContext(@"C:\website\", @"C:\website\_site", false);
+            Subject.FileSystem = FileSystem;
+
+            Subject.TagFactories = new List<TagFactoryBase> { new CustomTagFactory() };
+
+            Subject.Process(context);
+        }
+
+        [Fact]
+        public void Page_should_contain_custom_tag()
+        {
+            Assert.Equal(ExpectedPageContents, FileSystem.File.ReadAllText(@"C:\website\_site\index.html").RemoveWhiteSpace());
+        }
+
+        public class CustomTag : DotLiquid.Tag, ITag
+        {
+            private SiteContext _siteContext;
+
+            public new string Name { get { return "Custom"; } }
+
+            public CustomTag(SiteContext siteContext)
+            {
+                _siteContext = siteContext;
+            }
+
+            public string Custom()
+            {
+                return string.Format("custom tag: {0}", _siteContext.Config["title"]);
+            }
+
+            public override void Render(DotLiquid.Context context, TextWriter result)
+            {
+                result.WriteLine(Custom());
+            }
+        }
+
+        public class CustomTagFactory : TagFactoryBase
+        {
+            public CustomTagFactory() : base("Custom")
+            {
+
+            }
+
+            public override ITag CreateTag()
+            {
+                return new CustomTag(this.SiteContext);
+            }
+        }
+    }
 }
diff --git a/src/Pretzel/Program.cs b/src/Pretzel/Program.cs
@@ -1,7 +1,6 @@
 using NDesk.Options;
 using Pretzel.Commands;
 using Pretzel.Logic.Commands;
-using Pretzel.Logic.Extensibility;
 using Pretzel.Logic.Extensions;
 using System;
 using System.ComponentModel.Composition;
@@ -134,7 +133,16 @@ private void AddScriptCs(AggregateCatalog mainCatalog, string pluginsPath)
                         var scriptCsCatalogMethod = factoryType.GetMethod("CreateScriptCsCatalog");
                         if (scriptCsCatalogMethod != null)
                         {
-                            var catalog = (ComposablePartCatalog)scriptCsCatalogMethod.Invoke(null, new object[] { pluginsPath, new[] { typeof(DotLiquid.Tag), typeof(ITag) } });
+                            var catalog = (ComposablePartCatalog)scriptCsCatalogMethod.Invoke(null, new object[] 
+                                {
+                                    pluginsPath,
+                                    new[] 
+                                    {
+                                        typeof(DotLiquid.Tag),
+                                        typeof(Logic.Extensibility.ITag),
+                                        typeof(Logic.Templating.Context.SiteContext)
+                                    }
+                                });
                             mainCatalog.Catalogs.Add(catalog);
                         }
                         else