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

Add Liquid and Markdown template rendering and API #19

Merged
merged 85 commits into from
Jan 16, 2020
Merged

Add Liquid and Markdown template rendering and API #19

merged 85 commits into from
Jan 16, 2020

Conversation

jongeorge1
Copy link
Contributor

@jongeorge1 jongeorge1 commented Nov 19, 2019 •
edited
Loading

This branch contains two separate pieces of work:

  1. The addition of rendering engines for Liquid and Markdown templates
  2. The addition of a REST-style API for accessing the underlying functionality.

The first item is not yet complete, but we think it is sensible to create new issues for outstanding/incomplete items so that we can merge this PR back and then create smaller more focussed PRs for them.

mwadams and others added 29 commits November 11, 2019 13:10
@mwadams
WIP - initial commit of the rendering pipeline
7157560
@mwadams
WIP - first rendering spec
5640bd7
@mwadams
Added specs for Markdown rendering.
70bdfdd
@mwadams
Added a content renderer for compound content (i.e. content which ren…
8c7edda 
…derers other content)
@mwadams
Working on content and rendering for the Liquid templating engine.
3361cb5
@mwadams
Added a liquid with markdown renderer.
f13b419
@mwadams
Added a basic spec for liquid rendering.
c470967
@mwadams
Added a spec for Liquid with markdown rendering.
db74362
@mwadams
Updated to use our async fork of the dotliquid renderer.
55736ee
@mwadams
Pushed up async rendering changes.
9e149bb
@mwadams
Removed the not-going-to-work-like-this content renderer.
a9fcdd1
@jongeorge1
Code cleanup using Roslynator
2a3c52c 
Added functions host for API using Menes
Wired up content item GET/POST
@jongeorge1
Some renaming to make things consistent
d11a5b4 
Addition of test bindings to deal with tenancy and hosting
@jongeorge1
Further specs (and service tweaks) to verify etag/if-none-match behav…
e67499e 
…iour

Moved some code around.
@jongeorge1
Roslynator fixes
d08eefd
@jongeorge1
Temporarily disable a LOC that won't compile.
345fa6e
@jongeorge1
Add comments and fix styling rule violations in API specs project.
ae2364e
@jongeorge1
Rework the specs to use the shared content creation/comparison helpers.
6af5a09
@jongeorge1
Roslynator fixes
ba36c30
@jongeorge1
Build pipeline change to install the cosmos emulator
276addb
@jongeorge1
Remove Cosmos emulator from pipeline as it shouldnt be needed
22a9b4d
@jongeorge1
Added command line step to start Cosmos
6f20f3c
@jongeorge1
Quoted exe path
05585b1
@jongeorge1
Another attempt at fixing the Cosmos command
6a347b1
@jongeorge1
Remove Cosmos emulator command and config for root tenant
fb12f01
@jongeorge1
Added cache control header test step
4429392 
A further fix to get specs working in the build
@jongeorge1
Switch to ubuntu build agent and remove function tool installations.
c199ea7
@jongeorge1
Refactor to use Corvus exception handling in the AfterScenario methods.
9013909
@jongeorge1
Removed default feature info
fe145b9
idg10
idg10 reviewed Nov 21, 2019
View reviewed changes
Copy link
Contributor

@idg10 idg10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was a marathon!

Solutions/Marain.ContentManagement.Abstractions/Marain/Cms/CompoundContent.cs Outdated Show resolved Hide resolved
Solutions/Marain.ContentManagement.Abstractions/Marain/Cms/CompoundContent.cs Outdated Show resolved Hide resolved
Solutions/Marain.ContentManagement.Abstractions/Marain/Cms/CompoundContent.cs Outdated Show resolved Hide resolved
Solutions/Marain.ContentManagement.Abstractions/Marain/Cms/CompoundContent.cs Outdated Show resolved Hide resolved
Solutions/Marain.ContentManagement.Abstractions/Marain/Cms/CompoundContent.cs Outdated Show resolved Hide resolved
Solutions/Marain.ContentManagement.SpecHelpers/Drivers/ContentDriver.cs Outdated Show resolved Hide resolved
Solutions/Marain.ContentManagement.SpecHelpers/Marain.ContentManagement.SpecHelpers.csproj Outdated Show resolved Hide resolved
...ons/Marain.ContentManagement.Tenancy.Abstractions/Marain/Cms/ITenantedContentStoreFactory.cs Outdated Show resolved Hide resolved
...in.ContentManagement.Tenancy.AzureCosmos/Marain.ContentManagement.Tenancy.AzureCosmos.csproj Show resolved Hide resolved
...in.ContentManagement.Tenancy.AzureCosmos/Marain.ContentManagement.Tenancy.AzureCosmos.csproj Show resolved Hide resolved
@idg10 idg10 mentioned this pull request Jan 2, 2020
Open
mwadams and others added 22 commits January 9, 2020 12:49
@mwadams
Simplified the conditional assignment expression.
2bba213
@mwadams
Added a comment to explain that we are conciously shallow-copying the…
9ad40cc 
… references.
@mwadams
Refactored the common comparison code for Content into a shared funct…
5435793 
…ion, making the differences somewhat clearer.
@mwadams
Removed unnecessary package reference.
1796918
@mwadams
Fixed the documentation for the TenantedContentStoreFactory for a typ…
ded6c0f 
…o and an inaccuracy.
@mwadams
Renamed ContentDriver to ContentSpecHelpers
513f49c
@mwadams
Factored the ParseSpecValue and standard substitutions into a more ge…
9147578 
…nerically named class as they are not specifically content related.
@mwadams
Throw an ArgumentException if the wrong type of payload is passed to …
0a9e026 
…the renderer.

(This should never happen in a real system, and could possibly be an assertion instead of an exception.)
@mwadams
Improved the description of what the AbTestSetRenderer actually does.
05fc9f1
@mwadams
Improved the descriptions of the other renderers.
1471d36
@mwadams
Simplify the ContentType property.
94ca4f5
@mwadams
Fixed the erroneous copy-n-pasted documentation.
5142825
@jongeorge1
Refactor to make all bindings per feature so that test data can be cr…
a4b8bdf 
…eated per feature. We're hoping that this will avoid breaking the RU limit on the database used for testing.
@jongeorge1
Refactor YAML loading to use existing helper method
18e0558
@jongeorge1
Reworked abstractions to remove ContentWithState, ContentSummaryWithS…
57028b1 
…tate and associated classes and methods from IContentStore. Got the core Specs working; API and associated specs need further work.
@jongeorge1
Rework API specs to match new implementation
1aee6de
@jongeorge1
Correct typos
cac2f13
@jongeorge1
Remove unnecessary pragma warning restores at end of files
8cf69c2
@jongeorge1
Refactor bindings to pull request code into comment methods.
38b283d
@jongeorge1
Cleanup of payload classes.
1d89e82
@jongeorge1
Remove unneeded config setup code in rendering specs.
dd3e74a 
Move rendering specs into Rendering namespace.
@jongeorge1
Remove unnecessary package reference
cdfe08a
@jongeorge1 jongeorge1 mentioned this pull request Jan 15, 2020
Open
mwadams
mwadams reviewed Jan 15, 2020
View reviewed changes
Solutions/Marain.ContentManagement.Api.Host/Marain/Cms/Api/Host/Startup.cs Show resolved Hide resolved
Solutions/Marain.ContentManagement.Api.Services/Marain.ContentManagement.Api.Services.csproj Show resolved Hide resolved
...tions/Marain.ContentManagement.Api.Services/Marain/Cms/Api/Services/ContentSummaryService.cs Show resolved Hide resolved
...s/Marain.ContentManagement.Api.Services/Marain/Cms/Api/Services/Dtos/CreateContentRequest.cs Outdated Show resolved Hide resolved
...ntentManagement.Api.Services/Marain/Cms/Api/Services/Internal/ContentStatesResponseMapper.cs Show resolved Hide resolved
...ntManagement.Api.Services/Marain/Cms/Api/Services/Internal/ContentSummariesResponseMapper.cs Show resolved Hide resolved
Solutions/Marain.ContentManagement.Api.Specs/Bindings/TransientTenantBindings.cs Show resolved Hide resolved
@jongeorge1 jongeorge1 merged commit 5c7bde0 into master Jan 16, 2020
@jongeorge1 jongeorge1 deleted the feature/1-liquid-and-markdown-template-rendering branch January 16, 2020 16:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mwadams mwadams mwadams left review comments

@idg10 idg10 idg10 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jongeorge1 @idg10 @mwadams