v0.22.8

GenieFramework · Dec 5, 2019 · 4fa0288 · 4fa0288 · essenciary · Dec 5, 2019
1 parent e604d3e
commit 4fa0288
Show file tree

Hide file tree

Showing 11 changed files with 61 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,17 @@
 # Changelog
 
-## v0.22.5 - 2019-12-04
+## v0.22.8 - 2019-12-05
+
+* more tests
+* support for `if` blocks
+* internal API refactoring
+
+## v0.22.7 - 2019-12-04
 
 * added support for `if` blocks
 * performance optimisations
 
-## v0.22.5 - 2019-12-03
+## v0.22.6 - 2019-12-03
 
 * bug fixes
 * deps update

diff --git a/Manifest.toml b/Manifest.toml
@@ -108,9 +108,9 @@ version = "0.21.0"
 
 [[JuliaInterpreter]]
 deps = ["CodeTracking", "InteractiveUtils", "Random", "UUIDs"]
-git-tree-sha1 = "5bb6a8b09d881c1cbe39bd8135667ed5978168e9"
+git-tree-sha1 = "0bf5e88aa07b9ffe36dca3215642d5d1ea2901cc"
 uuid = "aa1ae85d-cabe-5617-a682-6adf51b2e16a"
-version = "0.7.4"
+version = "0.7.5"
 
 [[LibGit2]]
 uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"

diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Genie"
 uuid = "c43c736e-a2d1-11e8-161f-af95117fbd1e"
 authors = ["Adrian Salceanu <[email protected]>"]
-version = "0.22.7"
+version = "0.22.8"
 
 [deps]
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"

diff --git a/src/Configuration.jl b/src/Configuration.jl
@@ -3,7 +3,7 @@ Core genie configuration / settings functionality.
 """
 module Configuration
 
-const GENIE_VERSION = v"0.22.7"
+const GENIE_VERSION = v"0.22.8"
 
 import Logging
 import Genie

diff --git a/src/Flax.jl b/src/Flax.jl
@@ -23,13 +23,13 @@ const Path = FilePaths.Path
 const FilePath = Union{FilePaths.PosixPath,FilePaths.WindowsPath}
 const filepath = FilePaths.Path
 
-include("HTMLRenderer.jl")
+include("renderers/HTMLRenderer.jl")
 using .HTMLRenderer
 
-include("JSONRenderer.jl")
+include("renderers/JSONRenderer.jl")
 using .JSONRenderer
 
-include("JSRenderer.jl")
+include("renderers/JSRenderer.jl")
 using .JSRenderer
 
 
@@ -248,9 +248,13 @@ Parses special Flax tags.
 function parsetags(line::Tuple{Int,String}) :: String
   parsetags(line[2])
 end
+
+
 function parsetags(code::String) :: String
   code = replace(code, "<%"=>"""<script type="julia/eval">""")
+
   occursin(" if ", code) && (code = replace(code, " if "=>" Flax.@condblock if "))
+
   replace(code, "%>"=>"""</script>""")
 end
 
@@ -337,7 +341,12 @@ end
 
 
 macro condblock(expr)
-  expr.args[2] = esc(:([$([arg for arg in expr.args[2].args if !isa(arg, LineNumberNode)]...),]))
+  # dump(expr)
+
+  expr.args[2] = quote
+    join([$([arg for arg in expr.args[2].args if !isa(arg, LineNumberNode)]...),])
+  end
+
   expr
 end
 

diff --git a/src/Genie.jl b/src/Genie.jl
@@ -17,6 +17,7 @@ import Logging, LoggingExtras
 
 push!(LOAD_PATH,  joinpath(@__DIR__, "cache_adapters"),
                   joinpath(@__DIR__, "session_adapters"),
+                  joinpath(@__DIR__, "renderers"),
                   config.path_resources, config.path_helpers)
 
 include(joinpath(@__DIR__, "genie_types.jl"))

diff --git a/src/Renderer.jl b/src/Renderer.jl
@@ -333,8 +333,10 @@ function hasrequested(content_type::Symbol) :: Bool
   task_local_storage(:__params)[:response_type] == content_type
 end
 
+
 ### RESPONSES ###
 
+
 """
 Constructs a `Response` corresponding to the content-type sof the request.
 """

diff --git a/src/HTMLRenderer.jl → src/renderers/HTMLRenderer.jl b/src/HTMLRenderer.jl → src/renderers/HTMLRenderer.jl
diff --git a/src/JSONRenderer.jl → src/renderers/JSONRenderer.jl b/src/JSONRenderer.jl → src/renderers/JSONRenderer.jl
diff --git a/src/JSRenderer.jl → src/renderers/JSRenderer.jl b/src/JSRenderer.jl → src/renderers/JSRenderer.jl
diff --git a/test/tests_flax_control_flow_rendering.jl b/test/tests_flax_control_flow_rendering.jl
@@ -0,0 +1,33 @@
+@safetestset "Control flow rendering" begin
+  @safetestset "IF conditional rendering" begin
+    @safetestset "IF true" begin
+      using Genie
+      using Genie.Renderer
+
+      view = raw"""
+                <section class='block'>
+                  <% if true %>
+                    <h1>Hello</h1>
+                    <p>Welcome</p>
+                  <% end %>
+                </section>"""
+
+      @test String(html(view).body) == raw"<html><head></head><body><section class=\"block\"><h1>Hello</h1><p>Welcome</p></section></body></html>"
+    end;
+
+    @safetestset "IF false" begin
+      using Genie
+      using Genie.Renderer
+
+      view = raw"""
+                <section class='block'>
+                  <% if false %>
+                    <h1>Hello</h1>
+                    <p>Welcome</p>
+                  <% end %>
+                </section>"""
+
+      @test String(html(view).body) == raw"""<html><head></head><body><section class="block"></section></body></html>"""
+    end;
+  end;
+end;
-Original file line number
+Diff line change
@@ Expand Up / @@ -333,8 +333,10 @@ function hasrequested(content_type::Symbol) :: Bool @@
       task_local_storage(:__params)[:response_type] == content_type
     end
     ### RESPONSES ###
     """
     Constructs a `Response` corresponding to the content-type sof the request.
     """
@@ Expand Down @@