Skip to content

Implement allow_false argument for default filter #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebastienros merged 1 commit into from
Dec 2, 2021
+35 −12
Merged

Implement allow_false argument for default filter #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions Fluid.Tests/MiscFiltersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,29 @@ public async Task DefaultReturnsValueIfDefined()
Assert.Equal("foo", result.ToStringValue());
}

[Fact]
public async Task DefaultReturnsDefaultIfNotDefinedOrEmptyOrFalse()
{
foreach (var value in new FluidValue[] { NilValue.Instance, new StringValue(""), BooleanValue.False, ArrayValue.Empty })
{
var arguments = new FilterArguments().Add(new StringValue("bar"));
var context = new TemplateContext();
[Theory]
[InlineData("foo", "foo", "bar", false)]
[InlineData("bar", null, "bar", false)]
[InlineData("bar", false, "bar", false)]
[InlineData("bar", new int[0], "bar", false)]
[InlineData("bar", "", "bar", false)]
[InlineData("bar", "empty", "bar", false)]
[InlineData("foo", "foo", "bar", true)]
[InlineData("bar", null, "bar", true)]
[InlineData("bar", "", "bar", true)]
[InlineData(false, false, "bar", true)]
[InlineData("bar", new int[0], "bar", true)]
[InlineData("bar", "empty", "bar", true)]
public async Task DefaultReturnsDefaultIfNotDefinedOrEmptyOrFalse(object expected, object input, object @default, bool allowFalse)
{
var arguments = new FilterArguments()
.Add("default", FluidValue.Create(@default, TemplateOptions.Default))
.Add("allow_false", FluidValue.Create(allowFalse, TemplateOptions.Default));

var result = await MiscFilters.Default(value, arguments, context);
var context = new TemplateContext();
var result = await MiscFilters.Default("empty" == input as string ? EmptyValue.Instance : FluidValue.Create(input, TemplateOptions.Default), arguments, context);

Assert.Equal("bar", result.ToStringValue());
}
Assert.Equal(expected, result.ToObjectValue());
}

[Fact]
Expand Down
16 changes: 14 additions & 2 deletions Fluid/Filters/MiscFilters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,21 @@ public static ValueTask<FluidValue> Handleize(FluidValue input, FilterArguments

public static ValueTask<FluidValue> Default(FluidValue input, FilterArguments arguments, TemplateContext context)
{
if (input.IsNil() || input == BooleanValue.False || EmptyValue.Instance.Equals(input))
var falseCheck = arguments.HasNamed("allow_false") && arguments["allow_false"] == BooleanValue.True;

if (falseCheck)
{
if (input.IsNil() || EmptyValue.Instance.Equals(input))
{
return arguments.At(0);
}
}
else
{
return arguments.At(0);
if (input.IsNil() || input == BooleanValue.False || EmptyValue.Instance.Equals(input))
{
return arguments.At(0);
}
}

return input;
Expand Down