close issue #114 (#115)

Project.toml

@@ -1,6 +1,6 @@
 name = "Mustache"
 uuid = "ffc61752-8dc7-55ee-8c37-f3e9cdd09e70"
-version = "1.0.2"
+version = "1.0.3"
 
 [deps]
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"

src/tokens.jl

@@ -256,6 +256,7 @@ function make_tokens(template, tags)
         scan_past!(io, rtags)
 
         # what kinda tag did we get?
+        token_value = stripWhitespace(token_value)
         _type = token_value[1:1]
         if _type in  ("#", "^", "/", ">", "<", "!", "|", "=", "{", "&")
             # type is first, we peel it off, also strip trailing = and },
@@ -267,6 +268,10 @@ function make_tokens(template, tags)
                 # strip "}" if present in io
                 c = peekchar(io)
                 c == '}' && read(io, Char)
+                # strip "}" if  present in token
+                if token_value[end]=='}'
+                    token_value = token_value[1:end-1]
+                end
             end
 
             if _type == "="
@@ -330,7 +335,6 @@ function make_tokens(template, tags)
             end
 
         end
-
         push!(tokens, text_token)
         push!(tokens, tag_token)
 

test/Mustache_test.jl

@@ -154,8 +154,8 @@ filepath = joinpath(@__DIR__, "test-sections-crlf.tpl")
     tpl = "[[#list]][[ item ]] [[/list]]"
     @test Mustache.render(tpl, v, tags=("[[", "]]")) == "one two "
 
-## Issue 104, bad nesting (needed to pop context)
-tpl1 = mt"""
+    ## Issue 104, bad nesting (needed to pop context)
+    tpl1 = mt"""
 {{#nested.vec}}
 {{.}}
 {{/nested.vec}}
@@ -170,8 +170,10 @@ tpl2 = mt"""
 {{/nested}}
 {{nested.foo}}
 """
-data2 = Dict("nested" => Dict("vec" => [1,2], "foo" => "bar"))
-@test Mustache.render(tpl1, data2) == "1\n2\nbar\n"
-@test Mustache.render(tpl2, data2) == "1\n2\nbar\nbar\n"
+    data2 = Dict("nested" => Dict("vec" => [1,2], "foo" => "bar"))
+    @test Mustache.render(tpl1, data2) == "1\n2\nbar\n"
+    @test Mustache.render(tpl2, data2) == "1\n2\nbar\nbar\n"
 
+    ##  Issue 114 Combine custom tags with no HTML escaping
+    @test Mustache.render("\$[[{JL_VERSION_MATRIX}]]", Dict("JL_VERSION_MATRIX"=>"&"), tags=("\$[[","]]")) == "&"
 end