Address feedback

OrchardCoreContrib · Dec 1, 2023 · 5fcaa5a · 5fcaa5a
1 parent eb1105b
commit 5fcaa5a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/src/OrchardCoreContrib.Liquid/Environment.cs b/src/OrchardCoreContrib.Liquid/Environment.cs
@@ -0,0 +1,12 @@
+using Fluid.Values;
+
+namespace OrchardCoreContrib.Liquid;
+
+public class Environment
+{
+    public BooleanValue IsDevelopment { get; set; }
+
+    public BooleanValue IsStaging { get; set; }
+
+    public BooleanValue IsProduction { get; set; }
+}
diff --git a/src/OrchardCoreContrib.Liquid/LiquidEnvironmentAccessor.cs b/src/OrchardCoreContrib.Liquid/LiquidEnvironmentAccessor.cs
diff --git a/src/OrchardCoreContrib.Liquid/Startup.cs b/src/OrchardCoreContrib.Liquid/Startup.cs
@@ -16,21 +16,18 @@ public Startup(IHostEnvironment hostEnvironment)
 
     public override void ConfigureServices(IServiceCollection services)
     {
-        services.Configure<TemplateOptions>(o =>
+        var environment = new Environment
         {
-            o.Scope.SetValue("Environment", new ObjectValue(new LiquidEnvironmentAccessor()));
-            o.MemberAccessStrategy.Register<LiquidEnvironmentAccessor, FluidValue>((obj, name, context) =>
-            {
-                FluidValue result = name switch
-                {
-                    "IsDevelopment" => BooleanValue.Create(_hostEnvironment.IsDevelopment()),
-                    "IsStaging" => BooleanValue.Create(_hostEnvironment.IsStaging()),
-                    "IsProduction" => BooleanValue.Create(_hostEnvironment.IsProduction()),
-                    _ => NilValue.Instance
-                };
+            IsDevelopment = BooleanValue.Create(_hostEnvironment.IsDevelopment()),
+            IsStaging = BooleanValue.Create(_hostEnvironment.IsStaging()),
+            IsProduction = BooleanValue.Create(_hostEnvironment.IsProduction())
+        };
 
-                return result;
-            });
+        services.Configure<TemplateOptions>(options =>
+        {
+            options.Scope.SetValue("Environment", new ObjectValue(environment));
+
+            options.MemberAccessStrategy.Register<Environment>();
         });
     }
 }