Skip to content
This repository has been archived by the owner on Jan 23, 2021. It is now read-only.

Substitute include blocks before preprocessing #114

Merged
merged 144 commits into from
Jan 19, 2021
Merged

Substitute include blocks before preprocessing #114

merged 144 commits into from
Jan 19, 2021

Conversation

emmiegit
Copy link
Member

@emmiegit emmiegit commented Jan 17, 2021 •
edited
Loading

As discussed on the FTML-49 issue and in chat, we will need to parse and substitute [[include]] blocks before preprocessing, tokenization, or any of the other steps. It's unfortunate we can't make use of the regular parse process for this, but it is necessary for compatibility with how Wikidot uses includes, and is implemented here with a goal of minimal intrusiveness.

@emmiegit
Copy link
Member Author

https://scuttle.atlassian.net/browse/FTML-49

Ammon Smith added 26 commits January 16, 2021 23:26
Add start docs to README.
65f754e
Return included pages.
518b340
Export include stuff in lib.rs
bca63c7
Add INCLUDE_REGEX.
8f64116
Require matching full input in pest grammar.
fccbf7d
Start main include parsing code.
d155f10
Add parse() method to PageRef.
3300406
Add docs to PageRef.
396a045
Add docs to IncludeRef.
64277be
Change PageRef construction.
87ec1a5
Fail parse on empty string.
ec59791
Trim input string in PageRef::parse.
1081d79
Add tests for PageRef::parse.
ac8cdcf
Run cargo fmt.
d58a169
Add another test failure.
083e36b
Add todo stubs.
f42788f
Have Includer::include_pages() return Result.
b0a34a7
Add initial page text substitution.
002ce9e
Progress towards parsing include blocks.
c5e8900
Resolve fundamental borrowing issue.
d948c47
Actually append page for return.
3b0cae4
Change IncludeRef construction.
86b4d47
Implement full argument parsing.
874c879
Move includer to separate directory.
99e1596
Add DebugIncluder.
82c4191
Move include test to separate file.
1dbfd9f
@emmiegit
Copy link
Member Author

Updated ftml-http to go through the whole process. Now to update docs regarding it, and make give the README me one more look over.

Ammon Smith added 25 commits January 18, 2021 22:47
Make some more modules public for exposing organized items.
0886d46
Move modules to allow for top-level exports.
561f840
Fix ftml-http build.
3ffa27e
Fix tests.
adbafa7
Remove unused TextInput.
0579296
Update documentation.
e4ec4c7
Expose HtmlRenderOutput.
e1b3930
Have all ftml-http outputs be kebab-case.
98b131e
Add route_render_debug().
16655b1
Add to route.
403db75
Fix ftml-http typing.
1a5fedd
Remove defunct include blocked tests.
330ec63
Rename parser -> parsing, includer -> includes.
612f4bb 
Resolve clippy lint.
Fix build for ftml-http.
bc77d17
Fix tests.
d71f0ca
Zip fetched pages with requests.
e6b9cc9
Construct invalid response error.
06e1f8c
Always return fetched page in server.
78c6200
Use page-ref in sample ftml includer server.
520d0d5
PageRef serializes itself as kebab-case.
43b98e4
Have IncludeRef use kebab-case too.
ad73a6c
Have FetchedPage use kebab-case too...
e078cd2
Fix tests.
d0b0bd4
Run cargo fmt.
eee89cc
Update docs with include entry order change.
d6cf067
@emmiegit emmiegit marked this pull request as ready for review January 19, 2021 05:31
@emmiegit
Copy link
Member Author

Finally, after a long time, [[include]] blocks are replaced properly. This PR has tests for the various cases, block handling if it's not substituted, remote error handling, a sample HTTP server to return page responses, checks for missing and extant pages, and jinja2-like formatting for missing page messages.

@emmiegit emmiegit merged commit b1e881c into master Jan 19, 2021
@emmiegit emmiegit deleted the FTML-49 branch January 19, 2021 05:39
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@emmiegit