Skip to content

Commit c2ab680

Browse files
RoblindeRoblinde
authored
Add missing renderer (#346)
1 parent 681f214 commit c2ab680

File tree

4 files changed

+71
-6
lines changed

4 files changed

+71
-6
lines changed

‎Contentful.AspNetCore/Contentful.AspNetCore.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Description>Official .NET SDK for the Contentful Content Delivery and Management API for ASP.NET core.</Description>
44
<PackageId>contentful.aspnetcore</PackageId>
55
<NeutralLanguage>en-US</NeutralLanguage>
6-
<VersionPrefix>8.0.0</VersionPrefix>
6+
<VersionPrefix>8.0.1</VersionPrefix>
77
<TargetFramework>netstandard2.0</TargetFramework>
88
<Authors>Contentful</Authors>
99
<Copyright>Contentful GmbH.</Copyright>
@@ -13,10 +13,10 @@
1313
<PackageProjectUrl>https://github.com/contentful/contentful.net</PackageProjectUrl>
1414
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1515
<RepositoryType>git</RepositoryType>
16-
<Version>8.0.0</Version>
17-
<AssemblyVersion>8.0.0.0</AssemblyVersion>
16+
<Version>8.0.1</Version>
17+
<AssemblyVersion>8.0.1.0</AssemblyVersion>
1818
<RepositoryUrl>https://github.com/contentful/contentful.net</RepositoryUrl>
19-
<FileVersion>8.0.0.0</FileVersion>
19+
<FileVersion>8.0.1.0</FileVersion>
2020
</PropertyGroup>
2121
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
2222
<DocumentationFile>bin\Release\netstandard1.5\Contentful.AspNetCore.xml</DocumentationFile>
@@ -25,7 +25,7 @@
2525
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
2626
</PropertyGroup>
2727
<ItemGroup>
28-
<PackageReference Include="contentful.csharp" Version="8.0.0" />
28+
<PackageReference Include="contentful.csharp" Version="8.0.1" />
2929
<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
3030
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
3131
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor" Version="2.2.0" />

‎Contentful.Core/Configuration/ContentJsonConverter.cs

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
7474
case "hyperlink":
7575
return jObject.ToObject<Hyperlink>(serializer);
7676
case "asset-hyperlink":
77+
return jObject.ToObject<AssetHyperlink>(serializer);
7778
case "embedded-asset-inline":
7879
case "embedded-asset-block":
7980
return jObject.ToObject<AssetStructure>(serializer);

‎Contentful.Core/Contentful.Core.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<PackageId>contentful.csharp</PackageId>
55
<AssemblyTitle>contentful.net</AssemblyTitle>
66
<NeutralLanguage>en-US</NeutralLanguage>
7-
<VersionPrefix>8.0.0</VersionPrefix>
7+
<VersionPrefix>8.0.1</VersionPrefix>
88
<TargetFramework>netstandard2.0</TargetFramework>
99
<Authors>Contentful</Authors>
1010
<Copyright>Contentful GmbH.</Copyright>

‎Contentful.Core/Models/Authoring.cs

+64
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public HtmlRenderer(HtmlRendererOptions options)
6262
new ListItemContentRenderer(_contentRendererCollection, options.ListItemOptions),
6363
new QuoteContentRenderer(_contentRendererCollection),
6464
new AssetRenderer(_contentRendererCollection),
65+
new AssetHyperlinkRenderer(_contentRendererCollection),
6566
new NullContentRenderer()
6667
});
6768
}
@@ -667,6 +668,69 @@ public async Task<string> RenderAsync(IContent content)
667668
}
668669
}
669670

671+
/// <summary>
672+
/// A renderer for an asset hyperlink.
673+
/// </summary>
674+
public class AssetHyperlinkRenderer : IContentRenderer
675+
{
676+
private readonly ContentRendererCollection _rendererCollection;
677+
678+
/// <summary>
679+
/// Initializes a new AssetHyperlinkRenderer.
680+
/// </summary>
681+
/// <param name="rendererCollection">The collection of renderer to use for sub-content.</param>
682+
public AssetHyperlinkRenderer(ContentRendererCollection rendererCollection)
683+
{
684+
_rendererCollection = rendererCollection;
685+
}
686+
687+
/// <summary>
688+
/// The order of this renderer in the collection.
689+
/// </summary>
690+
public int Order { get; set; } = 100;
691+
692+
/// <summary>
693+
/// Whether or not this renderer supports the provided content.
694+
/// </summary>
695+
/// <param name="content">The content to evaluate.</param>
696+
/// <returns>Returns true if the content is an assethyperlink, otherwise false.</returns>
697+
public bool SupportsContent(IContent content)
698+
{
699+
return content is AssetHyperlink;
700+
}
701+
702+
/// <summary>
703+
/// Renders the content asynchronously.
704+
/// </summary>
705+
/// <param name="content">The content to render.</param>
706+
/// <returns>The a tag.</returns>
707+
public async Task<string> RenderAsync(IContent content)
708+
{
709+
var assetStructure = content as AssetHyperlink;
710+
var asset = assetStructure.Data.Target;
711+
var sb = new StringBuilder();
712+
713+
var url = asset.File?.Url;
714+
sb.Append(string.IsNullOrEmpty(url) ? "<a>" : $"<a href=\"{asset.File.Url}\">");
715+
716+
if (assetStructure.Content != null && assetStructure.Content.Any())
717+
{
718+
foreach (var subContent in assetStructure.Content)
719+
{
720+
var renderer = _rendererCollection.GetRendererForContent(subContent);
721+
sb.Append(await renderer.RenderAsync(subContent));
722+
}
723+
}
724+
else
725+
{
726+
sb.Append(asset.Title);
727+
}
728+
sb.Append("</a>");
729+
730+
return sb.ToString();
731+
}
732+
}
733+
670734
/// <summary>
671735
/// A renderer for a hyperlink.
672736
/// </summary>

0 commit comments

Comments
 (0)