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

Issue82a #86

Closed
wants to merge 3 commits into from
Closed

Issue82a #86

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd22052
edits
jverzani Nov 3, 2018
ff3bb34
address issue #82, comment on issue #83
jverzani Nov 3, 2018
0b72d2b
fix fix for #82
jverzani Nov 5, 2018
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: 22 additions & 9 deletions src/tokens.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,8 +449,8 @@ function renderTokensByValue(value, io, token, writer, context, template)
end

## Helper function for dispatch based on value in renderTokens
function _renderTokensByValue(value::Dict, io, token, writer, context, template)
renderTokens(io, token.collector, writer, ctx_push(context, value), template)
function _renderTokensByValue(value::AbstractDict, io, token, writer, context, template)
renderTokens(io, token.collector, writer, ctx_push(context, value), template)
end


Expand Down Expand Up @@ -543,12 +543,10 @@ function renderTokens(io, tokens, writer, context, template)
token = tokens[i]
tokenValue = token.value


if token._type == "#" || token._type == "|"
## iterate over value if Dict, Array or DataFrame,
## or display conditionally
value = lookup(context, tokenValue)

if !isa(value, AnIndex)
context = Context(value, context)
end
Expand All @@ -573,19 +571,22 @@ function renderTokens(io, tokens, writer, context, template)
elseif token._type == ">"
## partials: desc: Each line of the partial should be indented before rendering.
fname = stripWhitespace(tokenValue)
value = lookup(context, tokenValue)

tpl_string = ""

if isfile(fname)
found_partial = true
indent = token.indent
buf = IOBuffer()
for (rowno, l) in enumerate(eachline(fname, keep=true))
# we don't strip indent from first line, so we don't indent that
print(buf, rowno > 0 ? indent : "", l)
end
renderTokens(io, parse(String(take!(buf))), writer, context, template)
close(buf)
tpl_string = String(take!(buf))
else
value = lookup(context, fname)
if !falsy(value)

indent = token.indent
slashn = ""
# don't indent if last \n
Expand All @@ -596,12 +597,24 @@ function renderTokens(io, tokens, writer, context, template)
buf = IOBuffer()
l = split(value, r"[\n]")
print(buf, indent*join(l, "\n"*indent))
tpl = String(take!(buf)) * slashn
renderTokens(io, parse(tpl), writer, context, template)
tpl_string = String(take!(buf)) * slashn
close(buf)
end
end

if tpl_string != ""
## Delimiters set in a parent template should not affect a partial.
## Delimiters set in a partial should not affect the parent template.
tpl = parse(tpl_string, ("{{", "}}"))
## Issue 82, what context to pass along to the partial
## this makes "scope" of partial just the immediate value, not
## the parent
renderTokens(io, tpl, writer, Context(context.view,nothing), template)
else
# can't find partial. Issue #83 requests signal, but this doesn't
# seem to match spec. Signal would go here.
end

elseif token._type == "<"
## partials without parse
fname = stripWhitespace(tokenValue)
Expand Down