Skip to content
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

Jump to bottom

Update Handlebars Transformer logic (ReplaceNodeOptions) #1036

Merged
merged 12 commits into from
Dec 21, 2023
Merged

Update Handlebars Transformer logic (ReplaceNodeOptions) #1036

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e4d360d
Update Handlebars Transformer logic (ReplaceNodeOptions)
StefH Dec 9, 2023
bff194e
okeee
StefH Dec 9, 2023
d6e93cb
EvaluateAndKeep = Evaluate
StefH Dec 9, 2023
bd5ef04
fix?
StefH Dec 9, 2023
ac4b648
linux
StefH Dec 9, 2023
bc312d0
_
StefH Dec 10, 2023
25f64cc
tt
StefH Dec 11, 2023
6b9e33b
m
StefH Dec 11, 2023
87571dd
xxx
StefH Dec 15, 2023
33131f8
fx
StefH Dec 15, 2023
35b0bdc
x
StefH Dec 20, 2023
e103c18
fix test
StefH Dec 20, 2023
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
Prev Previous commit
Next Next commit
xxx
  • Loading branch information
@StefH
StefH committed Dec 15, 2023
commit 87571ddb5d4f2c28a36cc17ac8260f66323c2c13
9 changes: 8 additions & 1 deletion src/WireMock.Net/Transformers/Handlebars/HandlebarsContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,14 @@ public HandlebarsContext(IHandlebars handlebars, IFileSystemHandler fileSystemHa
public string ParseAndRender(string text, object model)
{
var template = Handlebars.Compile(text);
return template(model);
var text = template(model);

if (WrappedString.TryDecode(text, out var decoded))
{
return (true, decoded);
}

return text;
}

public object? ParseAndEvaluate(string text, object model)
Expand Down
4 changes: 2 additions & 2 deletions src/WireMock.Net/Transformers/Transformer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ private static (bool IsConverted, object ConvertedValue) TryConvert(ReplaceNodeO

if (options == ReplaceNodeOptions.Evaluate)
{
if (valueAsString != null && StringEncoder.TryDecode(valueAsString, out var decoded))
if (valueAsString != null && WrappedString.TryDecode(valueAsString, out var decoded))
{
return (true, decoded);
}
Expand All @@ -324,7 +324,7 @@ private static (bool IsConverted, object ConvertedValue) TryConvert(ReplaceNodeO

if (valueAsString != null)
{
return StringEncoder.TryDecode(valueAsString, out var decoded) ?
return WrappedString.TryDecode(valueAsString, out var decoded) ?
(true, decoded) :
StringUtils.TryConvertToKnownType(valueAsString);
}
Expand Down
14 changes: 7 additions & 7 deletions src/WireMock.Net/WireMock.Net.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
Expand Down Expand Up @@ -189,13 +189,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Handlebars.Net.Helpers" Version="2.4.1.2-ci-18050" />
<PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.4.1.2-ci-18050" />
<PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.4.1.2-ci-18050" />
<PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.4.1.2-ci-18050" />
<PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.4.1.2-ci-18050" />
<PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.4.1.2-ci-18050" />
<PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.4.1.2-ci-18050" />
<PackageReference Include="Handlebars.Net.Helpers" Version="2.4.1.3" />
<PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.4.1.23" />
<PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.4.1.23" />
<PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.4.1.3" />
<PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.4.1.3" />
<PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.4.1.3" />
<PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.4.1.3" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading