Merge remote-tracking branch 'origin-framework/main'

statiqdev · Dec 20, 2022 · 79e6f43 · 79e6f43
2 parents 5c311e4 + f6b50b3
commit 79e6f43
Show file tree

Hide file tree

Showing 4 changed files with 134 additions and 2 deletions.
diff --git a/src/core/Statiq.Core/Modules/Control/ExecuteIf.cs b/src/core/Statiq.Core/Modules/Control/ExecuteIf.cs
@@ -239,7 +239,7 @@ protected override async Task<IEnumerable<IDocument>> ExecuteContextAsync(IExecu
                         }
                     }
                 }
-                else
+                else if (!hasExecuted)
                 {
                     if (await condition.Predicate.GetValueAsync(null, context))
                     {

diff --git a/src/extensions/Statiq.Images/MutateImage.cs b/src/extensions/Statiq.Images/MutateImage.cs
@@ -112,6 +112,18 @@ public MutateImage OutputAsBmp()
             return this;
         }
 
+        /// <summary>
+        /// Outputs the image as WebP. This will override the default
+        /// behavior of outputting the image as the same format.
+        /// </summary>
+        /// <returns>The current module instance.</returns>
+        public MutateImage OutputAsWebp()
+        {
+            _operations.Peek().OutputActions.Add(
+                new OutputAction((i, s) => i.SaveAsWebp(s), x => x.ChangeExtension(".webp")));
+            return this;
+        }
+
         /// <summary>
         /// Allows you to specify an alternate output format for the image.
         /// For example, you might use this if you want to full specify the encoder and it's properties.

diff --git a/src/extensions/Statiq.Images/Statiq.Images.csproj b/src/extensions/Statiq.Images/Statiq.Images.csproj
@@ -4,7 +4,7 @@
     <PackageTags>Statiq Static StaticContent StaticSite Blog BlogEngine Images ImageProcessor</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.4" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\core\Statiq.Common\Statiq.Common.csproj" />

diff --git a/tests/core/Statiq.Core.Tests/Modules/Control/ExecuteIfFixture.cs b/tests/core/Statiq.Core.Tests/Modules/Control/ExecuteIfFixture.cs
@@ -252,6 +252,126 @@ public async Task FalseIfWithContextResultsInCorrectCounts()
                 c.OutputCount.ShouldBe(12);
             }
 
+            [Test]
+            public async Task TrueIfWithFollowingElseIfWithContextResultsInCorrectCounts()
+            {
+                // Given
+                CountModule a = new CountModule("A")
+                {
+                    AdditionalOutputs = 2,
+                    EnsureInputDocument = true
+                };
+                CountModule b = new CountModule("B")
+                {
+                    AdditionalOutputs = 2
+                };
+                CountModule c = new CountModule("C")
+                {
+                    AdditionalOutputs = 3
+                };
+
+                // When
+                await ExecuteAsync(
+                    a,
+                    new ExecuteIf(Config.FromContext(_ => true), b)
+                        .ElseIf(Config.FromContext(_ => true), c));
+
+                // Then
+                a.ExecuteCount.ShouldBe(1);
+                b.ExecuteCount.ShouldBe(1);
+                c.ExecuteCount.ShouldBe(0);
+            }
+
+            [Test]
+            public async Task FalseIfWithFollowingElseIfWithContextResultsInCorrectCounts()
+            {
+                // Given
+                CountModule a = new CountModule("A")
+                {
+                    AdditionalOutputs = 2,
+                    EnsureInputDocument = true
+                };
+                CountModule b = new CountModule("B")
+                {
+                    AdditionalOutputs = 2
+                };
+                CountModule c = new CountModule("C")
+                {
+                    AdditionalOutputs = 3
+                };
+
+                // When
+                await ExecuteAsync(
+                    a,
+                    new ExecuteIf(Config.FromContext(_ => false), b)
+                        .ElseIf(Config.FromContext(_ => true), c));
+
+                // Then
+                a.ExecuteCount.ShouldBe(1);
+                b.ExecuteCount.ShouldBe(0);
+                c.ExecuteCount.ShouldBe(1);
+            }
+
+            [Test]
+            public async Task TrueIfWithFollowingElseWithContextResultsInCorrectCounts()
+            {
+                // Given
+                CountModule a = new CountModule("A")
+                {
+                    AdditionalOutputs = 2,
+                    EnsureInputDocument = true
+                };
+                CountModule b = new CountModule("B")
+                {
+                    AdditionalOutputs = 2
+                };
+                CountModule c = new CountModule("C")
+                {
+                    AdditionalOutputs = 3
+                };
+
+                // When
+                await ExecuteAsync(
+                    a,
+                    new ExecuteIf(Config.FromContext(_ => true), b)
+                        .Else(c));
+
+                // Then
+                a.ExecuteCount.ShouldBe(1);
+                b.ExecuteCount.ShouldBe(1);
+                c.ExecuteCount.ShouldBe(0);
+            }
+
+            [Test]
+            public async Task FalseIfWithFollowingElseWithContextResultsInCorrectCounts()
+            {
+                // Given
+                CountModule a = new CountModule("A")
+                {
+                    AdditionalOutputs = 2,
+                    EnsureInputDocument = true
+                };
+                CountModule b = new CountModule("B")
+                {
+                    AdditionalOutputs = 2
+                };
+                CountModule c = new CountModule("C")
+                {
+                    AdditionalOutputs = 3
+                };
+
+                // When
+                await ExecuteAsync(
+                    a,
+                    new ExecuteIf(Config.FromContext(_ => false), b)
+                        .Else(c));
+
+                // Then
+                a.ExecuteCount.ShouldBe(1);
+                b.ExecuteCount.ShouldBe(0);
+                c.ExecuteCount.ShouldBe(1);
+            }
+
             [Test]
             public async Task UnmatchedDocumentsAreAddedToResults()
             {